From 9ffc959e07b5d52ba70691083ac3923e484da7ff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Feb 2013 11:16:14 +0100 Subject: php 5.4: sync patch with rawhide --- php54.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'php54.spec') diff --git a/php54.spec b/php54.spec index 7d377b4..06fb8ae 100644 --- a/php54.spec +++ b/php54.spec @@ -69,7 +69,7 @@ Version: 5.4.11 %if 0%{?snapdate:1}%{?rcver:1} Release: 0.5.%{?snapdate}%{?rcver}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -103,6 +103,10 @@ Patch8: php-5.4.7-libdb.patch # Fixes for extension modules # https://bugs.php.net/63171 no odbc call during timeout Patch21: php-5.4.7-odbctimer.patch +# https://bugs.php.net/64128 buit-in web server is broken on ppc64 +Patch22: php-5.4.11-select.patch +# https://bugs.php.net/64142 dval to lval issue on ppc64 +Patch23: php-5.4.11-conv.patch # Functional changes Patch40: php-5.4.0-dlopen.patch @@ -120,6 +124,7 @@ Patch46: php-5.4.9-fixheader.patch Patch47: php-5.4.9-phpinfo.patch # Fixes for tests +Patch50: php-5.4.11-sockets.patch # RC Patch Patch91: php-5.3.7-oci8conf.patch @@ -757,6 +762,8 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 rm -f ext/json/utf8_to_utf16.* %patch21 -p1 -b .odbctimer +%patch22 -p1 -b .select +%patch23 -p1 -b .conv %patch40 -p1 -b .dlopen %patch41 -p1 -b .easter @@ -772,6 +779,7 @@ rm -f ext/json/utf8_to_utf16.* %endif %patch46 -p1 -b .fixheader %patch47 -p1 -b .phpinfo +%patch50 -p1 -b .sockets %patch91 -p1 -b .remi-oci8 @@ -1610,6 +1618,13 @@ fi %changelog +* Wed Feb 13 2013 Remi Collet 5.4.11-2 +- upstream patch (5.4.13) to fix dval to lval conversion + https://bugs.php.net/64142 +- upstream patch (5.4.13) for 2 failed tests +- fix buit-in web server on ppc64 (fdset usage) + https://bugs.php.net/64128 + * Wed Jan 16 2013 Remi Collet 5.4.11-1 - update to 5.4.11 - fix php.conf to allow MultiViews managed by php scripts -- cgit