summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-01-09 09:55:13 +0100
committerRemi Collet <fedora@famillecollet.com>2015-01-09 09:55:13 +0100
commitcb36b389ba75af7d0cbf39ac761df903e458766c (patch)
treefb5b1aa4b06e35c07068457b7dd82f995dbcfd4f
parent36949e1877ee55658fd0778e58513df8c6746111 (diff)
PHP 5.6.5RC1
-rw-r--r--php-fpm-www.conf6
-rw-r--r--php56.spec10
2 files changed, 14 insertions, 2 deletions
diff --git a/php-fpm-www.conf b/php-fpm-www.conf
index 9f6dfe8..696cb7b 100644
--- a/php-fpm-www.conf
+++ b/php-fpm-www.conf
@@ -50,6 +50,12 @@ listen = 127.0.0.1:9000
;listen.group = nobody
;listen.mode = 0660
+; When POSIX Access Control Lists are supported you can set them using
+; these options, value is a comma separated list of user/group names.
+; When set, listen.owner and listen.group are ignored
+;listen.acl_users =
+;listen.acl_groups =
+
; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
diff --git a/php56.spec b/php56.spec
index 48efba7..3260c62 100644
--- a/php56.spec
+++ b/php56.spec
@@ -127,11 +127,11 @@
%endif
#global snapdate 201405061030
-#global rcver RC1
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.6.4
+Version: 5.6.5
%if 0%{?snapdate:1}%{?rcver:1}
Release: 0.1.%{?snapdate}%{?rcver}%{?dist}
%else
@@ -317,6 +317,7 @@ Summary: PHP FastCGI Process Manager
# Zend is licensed under Zend
# TSRM and fpm are licensed under BSD
License: PHP and Zend and BSD
+BuildRequires: libacl-devel
Requires: php-common%{?_isa} = %{version}-%{release}
Requires(pre): /usr/sbin/useradd
%if %{with_systemdfull}
@@ -1296,6 +1297,7 @@ build --enable-fpm \
%if %{with_systemdfull}
--with-fpm-systemd \
%endif
+ --with-fpm-acl \
--libdir=%{_libdir}/php \
--without-mysql \
--disable-pdo \
@@ -1947,6 +1949,10 @@ fi
%changelog
+* Fri Jan 9 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-0.1.RC1
+- update to 5.6.5RC1
+- FPM: enable ACL for Unix Domain Socket
+
* Wed Dec 17 2014 Remi Collet <remi@fedoraproject.org> 5.6.4-2
- Update to 5.6.4
http://www.php.net/releases/5_6_4.php