From 18b87509e62dab3f6d56f143d1221acbf9a29f7c Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 22 Aug 2013 08:28:39 +0200
Subject: PHP 5.4.19

---
 php-5.4.18-bison.patch | 29 -----------------------------
 php54.spec             | 18 ++++--------------
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 php-5.4.18-bison.patch

diff --git a/php-5.4.18-bison.patch b/php-5.4.18-bison.patch
deleted file mode 100644
index dd2481d..0000000
--- a/php-5.4.18-bison.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
-index ccbc9b1..6a9a24a 100644
---- a/Zend/zend_language_parser.y
-+++ b/Zend/zend_language_parser.y
-@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
- 
- #define YYERROR_VERBOSE
- #define YYSTYPE znode
--#ifdef ZTS
--# define YYPARSE_PARAM tsrm_ls
--# define YYLEX_PARAM tsrm_ls
--#endif
--
- 
- %}
- 
- %pure_parser
- %expect 3
- 
-+%code requires {
-+#ifdef ZTS
-+# define YYPARSE_PARAM tsrm_ls
-+# define YYLEX_PARAM tsrm_ls
-+#endif
-+}
-+
- %token END 0 "end of file"
- %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
- %token T_INCLUDE      "include (T_INCLUDE)"
diff --git a/php54.spec b/php54.spec
index d32a548..0cb8b7d 100644
--- a/php54.spec
+++ b/php54.spec
@@ -75,7 +75,7 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.4.18
+Version: 5.4.19
 %if 0%{?snapdate:1}%{?rcver:1}
 Release: 0.5.%{?snapdate}%{?rcver}%{?dist}
 %else
@@ -109,8 +109,6 @@ Patch5: php-5.2.0-includedir.patch
 Patch6: php-5.2.4-embed.patch
 Patch7: php-5.3.0-recode.patch
 Patch8: php-5.4.7-libdb.patch
-# Patch for https://bugs.php.net/65460
-Patch9: php-5.4.18-bison.patch
 
 # Fixes for extension modules
 # https://bugs.php.net/63171 no odbc call during timeout
@@ -159,8 +157,6 @@ BuildRequires: libtool-ltdl-devel
 %if %{with_libzip}
 BuildRequires: libzip-devel >= 0.10
 %endif
-# Temporary for need for https://bugs.php.net/65460
-BuildRequires: bison
 
 Obsoletes: php53, php53u, php54
 Provides: php-zts = %{version}-%{release}
@@ -770,10 +766,6 @@ httpd -V  | grep -q 'threaded:.*yes' && exit 1
 %patch7 -p1 -b .recode
 %patch8 -p1 -b .libdb
 rm -f ext/json/utf8_to_utf16.*
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-# bison >= 2.4
-%patch9 -p1 -b .bison
-%endif
 
 %patch21 -p1 -b .odbctimer
 
@@ -794,11 +786,6 @@ rm -f ext/json/utf8_to_utf16.*
 
 %patch91 -p1 -b .remi-oci8
 
-# Temporary workaround for https://bugs.php.net/65460
-# Regenerated bison files
-rm Zend/zend_{language,ini}_parser.[ch]
-./genfiles
-
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1641,6 +1628,9 @@ fi
 
 
 %changelog
+* Thu Aug 22 2013 Remi Collet <rcollet@redhat.com> - 5.4.19-1
+- update to 5.4.19
+
 * Mon Aug 19 2013 Remi Collet <remi@fedoraproject.org> 5.4.18-1
 - update to 5.4.18, fix for CVE-2013-4248
 - php-oci8 build with oracle instantclient 12.1
-- 
cgit