From c3cdddda46813bf72f3f42114bee2d99c4dd6388 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 19 2019 08:10:15 +0000
Subject: import rh-php71-php-7.1.30-1.el7


---

diff --git a/.gitignore b/.gitignore
index 78b1795..07a5a64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/php-7.1.8.tar.xz
+SOURCES/php-7.1.30.tar.xz
diff --git a/.rh-php71-php.metadata b/.rh-php71-php.metadata
index aab8cd0..441cad4 100644
--- a/.rh-php71-php.metadata
+++ b/.rh-php71-php.metadata
@@ -1 +1 @@
-c6554405a9ad1f901f037ad85b5bca318a073fc9 SOURCES/php-7.1.8.tar.xz
+ca26ccb60ca0a6897b61fafec02074b080c9c5b1 SOURCES/php-7.1.30.tar.xz
diff --git a/SOURCES/php-5.4.0-phpize.patch b/SOURCES/php-5.4.0-phpize.patch
deleted file mode 100644
index e666e45..0000000
--- a/SOURCES/php-5.4.0-phpize.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- php-5.4.0RC5/scripts/phpize.in.orig	2012-01-18 17:13:54.018022983 +0100
-+++ php-5.4.0RC5/scripts/phpize.in	2012-01-18 17:14:40.614024941 +0100
-@@ -162,6 +162,15 @@
-   $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 
-@@ -180,12 +189,15 @@
- 
-   # Version
-   --version|-v)
-+    phpize_check_headers
-     phpize_print_api_numbers
-     exit 0
-   ;;
- 
-   # Default
-   *)
-+     phpize_check_headers
-+
-      phpize_check_configm4 0
- 
-      phpize_check_build_files
diff --git a/SOURCES/php-5.6.3-ldap_r.patch b/SOURCES/php-5.6.3-ldap_r.patch
deleted file mode 100644
index b335488..0000000
--- a/SOURCES/php-5.6.3-ldap_r.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Use -lldap_r by default.
-
---- php-5.4.8/ext/ldap/config.m4.ldap_r
-+++ php-5.4.8/ext/ldap/config.m4
-@@ -117,7 +117,10 @@ if test "$PHP_LDAP" != "no"; then
-     LDAP_PTHREAD=
-   fi
- 
--  if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
-+  if test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME; then
-+    PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY_WITH_PATH(ldap_r, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-+  elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
-     PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-     PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
- 
diff --git a/SOURCES/php-7.0.0-fixheader.patch b/SOURCES/php-7.0.0-fixheader.patch
deleted file mode 100644
index 771a19e..0000000
--- a/SOURCES/php-7.0.0-fixheader.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-
-Make generated php_config.h constant across rebuilds.
-
---- php-7.0.0/configure.in.fixheader
-+++ php-7.0.0/configure.in
-@@ -1278,7 +1278,7 @@ fi
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
- EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
- 
--PHP_BUILD_DATE=`date '+%Y-%m-%d'`
-+PHP_BUILD_DATE=`date '+%Y-%m-%d' -r $srcdir/NEWS`
- AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
- 
- case $host_alias in
-@@ -1289,7 +1289,7 @@ case $host_alias in
-   AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host])
-   ;;
- *)
--  PHP_UNAME=`uname -a | xargs`
-+  PHP_UNAME=`uname | xargs`
-   AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
-   PHP_OS=`uname | xargs`
-   AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
diff --git a/SOURCES/php-7.1.15-ldap_r.patch b/SOURCES/php-7.1.15-ldap_r.patch
new file mode 100644
index 0000000..ab65a14
--- /dev/null
+++ b/SOURCES/php-7.1.15-ldap_r.patch
@@ -0,0 +1,19 @@
+
+Use -lldap_r by default.
+
+diff -up php-7.1.15RC1/ext/ldap/config.m4.ldap_r php-7.1.15RC1/ext/ldap/config.m4
+--- php-7.1.15RC1/ext/ldap/config.m4.ldap_r	2018-02-14 07:28:23.608321317 +0100
++++ php-7.1.15RC1/ext/ldap/config.m4	2018-02-14 07:28:58.527492025 +0100
+@@ -119,7 +119,11 @@ if test "$PHP_LDAP" != "no"; then
+ 
+   MACHINE_INCLUDES=$($CC -dumpmachine)
+ 
+-  if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
++  if test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME; then
++    PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
++    PHP_ADD_LIBRARY_WITH_PATH(ldap_r, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
++
++  elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
+     PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+     PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+ 
diff --git a/SOURCES/php-7.1.16-dlopen.patch b/SOURCES/php-7.1.16-dlopen.patch
new file mode 100644
index 0000000..7ace226
--- /dev/null
+++ b/SOURCES/php-7.1.16-dlopen.patch
@@ -0,0 +1,30 @@
+diff -up php-7.1.16RC1/sapi/litespeed/lsapilib.c.dlopen php-7.1.16RC1/sapi/litespeed/lsapilib.c
+--- php-7.1.16RC1/sapi/litespeed/lsapilib.c.dlopen	2018-03-14 13:19:47.998931942 +0100
++++ php-7.1.16RC1/sapi/litespeed/lsapilib.c	2018-03-14 13:20:30.942148432 +0100
+@@ -755,7 +755,7 @@ static int (*fp_lve_leave)(struct liblve
+ static int (*fp_lve_jail)( struct passwd *, char *) = NULL;
+ static int lsapi_load_lve_lib(void)
+ {
+-    s_liblve = dlopen("liblve.so.0", RTLD_LAZY);
++    s_liblve = dlopen("liblve.so.0", RTLD_NOW);
+     if (s_liblve)
+     {
+         fp_lve_is_available = dlsym(s_liblve, "lve_is_available");
+diff -up php-7.1.16RC1/Zend/zend_portability.h.dlopen php-7.1.16RC1/Zend/zend_portability.h
+--- php-7.1.16RC1/Zend/zend_portability.h.dlopen	2018-03-14 06:00:31.000000000 +0100
++++ php-7.1.16RC1/Zend/zend_portability.h	2018-03-14 13:19:47.998931942 +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)
diff --git a/SOURCES/php-7.1.24-phpize.patch b/SOURCES/php-7.1.24-phpize.patch
new file mode 100644
index 0000000..169f648
--- /dev/null
+++ b/SOURCES/php-7.1.24-phpize.patch
@@ -0,0 +1,35 @@
+diff -up php-7.1.24RC1/scripts/phpize.in.headers php-7.1.24RC1/scripts/phpize.in
+--- php-7.1.24RC1/scripts/phpize.in.headers	2018-10-24 08:44:25.000000000 +0200
++++ php-7.1.24RC1/scripts/phpize.in	2018-10-24 09:24:51.810847433 +0200
+@@ -162,6 +162,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
+@@ -180,12 +189,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
diff --git a/SOURCES/php-7.1.3-dlopen.patch b/SOURCES/php-7.1.3-dlopen.patch
deleted file mode 100644
index cd35dc0..0000000
--- a/SOURCES/php-7.1.3-dlopen.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up php-7.1.3RC1/sapi/litespeed/lsapilib.c.dlopen php-7.1.3RC1/sapi/litespeed/lsapilib.c
---- php-7.1.3RC1/sapi/litespeed/lsapilib.c.dlopen	2017-02-28 10:12:34.000000000 +0100
-+++ php-7.1.3RC1/sapi/litespeed/lsapilib.c	2017-02-28 10:23:11.384521740 +0100
-@@ -616,7 +616,7 @@ static int (*fp_lve_leave)(struct liblve
- static int (*fp_lve_jail)( struct passwd *, char *) = NULL;
- static int lsapi_load_lve_lib()
- {
--    s_liblve = dlopen("liblve.so.0", RTLD_LAZY);
-+    s_liblve = dlopen("liblve.so.0", RTLD_NOW);
-     if (s_liblve)
-     {
-         fp_lve_is_available = dlsym(s_liblve, "lve_is_available");
-diff -up php-7.1.3RC1/Zend/zend_portability.h.dlopen php-7.1.3RC1/Zend/zend_portability.h
---- php-7.1.3RC1/Zend/zend_portability.h.dlopen	2017-02-28 10:23:11.384521740 +0100
-+++ php-7.1.3RC1/Zend/zend_portability.h	2017-02-28 10:26:08.960308560 +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)
diff --git a/SPECS/php.spec b/SPECS/php.spec
index ddf7d65..f009b61 100644
--- a/SPECS/php.spec
+++ b/SPECS/php.spec
@@ -87,7 +87,7 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
-Version: 7.1.8
+Version: 7.1.30
 Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -123,14 +123,12 @@ Patch9: php-7.0.7-curl.patch
 # Fixes for extension modules
 
 # Functional changes
-Patch40: php-7.1.3-dlopen.patch
+Patch40: php-7.1.16-dlopen.patch
 Patch42: php-7.1.0-systzdata-v14.patch
 # See http://bugs.php.net/53436
-Patch43: php-5.4.0-phpize.patch
+Patch43: php-7.1.24-phpize.patch
 # Use -lldap_r for OpenLDAP
-Patch45: php-5.6.3-ldap_r.patch
-# Make php_config.h constant across builds
-Patch46: php-7.0.0-fixheader.patch
+Patch45: php-7.1.15-ldap_r.patch
 # drop "Configure command" from phpinfo output
 Patch47: php-5.6.3-phpinfo.patch
 
@@ -675,10 +673,10 @@ support for JavaScript Object Notation (JSON) to PHP.
 %patch40 -p1 -b .dlopen
 %patch42 -p1 -b .systzdata
 %patch43 -p1 -b .headers
+sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %patch45 -p1 -b .ldap_r
 %endif
-%patch46 -p1 -b .fixheader
 %patch47 -p1 -b .phpinfo
 
 # upstream patches
@@ -720,11 +718,17 @@ mkdir \
 rm ext/date/tests/timezone_location_get.phpt
 rm ext/date/tests/timezone_version_get.phpt
 rm ext/date/tests/timezone_version_get_basic1.phpt
+# related to tzdata
+rm ext/date/tests/bug33414-1.phpt
+rm ext/date/tests/bug33415-2.phpt
+rm ext/date/tests/date_modify-1.phpt
 # fails sometime
 rm ext/sockets/tests/mcast_ipv?_recv.phpt
 # cause stack exhausion
 rm Zend/tests/bug54268.phpt
 rm Zend/tests/bug68412.phpt
+# slow and erratic result
+rm sapi/cli/tests/upload_2G.phpt
 
 # Safety check for API version change.
 pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h)
@@ -803,6 +807,9 @@ sed -e 's:%{_root_sysconfdir}:%{_sysconfdir}:' \
 
 
 %build
+# Set build date from https://reproducible-builds.org/specs/source-date-epoch/
+export SOURCE_DATE_EPOCH=$(date +%s -r NEWS)
+
 # aclocal workaround - to be improved
 cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4
 
@@ -1502,7 +1509,7 @@ fi
 %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
 %config(noreplace) %{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm
 %config(noreplace) %{_sysconfdir}/sysconfig/php-fpm
-# %{_prefix}/lib/tmpfiles.d/php-fpm.conf
+# %%{_prefix}/lib/tmpfiles.d/php-fpm.conf
 %if %{with_systemd}
 %{_unitdir}/%{?scl_prefix}php-fpm.service
 %dir %{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d
@@ -1568,6 +1575,9 @@ fi
 
 
 %changelog
+* Wed Jul 10 2019 Remi Collet <rcollet@redhat.com> - 7.1.30-1
+- rebase to 7.1.30 #1631672
+
 * Tue Aug  8 2017 Remi Collet <rcollet@redhat.com> - 7.1.8-1
 - rebase to 7.1.8 #1465319
 - drop upstream oniguruma patch