From 2e43d27999bf2c74044786883fea888778dd0485 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 11 Oct 2019 09:58:31 +0200
Subject: test build with more upstream patches
---
1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch | 37 ++++++++++++
33958ccb3600daa3a3b96671aadada5e75bfd075.patch | 26 ++++++++
b64a182233344030dee3fb269c1d60cf1a23b106.patch | 84 ++++++++++++++++++++++++++
f633c347574c0d814050b4bf2493e0cac6a5988c.patch | 36 -----------
php.spec | 17 ++++--
5 files changed, 159 insertions(+), 41 deletions(-)
create mode 100644 1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch
create mode 100644 33958ccb3600daa3a3b96671aadada5e75bfd075.patch
create mode 100644 b64a182233344030dee3fb269c1d60cf1a23b106.patch
delete mode 100644 f633c347574c0d814050b4bf2493e0cac6a5988c.patch
diff --git a/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch b/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch
new file mode 100644
index 0000000..3863c41
--- /dev/null
+++ b/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch
@@ -0,0 +1,37 @@
+From 1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325 Mon Sep 17 00:00:00 2001
+From: Dmitry Stogov <dmitry@zend.com>
+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
new file mode 100644
index 0000000..7be359e
--- /dev/null
+++ b/33958ccb3600daa3a3b96671aadada5e75bfd075.patch
@@ -0,0 +1,26 @@
+From 33958ccb3600daa3a3b96671aadada5e75bfd075 Mon Sep 17 00:00:00 2001
+From: Dmitry Stogov <dmitry@zend.com>
+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
new file mode 100644
index 0000000..fffb15c
--- /dev/null
+++ b/b64a182233344030dee3fb269c1d60cf1a23b106.patch
@@ -0,0 +1,84 @@
+From b64a182233344030dee3fb269c1d60cf1a23b106 Mon Sep 17 00:00:00 2001
+From: Dmitry Stogov <dmitry@zend.com>
+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/f633c347574c0d814050b4bf2493e0cac6a5988c.patch b/f633c347574c0d814050b4bf2493e0cac6a5988c.patch
deleted file mode 100644
index 55fa13c..0000000
--- a/f633c347574c0d814050b4bf2493e0cac6a5988c.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f633c347574c0d814050b4bf2493e0cac6a5988c Mon Sep 17 00:00:00 2001
-From: Dmitry Stogov <dmitry@zend.com>
-Date: Thu, 19 Sep 2019 23:44:53 +0300
-Subject: [PATCH] Don't buid static libaraies when only DSO required
-
----
- 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 82e0d69f35e3..3aec9fc9d597 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 $(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 --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) --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 3624a33a8eec..3d6a1133777b 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 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 --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)
-
- EOF
- ])
diff --git a/php.spec b/php.spec
index ee0f513..8592374 100644
--- a/php.spec
+++ b/php.spec
@@ -108,7 +108,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 26%{?dist}
+Release: 27%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -166,8 +166,10 @@ 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/f633c347574c0d814050b4bf2493e0cac6a5988c.patch
-Patch101: https://github.com/php/php-src/commit/e1362b3cf0021c1c8492594da08b7a017b3585ba.patch
+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+)
@@ -940,8 +942,10 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -R
-%patch101 -p1 -b .up
+%patch100 -p1 -b .up
+%patch101 -p1 -b .up1
+%patch102 -p1 -b .up2
+%patch103 -p1 -b .up3
# security patches
@@ -1808,6 +1812,9 @@ fi
%changelog
+* Fri Oct 11 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc3-27
+- test build with more upstream patches
+
* Thu Oct 10 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc3-26
- fix librt issue on F31 using upstream patch
--
cgit