update to 7.4.0RC2 (new tag)

2 files changed, 3 insertions, 88 deletions

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 <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) \
diff --git a/php.spec b/php.spec
index 1612557..25bc52f 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: 20%{?dist}
+Release: 21%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -174,7 +174,6 @@ Patch91: php-7.2.0-oci8conf.patch
 Patch300: php-7.0.10-datetests.patch
 
 # WIP
-Patch100: https://github.com/php/php-src/commit/db094b4b2e5ef0f0c30f412ce3a2516e31e17da7.patch
 
 BuildRequires: gnupg2
 BuildRequires: bzip2-devel
@@ -946,7 +945,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch300 -p1 -b .datetests
 
 # WIP patch
-%patch100 -p1
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1790,8 +1788,8 @@ fi
 
 
 %changelog
-* Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc2-20
-- test build
+* Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc2-21
+- update to 7.4.0RC2 (new tag)
 
 * Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc2-19
 - update to 7.4.0RC2