From 952ff17391f86519e56e6124f34686550fca3d33 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Dec 2017 07:29:50 +0100 Subject: [PATCH] update to 7.2.1RC1 --- .gitignore | 1 + ...mt_rand-returns-value-outside-min-ma.patch | 89 ------------------- php.spec | 11 +-- sources | 2 +- 4 files changed, 8 insertions(+), 95 deletions(-) delete mode 100644 0001-Fixed-bug-75514-mt_rand-returns-value-outside-min-ma.patch diff --git a/.gitignore b/.gitignore index b976076..d7e4bc5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ php-7.1.*.xz /php-7.2.0RC5.tar.xz /php-7.2.0RC6.tar.xz /php-7.2.0.tar.xz +/php-7.2.1RC1.tar.xz 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 -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-- -+ -+===Done=== -+--EXPECT-- -+int(448865905) -+int(592) -+===Done=== --- -2.9.5 - -From 2b071028973782ed87e7038e56d47e9897be804a Mon Sep 17 00:00:00 2001 -From: Remi Collet -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/php.spec b/php.spec index f8c6e75..1d2419d 100644 --- a/php.spec +++ b/php.spec @@ -61,13 +61,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: 3%{?dist} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -114,7 +114,6 @@ Patch46: php-7.2.0-fixheader.patch Patch47: php-5.6.3-phpinfo.patch # Upstream fixes (100+) -Patch100: 0001-Fixed-bug-75514-mt_rand-returns-value-outside-min-ma.patch # Security fixes (200+) @@ -728,7 +727,6 @@ low-level PHP extension for the libsodium cryptographic library. %patch47 -p1 -b .phpinfo # upstream patches -%patch100 -p1 -b .upstream # security patches @@ -1522,6 +1520,9 @@ rm -f README.{Zeus,QNX,CVS-RULES} %changelog +* Wed Dec 13 2017 Remi Collet - 7.2.1~RC1-1 +- update to 7.2.1RC1 + * Thu Nov 30 2017 Pete Walter - 7.2.0-3 - Rebuild for ICU 60.1 diff --git a/sources b/sources index 8b422fb..73d77da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-7.2.0.tar.xz) = 828d38727edde0dbc6483add6cdc21d33527b887bffaedad2d7f53e25d58a6f661ac341a23db02741bc37248d161aaffd72026dd8ef85ac851594c127d6c0133 +SHA512 (php-7.2.1RC1.tar.xz) = bfab5564bb514ed9f3281b7a6480fd93e675380c840674c30b12817ba77523dd1abcc26d178223db14770f2e83404b8fe45daf81ab75aca53a20f53177c0df8c