7.2.1RC1

3 files changed, 7 insertions, 95 deletions

diff --git a/0001-Fixed-bug-75514-mt_rand-returns-value-outside-min-ma.patch b/0001-Fixed-bug-75514-mt_rand-returns-value-outside-min-ma.patch
deleted file mode 100644
index c963933..0000000
--- a/0001-Fixed-bug-75514-mt_rand-returns-value-outside-min-ma.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 00500c425ba895f1b3591ace3ccd5ee125307559 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 13 Nov 2017 09:55:10 +0100
-Subject: [PATCH] Fixed bug #75514 mt_rand returns value outside [$min,$max]+
- on 32-bit
-
----
- ext/standard/mt_rand.c                |  4 ++--
- ext/standard/tests/math/bug75514.phpt | 12 ++++++++++++
- 2 files changed, 14 insertions(+), 2 deletions(-)
- create mode 100644 ext/standard/tests/math/bug75514.phpt
-
-diff --git a/ext/standard/mt_rand.c b/ext/standard/mt_rand.c
-index 2335a92..6669cbc 100644
---- a/ext/standard/mt_rand.c
-+++ b/ext/standard/mt_rand.c
-@@ -294,7 +294,7 @@ PHPAPI zend_long php_mt_rand_range(zend_long min, zend_long max)
-  * rand() allows min > max, mt_rand does not */
- PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max)
- {
--	zend_long n;
-+	uint32_t n;
- 
- 	if (BG(mt_rand_mode) == MT_RAND_MT19937) {
- 		return php_mt_rand_range(min, max);
-@@ -302,7 +302,7 @@ PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max)
- 
- 	/* Legacy mode deliberately not inside php_mt_rand_range()
- 	 * to prevent other functions being affected */
--	n = (zend_long)php_mt_rand() >> 1;
-+	n = php_mt_rand() >> 1;
- 	RAND_RANGE_BADSCALING(n, min, max, PHP_MT_RAND_MAX);
- 
- 	return n;
-diff --git a/ext/standard/tests/math/bug75514.phpt b/ext/standard/tests/math/bug75514.phpt
-new file mode 100644
-index 0000000..af97b6d
---- /dev/null
-+++ b/ext/standard/tests/math/bug75514.phpt
-@@ -0,0 +1,12 @@
-+--TEST--
-+Bug #75514 mt_rand returns value outside [$min,$max]
-+--FILE--
-+<?php
-+mt_srand(0, MT_RAND_PHP);
-+var_dump(mt_rand(0,999999999), mt_rand(0,999));
-+?>
-+===Done===
-+--EXPECT--
-+int(448865905)
-+int(592)
-+===Done===
--- 
-2.9.5
-
-From 2b071028973782ed87e7038e56d47e9897be804a Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Tue, 28 Nov 2017 17:42:43 +0100
-Subject: [PATCH] better fix for #75514
-
----
- ext/standard/mt_rand.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ext/standard/mt_rand.c b/ext/standard/mt_rand.c
-index 0a76ab8..46f52db 100644
---- a/ext/standard/mt_rand.c
-+++ b/ext/standard/mt_rand.c
-@@ -260,7 +260,7 @@ PHPAPI zend_long php_mt_rand_range(zend_long min, zend_long max)
-  * rand() allows min > max, mt_rand does not */
- PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max)
- {
--	uint32_t n;
-+	int64_t n;
- 
- 	if (BG(mt_rand_mode) == MT_RAND_MT19937) {
- 		return php_mt_rand_range(min, max);
-@@ -268,7 +268,7 @@ PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max)
- 
- 	/* Legacy mode deliberately not inside php_mt_rand_range()
- 	 * to prevent other functions being affected */
--	n = php_mt_rand() >> 1;
-+	n = (int64_t)php_mt_rand() >> 1;
- 	RAND_RANGE_BADSCALING(n, min, max, PHP_MT_RAND_MAX);
- 
- 	return n;
--- 
-2.1.4
-
diff --git a/failed.txt b/failed.txt
index 2a7b9db..7065a27 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.1.0 (2017-11-30)
+===== 7.2.1RC1 (2017-12-14)
 
 $ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
 
diff --git a/php72.spec b/php72.spec
index d76a5be..4687bbd 100644
--- a/php72.spec
+++ b/php72.spec
@@ -111,13 +111,13 @@
 %global db_devel  libdb-devel
 %endif
 
-%global upver        7.2.0
-#global rcver        RC6
+%global upver        7.2.1
+%global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -182,7 +182,6 @@ Patch300: php-7.0.10-datetests.patch
 Patch301: php-7.0.0-oldpcre.patch
 
 # WIP
-Patch400: 0001-Fixed-bug-75514-mt_rand-returns-value-outside-min-ma.patch
 
 BuildRequires: bzip2-devel, curl-devel >= 7.9
 BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
@@ -1089,7 +1088,6 @@ fi
 %endif
 
 # WIP patch
-%patch400 -p1 -bug75514
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -2125,6 +2123,9 @@ fi
 
 
 %changelog
+* Wed Dec 13 2017 Remi Collet <remi@remirepo.net> - 7.2.1~RC1-1
+- update to 7.2.1RC1
+
 * Tue Nov 28 2017 Remi Collet <remi@remirepo.net> - 7.2.0-2
 - refresh patch for https://bugs.php.net/75514