summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-11-16 09:16:48 +0100
committerRemi Collet <fedora@famillecollet.com>2014-11-16 09:16:48 +0100
commit1d1880a5c85b73a7c7a2037bd73f79a1fc4312fd (patch)
tree82771cb9632d1a606eea3574a605c26b3baf8158 /php.spec
parentf19c2f5e89ed03755a2f3fddd3bd4d36ff35ab85 (diff)
PHP 5.6.3 + upstream patches for php-fpm
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec16
1 files changed, 15 insertions, 1 deletions
diff --git a/php.spec b/php.spec
index e4fe10f..0ee2730 100644
--- a/php.spec
+++ b/php.spec
@@ -129,7 +129,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: 5.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -179,6 +179,9 @@ Patch47: php-5.6.3-phpinfo.patch
Patch91: php-5.6.3-oci8conf.patch
# Upstream fixes (100+)
+Patch101: php-bug68423.patch
+Patch102: php-bug68421.patch
+Patch103: php-bug68420.patch
# Security fixes (200+)
@@ -854,6 +857,9 @@ support for using the enchant library to PHP.
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch101 -p1 -b .bug68423
+%patch102 -p1 -b .bug68421
+%patch103 -p1 -b .bug68420
# security patches
@@ -1720,6 +1726,14 @@ fi
%changelog
+* Sun Nov 16 2014 Remi Collet <remi@fedoraproject.org> 5.6.3-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.6.3-1
- Update to PHP 5.6.3
http://php.net/releases/5_6_3.php