diff --git a/.gitignore b/.gitignore index c51a83e..8df6419 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ php-7.1.*.xz /php-7.0.14.tar.xz /php-7.0.15.tar.xz /php-7.0.16.tar.xz +/php-7.0.17RC1.tar.xz diff --git a/php-7.0.0-dlopen.patch b/php-7.0.17-dlopen.patch similarity index 60% rename from php-7.0.0-dlopen.patch rename to php-7.0.17-dlopen.patch index 4047460..37a461c 100644 --- a/php-7.0.0-dlopen.patch +++ b/php-7.0.17-dlopen.patch @@ -1,7 +1,7 @@ -diff -up php-7.0.0RC1/sapi/litespeed/lsapilib.c.dlopen php-7.0.0RC1/sapi/litespeed/lsapilib.c ---- php-7.0.0RC1/sapi/litespeed/lsapilib.c.dlopen 2015-08-18 23:39:17.000000000 +0200 -+++ php-7.0.0RC1/sapi/litespeed/lsapilib.c 2015-08-22 07:46:31.729721983 +0200 -@@ -582,7 +582,7 @@ static int (*fp_lve_leave)(struct liblve +diff -up php-7.0.17RC1/sapi/litespeed/lsapilib.c.dlopen php-7.0.17RC1/sapi/litespeed/lsapilib.c +--- php-7.0.17RC1/sapi/litespeed/lsapilib.c.dlopen 2017-02-28 12:11:33.000000000 +0100 ++++ php-7.0.17RC1/sapi/litespeed/lsapilib.c 2017-02-28 13:06:07.493838664 +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() { @@ -10,16 +10,16 @@ diff -up php-7.0.0RC1/sapi/litespeed/lsapilib.c.dlopen php-7.0.0RC1/sapi/litespe if (s_liblve) { fp_lve_is_available = dlsym(s_liblve, "lve_is_available"); -diff -up php-7.0.0RC1/Zend/zend_portability.h.dlopen php-7.0.0RC1/Zend/zend_portability.h ---- php-7.0.0RC1/Zend/zend_portability.h.dlopen 2015-08-18 23:39:16.000000000 +0200 -+++ php-7.0.0RC1/Zend/zend_portability.h 2015-08-22 07:46:31.729721983 +0200 -@@ -136,11 +136,11 @@ +diff -up php-7.0.17RC1/Zend/zend_portability.h.dlopen php-7.0.17RC1/Zend/zend_portability.h +--- php-7.0.17RC1/Zend/zend_portability.h.dlopen 2017-02-28 13:06:07.493838664 +0100 ++++ php-7.0.17RC1/Zend/zend_portability.h 2017-02-28 13:07:10.626118397 +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) + # 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 diff --git a/php.spec b/php.spec index c00359e..aea656d 100644 --- a/php.spec +++ b/php.spec @@ -58,17 +58,13 @@ %global db_devel libdb-devel %endif -#global rcver RC1 +%global rcver RC1 %global rpmrel 1 Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 7.0.16 -%if 0%{?rcver:1} -Release: 0.%{rpmrel}.%{rcver}%{?dist} -%else -Release: %{rpmrel}%{?dist} -%endif +Version: 7.0.17 +Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -99,7 +95,7 @@ Patch7: php-5.3.0-recode.patch Patch8: php-7.0.2-libdb.patch # Functional changes -Patch40: php-7.0.0-dlopen.patch +Patch40: php-7.0.17-dlopen.patch Patch42: php-7.0.0-systzdata-v14.patch # See http://bugs.php.net/53436 Patch43: php-5.4.0-phpize.patch @@ -1490,6 +1486,9 @@ rm -f README.{Zeus,QNX,CVS-RULES} %changelog +* Tue Feb 28 2017 Remi Collet 7.0.17-0.1.RC1 +- Update to 7.0.17RC1 + * Wed Feb 15 2017 Remi Collet 7.0.16-1 - Update to 7.0.16 - http://www.php.net/releases/7_0_16.php diff --git a/sources b/sources index 1617a31..c56826d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-7.0.16.tar.xz) = 7925971a4a01f00110bd9fd80d805adc9cdb0021e639e4d84a9f5d76d7d7aa02d79ed54292fa0947f47cc99854181e203f7ecf6f25d60b804e0bc447b169134f +SHA512 (php-7.0.17RC1.tar.xz) = 383f94911b0d35038c2800f0ca89dea4ffe62e3e25ce5fefca3e3e1066190c2630c7f3d08fe04c3ee92951873195dd6717f3e0814fb3fbdaac9a36038ad6fd8d