7.4.9

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  php-7.3.0RC1.tar.xz: 60d0942021f6d26d416da655d42f06e264a78077
+  php-7.4.9.tar.xz: 6d8996e0e033745565eab8f4a8c67438c0f61ee0

php-5.3.0RC1-enchant_lib64_fix.diff

@@ -1,11 +0,0 @@
---- ext/enchant/config.m4	2004-03-08 21:12:12.000000000 +0100
-+++ ext/enchant/config.m4.oden	2009-03-27 12:50:12.000000000 +0100
-@@ -27,7 +27,7 @@
- 		AC_MSG_ERROR(Cannot find enchant)
- 	fi
- 
--	ENCHANT_LIBDIR=$ENCHANT_DIR/lib
-+	ENCHANT_LIBDIR=$ENCHANT_DIR/$PHP_LIBNAME
- 
- 	AC_DEFINE(HAVE_ENCHANT,1,[ ])
- 	PHP_SUBST(ENCHANT_SHARED_LIBADD)

php-5.3.0RC2-xmlrpc-epi_fix.diff

@@ -1,11 +0,0 @@
---- ext/xmlrpc/config.m4	2009-06-11 22:04:26.000000000 +0200
-+++ ext/xmlrpc/config.m4.oden	2009-06-11 22:17:31.000000000 +0200
-@@ -116,7 +116,7 @@
-   fi
- 
-   PHP_ADD_INCLUDE($XMLRPC_DIR)
--  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc,,XMLRPC_SHARED_LIBADD)
-+  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc-epi,,XMLRPC_SHARED_LIBADD)
-   PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c, $ext_shared)
-   PHP_SUBST(XMLRPC_SHARED_LIBADD)
-   XMLRPC_MODULE_TYPE=external

php-5.3.x-fpm-0.6.5-mdv_conf.diff

@@ -1,5 +1,6 @@
---- php-7.0.1/sapi/fpm/php-fpm.conf.in.fpmmdv.droplet	2015-12-16 11:41:54.000000000 +0100
+diff -up php-7.4.1/sapi/fpm/php-fpm.conf.in.fpmmdv.droplet php-7.4.1/sapi/fpm/php-fpm.conf.in
-+++ php-7.0.1/sapi/fpm/php-fpm.conf.in	2015-12-29 00:32:32.641437818 +0100
+--- php-7.4.1/sapi/fpm/php-fpm.conf.in.fpmmdv.droplet	2019-12-17 17:35:58.000000000 +0100
++++ php-7.4.1/sapi/fpm/php-fpm.conf.in	2020-01-08 22:22:54.634218365 +0100
 @@ -14,14 +14,14 @@
  ; Pid file
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
@@ -17,8 +18,9 @@
  
  ; syslog_facility is used to specify what type of program is logging the
  ; message. This lets syslogd specify that messages from different facilities
---- php-7.0.1/sapi/fpm/www.conf.in.fpmmdv.droplet	2015-12-29 00:33:15.685147449 +0100
+diff -up php-7.4.1/sapi/fpm/www.conf.in.fpmmdv.droplet php-7.4.1/sapi/fpm/www.conf.in
-+++ php-7.0.1/sapi/fpm/www.conf.in	2015-12-29 00:34:56.491559636 +0100
+--- php-7.4.1/sapi/fpm/www.conf.in.fpmmdv.droplet	2019-12-17 17:35:58.000000000 +0100
++++ php-7.4.1/sapi/fpm/www.conf.in	2020-01-08 22:23:54.016215484 +0100
 @@ -33,7 +33,7 @@ group = @php_fpm_group@
  ;                            (IPv6 and IPv4-mapped) on a specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
@@ -28,7 +30,7 @@
  
  ; Set listen(2) backlog.
  ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-@@ -104,22 +104,22 @@ pm = dynamic
+@@ -110,22 +110,22 @@ pm = dynamic
  ; forget to tweak pm.* to fit your needs.
  ; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
  ; Note: This value is mandatory.
@@ -37,7 +39,7 @@
  
  ; The number of child processes created on startup.
  ; Note: Used only when pm is set to 'dynamic'
- ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+ ; Default Value: (min_spare_servers + max_spare_servers) / 2
 -pm.start_servers = 2
 +pm.start_servers = 20
  
@@ -55,7 +57,7 @@
  
  ; The number of seconds after which an idle process will be killed.
  ; Note: Used only when pm is set to 'ondemand'
-@@ -130,7 +130,7 @@ pm.max_spare_servers = 3
+@@ -136,7 +136,7 @@ pm.max_spare_servers = 3
  ; This can be useful to work around memory leaks in 3rd party libraries. For
  ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
  ; Default Value: 0
@@ -64,7 +66,7 @@
  
  ; The URI to view the FPM status page. If this value is not set, no URI will be
  ; recognized as a status page. It shows the following informations:
-@@ -314,7 +314,7 @@ pm.max_spare_servers = 3
+@@ -320,7 +320,7 @@ pm.max_spare_servers = 3
  ; The log file for slow requests
  ; Default Value: not set
  ; Note: slowlog is mandatory if request_slowlog_timeout is set
@@ -73,7 +75,7 @@
  
  ; The timeout for serving a single request after which a PHP backtrace will be
  ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
-@@ -386,6 +386,7 @@ pm.max_spare_servers = 3
+@@ -411,6 +411,7 @@ pm.max_spare_servers = 3
  ;env[TMP] = /tmp
  ;env[TMPDIR] = /tmp
  ;env[TEMP] = /tmp

php-5.3.x-fpm-0.6.5-shared.diff

