summaryrefslogtreecommitdiffstats
path: root/php54.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php54.spec')
-rw-r--r--php54.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/php54.spec b/php54.spec
index 7d52789..5a6de28 100644
--- a/php54.spec
+++ b/php54.spec
@@ -88,7 +88,7 @@ Version: 5.4.33
%if 0%{?snapdate:1}%{?rcver:1}
Release: 0.2.%{?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
@@ -141,6 +141,8 @@ Patch47: php-5.4.9-phpinfo.patch
# Upstream fixes
# Backported from 5.5.18 for https://bugs.php.net/65641
Patch100: php-5.4.33-bug65641.patch
+# Revert to fix regression
+Patch101: php-5.4.33-openssl.patch
# Security fixes
@@ -836,6 +838,7 @@ rm -f ext/json/utf8_to_utf16.*
# upstream patches
%patch100 -p1 -b .bug65641
+%patch101 -p1 -R -b .revert
# security patches
@@ -1699,6 +1702,10 @@ fi
%changelog
+* Sat Sep 20 2014 Remi Collet <remi@fedoraproject.org> 5.4.33-2
+- openssl: fix regression introduce in changes for upstream
+ bug #65137 and #41631, revert to 5.4.32 behavior
+
* 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