diff options
| -rw-r--r-- | 56e880af9f90c9d313292c75eb6df58cc9e7e208.patch | 83 | ||||
| -rw-r--r-- | failed.txt | 8 | ||||
| -rw-r--r-- | php-7.4.0-ldap_r.patch (renamed from php-7.2.3-ldap_r.patch) | 12 | ||||
| -rw-r--r-- | php74.spec | 24 |
4 files changed, 109 insertions, 18 deletions
diff --git a/56e880af9f90c9d313292c75eb6df58cc9e7e208.patch b/56e880af9f90c9d313292c75eb6df58cc9e7e208.patch new file mode 100644 index 0000000..a8ea251 --- /dev/null +++ b/56e880af9f90c9d313292c75eb6df58cc9e7e208.patch @@ -0,0 +1,83 @@ +From 56e880af9f90c9d313292c75eb6df58cc9e7e208 Mon Sep 17 00:00:00 2001 +From: Dmitry Stogov <dmitry@zend.com> +Date: Tue, 3 Sep 2019 23:42:22 +0300 +Subject: [PATCH] Link executable files using non PIC object files. This + reduces PIC overhead and improves performance. + +--- + 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 ae927cd5f8de..04bd70b269ee 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) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(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)" + ;; + esac + +diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 +index 917d45fad17a..d17d53168360 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) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(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)" + ;; + esac + +diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 +index ad89c1bb52df..f71fa710ddaf 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) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(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)" + ;; + esac + +diff --git a/sapi/litespeed/config.m4 b/sapi/litespeed/config.m4 +index 3a816a19bf4f..89074053852c 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) \$(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)" + ;; + esac + +diff --git a/sapi/phpdbg/config.m4 b/sapi/phpdbg/config.m4 +index d4bceed4f78a..e78c012e88c5 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) \ +- \$(PHP_BINARY_OBJS) \ +- \$(PHP_PHPDBG_OBJS) \ ++ \$(PHP_GLOBAL_OBJS:.lo=.o) \ ++ \$(PHP_BINARY_OBJS:.lo=.o) \ ++ \$(PHP_PHPDBG_OBJS:.lo=.o) \ + \$(EXTRA_LIBS) \ + \$(PHPDBG_EXTRA_LIBS) \ + \$(ZEND_EXTRA_LIBS) \ @@ -1,9 +1,9 @@ -===== 7.4.0RC1 (2019-09-05) +===== 7.4.0RC2 (2019-09-19) $ grep -ar 'Tests failed' /var/lib/mock/{fc,el}*/build.log /var/lib/mock/el7x/build.log:Tests failed : 0 -/var/lib/mock/el8x74/build.log:Tests failed : 14 +/var/lib/mock/el8x74/build.log:Tests failed : 16 /var/lib/mock/fc29i/build.log:Tests failed : 0 /var/lib/mock/fc29x/build.log:Tests failed : 0 /var/lib/mock/fc30i/build.log:Tests failed : 0 @@ -12,10 +12,6 @@ $ grep -ar 'Tests failed' /var/lib/mock/{fc,el}*/build.log /var/lib/mock/fc31x/build.log:Tests failed : 0 -el8x, fc28i, fc28x: - 6 Bug #78338 (Array cross-border reading in PCRE) [ext/pcre/tests/bug78338.phpt] -el8x: - 5 buildroot issue with openssl under investigation 1 proc_open give erratic test results :( diff --git a/php-7.2.3-ldap_r.patch b/php-7.4.0-ldap_r.patch index 5e947cf..13566b4 100644 --- a/php-7.2.3-ldap_r.patch +++ b/php-7.4.0-ldap_r.patch @@ -1,12 +1,12 @@ Use -lldap_r by default. -diff -up php-7.2.3RC1/ext/ldap/config.m4.ldap_r php-7.2.3RC1/ext/ldap/config.m4 ---- php-7.2.3RC1/ext/ldap/config.m4.ldap_r 2018-02-14 06:05:11.553142812 +0100 -+++ php-7.2.3RC1/ext/ldap/config.m4 2018-02-14 06:07:31.179816122 +0100 -@@ -119,7 +119,11 @@ if test "$PHP_LDAP" != "no"; then - - MACHINE_INCLUDES=$($CC -dumpmachine) +diff -up php-7.4.0RC2/ext/ldap/config.m4.ldap_r php-7.4.0RC2/ext/ldap/config.m4 +--- php-7.4.0RC2/ext/ldap/config.m4.ldap_r 2019-09-17 10:21:24.769200812 +0200 ++++ php-7.4.0RC2/ext/ldap/config.m4 2019-09-17 10:21:30.658181771 +0200 +@@ -68,7 +68,11 @@ if test "$PHP_LDAP" != "no"; then + dnl -pc removal is a hack for clang + MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//') - if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then + if test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME; then @@ -97,13 +97,13 @@ %global with_zip 0 %global upver 7.4.0 -%global rcver RC1 -%global lower RC1 +%global rcver RC2 +%global lower RC2 Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{lower}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -150,7 +150,7 @@ Patch42: php-7.3.3-systzdata-v18.patch # See http://bugs.php.net/53436 Patch43: php-7.4.0-phpize.patch # Use -lldap_r for OpenLDAP -Patch45: php-7.2.3-ldap_r.patch +Patch45: php-7.4.0-ldap_r.patch # Make php_config.h constant across builds Patch46: php-7.2.4-fixheader.patch # drop "Configure command" from phpinfo output @@ -168,6 +168,7 @@ Patch91: php-7.2.0-oci8conf.patch Patch300: php-7.0.10-datetests.patch # WIP +Patch100: https://github.com/php/php-src/commit/56e880af9f90c9d313292c75eb6df58cc9e7e208.patch BuildRequires: gnupg2 BuildRequires: bzip2-devel @@ -447,6 +448,7 @@ Provides: php-zts-devel%{?_isa} = %{version}-%{release} %endif %if 0%{?rhel} Obsoletes: php53-devel, php53u-devel, php54-devel, php54w-devel, php55u-devel, php55w-devel, php56u-devel, php56w-devel +Obsoletes: php55u-pecl-jsonc-devel, php56u-pecl-jsonc-devel Obsoletes: php70u-devel, php70w-devel, php71u-devel, php71w-devel, php72u-devel, php72w-devel Obsoletes: php73-devel, php73w-devel Obsoletes: php74-devel, php74w-devel @@ -1172,6 +1174,7 @@ in pure PHP. %endif # WIP patch +%patch100 -p1 -R # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1204,6 +1207,8 @@ rm ext/date/tests/bug33414-1.phpt rm ext/date/tests/bug33415-2.phpt rm ext/date/tests/date_modify-1.phpt %endif +# too fast builder +rm ext/date/tests/bug73837.phpt # Should be skipped but fails sometime rm ext/standard/tests/file/file_get_contents_error001.phpt # fails sometime @@ -1215,9 +1220,11 @@ rm Zend/tests/bug68412.phpt rm sapi/cli/tests/upload_2G.phpt # tar issue rm ext/zlib/tests/004-mb.phpt -# avoid issue when 2 builds run simultaneously +# avoid issue when 2 builds run simultaneously (keep 64321 for the SCL) %ifarch x86_64 sed -e 's/64321/64322/' -i ext/openssl/tests/*.phpt +%else +sed -e 's/64321/64323/' -i ext/openssl/tests/*.phpt %endif # Safety check for API version change. @@ -1640,7 +1647,7 @@ export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 export SKIP_ONLINE_TESTS=1 export SKIP_IO_CAPTURE_TESTS=1 unset TZ LANG LC_ALL -if ! make test TESTS=%{?_smp_mflags}; then +if ! make test TESTS=-j4; then set +x for f in $(find .. -name \*.diff -type f -print); do if ! grep -q XFAIL "${f/.diff/.phpt}" @@ -2140,6 +2147,11 @@ fi %changelog +* Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc2-2 +- update to 7.4.0RC2 +- add tarball signature check +- reduce to 4 concurrent test workers + * Thu Sep 5 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC1-1 - update to 7.4.0RC1 |