summaryrefslogtreecommitdiffstats
path: root/php55.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-11-16 10:01:56 +0100
committerRemi Collet <fedora@famillecollet.com>2014-11-16 10:01:56 +0100
commit1e0933500a794e4723f42e846ba90a9663433eb9 (patch)
treea02eaa963a58fe5a69b9e77619bc633aedac1324 /php55.spec
parent66439f156271924f493978d7f50bfdb58696095d (diff)
PHP 5.5.19 + upstream patches for php-fpm
Diffstat (limited to 'php55.spec')
-rw-r--r--php55.spec16
1 files changed, 15 insertions, 1 deletions
diff --git a/php55.spec b/php55.spec
index 7285d10..4284a6c 100644
--- a/php55.spec
+++ b/php55.spec
@@ -128,7 +128,7 @@ Version: 5.5.19
%if 0%{?snapdate:1}%{?rcver:1}
Release: 0.1.%{?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
@@ -189,6 +189,9 @@ Patch47: php-5.4.9-phpinfo.patch
Patch91: php-5.3.7-oci8conf.patch
# Upstream fixes (100+)
+Patch101: php-bug68423.patch
+Patch102: php-bug68421.patch
+Patch103: php-bug68420.patch
# Security fixes (200+)
@@ -940,6 +943,9 @@ rm -rf ext/json
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch101 -p1 -b .bug68423
+%patch102 -p1 -b .bug68421
+%patch103 -p1 -b .bug68420
# security patches
@@ -1943,6 +1949,14 @@ fi
%changelog
+* Sun Nov 16 2014 Remi Collet <remi@fedoraproject.org> 5.5.19-2
+- FPM: add upstream patch for https://bugs.php.net/68421
+ access.format=R doesn't log ipv6 address
+- FPM: add upstream patch for https://bugs.php.net/68420
+ listen=9000 listens to ipv6 localhost instead of all addresses
+- FPM: add upstream patch for https://bugs.php.net/68423
+ will no longer load all pools
+
* Thu Nov 13 2014 Remi Collet <remi@fedoraproject.org> 5.5.19-1
- Update to 5.5.19
http://www.php.net/releases/5_5_19.php