@@ -4,8 +4,8 @@
          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 --tag=CC \$(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) libphp\$(PHP_MAJOR_VERSION)_common.la \$(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 --tag=CC \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp\$(PHP_MAJOR_VERSION)_common.la \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
        ;;
    esac
  

php-7.2.0-visibility.patch

@@ -1,83 +1,8 @@
---- php-7.2.0/ext/date/php_date.c.omv~	2017-11-29 13:24:17.183364915 +0100
+diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
-+++ php-7.2.0/ext/date/php_date.c	2017-11-29 13:24:28.970391388 +0100
+index e6991475..1fbd59f6 100644
-@@ -664,7 +664,7 @@ static zval *date_period_read_property(z
+--- a/Zend/zend_signal.c
- static void date_period_write_property(zval *object, zval *member, zval *value, void **cache_slot);
++++ b/Zend/zend_signal.c
- 
+@@ -386,7 +386,7 @@ static void zend_signal_globals_ctor(zend_signal_globals_t *zend_signal_globals)
- /* {{{ Module struct */
--zend_module_entry date_module_entry = {
-+__attribute__((visibility("default"))) zend_module_entry date_module_entry = {
- 	STANDARD_MODULE_HEADER_EX,
- 	NULL,
- 	NULL,
---- php-7.2.0/ext/libxml/libxml.c.omv~	2017-11-29 13:29:29.380067310 +0100
-+++ php-7.2.0/ext/libxml/libxml.c	2017-11-29 13:29:45.521103681 +0100
-@@ -135,7 +135,7 @@ static const zend_function_entry libxml_
- 	PHP_FE_END
- };
- 
--zend_module_entry libxml_module_entry = {
-+__attribute__((visibility("default"))) zend_module_entry libxml_module_entry = {
- 	STANDARD_MODULE_HEADER,
- 	"libxml",                /* extension name */
- 	libxml_functions,        /* extension function list */
---- php-7.2.0/ext/pcre/php_pcre.c.omv~	2017-11-29 13:29:59.452135074 +0100
-+++ php-7.2.0/ext/pcre/php_pcre.c	2017-11-29 13:30:04.050145437 +0100
-@@ -2715,7 +2715,7 @@ static const zend_function_entry pcre_fu
- 	PHP_FE_END
- };
- 
--zend_module_entry pcre_module_entry = {
-+__attribute__((visibility("default"))) zend_module_entry pcre_module_entry = {
- 	STANDARD_MODULE_HEADER,
-    "pcre",
- 	pcre_functions,
---- php-7.2.0/ext/reflection/php_reflection.c.omv~	2017-11-29 13:30:13.372166447 +0100
-+++ php-7.2.0/ext/reflection/php_reflection.c	2017-11-29 13:30:34.731214591 +0100
-@@ -6830,7 +6830,7 @@ PHP_MINFO_FUNCTION(reflection) /* {{{ */
- 	php_info_print_table_end();
- } /* }}} */
- 
--zend_module_entry reflection_module_entry = { /* {{{ */
-+__attribute__((visibility("default"))) zend_module_entry reflection_module_entry = { /* {{{ */
- 	STANDARD_MODULE_HEADER,
- 	"Reflection",
- 	reflection_ext_functions,
---- php-7.2.0/ext/simplexml/simplexml.c.omv~	2017-11-29 13:31:10.373294945 +0100
-+++ php-7.2.0/ext/simplexml/simplexml.c	2017-11-29 13:31:14.562304390 +0100
-@@ -2676,7 +2676,7 @@ static const zend_module_dep simplexml_d
- };
- /* }}} */
- 
--zend_module_entry simplexml_module_entry = { /* {{{ */
-+__attribute__((visibility("default"))) zend_module_entry simplexml_module_entry = { /* {{{ */
- 	STANDARD_MODULE_HEADER_EX, NULL,
- 	simplexml_deps,
- 	"SimpleXML",
---- php-7.2.0/ext/spl/php_spl.c.omv~	2017-11-29 13:30:51.564252538 +0100
-+++ php-7.2.0/ext/spl/php_spl.c	2017-11-29 13:31:00.361272372 +0100
-@@ -1015,7 +1015,7 @@ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */
- 
- /* {{{ spl_module_entry
-  */
--zend_module_entry spl_module_entry = {
-+__attribute__((visibility("default"))) zend_module_entry spl_module_entry = {
- 	STANDARD_MODULE_HEADER,
- 	"SPL",
- 	spl_functions,
---- php-7.2.0/ext/standard/basic_functions.c.omv~	2017-11-29 13:31:35.333351228 +0100
-+++ php-7.2.0/ext/standard/basic_functions.c	2017-11-29 13:31:39.891361507 +0100
-@@ -3422,7 +3422,7 @@ static const zend_module_dep standard_de
- };
- /* }}} */
- 
--zend_module_entry basic_functions_module = { /* {{{ */
-+__attribute__((visibility("default"))) zend_module_entry basic_functions_module = { /* {{{ */
- 	STANDARD_MODULE_HEADER_EX,
- 	NULL,
- 	standard_deps,
---- php-7.2.0/Zend/zend_signal.c.omv~	2017-11-29 13:31:58.788404124 +0100
-+++ php-7.2.0/Zend/zend_signal.c	2017-11-29 13:32:19.265450309 +0100
-@@ -377,7 +377,7 @@ static void zend_signal_globals_ctor(zen
  }
  /* }}} */
  
@@ -86,12 +11,103 @@
  {
  	int signo;
  	struct sigaction sa;
-@@ -399,7 +399,7 @@ void zend_signal_init(void) /* {{{ */
+@@ -408,7 +408,7 @@ void zend_signal_init(void) /* {{{ */
  
  /* {{{ zend_signal_startup
   * alloc zend signal globals */
--void zend_signal_startup(void)
+-ZEND_API void zend_signal_startup(void)
-+__attribute__((visibility("default"))) void zend_signal_startup(void)
++__attribute__((visibility("default"))) ZEND_API void zend_signal_startup(void)
  {
  
  #ifdef ZTS
+diff --git a/ext/date/php_date.c b/ext/date/php_date.c
+index 02068b44..e7883b32 100644
+--- a/ext/date/php_date.c
++++ b/ext/date/php_date.c
+@@ -683,7 +683,7 @@ static zval *date_period_get_property_ptr_ptr(zval *object, zval *member, int ty
+ static int date_object_compare_timezone(zval *tz1, zval *tz2);
+ 
+ /* {{{ Module struct */
+-zend_module_entry date_module_entry = {
++__attribute__((visibility("default"))) zend_module_entry date_module_entry = {
+ 	STANDARD_MODULE_HEADER_EX,
+ 	NULL,
+ 	NULL,
+diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
+index c024e166..926708dc 100644
+--- a/ext/libxml/libxml.c
++++ b/ext/libxml/libxml.c
+@@ -130,7 +130,7 @@ static const zend_function_entry libxml_functions[] = {
+ 	PHP_FE_END
+ };
+ 
+-zend_module_entry libxml_module_entry = {
++__attribute__((visibility("default"))) zend_module_entry libxml_module_entry = {
+ 	STANDARD_MODULE_HEADER,
+ 	"libxml",                /* extension name */
+ 	libxml_functions,        /* extension function list */
+diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
+index 39896bb0..9d7c7d12 100644
+--- a/ext/pcre/php_pcre.c
++++ b/ext/pcre/php_pcre.c
+@@ -3058,7 +3058,7 @@ static const zend_function_entry pcre_functions[] = {
+ 	PHP_FE_END
+ };
+ 
+-zend_module_entry pcre_module_entry = {
++__attribute__((visibility("default"))) zend_module_entry pcre_module_entry = {
+ 	STANDARD_MODULE_HEADER,
+    "pcre",
+ 	pcre_functions,
+diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
+index f62dd15e..78638d9c 100644
+--- a/ext/reflection/php_reflection.c
++++ b/ext/reflection/php_reflection.c
+@@ -6946,7 +6946,7 @@ PHP_MINFO_FUNCTION(reflection) /* {{{ */
+ 	php_info_print_table_end();
+ } /* }}} */
+ 
+-zend_module_entry reflection_module_entry = { /* {{{ */
++__attribute__((visibility("default"))) zend_module_entry reflection_module_entry = { /* {{{ */
+ 	STANDARD_MODULE_HEADER,
+ 	"Reflection",
+ 	reflection_ext_functions,
+diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
+index 6394d491..dc21dc11 100644
+--- a/ext/simplexml/simplexml.c
++++ b/ext/simplexml/simplexml.c
+@@ -2661,7 +2661,7 @@ static const zend_module_dep simplexml_deps[] = { /* {{{ */
+ };
+ /* }}} */
+ 
+-zend_module_entry simplexml_module_entry = { /* {{{ */
++__attribute__((visibility("default"))) zend_module_entry simplexml_module_entry = { /* {{{ */
+ 	STANDARD_MODULE_HEADER_EX, NULL,
+ 	simplexml_deps,
+ 	"SimpleXML",
+diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
+index b147a961..2e1e551d 100644
+--- a/ext/spl/php_spl.c
++++ b/ext/spl/php_spl.c
+@@ -1042,7 +1042,7 @@ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */
+ 
+ /* {{{ spl_module_entry
+  */
+-zend_module_entry spl_module_entry = {
++__attribute__((visibility("default"))) zend_module_entry spl_module_entry = {
+ 	STANDARD_MODULE_HEADER,
+ 	"SPL",
+ 	spl_functions,
+diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
+index 64f27ef5..a4905b8a 100644
+--- a/ext/standard/basic_functions.c
++++ b/ext/standard/basic_functions.c
+@@ -3448,7 +3448,7 @@ static const zend_module_dep standard_deps[] = { /* {{{ */
+ };
+ /* }}} */
+ 
+-zend_module_entry basic_functions_module = { /* {{{ */
++__attribute__((visibility("default"))) zend_module_entry basic_functions_module = { /* {{{ */
+ 	STANDARD_MODULE_HEADER_EX,
+ 	NULL,
+ 	standard_deps,

php-7.2.5-freetype-2.9.1.patch

@@ -1,27 +0,0 @@
-diff -up php-7.2.5/ext/gd/config.m4.omv~ php-7.2.5/ext/gd/config.m4
---- php-7.2.5/ext/gd/config.m4.omv~	2018-05-09 00:44:24.799260377 +0200
-+++ php-7.2.5/ext/gd/config.m4	2018-05-09 00:45:22.108945925 +0200
-@@ -185,21 +185,8 @@ AC_DEFUN([PHP_GD_XPM],[
- 
- AC_DEFUN([PHP_GD_FREETYPE2],[
-   if test "$PHP_FREETYPE_DIR" != "no"; then
--
--    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
--      if test -f "$i/bin/freetype-config"; then
--        FREETYPE2_DIR=$i
--        FREETYPE2_CONFIG="$i/bin/freetype-config"
--        break
--      fi
--    done
--
--    if test -z "$FREETYPE2_DIR"; then
--      AC_MSG_ERROR([freetype-config not found.])
--    fi
--
--    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
--    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-+    FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
-+    FREETYPE2_LIBS=`pkg-config --libs freetype2`
- 
-     PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
-     PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)

php-7.3.4-libtool-2.4.6.patch

@@ -0,0 +1,115 @@
+diff -up php-7.3.4/build/Makefile.global.omv~ php-7.3.4/build/Makefile.global
+--- php-7.3.4/build/Makefile.global.omv~	2019-04-03 03:49:31.503343477 +0200
++++ php-7.3.4/build/Makefile.global	2019-04-03 03:49:41.524376338 +0200
+@@ -16,7 +16,7 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND
+ 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=CC $(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 -up php-7.3.4/sapi/cgi/config9.m4.omv~ php-7.3.4/sapi/cgi/config9.m4
+--- php-7.3.4/sapi/cgi/config9.m4.omv~	2019-04-03 03:49:12.605281759 +0200
++++ php-7.3.4/sapi/cgi/config9.m4	2019-04-03 03:49:28.095332321 +0200
+@@ -53,16 +53,16 @@ if test "$PHP_CGI" != "no"; then
+     case $host_alias in
+       *aix*)
+         if test "$php_sapi_module" = "shared"; then
+-          BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(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="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link --tag=CC \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+         else
+-          BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(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="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link --tag=CC \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+         fi
+         ;;
+       *darwin*)
+         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 --tag=CC \$(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 -up php-7.3.4/sapi/cgi/config.w32.omv~ php-7.3.4/sapi/cgi/config.w32
+diff -up php-7.3.4/sapi/fpm/config.m4.omv~ php-7.3.4/sapi/fpm/config.m4
+--- php-7.3.4/sapi/fpm/config.m4.omv~	2019-04-03 03:48:02.579056166 +0200
++++ php-7.3.4/sapi/fpm/config.m4	2019-04-03 03:48:15.722098116 +0200
+@@ -706,13 +706,13 @@ if test "$PHP_FPM" != "no"; then
+ 
+   case $host_alias in
+       *aix*)
+-        BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(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="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link --tag=CC \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(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)"
+         ;;
+       *darwin*)
+         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 --tag=CC \$(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 -up php-7.3.4/sapi/phpdbg/config.m4.omv~ php-7.3.4/sapi/phpdbg/config.m4
+--- php-7.3.4/sapi/phpdbg/config.m4.omv~	2019-04-03 03:48:27.441135676 +0200
++++ php-7.3.4/sapi/phpdbg/config.m4	2019-04-03 03:48:43.169186314 +0200
+@@ -37,7 +37,7 @@ if test "$BUILD_PHPDBG" = "" && test "$P
+   BUILD_BINARY="sapi/phpdbg/phpdbg"
+   BUILD_SHARED="sapi/phpdbg/libphpdbg.la"
+ 
+-  BUILD_PHPDBG="\$(LIBTOOL) --mode=link \
++  BUILD_PHPDBG="\$(LIBTOOL) --mode=link --tag=CC \
+         \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
+                 \$(PHP_GLOBAL_OBJS) \
+                 \$(PHP_BINARY_OBJS) \
+@@ -48,7 +48,7 @@ if test "$BUILD_PHPDBG" = "" && test "$P
+                 \$(PHP_FRAMEWORKS) \
+          -o \$(BUILD_BINARY)"
+ 
+-  BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \
++  BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link --tag=CC \
+         \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
+                 \$(PHP_GLOBAL_OBJS) \
+                 \$(PHP_BINARY_OBJS) \
+diff -up php-7.3.4/sapi/phpdbg/config..omv~ php-7.3.4/sapi/phpdbg/config.
+diff -up php-7.3.4/sapi/cli/config.m4.omv~ php-7.3.4/sapi/cli/config.m4
+--- php-7.3.4/sapi/cli/config.m4.omv~	2019-04-03 03:52:42.245983057 +0200
++++ php-7.3.4/sapi/cli/config.m4	2019-04-03 03:52:55.589028777 +0200
+@@ -33,16 +33,16 @@ if test "$PHP_CLI" != "no"; then
+   case $host_alias in
+   *aix*)
+     if test "$php_sapi_module" = "shared"; then
+-      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
++      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link --tag=CC \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+     else
+-      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
++      BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link --tag=CC \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+     fi
+     ;;
+   *darwin*)
+     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 --tag=CC \$(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 -up php-7.3.4/configure.ac.omv~ php-7.3.4/configure.ac
+--- php-7.3.4/configure.ac.omv~	2019-04-03 14:28:11.391584272 +0200
++++ php-7.3.4/configure.ac	2019-04-03 14:29:17.445196792 +0200
+@@ -1479,8 +1479,9 @@ PHP_SET_LIBTOOL_VARIABLE([--silent])
+ dnl libtool 1.4.3 needs this.
+ PHP_SET_LIBTOOL_VARIABLE([--preserve-dup-deps])
++PHP_SET_LIBTOOL_VARIABLE([--tag=CC])
+ 
+-test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
+-test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'
++test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile --tag=CC $(COMPILE) -c $<'
++test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile --tag=CXX $(CXX_COMPILE) -c $<'
+ SHARED_LIBTOOL='$(LIBTOOL)'
+ 
+ CC=$old_CC

php-7.4.0-phpize.patch

@@ -0,0 +1,35 @@
+diff -up ./scripts/phpize.in.headers ./scripts/phpize.in
+--- ./scripts/phpize.in.headers	2019-07-23 10:05:11.000000000 +0200
++++ ./scripts/phpize.in	2019-07-23 10:18:13.648098089 +0200
+@@ -165,6 +165,15 @@ phpize_autotools()
+   $PHP_AUTOHEADER || exit 1
+ }
+ 
++phpize_check_headers()
++{
++  if test ! -f $includedir/main/php.h; then
++    echo "Can't find PHP headers in $includedir"
++    echo "The php-devel package is required for use of this command."
++    exit 1
++  fi
++}
++
+ # Main script
+ 
+ case "$1" in
+@@ -183,12 +192,15 @@ case "$1" in
+ 
+   # Version
+   --version|-v)
++    phpize_check_headers
+     phpize_print_api_numbers
+     exit 0
+   ;;
+ 
+   # Default
+   *)
++     phpize_check_headers
++
+      phpize_check_configm4 0
+ 
+      phpize_check_build_files

php-7.4.1-missing-symbols.patch

@@ -0,0 +1,36 @@
+diff -up php-7.4.1/build/Makefile.global.omv~ php-7.4.1/build/Makefile.global
+--- php-7.4.1/build/Makefile.global.omv~	2020-01-09 17:28:46.652882773 +0100
++++ php-7.4.1/build/Makefile.global	2020-01-09 17:28:59.936882128 +0100
+@@ -16,7 +16,7 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND
+ build-binaries: $(PHP_BINARIES)
+ 
+ libphp$(PHP_MAJOR_VERSION)_common.la: $(PHP_GLOBAL_OBJS)
+-	$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -version-info 8:0:3 -rpath $(phptempdir) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
++	$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -version-info 8:0:3 -rpath $(phptempdir) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -lz -o $@
+ 	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+ 
+ libphp$(PHP_MAJOR_VERSION).la: libphp$(PHP_MAJOR_VERSION)_common.la $(PHP_SAPI_OBJS)
+diff -up php-7.4.1/ext/hash/hash.c.omv~ php-7.4.1/ext/hash/hash.c
+--- php-7.4.1/ext/hash/hash.c.omv~	2020-01-09 15:43:14.481189986 +0100
++++ php-7.4.1/ext/hash/hash.c	2020-01-09 15:43:30.344189217 +0100
+@@ -1486,7 +1486,7 @@ static const zend_function_entry hash_fu
+ 
+ /* {{{ hash_module_entry
+  */
+-zend_module_entry hash_module_entry = {
++__attribute__((visibility("default"))) zend_module_entry hash_module_entry = {
+ 	STANDARD_MODULE_HEADER,
+ 	PHP_HASH_EXTNAME,
+ 	hash_functions,
+diff -up php-7.4.1/ext/gd/gd.c.omv~ php-7.4.1/ext/gd/gd.c
+--- php-7.4.1/ext/gd/gd.c.omv~	2020-01-10 21:34:30.189975665 +0100
++++ php-7.4.1/ext/gd/gd.c	2020-01-10 21:34:43.455975021 +0100
+@@ -1018,7 +1018,7 @@ static const zend_function_entry gd_func
+ };
+ /* }}} */
+ 
+-zend_module_entry gd_module_entry = {
++__attribute__((visibility("default"))) zend_module_entry gd_module_entry = {
+ 	STANDARD_MODULE_HEADER,
+ 	"gd",
+ 	gd_functions,

php-cxx.diff

@@ -1,18 +0,0 @@
---- php-5.4.1RC2/aclocal.m4.cxx.droplet	2012-04-17 21:11:51.000000000 +0200
-+++ php-5.4.1RC2/aclocal.m4	2012-04-17 21:12:43.372215983 +0200
-@@ -758,14 +758,7 @@ AC_DEFUN([PHP_BUILD_THREAD_SAFE],[
- dnl
- dnl PHP_REQUIRE_CXX
- dnl
--AC_DEFUN([PHP_REQUIRE_CXX],[
--  if test -z "$php_cxx_done"; then
--    AC_PROG_CXX
--    AC_PROG_CXXCPP
--    PHP_ADD_LIBRARY(stdc++)
--    php_cxx_done=yes
--  fi
--])
-+AC_DEFUN([PHP_REQUIRE_CXX])
- 
- dnl
- dnl PHP_BUILD_SHARED

php-dlopen.diff

@@ -1,17 +0,0 @@
---- php-7.1.3/Zend/zend_portability.h.dlopen.droplet	2017-03-15 01:29:44.168736658 +0100
-+++ php-7.1.3/Zend/zend_portability.h	2017-03-15 01:30:29.179707854 +0100
-@@ -146,11 +146,11 @@
- # endif
- 
- # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
--#  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
-+#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
- # elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__)
--#  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)
-+#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND)
- # else
--#  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL)
-+#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW | RTLD_GLOBAL)
- # endif
- # define DL_UNLOAD					dlclose
- # if defined(DLSYM_NEEDS_UNDERSCORE)

php-filter-shared.diff

@@ -1,14 +0,0 @@
---- ext/filter/config.m4	2006-12-06 00:51:30.000000000 +0100
-+++ ext/filter/config.m4.oden	2007-06-20 12:26:17.000000000 +0200
-@@ -10,10 +10,7 @@
- if test "$PHP_FILTER" != "no"; then
- 
-   dnl Check if configure is the PHP core configure
--  if test -n "$PHP_VERSION"; then
--    dnl This extension can not be build as shared when in PHP core
--    ext_shared=no
--  else
-+  if test -z "$PHP_VERSION"; then
-     dnl This is PECL build, check if bundled PCRE library is used
-     old_CPPFLAGS=$CPPFLAGS
-     CPPFLAGS=$INCLUDES

php-imap-annotation+status-current.diff

@@ -110,7 +110,7 @@ diff -Naurp php-5.3.4RC1/ext/imap/php_imap.c php-5.3.4RC1.oden/ext/imap/php_imap
 +        long ret;
 +	
 +        // TODO: Use zend_parse_parameters here
-+	if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &streamind, &mailbox, &entry, &attr, &value) == FAILURE) {
++	if (ZEND_NUM_ARGS() != 5 || zend_parse_parameters(5 TSRMLS_CC, "zzzzz", &streamind, &mailbox, &entry, &attr, &value) == FAILURE) {
 +		ZEND_WRONG_PARAM_COUNT();
 +	}
 +
@@ -158,7 +158,7 @@ diff -Naurp php-5.3.4RC1/ext/imap/php_imap.c php-5.3.4RC1.oden/ext/imap/php_imap
 +	pils *imap_le_struct;
 +        long ret;
 +
-+	if(ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &streamind, &mailbox, &entry, &attr) == FAILURE) {
++	if(ZEND_NUM_ARGS() != 4 || zend_parse_parameters(4 TSRMLS_CC, "zzzz", &streamind, &mailbox, &entry, &attr) == FAILURE) {
 +		ZEND_WRONG_PARAM_COUNT();
 +	}
  
@@ -226,7 +226,7 @@ diff -Naurp php-5.3.4RC1/ext/imap/php_imap.c php-5.3.4RC1.oden/ext/imap/php_imap
 +	pils *imap_le_struct;
 +	long flags = 0L;
 +
-+ 	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &pflags) == FAILURE) {
++ 	if (ZEND_NUM_ARGS() != 2 || zend_parse_parameters(2, "zz", &streamind, &pflags) == FAILURE) {
 + 		ZEND_WRONG_PARAM_COUNT();
 + 	}
 +

php-imap-myrights.diff

@@ -54,7 +54,7 @@ diff -Naurp php-5.3.4RC1/ext/imap/php_imap.c php-5.3.4RC1.oden/ext/imap/php_imap
 +	zval **streamind, **mailbox;
 +	pils *imap_le_struct;
 +
-+	if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &mailbox) == FAILURE) {
++	if(ZEND_NUM_ARGS() != 2 || zend_parse_parameters(2 TSRMLS_CC, "zz", &streamind, &mailbox) == FAILURE) {
 +		ZEND_WRONG_PARAM_COUNT();
 +	}
 +

php-libtool.diff

@@ -1,37 +0,0 @@
---- aclocal.m4	2009-12-22 23:07:46.000000000 +0100
-+++ aclocal.m4.oden	2010-01-02 15:56:37.000000000 +0100
-@@ -3540,6 +3540,20 @@
-   rm -rf conftest*
-   ;;
- 
-+*-*-linux*)
-+  # Test if the compiler is 64bit
-+  echo 'int i;' > conftest.$ac_ext
-+  lt_cv_cc_64bit_output=no
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *"ELF 64"*)
-+      lt_cv_cc_64bit_output=yes
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+  
- *-*-sco3.2v5*)
-   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-   SAVE_CFLAGS="$CFLAGS"
-@@ -4587,6 +4601,13 @@
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-+  case $host_cpu:$lt_cv_cc_64bit_output in
-+  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
-+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
-+    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
-+    ;;
-+  esac
-+
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-   # powerpc, because MkLinux only supported shared libraries with the
-   # GNU dynamic linker.  Since this was broken with cross compilers,

php-mariadb-10.3.patch

@@ -1,7 +1,20 @@
-diff -up php-7.2.4/ext/mysqli/mysqli_api.c.omv~ php-7.2.4/ext/mysqli/mysqli_api.c
+diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
---- php-7.2.4/ext/mysqli/mysqli_api.c.omv~	2018-04-06 21:50:05.183703414 +0200
+index dc2e0e7e..a02254b0 100644
-+++ php-7.2.4/ext/mysqli/mysqli_api.c	2018-04-06 21:50:16.436829372 +0200
+--- a/ext/mysqli/mysqli.c
-@@ -616,7 +616,7 @@ PHP_FUNCTION(mysqli_change_user)
++++ b/ext/mysqli/mysqli.c
+@@ -24,6 +24,7 @@
+ 
+ #include <signal.h>
+ 
++#include <mysql/mysql_version.h>
+ #include "php.h"
+ #include "php_ini.h"
+ #include "ext/standard/info.h"
+diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
+index 6462c19c..f54a10a5 100644
+--- a/ext/mysqli/mysqli_api.c
++++ b/ext/mysqli/mysqli_api.c
+@@ -614,7 +614,7 @@ PHP_FUNCTION(mysqli_change_user)
  	size_t			user_len, password_len, dbname_len;
  	zend_ulong		rc;
  #if !defined(MYSQLI_USE_MYSQLND) && defined(HAVE_MYSQLI_SET_CHARSET)
@@ -10,44 +23,36 @@ diff -up php-7.2.4/ext/mysqli/mysqli_api.c.omv~ php-7.2.4/ext/mysqli/mysqli_api.
  #endif
  
  	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osss!", &mysql_link, mysqli_link_class_entry, &user, &user_len, &password, &password_len, &dbname, &dbname_len) == FAILURE) {
-diff -up php-7.2.4/ext/mysqli/mysqli.c.omv~ php-7.2.4/ext/mysqli/mysqli.c
+diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
---- php-7.2.4/ext/mysqli/mysqli.c.omv~	2018-04-06 21:49:41.782434506 +0200
+index e8b1e348..7924bc3c 100644
-+++ php-7.2.4/ext/mysqli/mysqli.c	2018-04-06 21:49:52.708561249 +0200
+--- a/ext/mysqli/mysqli_nonapi.c
-@@ -26,6 +26,7 @@
++++ b/ext/mysqli/mysqli_nonapi.c
- 
+@@ -328,7 +328,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
- #include <signal.h>
- 
-+#include <server/mysql_version.h>
- #include "php.h"
- #include "php_ini.h"
- #include "ext/standard/info.h"
-diff -up php-7.2.4/ext/mysqli/mysqli_nonapi.c.omv~ php-7.2.4/ext/mysqli/mysqli_nonapi.c
---- php-7.2.4/ext/mysqli/mysqli_nonapi.c.omv~	2018-04-06 21:51:43.217399945 +0200
-+++ php-7.2.4/ext/mysqli/mysqli_nonapi.c	2018-04-06 21:58:52.799445824 +0200
-@@ -263,7 +263,7 @@ void mysqli_common_connect(INTERNAL_FUNC
  	php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql));
  
  #if !defined(MYSQLI_USE_MYSQLND)
 -	mysql->mysql->reconnect = MyG(reconnect);
 +/*	mysql->mysql->reconnect = MyG(reconnect); */
  #endif
- 
+ 	unsigned int allow_local_infile = MyG(allow_local_infile);
- 	mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char *)&MyG(allow_local_infile));
+ 	mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char *)&allow_local_infile);
-diff -up php-7.2.4/ext/mysqli/mysqli_prop.c.omv~ php-7.2.4/ext/mysqli/mysqli_prop.c
+diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
---- php-7.2.4/ext/mysqli/mysqli_prop.c.omv~	2018-04-06 21:50:25.687842714 +0200
+index 8190d4ab..a42b3cf9 100644
-+++ php-7.2.4/ext/mysqli/mysqli_prop.c	2018-04-06 21:50:35.116768902 +0200
+--- a/ext/mysqli/mysqli_prop.c
++++ b/ext/mysqli/mysqli_prop.c
 @@ -23,6 +23,7 @@
  
  #include <signal.h>
  
-+#include <server/mysql_version.h>
++#include <mysql/mysql_version.h>
  #include "php.h"
  #include "php_ini.h"
  #include "ext/standard/info.h"
-diff -up php-7.2.4/ext/mysqli/php_mysqli_structs.h.omv~ php-7.2.4/ext/mysqli/php_mysqli_structs.h
+diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
---- php-7.2.4/ext/mysqli/php_mysqli_structs.h.omv~	2018-04-06 21:49:12.161080045 +0200
+index 96fbacb8..dca05fbe 100644
-+++ php-7.2.4/ext/mysqli/php_mysqli_structs.h	2018-04-06 21:58:44.599503172 +0200
+--- a/ext/mysqli/php_mysqli_structs.h
-@@ -79,11 +79,7 @@
++++ b/ext/mysqli/php_mysqli_structs.h
+@@ -73,11 +73,7 @@
  #include <my_sys.h>
  #include <mysql.h>
  #include <errmsg.h>

php-phpize.diff

@@ -1,63 +0,0 @@
-diff -up php-7.3.0RC1/build/build2.mk.phpize.droplet php-7.3.0RC1/build/build2.mk
---- php-7.3.0RC1/build/build2.mk.phpize.droplet	2018-09-13 22:42:02.479901557 +0200
-+++ php-7.3.0RC1/build/build2.mk	2018-09-13 22:46:57.574353336 +0200
-@@ -26,6 +26,7 @@ targets = $(TOUCH_FILES) configure $(con
- 
- PHP_AUTOCONF ?= 'autoconf'
- PHP_AUTOHEADER ?= 'autoheader'
-+PHP_ACLOCAL ?= 'aclocal'
- 
- SUPPRESS_WARNINGS ?= 2>&1 | (egrep -v '(AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used)'||true)
- 
-diff -up php-7.3.0RC1/scripts/phpize.in.phpize.droplet php-7.3.0RC1/scripts/phpize.in
---- php-7.3.0RC1/scripts/phpize.in.phpize.droplet	2018-09-11 13:13:29.000000000 +0200
-+++ php-7.3.0RC1/scripts/phpize.in	2018-09-13 22:47:29.701503740 +0200
-@@ -11,7 +11,7 @@ SED="@SED@"
- 
- FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4"
- FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
--CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \
-+CLEAN_FILES="$FILES *.o *.so *.lo *.la .deps .libs/ build/ modules/ install-sh \
- 	mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \
- 	aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
- 	config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \
-@@ -121,6 +121,7 @@ phpize_check_autotools()
- {
-   test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
-   test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
-+  test -z "$PHP_ACLOCAL" && PHP_ACLOCAL=aclocal
-   
-   if test ! -x "$PHP_AUTOCONF" && test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
-     cat <<EOF
-@@ -138,6 +139,14 @@ Cannot find autoheader. Please check you
- EOF
-     exit 1
-   fi
-+  if ! test -x "`$php_shtool path $PHP_ACLOCAL`"; then
-+    cat <<EOF
-+Cannot find aclocal. Please check your autoconf installation and the \$PHP_ACLOCAL 
-+environment variable is set correctly and then rerun this script. 
-+
-+EOF
-+    exit 1
-+  fi
- }
- 
- phpize_copy_files()
-@@ -151,13 +160,13 @@ phpize_copy_files()
- 
- phpize_replace_prefix()
- {
--  $SED \
--  -e "s#@prefix@#$prefix#" \
--  < "$phpdir/phpize.m4" > configure.ac
-+  cp $phpdir/phpize.m4 configure.in
- }
- 
- phpize_autotools()
- {
-+  libtoolize --copy --force || exit 1
-+  $PHP_ACLOCAL    || exit 1
-   $PHP_AUTOCONF   || exit 1
-   $PHP_AUTOHEADER || exit 1
- }

php-shared.diff

@@ -1,17 +1,17 @@
---- php-7.2.0/Makefile.global.shared.droplet	2017-11-28 10:22:51.000000000 +0100
+--- php-7.2.0/build/Makefile.global.shared.droplet	2017-11-28 10:22:51.000000000 +0100
-+++ php-7.2.0/Makefile.global	2017-11-29 00:28:39.001984696 +0100
++++ php-7.2.0/build/Makefile.global	2017-11-29 00:28:39.001984696 +0100
 @@ -15,8 +15,12 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND
  
  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=CC $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 +libphp$(PHP_MAJOR_VERSION)_common.la: $(PHP_GLOBAL_OBJS)
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -version-info 8:0:3 -rpath $(phptempdir) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
++	$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -version-info 8:0:3 -rpath $(phptempdir) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 +	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
 +
 +libphp$(PHP_MAJOR_VERSION).la: libphp$(PHP_MAJOR_VERSION)_common.la $(PHP_SAPI_OBJS)
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp$(PHP_MAJOR_VERSION)_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
++	$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp$(PHP_MAJOR_VERSION)_common.la $(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)
@@ -35,8 +35,8 @@
          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 --tag=CC \$(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) libphp\$(PHP_MAJOR_VERSION)_common.la \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
++        BUILD_CGI="\$(LIBTOOL) --mode=link --tag=CC \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp\$(PHP_MAJOR_VERSION)_common.la \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
        ;;
      esac
  
@@ -56,8 +56,8 @@
      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 --tag=CC \$(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) libphp\$(PHP_MAJOR_VERSION)_common.la \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
++    BUILD_CLI="\$(LIBTOOL) --mode=link --tag=CC \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp\$(PHP_MAJOR_VERSION)_common.la \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
      ;;
    esac
  

php-tests-wddx.diff

@@ -1,24 +0,0 @@
-diff -Naur php-5.2.3/ext/wddx/tests/001.phpt php-5.2.3.oden/ext/wddx/tests/001.phpt
---- php-5.2.3/ext/wddx/tests/001.phpt	2007-05-18 13:29:55.000000000 +0200
-+++ php-5.2.3.oden/ext/wddx/tests/001.phpt	2007-06-20 13:19:55.000000000 +0200
-@@ -22,7 +22,7 @@
-   ["aDateTime2"]=>
-   int(329632332)
-   ["aDateTime3"]=>
--  string(22) "2040-06-12T04:32:12+00"
-+  string(12) "NotADateTime"
-   ["aBoolean"]=>
-   bool(true)
-   ["anArray"]=>
-diff -Naur php-5.2.3/ext/wddx/tests/wddx.xml php-5.2.3.oden/ext/wddx/tests/wddx.xml
---- php-5.2.3/ext/wddx/tests/wddx.xml	2005-03-12 02:52:48.000000000 +0100
-+++ php-5.2.3.oden/ext/wddx/tests/wddx.xml	2007-06-20 13:19:55.000000000 +0200
-@@ -20,7 +20,7 @@
-                          <dateTime>1980-06-12T04:32:12+00</dateTime>
-                      </var>
-                      <var name='aDateTime3'>
--                         <dateTime>2040-06-12T04:32:12+00</dateTime>
-+                         <dateTime>NotADateTime</dateTime>
-                      </var>
-                      <var name='aBoolean'>
-                          <boolean value='true'/>

php-umask.diff

@@ -1,6 +1,7 @@
---- php-7.0.1/sapi/apache2handler/sapi_apache2.c.umask.droplet	2015-12-16 11:41:54.000000000 +0100
+diff -up php-7.4.1/sapi/apache2handler/sapi_apache2.c.umask.droplet php-7.4.1/sapi/apache2handler/sapi_apache2.c
-+++ php-7.0.1/sapi/apache2handler/sapi_apache2.c	2015-12-29 00:40:11.502348482 +0100
+--- php-7.4.1/sapi/apache2handler/sapi_apache2.c.umask.droplet	2019-12-17 17:35:58.000000000 +0100
-@@ -475,6 +475,19 @@ static apr_status_t php_server_context_c
++++ php-7.4.1/sapi/apache2handler/sapi_apache2.c	2020-01-08 22:26:12.858208748 +0100
+@@ -499,6 +499,19 @@ static apr_status_t php_server_context_c
  	return APR_SUCCESS;
  }
  
@@ -20,16 +21,17 @@
  static int php_apache_request_ctor(request_rec *r, php_struct *ctx)
  {
  	char *content_length;
-@@ -669,6 +682,8 @@ zend_first_try {
+@@ -694,6 +707,9 @@ zend_first_try {
+ 		highlight_file((char *)r->filename, &syntax_highlighter_ini);
  	} else {
  		zend_file_handle zfd;
- 
++
 +		php_save_umask();
 +
- 		zfd.type = ZEND_HANDLE_FILENAME;
+ 		zend_stream_init_filename(&zfd, (char *) r->filename);
- 		zfd.filename = (char *) r->filename;
+ 
- 		zfd.free_filename = 0;
+ 		if (!parent_req) {
-@@ -680,6 +695,8 @@ zend_first_try {
+@@ -702,6 +718,8 @@ zend_first_try {
  			zend_execute_scripts(ZEND_INCLUDE, NULL, 1, &zfd);
  		}
  

php-xmlrpc_no_rpath.diff

@@ -1,21 +0,0 @@
---- ext/xmlrpc/config.m4	2007-06-11 11:48:59.000000000 +0200
-+++ ext/xmlrpc/config.m4.oden	2007-06-11 12:21:28.000000000 +0200
-@@ -49,7 +49,7 @@
-     for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
-       if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
-         AC_DEFINE(HAVE_LIBEXPAT,1,[ ])
--        PHP_ADD_LIBRARY_WITH_PATH(expat, $i/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD)
-+        PHP_ADD_LIBRARY_WITH_PATH(expat,,XMLRPC_SHARED_LIBADD)
-         PHP_ADD_INCLUDE($i/include)
-         testval=yes
-         break
-@@ -100,7 +100,8 @@
-   fi
- 
-   PHP_ADD_INCLUDE($XMLRPC_DIR)
--  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD)
-+  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc,,XMLRPC_SHARED_LIBADD)
-   PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c, $ext_shared)
-+  PHP_SUBST(XMLRPC_SHARED_LIBADD)
-   XMLRPC_MODULE_TYPE=external
- fi

php5-apache2-filters.diff

@@ -1,6 +1,6 @@
 --- php-7.0.1/sapi/apache2handler/php_functions.c.apache2-filters.droplet	2015-12-16 11:41:55.000000000 +0100
 +++ php-7.0.1/sapi/apache2handler/php_functions.c	2015-12-29 00:12:07.202603653 +0100
-@@ -216,6 +216,65 @@ PHP_FUNCTION(apache_response_headers)
+@@ -216,6 +216,63 @@ PHP_FUNCTION(apache_response_headers)
  }
  /* }}} */
  
@@ -38,19 +38,17 @@
 +{
 +       php_struct *ctx;
 +       int arg_count = ZEND_NUM_ARGS();
-+       zval **filter_name;
++       char *filter_name;
 +       ap_filter_rec_t* ap_filter;
 +
 +       if (arg_count != 1 ||
-+               zend_get_parameters_ex(arg_count, &filter_name) == FAILURE) {
++               zend_parse_parameters(arg_count TSRMLS_CC, "s", &filter_name) == FAILURE) {
 +               WRONG_PARAM_COUNT;
 +       }
 +
 +       ctx = SG(server_context);
 +
-+       convert_to_string_ex(filter_name);
++        ap_filter = ap_get_output_filter_handle(filter_name);
-+
-+        ap_filter = ap_get_output_filter_handle(Z_STRVAL_P(*filter_name));
 +
 +        /* requested output filter was not found */
 +       if(ap_filter == NULL) {

php7.spec

@@ -1,7 +1,10 @@
 %define _build_pkgcheck_set %{nil}
 %define _build_pkgcheck_srpm %{nil}
 
-%define _disable_lto 1
+# LTO causes a build failure because something forces a linking step of
+# libphp7_common to barf because libtool foolishly takes -flto out of
+# compiler flags
+#define _disable_lto 1
 
 %define build_test 0
 %{?_with_test: %{expand: %%global build_test 1}}
@@ -16,18 +19,11 @@
 
 %define __noautoreq '.*/bin/awk|.*/bin/gawk'
 
-%define beta RC1
-
 Summary:	The PHP7 scripting language
-Name:		php
+Name:		php7
-Version:	7.3.0
+Version:	7.4.9
-%if "%{beta}" != ""
-Release:	0.%{beta}.1
-Source0:	https://downloads.php.net/~cmb/php-%{version}%{beta}.tar.xz
-%else
 Release:	1
 Source0:	http://ch1.php.net/distributions/php-%{version}.tar.xz
-%endif
 Group:		Development/PHP
 License:	PHP License
 URL:		http://www.php.net
@@ -40,16 +36,16 @@ Source6:	php-fpm.logrotate
 Source7:	create_data_file.php
 Source9:        php-fpm-tmpfiles.conf
 Source10:	php.ini
+Patch0:		php-7.3.4-libtool-2.4.6.patch
 Patch1:		php-shared.diff
 Patch2:		php-mariadb-10.3.patch
-Patch3:		php-libtool.diff
+Patch3:		php-7.4.1-missing-symbols.patch
-Patch4:		php-phpize.diff
+Patch4:		https://src.fedoraproject.org/rpms/php/raw/master/f/php-7.4.0-phpize.patch
 Patch5:		php-phpbuilddir.diff
 # http://www.outoforder.cc/projects/apache/mod_transform/
 # http://www.outoforder.cc/projects/apache/mod_transform/patches/php7-apache2-filters.patch
 Patch6:		php5-apache2-filters.diff
 Patch8:		php-xmlrpc_epi.patch
-Patch9:		php-xmlrpc_no_rpath.diff
 Patch10:	php-7.3.0rc1-compile.patch
 Patch11:	php-5.3.8-bdb-5.2.diff
 Patch12:	php-5.5.6-db-6.0.patch
@@ -58,7 +54,6 @@ Patch14:	php-7.2.0-visibility.patch
 #####################################################################
 # Stolen from PLD
 Patch20:	php-mail.diff
-Patch21:	php-filter-shared.diff
 Patch22:	php-dba-link.patch
 Patch23:	php-zlib-for-getimagesize.patch
 # for kolab2
@@ -74,22 +69,14 @@ Patch50:	php-session.save_path.diff
 Patch51:	php-exif_nesting_level.diff
 #####################################################################
 # Stolen from fedora
-Patch101:	php-cxx.diff
 Patch102:	php-install.diff
 Patch105:	php-umask.diff
 # Fixes for extension modules
 Patch113:	php-libc-client.diff
 Patch114:	php-no_pam_in_c-client.diff
-# Functional changes
-Patch115:	php-dlopen.diff
 # Fix bugs
-Patch120:	php-tests-wddx.diff
 Patch121:	php-bug43221.diff
 Patch123:	php-bug43589.diff
-Patch227:	php-5.3.0RC1-enchant_lib64_fix.diff
-Patch228:	php-5.3.0RC2-xmlrpc-epi_fix.diff
-# Use pkg-config instead of (removed as of 2.9.1) freetype-config
-Patch229:	php-7.2.5-freetype-2.9.1.patch
 
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -119,11 +106,12 @@ BuildRequires:	pkgconfig(sqlite3)
 BuildRequires:	pkgconfig(uuid)
 BuildRequires:	pkgconfig(x11)
 BuildRequires:	pkgconfig(xpm)
-#BuildRequires:	pkgconfig(libxcrypt)
+BuildRequires:	pkgconfig(libxcrypt)
 BuildRequires:	pkgconfig(libpcre2-posix)
 BuildRequires:	pkgconfig(libpcre2-8)
 BuildRequires:	pkgconfig(libpcre2-16)
 BuildRequires:	pkgconfig(libpcre2-32)
+BuildRequires:	pkgconfig(xmlrpc)
 
 BuildRequires:	apache-devel >= 2.2.0
 BuildRequires:	aspell-devel
@@ -178,26 +166,25 @@ most common use of PHP7 coding is probably as a replacement for CGI scripts.
 Summary:	PHP7 CLI interface
 Group:		Development/Other
 Requires:	%{libname} >= %{EVRD}
-Requires:	php-ctype >= %{EVRD}
+Requires:	%{name}-ctype >= %{EVRD}
-Requires:	php-filter >= %{EVRD}
+Requires:	%{name}-filter >= %{EVRD}
-Requires:	php-ftp >= %{EVRD}
+Requires:	%{name}-ftp >= %{EVRD}
-Requires:	php-gettext >= %{EVRD}
+Requires:	%{name}-gettext >= %{EVRD}
-Requires:	php-hash >= %{EVRD}
+Requires:	%{name}-ini >= %{version}
-Requires:	php-ini >= %{version}
+Requires:	%{name}-json >= %{EVRD}
-Requires:	php-json >= %{EVRD}
+Requires:	%{name}-openssl >= %{EVRD}
-Requires:	php-openssl >= %{EVRD}
+Requires:	%{name}-posix >= %{EVRD}
-Requires:	php-posix >= %{EVRD}
+Requires:	%{name}-session >= %{EVRD}
-Requires:	php-session >= %{EVRD}
+# Suggests:	%{name}-suhosin >= 0.9.33
-# Suggests:	php-suhosin >= 0.9.33
+Requires:	%{name}-sysvsem >= %{EVRD}
-Requires:	php-sysvsem >= %{EVRD}
+Requires:	%{name}-sysvshm >= %{EVRD}
-Requires:	php-sysvshm >= %{EVRD}
+Requires:	%{name}-timezonedb >= 3:2009.10
-Requires:	php-timezonedb >= 3:2009.10
+Requires:	%{name}-tokenizer >= %{EVRD}
-Requires:	php-tokenizer >= %{EVRD}
+Requires:	%{name}-xmlreader >= %{EVRD}
-Requires:	php-xmlreader >= %{EVRD}
+Requires:	%{name}-xmlwriter >= %{EVRD}
-Requires:	php-xmlwriter >= %{EVRD}
+Requires:	%{name}-zlib >= %{EVRD}
-Requires:	php-zlib >= %{EVRD}
+Requires:	%{name}-xml >= %{EVRD}
-Requires:	php-xml >= %{EVRD}
+Provides:	%{name} = %{EVRD}
-Provides:	php = %{EVRD}
 Provides:	/usr/bin/php
 
 %description	cli
@@ -214,26 +201,25 @@ install the apache-mod_php package.
 Summary:	Debugging version of the PHP7 CLI interface
 Group:		Development/Other
 Requires:	%{libname} >= %{EVRD}
-Requires:	php-ctype >= %{EVRD}
+Requires:	%{name}-ctype >= %{EVRD}
-Requires:	php-filter >= %{EVRD}
+Requires:	%{name}-filter >= %{EVRD}
-Requires:	php-ftp >= %{EVRD}
+Requires:	%{name}-ftp >= %{EVRD}
-Requires:	php-gettext >= %{EVRD}
+Requires:	%{name}-gettext >= %{EVRD}
-Requires:	php-hash >= %{EVRD}
+Requires:	%{name}-ini >= %{version}
-Requires:	php-ini >= %{version}
+Requires:	%{name}-json >= %{EVRD}
-Requires:	php-json >= %{EVRD}
+Requires:	%{name}-openssl >= %{EVRD}
-Requires:	php-openssl >= %{EVRD}
+Requires:	%{name}-posix >= %{EVRD}
-Requires:	php-posix >= %{EVRD}
+Requires:	%{name}-session >= %{EVRD}
-Requires:	php-session >= %{EVRD}
+# Suggests:	%{name}-suhosin >= 0.9.33
-# Suggests:	php-suhosin >= 0.9.33
+Requires:	%{name}-sysvsem >= %{EVRD}
-Requires:	php-sysvsem >= %{EVRD}
+Requires:	%{name}-sysvshm >= %{EVRD}
-Requires:	php-sysvshm >= %{EVRD}
+Requires:	%{name}-timezonedb >= 3:2009.10
-Requires:	php-timezonedb >= 3:2009.10
+Requires:	%{name}-tokenizer >= %{EVRD}
-Requires:	php-tokenizer >= %{EVRD}
+Requires:	%{name}-xmlreader >= %{EVRD}
-Requires:	php-xmlreader >= %{EVRD}
+Requires:	%{name}-xmlwriter >= %{EVRD}
-Requires:	php-xmlwriter >= %{EVRD}
+Requires:	%{name}-zlib >= %{EVRD}
-Requires:	php-zlib >= %{EVRD}
+Requires:	%{name}-xml >= %{EVRD}
-Requires:	php-xml >= %{EVRD}
+Provides:	%{name} = %{EVRD}
-Provides:	php = %{EVRD}
 
 %description	dbg
 PHP7 is an HTML-embeddable scripting language. PHP7 offers built-in database
@@ -249,30 +235,27 @@ install the apache-mod_php package.
 Summary:	PHP7 CGI interface
 Group:		Development/Other
 Requires:	%{libname} >= %{EVRD}
-Requires:	php-ctype >= %{EVRD}
+Requires:	%{name}-ctype >= %{EVRD}
-Requires:	php-filter >= %{EVRD}
+Requires:	%{name}-filter >= %{EVRD}
-Requires:	php-ftp >= %{EVRD}
+Requires:	%{name}-ftp >= %{EVRD}
-Requires:	php-gettext >= %{EVRD}
+Requires:	%{name}-gettext >= %{EVRD}
-Requires:	php-hash >= %{EVRD}
+Requires:	%{name}-ini >= %{version}
-Requires:	php-ini >= %{version}
+Requires:	%{name}-json >= %{EVRD}
-Requires:	php-json >= %{EVRD}
+Requires:	%{name}-openssl >= %{EVRD}
-Requires:	php-openssl >= %{EVRD}
+Requires:	%{name}-posix >= %{EVRD}
-Requires:	php-posix >= %{EVRD}
+Requires:	%{name}-session >= %{EVRD}
-Requires:	php-session >= %{EVRD}
+# Suggests:	%{name}-suhosin >= 0.9.33
-# Suggests:	php-suhosin >= 0.9.33
+Requires:	%{name}-sysvsem >= %{EVRD}
-Requires:	php-sysvsem >= %{EVRD}
+Requires:	%{name}-sysvshm >= %{EVRD}
-Requires:	php-sysvshm >= %{EVRD}
+Requires:	%{name}-timezonedb >= 3:2009.10
-Requires:	php-timezonedb >= 3:2009.10
+Requires:	%{name}-tokenizer >= %{EVRD}
-Requires:	php-tokenizer >= %{EVRD}
+Requires:	%{name}-xmlreader >= %{EVRD}
-Requires:	php-xmlreader >= %{EVRD}
+Requires:	%{name}-xmlwriter >= %{EVRD}
-Requires:	php-xmlwriter >= %{EVRD}
+Requires:	%{name}-zlib >= %{EVRD}
-Requires:	php-zlib >= %{EVRD}
+Requires:	%{name}-xml >= %{EVRD}
-Requires:	php-xml >= %{EVRD}
+Provides:	%{name} = %{EVRD}
-Provides:	php = %{EVRD}
+Provides:	%{name}-fcgi = %{EVRD}
-Provides:	php-fcgi = %{EVRD}
+Obsoletes:	%{name}-fcgi < %{EVRD}
-Obsoletes:	php-fcgi
-# because of a added compat softlink
-Conflicts:	php-fcgi < %{EVRD}
 
 %description	cgi
 PHP7 is an HTML-embeddable scripting language. PHP7 offers built-in database
@@ -287,8 +270,8 @@ also need to install the apache-mod_php package.
 %package -n	%{libname}
 Summary:	Shared library for PHP7
 Group:		Development/Other
-Provides:	php-pcre = %{EVRD}
+Provides:	%{name}-pcre = %{EVRD}
-Provides:	php-simplexml = %{EVRD}
+Provides:	%{name}-simplexml = %{EVRD}
 Requires:	systemd-units
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -462,7 +445,7 @@ spell libraries:
 
  - aspell/pspell (intended to replace ispell)
  - hspell (hebrew)
- - ispell 
+ - ispell
  - myspell (OpenOffice project, mozilla)
  - uspell (primarily Yiddish, Hebrew, and Eastern European languages)
    A plugin system allows to add custom spell support.
@@ -472,7 +455,7 @@ spell libraries:
 Summary:	EXIF extension module for PHP
 Group:		Development/PHP
 Requires:	%{libname} >= %{EVRD}
-Requires:	php-mbstring >= %{EVRD}
+Requires:	%{name}-mbstring >= %{EVRD}
 
 %description	exif
 This is a dynamic shared object (DSO) for PHP that will add EXIF tags support
@@ -747,7 +730,7 @@ Read the documentation at http://www.php.net/pdo for more information.
 Summary:	Sybase Interface driver for PDO
 Group:		Development/PHP
 Requires:       freetds >= 0.63
-Requires:	php-pdo >= %{EVRD}
+Requires:	%{name}-pdo >= %{EVRD}
 Requires:	%{libname} >= %{EVRD}
 
 %description	pdo_dblib
@@ -758,13 +741,13 @@ FreeTDS libary.
 %package	pdo_mysql
 Summary:	MySQL Interface driver for PDO
 Group:		Development/PHP
-Requires:	php-pdo >= %{EVRD}
+Requires:	%{name}-pdo >= %{EVRD}
 Requires:	%{libname} >= %{EVRD}
 
 %description	pdo_mysql
 PDO_MYSQL is a driver that implements the PHP Data Objects (PDO) interface to
 enable access from PHP to MySQL 3.x and 4.x databases.
- 
+
 PDO_MYSQL will take advantage of native prepared statement support present in
 MySQL 4.1 and higher. If you're using an older version of the mysql client
 libraries, PDO will emulate them for you.
@@ -772,7 +755,7 @@ libraries, PDO will emulate them for you.
 %package	pdo_odbc
 Summary:	ODBC v3 Interface driver for PDO
 Group:		Development/PHP
-Requires:	php-pdo >= %{EVRD}
+Requires:	%{name}-pdo >= %{EVRD}
 Requires:	%{libname} >= %{EVRD}
 
 %description	pdo_odbc
@@ -780,7 +763,7 @@ PDO_ODBC is a driver that implements the PHP Data Objects (PDO) interface to
 enable access from PHP to databases through ODBC drivers or through the IBM DB2
 Call Level Interface (DB2 CLI) library. PDO_ODBC currently supports three
 different "flavours" of database drivers:
- 
+
  o ibm-db2  - Supports access to IBM DB2 Universal Database, Cloudscape, and
               Apache Derby servers through the free DB2 client.
 
@@ -793,7 +776,7 @@ different "flavours" of database drivers:
 %package	pdo_pgsql
 Summary:	PostgreSQL interface driver for PDO
 Group:		Development/PHP
-Requires:	php-pdo >= %{EVRD}
+Requires:	%{name}-pdo >= %{EVRD}
 Requires:	%{libname} >= %{EVRD}
 Requires:	postgresql-libs >= %{postgresql_version}
 
@@ -804,7 +787,7 @@ enable access from PHP to PostgreSQL databases.
 %package	pdo_sqlite
 Summary:	SQLite v3 Interface driver for PDO
 Group:		Development/PHP
-Requires:	php-pdo >= %{EVRD}
+Requires:	%{name}-pdo >= %{EVRD}
 Requires:	%{libname} >= %{EVRD}
 
 %description	pdo_sqlite
@@ -837,8 +820,7 @@ an open source descendant of this original Berkeley code.
 Summary:	Allows running of complete applications out of .phar files
 Group:		Development/PHP
 Requires:	%{libname} >= %{EVRD}
-Requires:	php-bz2
+Requires:	%{name}-bz2
-Requires:	php-hash
 
 %description	phar
 This is the extension version of PEAR's PHP_Archive package. Support for
@@ -984,7 +966,7 @@ possibility to act as a socket server as well as a client.
 %package	sqlite3
 Summary:	SQLite database bindings for PHP
 Group:		Development/PHP
-Requires:	php-pdo >= %{EVRD}
+Requires:	%{name}-pdo >= %{EVRD}
 Requires:	%{libname} >= %{EVRD}
 Obsoletes:	%name-sqlite
 
@@ -1061,7 +1043,7 @@ XML events.
 %package	xmlreader
 Summary:	Xmlreader extension module for PHP
 Group:		Development/PHP
-Requires:	php-dom
+Requires:	%{name}-dom
 Requires:	%{libname} >= %{EVRD}
 
 %description	xmlreader
@@ -1102,17 +1084,6 @@ This is a dynamic shared object (DSO) for PHP that will add xsl support.
 The XSL extension implements the XSL standard, performing XSLT transformations
 using the libxslt library
 
-%package	wddx
-Summary:	WDDX serialization functions
-Group:		Development/PHP
-Requires:	php-xml
-Requires:	%{libname} >= %{EVRD}
-
-%description	wddx
-This is a dynamic shared object (DSO) that adds wddx support to PHP. 
-
-These functions are intended for work with WDDX (http://www.openwddx.org/)
-
 %package	zip
 Summary:	A zip management extension for PHP
 Group:		Development/PHP
@@ -1129,26 +1100,25 @@ Requires(preun): rpm-helper
 Requires(pre): rpm-helper
 Requires(postun): rpm-helper
 Requires:	%{libname} >= %{EVRD}
-Requires:	php-ctype >= %{EVRD}
+Requires:	%{name}-ctype >= %{EVRD}
-Requires:	php-filter >= %{EVRD}
+Requires:	%{name}-filter >= %{EVRD}
-Requires:	php-ftp >= %{EVRD}
+Requires:	%{name}-ftp >= %{EVRD}
-Requires:	php-gettext >= %{EVRD}
+Requires:	%{name}-gettext >= %{EVRD}
-Requires:	php-hash >= %{EVRD}
+Requires:	%{name}-ini >= %{version}
-Requires:	php-ini >= %{version}
+Requires:	%{name}-json >= %{EVRD}
-Requires:	php-json >= %{EVRD}
+Requires:	%{name}-openssl >= %{EVRD}
-Requires:	php-openssl >= %{EVRD}
+Requires:	%{name}-posix >= %{EVRD}
-Requires:	php-posix >= %{EVRD}
+Requires:	%{name}-session >= %{EVRD}
-Requires:	php-session >= %{EVRD}
+# Suggests:	%{name}-suhosin >= 0.9.33
-# Suggests:	php-suhosin >= 0.9.33
+Requires:	%{name}-sysvsem >= %{EVRD}
-Requires:	php-sysvsem >= %{EVRD}
+Requires:	%{name}-sysvshm >= %{EVRD}
-Requires:	php-sysvshm >= %{EVRD}
+Requires:	%{name}-timezonedb >= 3:2009.10
-Requires:	php-timezonedb >= 3:2009.10
+Requires:	%{name}-tokenizer >= %{EVRD}
-Requires:	php-tokenizer >= %{EVRD}
+Requires:	%{name}-xmlreader >= %{EVRD}
-Requires:	php-xmlreader >= %{EVRD}
+Requires:	%{name}-xmlwriter >= %{EVRD}
-Requires:	php-xmlwriter >= %{EVRD}
+Requires:	%{name}-zlib >= %{EVRD}
-Requires:	php-zlib >= %{EVRD}
+Requires:	%{name}-xml >= %{EVRD}
-Requires:	php-xml >= %{EVRD}
+Provides:	%{name} = %{EVRD}
-Provides:	php = %{EVRD}
 
 %description	fpm
 PHP7 is an HTML-embeddable scripting language. PHP7 offers built-in database
@@ -1171,7 +1141,6 @@ Requires:	%{name}-ctype = %{EVRD}
 Requires:	%{name}-filter = %{EVRD}
 Requires:	%{name}-ftp = %{EVRD}
 Requires:	%{name}-gettext = %{EVRD}
-Requires:	%{name}-hash = %{EVRD}
 Requires:	%{name}-ini >= %{version}
 Requires:	%{name}-json = %{EVRD}
 Requires:	%{name}-openssl = %{EVRD}
@@ -1220,7 +1189,7 @@ export LC_ALL=en_US.utf-8
 export LANG=en_US.utf-8
 export LANGUAGE=en_US.utf-8
 export LANGUAGES=en_US.utf-8
-%setup -qn %{name}-%{version}%{beta}
+%setup -qn php-%{version}
 
 %if %{build_libmagic}
 if ! [ -f %{_datadir}/misc/magic.mgc ]; then
@@ -1230,15 +1199,16 @@ fi
 %endif
 
 # the ".droplet" suffix is here to nuke the backups later..., we don't want those in php-devel
+# (same goes for the more common "~" suffix)
 
+%patch0 -p1 -b .libtool246~
 %patch1 -p1 -b .shared.droplet
 %patch2 -p1 -b .mariadb~
-%patch3 -p0 -b .libtool.droplet
+%patch3 -p1 -b .missingsym~
-%patch4 -p1 -b .phpize.droplet
+%patch4 -p1 -b .phpize~
 %patch5 -p1 -b .phpbuilddir.droplet
 %patch6 -p1 -b .apache2-filters.droplet
 %patch8 -p1 -b .xmlrpc_epi_header
-%patch9 -p0 -b .xmlrpc_no_rpath.droplet
 %patch10 -p1 -b .compile~
 %patch11 -p1 -b .bdb-5.2.droplet
 %patch12 -p1 -b .db60~
@@ -1249,7 +1219,6 @@ fi
 # Stolen from PLD
 # FIXME needs porting
 #patch20 -p1 -b .mail.droplet
-%patch21 -p0 -b .filter-shared.droplet
 %patch22 -p1 -b .dba-link.droplet
 %patch23 -p1 -b .zlib-for-getimagesize.droplet
 # for kolab2
@@ -1267,21 +1236,14 @@ fi
 
 #####################################################################
 # Stolen from fedora
-%patch101 -p1 -b .cxx.droplet
 %patch102 -p1 -b .install.droplet
 %patch105 -p1 -b .umask.droplet
 %patch113 -p1 -b .libc-client-php.droplet
 %patch114 -p1 -b .no_pam_in_c-client.droplet
-%patch115 -p1 -b .dlopen.droplet
 
 # upstream fixes
-%patch120 -p1 -b .tests-wddx.droplet
 %patch121 -p0 -b .bug43221.droplet
 %patch123 -p0 -b .bug43589.droplet
-%patch227 -p0 -b .enchant_lib64_fix.droplet
-%patch228 -p0 -b .xmlrpc-epi_fix.droplet
-
-%patch229 -p1 -b .ft291~
 
 cp %{SOURCE2} maxlifetime
 cp %{SOURCE3} php.crond
@@ -1317,14 +1279,14 @@ rm -f php-devel/extensions/standard/.deps
 rm -f php-devel/extensions/skeleton/EXPERIMENTAL
 
 # SAPI
-cp -dpR sapi/* php-devel/sapi/ 
+cp -dpR sapi/* php-devel/sapi/
 rm -f php-devel/sapi/thttpd/stub.c
 rm -f php-devel/sapi/cgi/php.sym
 rm -f php-devel/sapi/fastcgi/php.sym
 rm -f php-devel/sapi/pi3web/php.sym
 
 # cleanup
-find php-devel -name "*.droplet" | xargs rm -f
+find php-devel -name "*.droplet" -o -name "*~" | xargs rm -f
 
 # don't ship MS Windows source
 rm -rf php-devel/extensions/com_dotnet
@@ -1339,6 +1301,11 @@ rm -rf ext/pcre/pcrelib
 rm -rf ext/pdo_sqlite/sqlite
 rm -rf ext/xmlrpc/libxmlrpc
 
+# Included ltmain.sh is obsolete and breaks lto
+rm -f ltmain.sh
+libtoolize --force
+aclocal
+
 %build
 %serverbuild
 
@@ -1355,7 +1322,7 @@ export RPM_OPT_FLAGS="${CFLAGS}"
 
 cat > php-devel/buildext <<EOF
 #!/bin/bash
-gcc -Wall -fPIC -shared $CFLAGS \\
+exec %{__cc} -Wall -fPIC -shared $CFLAGS \\
     -I. \`%{_bindir}/php-config --includes\` \\
     -I%{_includedir}/libxml2 \\
     -I%{_includedir}/freetype \\
@@ -1370,6 +1337,7 @@ chmod 755 php-devel/buildext
 rm -f configure
 rm -rf autom4te.cache
 ./buildconf --force
+cp -f %{_bindir}/libtool .
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -1378,7 +1346,12 @@ export oldstyleextdir=yes
 export EXTENSION_DIR="%{_libdir}/php/extensions"
 export PROG_SENDMAIL="%{_sbindir}/sendmail"
 export GD_SHARED_LIBADD="$GD_SHARED_LIBADD -lm"
-SAFE_LDFLAGS=`echo %{ldflags}|sed -e 's|-Wl,--no-undefined||g'`
+# FIXME
+# -fuse-ld=gold is a workaround for a very weird bug showing with lld 9.0.1
+# and php 7.4.1: "cannot apply additional memory protection after relocation"
+# Check if we can get rid of this after lld 10 is released.
+SAFE_LDFLAGS=`echo %{ldflags} -fuse-ld=gold|sed -e 's|-Wl,--no-undefined||g'`
+export EXTRA_LIBS="-lz"
 export LDFLAGS="$SAFE_LDFLAGS"
 
 # never use "--disable-rpath", it does the opposite
@@ -1387,7 +1360,7 @@ export LDFLAGS="$SAFE_LDFLAGS"
 # FIXME switch to external gd (--with-gd=shared,%_prefix) once php bug #60108 is fixed
 for i in fpm cgi cli apxs; do
 ./configure \
-    `[ $i = fpm ] && echo --disable-cli --enable-fpm --with-libxml-dir=%{_prefix} --with-fpm-user=apache --with-fpm-group=apache` \
+    `[ $i = fpm ] && echo --disable-cli --enable-fpm --with-fpm-user=apache --with-fpm-group=apache` \
     `[ $i = cgi ] && echo --disable-cli` \
     `[ $i = cli ] && echo --disable-cgi --enable-cli` \
     `[ $i = apxs ] && echo --with-apxs2=%{_bindir}/apxs` \
@@ -1403,22 +1376,19 @@ for i in fpm cgi cli apxs; do
     --libexecdir=%{_libexecdir} \
     --localstatedir=/var/lib \
     --mandir=%{_mandir} \
+    --enable-rtld-now \
     --enable-shared=yes \
     --enable-static=no \
+    --with-external-pcre \
     --with-libdir=%{_lib} \
     --with-config-file-path=%{_sysconfdir} \
     --with-config-file-scan-dir=%{_sysconfdir}/php.d \
     --disable-debug  \
     --enable-inline-optimization \
-    --with-regex=system \
+    --with-zlib=%{_prefix} \
-    --with-pcre-regex=%{_prefix} \
-    --with-freetype-dir=%{_prefix} --with-zlib=%{_prefix} \
-    --with-png-dir=%{_prefix} \
     --with-pdo-odbc=unixODBC \
     --with-zlib=shared,%{_prefix} --with-zlib-dir=%{_prefix} \
     --with-openssl=shared,%{_prefix} \
-    --enable-libxml=%{_prefix} --with-libxml-dir=%{_prefix} \
-    --enable-mod_charset \
     --without-pear \
     --enable-bcmath=shared \
     --with-bz2=shared,%{_prefix} \
@@ -1426,24 +1396,22 @@ for i in fpm cgi cli apxs; do
     --enable-ctype=shared \
     --with-curl=shared,%{_prefix} \
     --enable-dba=shared --with-gdbm --with-db4 --with-cdb  \
-    --enable-dom=shared,%{_prefix} --with-libxml-dir=%{_prefix} \
+    --enable-dom=shared,%{_prefix} \
     --with-enchant=shared,%{_prefix} \
     --enable-exif=shared \
     --enable-fileinfo=shared \
-    --enable-filter=shared --with-pcre-dir=%{_prefix} \
+    --enable-filter=shared \
-    --enable-intl=shared --with-icu-dir=%{_prefix} \
+    --enable-intl=shared \
     --enable-json=shared \
     --with-openssl-dir=%{_prefix} --enable-ftp=shared \
-    --with-gd=shared --with-jpeg-dir=%{_prefix} --with-png-dir=%{_prefix} --with-zlib-dir=%{_prefix} --with-xpm-dir=%{_prefix}/X11R6 --with-freetype-dir=%{_prefix} --enable-gd-native-ttf --with-t1lib=%{_prefix} \
+    --with-zlib-dir=%{_prefix} \
     --with-gettext=shared,%{_prefix} \
     --with-gmp=shared,%{_prefix} \
-    --enable-hash=shared,%{_prefix} \
     --with-iconv=shared \
     --with-imap=shared,%{_prefix} --with-imap-ssl=%{_prefix} \
     --with-ldap=shared,%{_prefix} --with-ldap-sasl=%{_prefix} \
-    --enable-mbstring=shared,%{_prefix} --enable-mbregex --with-libmbfl=%{_prefix} --with-onig=%{_prefix} \
+    --enable-mbstring=shared,%{_prefix} --enable-mbregex \
-    --with-mssql=shared,%{_prefix} \
+    --with-mysql-sock=/run/mysqld/mysql.sock --with-zlib-dir=%{_prefix} \
-    --with-mysql=shared,%{_prefix} --with-mysql-sock=/run/mysqld/mysql.sock --with-zlib-dir=%{_prefix} \
     --with-mysqli=shared,mysqlnd \
     --enable-mysqlnd=shared,%{_prefix} \
     --with-unixODBC=shared,%{_prefix} \
@@ -1454,29 +1422,30 @@ for i in fpm cgi cli apxs; do
     --enable-posix=shared \
     --with-pspell=shared,%{_prefix} \
     --with-readline=shared,%{_prefix} \
-    --with-recode=shared,%{_prefix} \
     --enable-session=shared,%{_prefix} \
     --enable-shmop=shared,%{_prefix} \
     --enable-simplexml \
     --with-snmp=shared,%{_prefix} \
-    --enable-soap=shared,%{_prefix} --with-libxml-dir=%{_prefix} \
+    --enable-soap=shared,%{_prefix} \
     --enable-sockets=shared,%{_prefix} \
     --with-sqlite3=shared,%{_prefix} \
-    --with-sybase-ct=shared,%{_prefix} \
     --enable-sysvmsg=shared,%{_prefix} \
     --enable-sysvsem=shared,%{_prefix} \
     --enable-sysvshm=shared,%{_prefix} \
     --with-tidy=shared,%{_prefix} \
     --enable-tokenizer=shared,%{_prefix} \
-    --enable-xml=shared,%{_prefix} --with-libxml-dir=%{_prefix} \
+    --enable-xml=shared,%{_prefix} \
     --enable-xmlreader=shared,%{_prefix} \
     --with-xmlrpc=shared,%{_prefix} \
     --enable-xmlwriter=shared,%{_prefix} \
     --with-xsl=shared,%{_prefix} \
-    --enable-wddx=shared --with-libxml-dir=%{_prefix} \
+    --enable-gd=shared --with-external-gd \
-    --enable-zip=shared --with-libzip=%{_prefix} || (cat config.log && exit 1)
+    --with-zip=shared,%{_prefix} \
+    --with-mhash=shared \
+    || (cat config.log && exit 1)
 
 cp -f Makefile Makefile.$i
+cp -f %{_bindir}/libtool .
 
 # left for debugging purposes
 cp -f main/php_config.h php_config.h.$i
@@ -1490,24 +1459,24 @@ done
 perl -pi -e "s|^#define CONFIGURE_COMMAND .*|#define CONFIGURE_COMMAND \"This is irrelevant, look inside the %{_docdir}/php-doc/configure_command file. urpmi is your friend, use it to install extensions not shown below.\"|g" main/build-defs.h
 cp config.nice configure_command; chmod 644 configure_command
 
-%make PHPDBG_EXTRA_LIBS="-lreadline"
+%make PHPDBG_EXTRA_LIBS="-lreadline" CXX=%{__cxx}
 
 %if %{build_libmagic}
 # keep in sync with latest system magic, the next best thing when system libmagic can't be used...
 sapi/cli/php create_data_file.php %{_datadir}/misc/magic.mgc > ext/fileinfo/data_file.c
 rm -rf ext/fileinfo/.libs ext/fileinfo/*.lo ext/fileinfo/*.la modules/fileinfo.so modules/fileinfo.la
 cp -p ext/fileinfo/data_file.c php-devel/extensions/fileinfo/data_file.c
-%make
+%make CXX=%{__cxx} PHPDBG_EXTRA_LIBS="-lreadline"
 %endif
 
 # make php-cgi
 cp -af php_config.h.cgi main/php_config.h
-make -f Makefile.cgi sapi/cgi/php-cgi
+make -f Makefile.cgi sapi/cgi/php-cgi CXX=%{__cxx} PHPDBG_EXTRA_LIBS="-lreadline"
 cp -af php_config.h.apxs main/php_config.h
 
 # make php-fpm
 cp -af php_config.h.fpm main/php_config.h
-make -f Makefile.fpm sapi/fpm/php-fpm
+make -f Makefile.fpm sapi/fpm/php-fpm CXX=%{__cxx} PHPDBG_EXTRA_LIBS="-lreadline"
 cp -af php_config.h.apxs main/php_config.h
 
 # make apache-mod_php
@@ -1538,6 +1507,7 @@ install -d %{buildroot}%{_sysconfdir}/cron.d
 install -d %{buildroot}/var/lib/php
 
 make -f Makefile.apxs install \
+	PHPDBG_EXTRA_LIBS="-lreadline" \
 	INSTALL_ROOT=%{buildroot} \
 	INSTALL_IT="\$(LIBTOOL) --mode=install install libphp7_common.la %{buildroot}%{_libdir}/"
 
@@ -1598,7 +1568,7 @@ echo "extension = ftp.so"		> %{buildroot}%{_sysconfdir}/php.d/22_ftp.ini
 echo "extension = gd.so"		> %{buildroot}%{_sysconfdir}/php.d/23_gd.ini
 echo "extension = gettext.so"		> %{buildroot}%{_sysconfdir}/php.d/24_gettext.ini
 echo "extension = gmp.so"		> %{buildroot}%{_sysconfdir}/php.d/25_gmp.ini
-echo "extension = hash.so"		> %{buildroot}%{_sysconfdir}/php.d/54_hash.ini
+#echo "extension = hash.so"		> %{buildroot}%{_sysconfdir}/php.d/54_hash.ini
 echo "extension = iconv.so"		> %{buildroot}%{_sysconfdir}/php.d/26_iconv.ini
 echo "extension = imap.so"		> %{buildroot}%{_sysconfdir}/php.d/27_imap.ini
 echo "extension = intl.so"		> %{buildroot}%{_sysconfdir}/php.d/27_intl.ini
@@ -1620,7 +1590,7 @@ echo "extension = pgsql.so"		> %{buildroot}%{_sysconfdir}/php.d/42_pgsql.ini
 echo "extension = posix.so"		> %{buildroot}%{_sysconfdir}/php.d/43_posix.ini
 echo "extension = pspell.so"		> %{buildroot}%{_sysconfdir}/php.d/44_pspell.ini
 echo "extension = readline.so"		> %{buildroot}%{_sysconfdir}/php.d/45_readline.ini
-echo "extension = recode.so"		> %{buildroot}%{_sysconfdir}/php.d/46_recode.ini
+#echo "extension = recode.so"		> %{buildroot}%{_sysconfdir}/php.d/46_recode.ini
 echo "extension = session.so"		> %{buildroot}%{_sysconfdir}/php.d/47_session.ini
 echo "extension = shmop.so"		> %{buildroot}%{_sysconfdir}/php.d/48_shmop.ini
 echo "extension = snmp.so"		> %{buildroot}%{_sysconfdir}/php.d/50_snmp.ini
@@ -1637,7 +1607,6 @@ echo "extension = xmlreader.so"		> %{buildroot}%{_sysconfdir}/php.d/63_xmlreader
 echo "extension = xmlrpc.so"		> %{buildroot}%{_sysconfdir}/php.d/62_xmlrpc.ini
 echo "extension = xmlwriter.so"		> %{buildroot}%{_sysconfdir}/php.d/64_xmlwriter.ini
 echo "extension = xsl.so"		> %{buildroot}%{_sysconfdir}/php.d/63_xsl.ini
-echo "extension = wddx.so"		> %{buildroot}%{_sysconfdir}/php.d/63_wddx.ini
 echo "extension = json.so"		> %{buildroot}%{_sysconfdir}/php.d/82_json.ini
 echo "extension = zip.so"		> %{buildroot}%{_sysconfdir}/php.d/83_zip.ini
 echo "extension = phar.so"		> %{buildroot}%{_sysconfdir}/php.d/84_phar.ini
@@ -1669,22 +1638,6 @@ AddType application/x-httpd-php-source .phps
 DirectoryIndex index.php index.phtml
 EOF
 
-# fix docs
-cp Zend/LICENSE Zend/ZEND_LICENSE
-cp README.SELF-CONTAINED-EXTENSIONS SELF-CONTAINED-EXTENSIONS
-cp ext/openssl/README README.openssl
-cp ext/spl/README README.spl
-cp ext/libxml/CREDITS CREDITS.libxml
-cp ext/zlib/CREDITS CREDITS.zlib
-
-# cgi docs
-cp sapi/cgi/CREDITS CREDITS.cgi
-cp sapi/cgi/README.FastCGI README.fcgi
-
-# cli docs
-cp sapi/cli/CREDITS CREDITS.cli
-cp sapi/cli/README README.cli
-
 # phar fixes
 if [ -L %{buildroot}%{_bindir}/phar ]; then
     rm -f %{buildroot}%{_bindir}/phar
@@ -1759,7 +1712,6 @@ rm -rf %{buildroot}%{_usrsrc}/php-devel/extensions/sysvsem
 rm -rf %{buildroot}%{_usrsrc}/php-devel/extensions/sysvshm
 rm -rf %{buildroot}%{_usrsrc}/php-devel/extensions/tidy
 rm -rf %{buildroot}%{_usrsrc}/php-devel/extensions/tokenizer
-rm -rf %{buildroot}%{_usrsrc}/php-devel/extensions/wddx
 rm -rf %{buildroot}%{_usrsrc}/php-devel/extensions/xml
 rm -rf %{buildroot}%{_usrsrc}/php-devel/extensions/xmlreader
 rm -rf %{buildroot}%{_usrsrc}/php-devel/extensions/xmlrpc
@@ -1812,7 +1764,7 @@ for i in modules/*.so; do
 	opcache.so)
 		echo zend_extension=$B >>php-test.ini
 		;;
-	wddx.so|xsl.so)
+	xsl.so)
 		# Unresolved symbols, need fixing
 		;;
 #	ctype.so|dom.so|openssl.so|zlib.so|ftp.so|gettext.so|posix.so|session.so|hash.so|sysvsem.so|sysvshm.so|tokenizer.so|xml.so|xmlreader.so|xmlwriter.so|filter.so|json.so)
@@ -2273,14 +2225,6 @@ if [ "$1" = "0" ]; then
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 
-%post wddx
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-
-%postun wddx
-if [ "$1" = "0" ]; then
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-
 %post xml
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
@@ -2373,17 +2317,12 @@ if [ "$1" = "0" ]; then
 fi
 
 %files doc
-%doc CREDITS INSTALL LICENSE NEWS Zend/ZEND_LICENSE 
 %doc php.ini-production php.ini-development configure_command
-%doc README.openssl README.spl CREDITS.libxml CREDITS.zlib
-%doc README.EXT_SKEL README.input_filter
-%doc README.PARAMETER_PARSING_API README.STREAMS
 
 %files -n %{libname}
 %{_libdir}/libphp7_common.so.%{php7_common_major}*
 
 %files cli
-%doc CREDITS.cli README.cli
 %attr(0755,root,root) %{_bindir}/php
 %attr(0644,root,root) %{_mandir}/man1/php.1*
 
@@ -2392,14 +2331,12 @@ fi
 %attr(0644,root,root) %{_mandir}/man1/phpdbg.1*
 
 %files cgi
-%doc CREDITS.cgi README.fcgi
 %attr(0755,root,root) %{_bindir}/php-cgi
 %attr(0755,root,root) %{_bindir}/php-fcgi
 %{_mandir}/man1/php-cgi.1*
 
 %files devel
-%doc SELF-CONTAINED-EXTENSIONS CODING_STANDARDS README.* EXTENSIONS
+%doc README.* EXTENSIONS
-%doc Zend/ZEND_* README.TESTING*
 %attr(0755,root,root) %{_bindir}/php-config
 %attr(0755,root,root) %{_bindir}/phpize
 %attr(0755,root,root) %{_libdir}/libphp7_common.so
@@ -2477,9 +2414,9 @@ fi
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/25_gmp.ini
 %attr(0755,root,root) %{_libdir}/php/extensions/gmp.so
 
-%files hash
+#files hash
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/54_hash.ini
+#attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/54_hash.ini
-%attr(0755,root,root) %{_libdir}/php/extensions/hash.so
+#attr(0755,root,root) %{_libdir}/php/extensions/hash.so
 
 %files iconv
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/26_iconv.ini
@@ -2572,9 +2509,9 @@ fi
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/45_readline.ini
 %attr(0755,root,root) %{_libdir}/php/extensions/readline.so
 
-%files recode
+#files recode
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/46_recode.ini
+#attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/46_recode.ini
-%attr(0755,root,root) %{_libdir}/php/extensions/recode.so
+#attr(0755,root,root) %{_libdir}/php/extensions/recode.so
 
 %files session
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/47_session.ini
@@ -2643,16 +2580,12 @@ fi
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/63_xsl.ini
 %attr(0755,root,root) %{_libdir}/php/extensions/xsl.so
 
-%files wddx
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/63_wddx.ini
-%attr(0755,root,root) %{_libdir}/php/extensions/wddx.so
-
 %files zip
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php.d/83_zip.ini
 %attr(0755,root,root) %{_libdir}/php/extensions/zip.so
 
 %files fpm
-%doc sapi/fpm/CREDITS sapi/fpm/LICENSE
+%doc sapi/fpm/LICENSE
 /lib/systemd/system/php-fpm.service
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php-fpm.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/php-fpm