From 58d19e666eccf885324268cde15819faba76be8e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 24 Oct 2018 11:32:10 +0200
Subject: 7.1.24RC1

---
 failed.txt              | 13 +++++++++----
 php-5.4.0-phpize.patch  | 34 ----------------------------------
 php-7.1.24-phpize.patch | 35 +++++++++++++++++++++++++++++++++++
 php71.spec              |  9 ++++++---
 4 files changed, 50 insertions(+), 41 deletions(-)
 delete mode 100644 php-5.4.0-phpize.patch
 create mode 100644 php-7.1.24-phpize.patch

diff --git a/failed.txt b/failed.txt
index 63cf0fa..500f587 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,18 +1,23 @@
-===== 7.1.23 (2018-10-11)
+===== 7.1.24RC1 (2018-10-25)
 
 $ grep -r 'Tests failed' /var/lib/mock/*/build.log
 
 /var/lib/mock/el6i/build.log:Tests failed    :     0
-/var/lib/mock/el6x/build.log:Tests failed    :     0
+/var/lib/mock/el6x/build.log:Tests failed    :     1
 /var/lib/mock/el7x/build.log:Tests failed    :     0
 /var/lib/mock/fc26i/build.log:Tests failed    :    0
 /var/lib/mock/fc26x/build.log:Tests failed    :    0
-/var/lib/mock/fc27i/build.log:Tests failed    :    0
+/var/lib/mock/fc27i/build.log:Tests failed    :    2
 /var/lib/mock/fc27x/build.log:Tests failed    :    1
 
 
+el6x
+		file upload greater than 2G [sapi/cli/tests/upload_2G.phpt]
+fc27i
+	1	Server bitwise stream crypto flag assignment [ext/openssl/tests/stream_crypto_flags_003.phpt]
+	1	Specific protocol method specification [ext/openssl/tests/stream_crypto_flags_004.phpt]
 fc27x
-	1	Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
+	1	Bug #69521      Segfault in gc_collect_cycles() [ext/standard/tests/streams/bug69521.phpt]
 
 
 1	proc_open give erratic test results :(
diff --git a/php-5.4.0-phpize.patch b/php-5.4.0-phpize.patch
deleted file mode 100644
index e666e45..0000000
--- a/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/php-7.1.24-phpize.patch b/php-7.1.24-phpize.patch
new file mode 100644
index 0000000..169f648
--- /dev/null
+++ b/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/php71.spec b/php71.spec
index fd57f0f..e903653 100644
--- a/php71.spec
+++ b/php71.spec
@@ -107,8 +107,8 @@
 %global db_devel  libdb-devel
 %endif
 
-%global upver        7.1.23
-#global rcver        RC1
+%global upver        7.1.24
+%global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -157,7 +157,7 @@ Patch9: php-7.0.7-curl.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-7.1.15-ldap_r.patch
 # drop "Configure command" from phpinfo output
@@ -2056,6 +2056,9 @@ fi
 
 
 %changelog
+* Wed Oct 24 2018 Remi Collet <remi@remirepo.net> - 7.1.24~RC1-1
+- update to 7.1.24RC1
+
 * Wed Oct 10 2018 Remi Collet <remi@remirepo.net> - 7.1.23-1
 - Update to 7.1.23 - http://www.php.net/releases/7_1_23.php
 
-- 
cgit