From 992a07a7e8d49c49313bf21cf0fc2f508ece9fc7 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 6 Jan 2017 07:59:48 +0100
Subject: PHP 5.6.30RC1

---
 failed.txt         |  8 ++++----
 php-upstream.patch | 21 +++++++++++++++++++++
 php56.spec         |  9 +++++++--
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 php-upstream.patch

diff --git a/failed.txt b/failed.txt
index 6bc3e82..65ecd56 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,9 +1,9 @@
-===== 5.6.29 (2016-12-08)
+===== 5.6.30RC1 (2017-01-06)
 
 $ grep -r 'Tests failed' /var/lib/mock/*/build.log
 
-/var/lib/mock/el5i/build.log:Tests failed    :     7
-/var/lib/mock/el5x/build.log:Tests failed    :     2
+/var/lib/mock/el5i/build.log:Tests failed    :     8
+/var/lib/mock/el5x/build.log:Tests failed    :     3
 /var/lib/mock/el6i/build.log:Tests failed    :     5
 /var/lib/mock/el6x/build.log:Tests failed    :     0
 /var/lib/mock/el7x/build.log:Tests failed    :     0
@@ -19,6 +19,7 @@ el5i, el5x
 		openssl_error_string() tests [ext/openssl/tests/openssl_error_string_basic.phpt]
 el5i, el5x
 		sni_server [ext/openssl/tests/sni_server.phpt]
+	*	Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
 el5i, el6i, fc22i, fc23i, fc24i
 		Bug #53437 DateInterval unserialize bad data, 32 bit [ext/date/tests/bug53437_var3.phpt]
 	**	Bug #64146 (serialize incorrectly saving objects when they are cloned) [ext/standard/tests/serialize/bug64146.phpt]
@@ -30,5 +31,4 @@ el5i, el6i
 
 *	proc_open have erratic results... :(
 **	#64146 known issue, no fix found
-***	Related to tzdata 2016g (f24+) vs 2016f
 
diff --git a/php-upstream.patch b/php-upstream.patch
new file mode 100644
index 0000000..790f457
--- /dev/null
+++ b/php-upstream.patch
@@ -0,0 +1,21 @@
+From db890956ecc11c090716a536b00a07f2499fa73a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Fri, 6 Jan 2017 06:23:59 +0100
+Subject: [PATCH] add skip when json not loaded
+
+---
+ ext/standard/tests/serialize/bug72610_3.phpt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/standard/tests/serialize/bug72610_3.phpt b/ext/standard/tests/serialize/bug72610_3.phpt
+index 4e69087..86941f2 100644
+--- a/ext/standard/tests/serialize/bug72610_3.phpt
++++ b/ext/standard/tests/serialize/bug72610_3.phpt
+@@ -1,5 +1,7 @@
+ --TEST--
+ __wakeup should be able to modify dynamic properties without affecting copies of those properties
++--SKIPIF--
++<?php if (!extension_loaded("json")) print "skip json_encode needed"; ?>
+ --FILE--
+ <?php
+ 
diff --git a/php56.spec b/php56.spec
index 46165cd..f82beda 100644
--- a/php56.spec
+++ b/php56.spec
@@ -143,12 +143,12 @@
 %global db_devel  libdb-devel
 %endif
 
-#global rcver  RC1
+%global rcver  RC1
 %global rpmrel 1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.6.29
+Version: 5.6.30
 %if 0%{?rcver:1}
 Release: 0.%{rpmrel}.%{rcver}%{?dist}
 %else
@@ -207,6 +207,7 @@ Patch47: php-5.6.3-phpinfo.patch
 Patch91: php-5.6.3-oci8conf.patch
 
 # Upstream fixes (100+)
+Patch100: php-upstream.patch
 
 # Security fixes (200+)
 
@@ -969,6 +970,7 @@ httpd -V  | grep -q 'threaded:.*yes' && exit 1
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
+%patch100 -p1 -b .skip
 
 # security patches
 
@@ -1997,6 +1999,9 @@ fi
 
 
 %changelog
+* Fri Jan  6 2017 Remi Collet <remi@fedoraproject.org> 5.6.30-0.1.RC1
+- update to 5.6.30RC1
+
 * Thu Dec  8 2016 Remi Collet <remi@fedoraproject.org> 5.6.29-1
 - Update to 5.6.29 - http://www.php.net/releases/5_6_29.php
 
-- 
cgit