From 7b45c41bf35e7e2b90a0dd530f6f1ce32a0a1c3a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 10 Jun 2014 16:11:30 +0200 Subject: PHP 5.6: add some upstream patches --- php56.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'php56.spec') diff --git a/php56.spec b/php56.spec index 303bfd5..308d3f1 100644 --- a/php56.spec +++ b/php56.spec @@ -124,7 +124,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.6.0 %if 0%{?snapdate:1}%{?rcver:1} -Release: 0.10.%{?snapdate}%{?rcver}%{?dist} +Release: 0.11.%{?snapdate}%{?rcver}%{?dist} %else Release: 1%{?dist} %endif @@ -186,6 +186,11 @@ Patch91: php-5.3.7-oci8conf.patch # Upstream fixes (100+) Patch100: php-reg67118.patch +Patch101: php-bug67392.patch +Patch102: php-bug67410.patch +Patch103: php-bug67411.patch +Patch104: php-bug67412.patch +Patch105: php-bug67413.patch # Security fixes (200+) @@ -909,6 +914,11 @@ rm -rf ext/json # upstream patches %patch100 -p1 -b .reg67118 +%patch101 -p1 -b .bug67392 +%patch102 -p1 -b .bug67410 +%patch103 -p1 -b .bug67411 +%patch104 -p1 -b .bug67412 +%patch105 -p1 -b .bug67413 # security patches @@ -1911,6 +1921,10 @@ fi %changelog +* Tue Jun 10 2014 Remi Collet 5.6.0-0.11.beta4 +- test build for bug 67410, 67411, 67412, 67413 +- fix 67392, dtrace breaks argument unpack + * Thu Jun 5 2014 Remi Collet 5.6.0-0.10.beta4 - fix regression introduce in fix for #67118 -- cgit