From 755af19adc8fc00e300152e3954d9e605ba85c48 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Mar 2018 16:21:11 +0100 Subject: v7.1.16RC1 --- failed.txt | 6 ++---- php-7.1.16-dlopen.patch | 30 ++++++++++++++++++++++++++++++ php-7.1.3-dlopen.patch | 30 ------------------------------ php71.spec | 9 ++++++--- 4 files changed, 38 insertions(+), 37 deletions(-) create mode 100644 php-7.1.16-dlopen.patch delete mode 100644 php-7.1.3-dlopen.patch diff --git a/failed.txt b/failed.txt index 883fed9..b2b4995 100644 --- a/failed.txt +++ b/failed.txt @@ -1,9 +1,9 @@ -===== 7.1.15 (2018-03-01) +===== 7.1.16RC1 (2018-03-15) $ grep -r 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/el6i/build.log:Tests failed : 0 -/var/lib/mock/el6x/build.log:Tests failed : 1 +/var/lib/mock/el6x/build.log:Tests failed : 0 /var/lib/mock/el7x/build.log:Tests failed : 0 /var/lib/mock/fc25i/build.log:Tests failed : 0 /var/lib/mock/fc25x/build.log:Tests failed : 0 @@ -13,8 +13,6 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/fc27x/build.log:Tests failed : 0 -el6x: - 1 Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt] fc26i: 1 Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt] diff --git a/php-7.1.16-dlopen.patch b/php-7.1.16-dlopen.patch new file mode 100644 index 0000000..7ace226 --- /dev/null +++ b/php-7.1.16-dlopen.patch @@ -0,0 +1,30 @@ +diff -up php-7.1.16RC1/sapi/litespeed/lsapilib.c.dlopen php-7.1.16RC1/sapi/litespeed/lsapilib.c +--- php-7.1.16RC1/sapi/litespeed/lsapilib.c.dlopen 2018-03-14 13:19:47.998931942 +0100 ++++ php-7.1.16RC1/sapi/litespeed/lsapilib.c 2018-03-14 13:20:30.942148432 +0100 +@@ -755,7 +755,7 @@ static int (*fp_lve_leave)(struct liblve + static int (*fp_lve_jail)( struct passwd *, char *) = NULL; + static int lsapi_load_lve_lib(void) + { +- s_liblve = dlopen("liblve.so.0", RTLD_LAZY); ++ s_liblve = dlopen("liblve.so.0", RTLD_NOW); + if (s_liblve) + { + fp_lve_is_available = dlsym(s_liblve, "lve_is_available"); +diff -up php-7.1.16RC1/Zend/zend_portability.h.dlopen php-7.1.16RC1/Zend/zend_portability.h +--- php-7.1.16RC1/Zend/zend_portability.h.dlopen 2018-03-14 06:00:31.000000000 +0100 ++++ php-7.1.16RC1/Zend/zend_portability.h 2018-03-14 13:19:47.998931942 +0100 +@@ -146,11 +146,11 @@ + # endif + + # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT) +-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT) ++# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT) + # elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) +-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND) ++# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND) + # else +-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL) ++# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL) + # endif + # define DL_UNLOAD dlclose + # if defined(DLSYM_NEEDS_UNDERSCORE) diff --git a/php-7.1.3-dlopen.patch b/php-7.1.3-dlopen.patch deleted file mode 100644 index cd35dc0..0000000 --- a/php-7.1.3-dlopen.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up php-7.1.3RC1/sapi/litespeed/lsapilib.c.dlopen php-7.1.3RC1/sapi/litespeed/lsapilib.c ---- php-7.1.3RC1/sapi/litespeed/lsapilib.c.dlopen 2017-02-28 10:12:34.000000000 +0100 -+++ php-7.1.3RC1/sapi/litespeed/lsapilib.c 2017-02-28 10:23:11.384521740 +0100 -@@ -616,7 +616,7 @@ static int (*fp_lve_leave)(struct liblve - static int (*fp_lve_jail)( struct passwd *, char *) = NULL; - static int lsapi_load_lve_lib() - { -- s_liblve = dlopen("liblve.so.0", RTLD_LAZY); -+ s_liblve = dlopen("liblve.so.0", RTLD_NOW); - if (s_liblve) - { - fp_lve_is_available = dlsym(s_liblve, "lve_is_available"); -diff -up php-7.1.3RC1/Zend/zend_portability.h.dlopen php-7.1.3RC1/Zend/zend_portability.h ---- php-7.1.3RC1/Zend/zend_portability.h.dlopen 2017-02-28 10:23:11.384521740 +0100 -+++ php-7.1.3RC1/Zend/zend_portability.h 2017-02-28 10:26:08.960308560 +0100 -@@ -146,11 +146,11 @@ - # endif - - # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT) --# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT) -+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT) - # elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) --# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND) -+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND) - # else --# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL) -+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL) - # endif - # define DL_UNLOAD dlclose - # if defined(DLSYM_NEEDS_UNDERSCORE) diff --git a/php71.spec b/php71.spec index 4c2f56b..29d2db3 100644 --- a/php71.spec +++ b/php71.spec @@ -107,8 +107,8 @@ %global db_devel libdb-devel %endif -%global upver 7.1.15 -#global rcver RC1 +%global upver 7.1.16 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -153,7 +153,7 @@ Patch8: php-7.0.2-libdb.patch Patch9: php-7.0.7-curl.patch # Functional changes -Patch40: php-7.1.3-dlopen.patch +Patch40: php-7.1.16-dlopen.patch Patch42: php-7.1.0-systzdata-v14.patch # See http://bugs.php.net/53436 Patch43: php-5.4.0-phpize.patch @@ -2052,6 +2052,9 @@ fi %changelog +* Wed Mar 14 2018 Remi Collet - 7.1.16~RC1-1 +- Update to 7.1.16RC1 + * Wed Feb 28 2018 Remi Collet - 7.1.15-1 - Update to 7.1.15 - http://www.php.net/releases/7_1_15.php - FPM: revert pid file removal -- cgit