From 028729a3046424e0cada55f9a22134b0ab71ba53 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Sep 2019 08:54:38 +0200 Subject: update to 7.4.0RC2 (new tag) --- 56e880af9f90c9d313292c75eb6df58cc9e7e208.patch | 83 -------------------------- failed.txt | 6 +- php74.spec | 10 ++-- 3 files changed, 10 insertions(+), 89 deletions(-) delete mode 100644 56e880af9f90c9d313292c75eb6df58cc9e7e208.patch diff --git a/56e880af9f90c9d313292c75eb6df58cc9e7e208.patch b/56e880af9f90c9d313292c75eb6df58cc9e7e208.patch deleted file mode 100644 index a8ea251..0000000 --- a/56e880af9f90c9d313292c75eb6df58cc9e7e208.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 56e880af9f90c9d313292c75eb6df58cc9e7e208 Mon Sep 17 00:00:00 2001 -From: Dmitry Stogov -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) \ diff --git a/failed.txt b/failed.txt index 90e316c..01780d3 100644 --- a/failed.txt +++ b/failed.txt @@ -6,12 +6,14 @@ $ grep -ar 'Tests failed' /var/lib/mock/{fc,el}*/build.log /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 +/var/lib/mock/fc30i/build.log:Tests failed : 1 /var/lib/mock/fc30x/build.log:Tests failed : 0 /var/lib/mock/fc31i/build.log:Tests failed : 0 /var/lib/mock/fc31x/build.log:Tests failed : 0 +fc30i + 6 SPL: DirectoryIterator and clone [ext/spl/tests/dit_004.phpt] 1 proc_open give erratic test results :( @@ -19,4 +21,4 @@ $ grep -ar 'Tests failed' /var/lib/mock/{fc,el}*/build.log 3 known issue 4 bugs related to tzdata 5 need investigation -6 https://bugzilla.redhat.com/1734468 +6 // issue diff --git a/php74.spec b/php74.spec index 9d942ba..240384d 100644 --- a/php74.spec +++ b/php74.spec @@ -103,7 +103,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{lower}} -Release: 2%{?dist} +Release: 3%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -168,7 +168,6 @@ 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 @@ -1174,7 +1173,6 @@ in pure PHP. %endif # WIP patch -%patch100 -p1 -R # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1916,6 +1914,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \ $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/*.a \ $RPM_BUILD_ROOT%{_bindir}/{phptar} \ $RPM_BUILD_ROOT%{_datadir}/pear \ + $RPM_BUILD_ROOT%{_libdir}/libphp7.a \ $RPM_BUILD_ROOT%{_libdir}/libphp7.la # Remove irrelevant docs @@ -2147,7 +2146,10 @@ fi %changelog -* Tue Sep 17 2019 Remi Collet - 7.4.0~rc2-2 +* Tue Sep 17 2019 Remi Collet - 7.4.0~RC2-3 +- update to 7.4.0RC2 (new tag) + +* Tue Sep 17 2019 Remi Collet - 7.4.0~RC2-2 - update to 7.4.0RC2 - add tarball signature check - reduce to 4 concurrent test workers -- cgit