summaryrefslogtreecommitdiffstats
path: root/php54.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-09-17 11:39:34 +0200
committerRemi Collet <fedora@famillecollet.com>2014-09-17 11:39:34 +0200
commitcc1ac0d64380223ce7fbb91687adcfbeaaca66a6 (patch)
tree491247b1f08e2f8efa8b02f02873d74738b82add /php54.spec
parente9aefc9401877d7640e4d574dff78cec586ee145 (diff)
PHP 5.4.33
Diffstat (limited to 'php54.spec')
-rw-r--r--php54.spec14
1 files changed, 10 insertions, 4 deletions
diff --git a/php54.spec b/php54.spec
index a3287a1..7d52789 100644
--- a/php54.spec
+++ b/php54.spec
@@ -84,7 +84,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.4.32
+Version: 5.4.33
%if 0%{?snapdate:1}%{?rcver:1}
Release: 0.2.%{?snapdate}%{?rcver}%{?dist}
%else
@@ -139,7 +139,8 @@ Patch46: php-5.4.9-fixheader.patch
Patch47: php-5.4.9-phpinfo.patch
# Upstream fixes
-Patch100: php-bug67873.patch
+# Backported from 5.5.18 for https://bugs.php.net/65641
+Patch100: php-5.4.33-bug65641.patch
# Security fixes
@@ -831,11 +832,10 @@ rm -f ext/json/utf8_to_utf16.*
%patch46 -p1 -b .fixheader
%patch47 -p1 -b .phpinfo
-%patch100 -p1 -b .wddx
-
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch100 -p1 -b .bug65641
# security patches
@@ -1699,6 +1699,12 @@ fi
%changelog
+* Wed Sep 17 2014 Remi Collet <remi@fedoraproject.org> 5.4.33-1
+- Update to 5.4.33
+ http://www.php.net/releases/5_4_33.php
+- fpm: fix script_name with mod_proxy_fcgi / proxypass
+ add upstream patch for https://bugs.php.net/65641
+
* Thu Aug 21 2014 Remi Collet <remi@fedoraproject.org> 5.4.32-1
- Update to 5.4.32
http://www.php.net/releases/5_4_32.php