From 7242cd5b86ed5e0e38436884e5246f1f657cc346 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Oct 2019 14:21:46 +0200 Subject: update to 7.4.0RC4 --- 1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch | 37 ------------ 33958ccb3600daa3a3b96671aadada5e75bfd075.patch | 26 -------- b64a182233344030dee3fb269c1d60cf1a23b106.patch | 84 -------------------------- e1362b3cf0021c1c8492594da08b7a017b3585ba.patch | 53 ---------------- failed.txt | 4 +- php.ini | 12 ++++ php.spec | 17 ++---- 7 files changed, 20 insertions(+), 213 deletions(-) delete mode 100644 1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch delete mode 100644 33958ccb3600daa3a3b96671aadada5e75bfd075.patch delete mode 100644 b64a182233344030dee3fb269c1d60cf1a23b106.patch delete mode 100644 e1362b3cf0021c1c8492594da08b7a017b3585ba.patch diff --git a/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch b/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch deleted file mode 100644 index 3863c41..0000000 --- a/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325 Mon Sep 17 00:00:00 2001 -From: Dmitry Stogov -Date: Thu, 10 Oct 2019 16:24:12 +0300 -Subject: [PATCH] Revert "Don't buid static libaraies when only DSO required" - -This reverts commit f633c347574c0d814050b4bf2493e0cac6a5988c. ---- - build/Makefile.global | 2 +- - build/php.m4 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/Makefile.global b/build/Makefile.global -index 3aec9fc9d597..82e0d69f35e3 100644 ---- a/build/Makefile.global -+++ b/build/Makefile.global -@@ -16,7 +16,7 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) - build-binaries: $(PHP_BINARIES) - - libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -- $(LIBTOOL) --mode=link --tag=disable-static $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ - -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 - - libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -diff --git a/build/php.m4 b/build/php.m4 -index 57016ad7669f..2105e703249c 100644 ---- a/build/php.m4 -+++ b/build/php.m4 -@@ -849,7 +849,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[ - \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir) - - $3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES) -- \$(LIBTOOL) --mode=link --tag=disable-static ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) -+ \$(LIBTOOL) --mode=link ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) - - EOF - ]) diff --git a/33958ccb3600daa3a3b96671aadada5e75bfd075.patch b/33958ccb3600daa3a3b96671aadada5e75bfd075.patch deleted file mode 100644 index 7be359e..0000000 --- a/33958ccb3600daa3a3b96671aadada5e75bfd075.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 33958ccb3600daa3a3b96671aadada5e75bfd075 Mon Sep 17 00:00:00 2001 -From: Dmitry Stogov -Date: Thu, 10 Oct 2019 16:24:15 +0300 -Subject: [PATCH] Revert "Fixed CLI/CGI/FPM build, when they are built together - with Apache SAPI" - -This reverts commit db094b4b2e5ef0f0c30f412ce3a2516e31e17da7. ---- - configure.ac | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a522bdc2b562..8f19fe0e60d1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1103,9 +1103,7 @@ enable_static=yes - - case $php_sapi_module in - shared[)] -- if test "$PHP_CGI" = "no" && test "$PHP_CLI" = "no" && test "$PHP_FPM" = "no" && test "$PHP_LITESPEED" = "no" && test "$PHP_PHPDBG" = "no"; then -- enable_static=no -- fi -+ enable_static=no - case $with_pic in - yes) - standard_libtool_flag='-prefer-pic' diff --git a/b64a182233344030dee3fb269c1d60cf1a23b106.patch b/b64a182233344030dee3fb269c1d60cf1a23b106.patch deleted file mode 100644 index fffb15c..0000000 --- a/b64a182233344030dee3fb269c1d60cf1a23b106.patch +++ /dev/null @@ -1,84 +0,0 @@ -From b64a182233344030dee3fb269c1d60cf1a23b106 Mon Sep 17 00:00:00 2001 -From: Dmitry Stogov -Date: Thu, 10 Oct 2019 16:23:59 +0300 -Subject: [PATCH] Revert "Link executable files using non PIC object files. - This reduces PIC overhead and improves performance." - -This reverts commit eef85229d0fe9f69d325aa0231e592f35c468afb. ---- - sapi/cgi/config9.m4 | 2 +- - sapi/cli/config.m4 | 2 +- - sapi/fpm/config.m4 | 2 +- - sapi/litespeed/config.m4 | 2 +- - sapi/phpdbg/config.m4 | 6 +++--- - 5 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 -index 04bd70b269ee..ae927cd5f8de 100644 ---- a/sapi/cgi/config9.m4 -+++ b/sapi/cgi/config9.m4 -@@ -55,7 +55,7 @@ if test "$PHP_CGI" != "no"; then - BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" - ;; - *) -- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" -+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" - ;; - esac - -diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 -index d17d53168360..917d45fad17a 100644 ---- a/sapi/cli/config.m4 -+++ b/sapi/cli/config.m4 -@@ -42,7 +42,7 @@ if test "$PHP_CLI" != "no"; then - BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" - ;; - *) -- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" -+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" - ;; - esac - -diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 -index f71fa710ddaf..ad89c1bb52df 100644 ---- a/sapi/fpm/config.m4 -+++ b/sapi/fpm/config.m4 -@@ -660,7 +660,7 @@ if test "$PHP_FPM" != "no"; then - BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" - ;; - *) -- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" -+ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" - ;; - esac - -diff --git a/sapi/litespeed/config.m4 b/sapi/litespeed/config.m4 -index 89074053852c..3a816a19bf4f 100644 ---- a/sapi/litespeed/config.m4 -+++ b/sapi/litespeed/config.m4 -@@ -18,7 +18,7 @@ if test "$PHP_LITESPEED" != "no"; then - BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" - ;; - *) -- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" -+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" - ;; - esac - -diff --git a/sapi/phpdbg/config.m4 b/sapi/phpdbg/config.m4 -index e78c012e88c5..d4bceed4f78a 100644 ---- a/sapi/phpdbg/config.m4 -+++ b/sapi/phpdbg/config.m4 -@@ -63,9 +63,9 @@ if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then - - BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ - \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ -- \$(PHP_GLOBAL_OBJS:.lo=.o) \ -- \$(PHP_BINARY_OBJS:.lo=.o) \ -- \$(PHP_PHPDBG_OBJS:.lo=.o) \ -+ \$(PHP_GLOBAL_OBJS) \ -+ \$(PHP_BINARY_OBJS) \ -+ \$(PHP_PHPDBG_OBJS) \ - \$(EXTRA_LIBS) \ - \$(PHPDBG_EXTRA_LIBS) \ - \$(ZEND_EXTRA_LIBS) \ diff --git a/e1362b3cf0021c1c8492594da08b7a017b3585ba.patch b/e1362b3cf0021c1c8492594da08b7a017b3585ba.patch deleted file mode 100644 index 3fd99a8..0000000 --- a/e1362b3cf0021c1c8492594da08b7a017b3585ba.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e1362b3cf0021c1c8492594da08b7a017b3585ba Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 7 Oct 2019 16:31:09 +0200 -Subject: [PATCH] add librt for opcache - ---- - ext/opcache/config.m4 | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index a388dd787b67..6c40cafc1c39 100644 ---- a/ext/opcache/config.m4 -+++ b/ext/opcache/config.m4 -@@ -13,6 +13,9 @@ PHP_ARG_ENABLE([huge-code-pages], - - if test "$PHP_OPCACHE" != "no"; then - -+ dnl Always build as shared extension -+ ext_shared=yes -+ - if test "$PHP_HUGE_CODE_PAGES" = "yes"; then - AC_DEFINE(HAVE_HUGE_CODE_PAGES, 1, [Define to enable copying PHP CODE pages into HUGE PAGES (experimental)]) - fi -@@ -141,6 +144,7 @@ int main() { - msg=yes],[msg=no],[msg=no]) - AC_MSG_RESULT([$msg]) - -+ PHP_CHECK_FUNC_LIB(shm_open, rt) - AC_MSG_CHECKING(for mmap() using shm_open() shared memory support) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include -@@ -207,8 +211,13 @@ int main() { - } - ]])],[dnl - AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) -- msg=yes],[msg=no],[msg=no]) -- AC_MSG_RESULT([$msg]) -+ AC_MSG_RESULT([yes]) -+ PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) -+ ],[ -+ AC_MSG_RESULT([no]) -+ ],[ -+ AC_MSG_RESULT([no]) -+ ]) - - PHP_NEW_EXTENSION(opcache, - ZendAccelerator.c \ -@@ -250,4 +259,5 @@ int main() { - - PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1) - PHP_ADD_EXTENSION_DEP(opcache, pcre) -+ PHP_SUBST(OPCACHE_SHARED_LIBADD) - fi diff --git a/failed.txt b/failed.txt index 5781176..daea284 100644 --- a/failed.txt +++ b/failed.txt @@ -1,9 +1,9 @@ -===== 7.4.0RC3 (2019-10-03) +===== 7.4.0RC4 (2019-10-17) $ grep -ar 'Tests failed' /var/lib/mock/scl74*/build.log /var/lib/mock/scl74el7x/build.log:Tests failed : 0 -/var/lib/mock/scl74el8x/build.log:Tests failed : 16 +/var/lib/mock/scl74el8x/build.log:Tests failed : 30 /var/lib/mock/scl74fc29x/build.log:Tests failed : 0 /var/lib/mock/scl74fc30x/build.log:Tests failed : 0 /var/lib/mock/scl74fc31x/build.log:Tests failed : 0 diff --git a/php.ini b/php.ini index e7db839..6f476b2 100644 --- a/php.ini +++ b/php.ini @@ -284,6 +284,13 @@ implicit_flush = Off ; callback-function. unserialize_callback_func = +; The unserialize_max_depth specifies the default depth limit for unserialized +; structures. Setting the depth limit too high may result in stack overflows +; during unserialization. The unserialize_max_depth ini setting can be +; overridden by the max_depth option on individual unserialize() calls. +; A value of 0 disables the depth limit. +;unserialize_max_depth = 4096 + ; When floats & doubles are serialized, store serialize_precision significant ; digits after the floating point. The default value ensures that when floats ; are decoded with unserialize, the data will remain the same. @@ -1568,6 +1575,11 @@ zend.assertions = -1 ; Default: 100000 ;mbstring.regex_stack_limit=100000 +; This directive specifies maximum retry count for mbstring regular expressions. It is similar +; to the pcre.backtrack_limit for PCRE. +; Default: 1000000 +;mbstring.regex_retry_limit=1000000 + [gd] ; Tell the jpeg decode to ignore warnings and try to create ; a gd image. The warning will then be displayed as notices diff --git a/php.spec b/php.spec index 8592374..b1f7985 100644 --- a/php.spec +++ b/php.spec @@ -102,13 +102,13 @@ %global gh_owner php %global gh_project php-src %global upver 7.4.0 -%global rcver RC3 -%global lower rc3 +%global rcver RC4 +%global lower rc4 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} -Release: 27%{?dist} +Release: 28%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -166,10 +166,6 @@ Patch47: php-5.6.3-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) -Patch100: https://github.com/php/php-src/commit/b64a182233344030dee3fb269c1d60cf1a23b106.patch -Patch101: https://github.com/php/php-src/commit/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch -Patch102: https://github.com/php/php-src/commit/33958ccb3600daa3a3b96671aadada5e75bfd075.patch -Patch103: https://github.com/php/php-src/commit/e1362b3cf0021c1c8492594da08b7a017b3585ba.patch # Security fixes (200+) @@ -942,10 +938,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .up -%patch101 -p1 -b .up1 -%patch102 -p1 -b .up2 -%patch103 -p1 -b .up3 # security patches @@ -1812,6 +1804,9 @@ fi %changelog +* Tue Oct 15 2019 Remi Collet - 7.4.0~rc4-28 +- update to 7.4.0RC4 + * Fri Oct 11 2019 Remi Collet - 7.4.0~rc3-27 - test build with more upstream patches -- cgit