diff options
| -rw-r--r-- | php-5.5.8-bug66412.patch | 15 | ||||
| -rw-r--r-- | php55.spec | 13 |
2 files changed, 7 insertions, 21 deletions
diff --git a/php-5.5.8-bug66412.patch b/php-5.5.8-bug66412.patch deleted file mode 100644 index 2018acc..0000000 --- a/php-5.5.8-bug66412.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up ext/readline/readline.c.old ext/readline/readline.c ---- ext/readline/readline.c.old 2014-01-20 08:19:13.009830341 +0100 -+++ ext/readline/readline.c 2014-01-20 08:20:56.463158818 +0100 -@@ -354,6 +354,11 @@ PHP_FUNCTION(readline_clear_history) - return; - } - -+#if HAVE_LIBEDIT -+ /* clear_history is the only function where rl_initialize -+ is not call to ensure correct allocation */ -+ using_history(); -+#endif - clear_history(); - - RETURN_TRUE; @@ -3,7 +3,7 @@ %global zendver 20121212 %global pdover 20080721 # Extension version -%global opcachever 7.0.3-dev +%global opcachever 7.0.3 %global oci8ver 1.4.10 # Use for first build of PHP (before pecl/zip and pecl/jsonc) @@ -100,13 +100,13 @@ %endif #global snapdate 201308300430 -#global rcver RC1 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 5.5.8 +Version: 5.5.9 %if 0%{?snapdate:1}%{?rcver:1} -Release: 0.2.%{?snapdate}%{?rcver}%{?dist} +Release: 0.1.%{?snapdate}%{?rcver}%{?dist} %else Release: 2%{?dist} %endif @@ -175,7 +175,6 @@ Patch91: php-5.3.7-oci8conf.patch # Fixes for tests # WIP -Patch100: php-5.5.8-bug66412.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -885,7 +884,6 @@ rm -rf ext/json # security patches # WIP patch -%patch100 -p0 -b .bug66412 # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1860,6 +1858,9 @@ fi %changelog +* Thu Jan 23 2014 Remi Collet <rcollet@redhat.com> 5.5.9-0.1.RC1 +- test build of 5.5.9RC1 + * Mon Jan 20 2014 Remi Collet <rcollet@redhat.com> 5.5.8-2 - test build for https://bugs.php.net/66412 |