diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-01-09 09:55:13 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-01-09 09:55:13 +0100 |
| commit | 18395ff3cd298d695cebf7fddfb4b5b3c68b562c (patch) | |
| tree | f47a65b63c756a4c0753f6ed52bb9b31d0c9698f | |
| parent | e6a33290dfa640cdc2c25f975bbca8267911fe79 (diff) | |
PHP 5.6.5RC1
| -rw-r--r-- | php-5.6.3-includedir.patch | 2 | ||||
| -rw-r--r-- | php-fpm-www.conf | 6 | ||||
| -rw-r--r-- | php.spec | 13 |
3 files changed, 17 insertions, 4 deletions
diff --git a/php-5.6.3-includedir.patch b/php-5.6.3-includedir.patch index 70734cf..748f64f 100644 --- a/php-5.6.3-includedir.patch +++ b/php-5.6.3-includedir.patch @@ -5,7 +5,7 @@ EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` -INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR -+INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php ++INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php:/usr/share/pear:/usr/share/php exec_prefix=$old_exec_prefix libdir=$old_libdir 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 @@ -127,12 +127,12 @@ %global db_devel libdb-devel %endif -#global rcver RC1 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php -Version: 5.6.4 -Release: 2%{?dist} +Version: 5.6.5 +Release: 0.1.RC1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -277,6 +277,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(pre): %{_root_sbindir}/useradd Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} %if %{with_systemd} @@ -1213,6 +1214,7 @@ build --enable-fpm \ %if %{with_systemd} --with-fpm-systemd \ %endif + --with-fpm-acl \ --libdir=%{_libdir}/php \ --without-mysql \ --disable-pdo \ @@ -1758,6 +1760,11 @@ fi %changelog +* Fri Jan 9 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-0.1.RC1 +- update to 5.6.5RC1 +- add base system path in default include path +- 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 |