summaryrefslogtreecommitdiffstats
path: root/php55.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-21 08:33:35 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-21 08:33:35 +0200
commite95f0fabb1434d5414af12858ae8697a4bc1c20d (patch)
tree4bd655c3df8928cecf93e6b3bb9e569543c0b35b /php55.spec
parent34c4efbb45da165553ae66756706a65cb24a378e (diff)
php 5.5.16, revert fix for 67724 because of 67865
Diffstat (limited to 'php55.spec')
-rw-r--r--php55.spec3
1 files changed, 3 insertions, 0 deletions
diff --git a/php55.spec b/php55.spec
index de72d57..ed95090 100644
--- a/php55.spec
+++ b/php55.spec
@@ -190,6 +190,7 @@ Patch47: php-5.4.9-phpinfo.patch
Patch91: php-5.3.7-oci8conf.patch
# Upstream fixes (100+)
+Patch100: php-bug67865.patch
# Security fixes (200+)
@@ -938,6 +939,7 @@ rm -rf ext/json
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch100 -p1 -b .bug67865
# security patches
@@ -1945,6 +1947,7 @@ fi
- Update to 5.5.16
http://www.php.net/releases/5_5_16.php
- fix zts-php-config --php-binary output #1124605
+- revert fix for 67724 because of 67865
* Thu Jul 24 2014 Remi Collet <remi@fedoraproject.org> 5.5.15-1
- Update to 5.5.15