summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt4
-rw-r--r--php-upstream.patch47
-rw-r--r--php56.spec7
3 files changed, 54 insertions, 4 deletions
diff --git a/failed.txt b/failed.txt
index 1407e45..f2f8ca8 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 5.6.26RC1 (2016-09-01)
+===== 5.6.26 (2016-09-15)
$ grep -r 'Tests failed' /var/lib/mock/*/build.log
@@ -7,8 +7,6 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log
/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
-/var/lib/mock/fc21i/build.log:Tests failed : 2
-/var/lib/mock/fc21x/build.log:Tests failed : 0
/var/lib/mock/fc22i/build.log:Tests failed : 2
/var/lib/mock/fc22x/build.log:Tests failed : 0
/var/lib/mock/fc23i/build.log:Tests failed : 2
diff --git a/php-upstream.patch b/php-upstream.patch
new file mode 100644
index 0000000..ecd9d45
--- /dev/null
+++ b/php-upstream.patch
@@ -0,0 +1,47 @@
+From 55237fe153694f5501636a49e387f36297037e4a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Thu, 15 Sep 2016 13:27:20 +0200
+Subject: [PATCH] fix ZTS build
+
+---
+ ext/mysqlnd/mysqlnd_wireprotocol.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
+index 855a25c..844330f 100644
+--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
++++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
+@@ -1610,7 +1610,7 @@ php_mysqlnd_rowp_read_text_protocol_aux(MYSQLND_MEMORY_POOL_CHUNK * row_buffer,
+ const unsigned long len = php_mysqlnd_net_field_length(&p);
+
+ if (len != MYSQLND_NULL_LENGTH && ((p + len) > packet_end)) {
+- php_error_docref(NULL, E_WARNING, "Malformed server packet. Field length pointing "MYSQLND_SZ_T_SPEC
++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Malformed server packet. Field length pointing "MYSQLND_SZ_T_SPEC
+ " bytes after end of packet", (p + len) - packet_end - 1);
+ DBG_RETURN(FAIL);
+ }
+--
+2.1.4
+
+From 3c117d4136d26c8d6e4127c89b2160c477f45e11 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Thu, 15 Sep 2016 15:32:39 +0200
+Subject: [PATCH] fix test (32bits)
+
+---
+ ext/standard/tests/strings/str_pad_variation5.phpt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/standard/tests/strings/str_pad_variation5.phpt b/ext/standard/tests/strings/str_pad_variation5.phpt
+index cd979a1..4e1b1a9 100644
+--- a/ext/standard/tests/strings/str_pad_variation5.phpt
++++ b/ext/standard/tests/strings/str_pad_variation5.phpt
+@@ -31,4 +31,4 @@ var_dump( str_pad($input, $pad_length) );
+ --EXPECTF--
+ *** Testing str_pad() function: with large value for for 'pad_length' argument ***
+
+-Fatal error: Allowed memory size of 134217728 bytes exhausted%s(tried to allocate 2147483648 bytes) in %s on line %d
++Fatal error: String allocation overflow, max size is 2147483647 in %s on line %d
+--
+2.1.4
+
diff --git a/php56.spec b/php56.spec
index c5a2f71..083fdf0 100644
--- a/php56.spec
+++ b/php56.spec
@@ -143,7 +143,7 @@
%global db_devel libdb-devel
%endif
-%global rcver RC1
+#global rcver RC1
%global rpmrel 1
Summary: PHP scripting language for creating dynamic web sites
@@ -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 .upstream
# security patches
@@ -1997,6 +1999,9 @@ fi
%changelog
+* Thu Sep 15 2016 Remi Collet <remi@fedoraproject.org> 5.6.26-1
+- Update to 5.6.26 - http://www.php.net/releases/5_6_26.php
+
* Fri Sep 2 2016 Remi Collet <remi@fedoraproject.org> 5.6.26-0.1.RC1
- update to 5.6.26RC1
- oci8 version is now 2.0.12