From e2e1e906d85aa527df08987c92724e4b9b151aca Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 1 Dec 2016 08:36:59 +0100
Subject: PHP 7.1.0 GA

---
 failed.txt | 31 +++++++++++++------------------
 php71.spec | 15 +++++++++------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/failed.txt b/failed.txt
index d63dcf1..9334e38 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,32 +1,27 @@
-===== 7.1.0RC6 (2016-11-10)
+===== 7.1.0 (2016-12-01)
 
 $ grep -r 'Tests failed' /var/lib/mock/*/build.log
 
-/var/lib/mock/el6i/build.log:Tests failed    :     1
-/var/lib/mock/el6x/build.log:Tests failed    :     0
+/var/lib/mock/el6i/build.log:Tests failed    :     2
+/var/lib/mock/el6x/build.log:Tests failed    :     1
 /var/lib/mock/el7x/build.log:Tests failed    :     0
-/var/lib/mock/fc23i/build.log:Tests failed    :    5
-/var/lib/mock/fc23x/build.log:Tests failed    :    4
-/var/lib/mock/fc24i/build.log:Tests failed    :    2
+/var/lib/mock/fc23i/build.log:Tests failed    :    0
+/var/lib/mock/fc23x/build.log:Tests failed    :    0
+/var/lib/mock/fc24i/build.log:Tests failed    :    1
 /var/lib/mock/fc24x/build.log:Tests failed    :    0
-/var/lib/mock/fc25i/build.log:Tests failed    :    1
-/var/lib/mock/fc25x/build.log:Tests failed    :    1
+/var/lib/mock/fc25i/build.log:Tests failed    :    0
+/var/lib/mock/fc25x/build.log:Tests failed    :    0
 
-fc23i, fc23x
-	***	Bug #20382 [2] (strtotime ("Monday", $date) produces wrong result on DST changeover) [ext/date/tests/bug20382-2.phpt]
-	***	Bug #33414 [1] (Comprehensive list of incorrect days returned after strotime() / date() tests) [ext/date/tests/bug33414-1.phpt]
-	***	Bug #33415 [1] (Possibly invalid non-one-hour DST or timezone shifts) [ext/date/tests/bug33415-1.phpt]
-	***	Bug #51819 (Case discrepancy in timezone names cause Uncaught exception and fatal error) [ext/date/tests/bug51819.phpt]
-el6i, fc23i, fc24i, fc25i
-	***	Bug #53437 DateInterval unserialize bad data, 32 bit [ext/date/tests/bug53437_var3.phpt]
+el6i
+	*	Capture SSL session meta array in stream context [ext/openssl/tests/session_meta_capture.phpt]
+	*	sni_server [ext/openssl/tests/sni_server.phpt]
+el6x
+	*	Bug #69521      Segfault in gc_collect_cycles() [ext/standard/tests/streams/bug69521.phpt]
 fc24i
-	*	Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
-fc25x
 	*	Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
 
 
 *	proc_open give erratic test results :(
 **	date tests vary with tzdata available in system
 ***	test fixed upstream
-***	Related to tzdata 2016g (f24+) vs 2016f
 
diff --git a/php71.spec b/php71.spec
index af9a5b1..383b7df 100644
--- a/php71.spec
+++ b/php71.spec
@@ -46,7 +46,7 @@
 # Optional components; pass "--with mssql" etc to rpmbuild.
 %global with_oci8      %{?_with_oci8:1}%{!?_with_oci8:0}
 
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 22 || 0%{?rhel} >= 8
 %global with_libpcre  1
 %else
 %global with_libpcre  0
@@ -120,8 +120,8 @@
 %global db_devel  libdb-devel
 %endif
 
-%global rcver         RC6
-%global rpmrel        8
+#global rcver         RC6
+%global rpmrel        1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -945,7 +945,7 @@ httpd -V  | grep -q 'threaded:.*yes' && exit 1
 %endif
 
 %patch40 -p1 -b .dlopen
-%if 0%{?fedora} >= 23 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
 %patch42 -p1 -b .systzdata
 %endif
 %patch43 -p1 -b .headers
@@ -962,7 +962,7 @@ httpd -V  | grep -q 'threaded:.*yes' && exit 1
 # security patches
 
 # Fixes for tests
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
 %patch300 -p1 -b .datetests
 %endif
 %if %{with_libpcre}
@@ -1185,7 +1185,7 @@ ln -sf ../configure
     --with-layout=GNU \
     --with-kerberos \
     --with-libxml-dir=%{_prefix} \
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
     --with-system-tzdata \
 %endif
     --with-mhash \
@@ -1988,6 +1988,9 @@ fi
 
 
 %changelog
+* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> 7.1.0-1
+- Update to 7.1.0 - http://www.php.net/releases/7_1_0.php
+- use bundled pcre library 8.38 on EL-7
 - disable pcre.jit everywhere as it raise AVC #1398474
 - sync provided configuration with upstream production defaults
 
-- 
cgit