diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-08-06 18:00:34 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-08-06 18:00:34 +0200 |
| commit | e557501fc3f793676fe77a9efe5a3eb292dba996 (patch) | |
| tree | 1479383ecf4371b8cbdf1d3d556be79ab1b6915a | |
| parent | 91d9f4c0401abc5c30fc3dedd8ba0e52546858cb (diff) | |
PHP 5.6.12
| -rw-r--r-- | failed.txt | 14 | ||||
| -rw-r--r-- | php-fpm-www.conf | 2 | ||||
| -rw-r--r-- | php56.spec | 19 |
3 files changed, 27 insertions, 8 deletions
@@ -1,21 +1,22 @@ -===== 5.6.11 +===== 5.6.12 $ grep -r 'Tests failed' /var/lib/mock/56*/build.log -/var/lib/mock/el5i/build.log:Tests failed : 4 ( 0.0%) ( 0.1%) +/var/lib/mock/el5i/build.log:Tests failed : 5 ( 0.0%) ( 0.1%) /var/lib/mock/el5x/build.log:Tests failed : 3 ( 0.0%) ( 0.0%) -/var/lib/mock/el6i/build.log:Tests failed : 1 ( 0.0%) ( 0.0%) +/var/lib/mock/el6i/build.log:Tests failed : 2 ( 0.0%) ( 0.0%) /var/lib/mock/el6x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%) /var/lib/mock/el7x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%) -/var/lib/mock/fc20i/build.log:Tests failed : 1 ( 0.0%) ( 0.0%) +/var/lib/mock/fc20i/build.log:Tests failed : 2 ( 0.0%) ( 0.0%) /var/lib/mock/fc20x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%) -/var/lib/mock/fc21i/build.log:Tests failed : 1 ( 0.0%) ( 0.0%) +/var/lib/mock/fc21i/build.log:Tests failed : 2 ( 0.0%) ( 0.0%) /var/lib/mock/fc21x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%) /var/lib/mock/fc22i/build.log:Tests failed : 1 ( 0.0%) ( 0.0%) /var/lib/mock/fc22x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%) el5i, el6i, fc20i, fc21i, fc22i + Bug #53437 DateInterval unserialize bad data, 32 bit [ext/date/tests/bug53437_var3.phpt] [1] Bug #64146 (serialize incorrectly saving objects when they are cloned) [ext/standard/tests/serialize/bug64146.phpt] el5i, el5x @@ -23,5 +24,6 @@ el5i, el5x sni_server [ext/openssl/tests/sni_server.phpt] Specific protocol method specification [ext/openssl/tests/stream_crypto_flags_004.phpt] + [1] known issue, no fix found -[2] ext/openssl erratic results... unable to connect to ssl://127.0.0.1:64321 +[2] proc_open erratic results... diff --git a/php-fpm-www.conf b/php-fpm-www.conf index 696cb7b..7714d46 100644 --- a/php-fpm-www.conf +++ b/php-fpm-www.conf @@ -53,7 +53,7 @@ listen = 127.0.0.1:9000 ; 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_users = apache,nginx ;listen.acl_groups = ; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. @@ -147,7 +147,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 5.6.11 +Version: 5.6.12 %if 0%{?snapdate:1}%{?rcver:1} Release: 0.1.%{?snapdate}%{?rcver}%{?dist} %else @@ -1594,6 +1594,18 @@ install -m 755 %{SOURCE99} $RPM_BUILD_ROOT%{_initrddir}/php-fpm # Nginx configuration install -D -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf install -D -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/default.d/php.conf + +# Switch to UDS +# FPM +sed -e 's@127.0.0.1:9000@/run/php-fpm/www.sock@' \ + -e 's@^;listen.acl_users@listen.acl_users@' \ + -i $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf +# Nginx +sed -e 's@127.0.0.1:9000@unix:/run/php-fpm/www.sock@' \ + -i $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf +# Apache +sed -e 's@proxy:fcgi://127.0.0.1:9000@proxy:unix:/run/php-fpm/www.sock|fcgi://localhost@' \ + -i $RPM_BUILD_ROOT%{_httpd_confdir}/php.conf %endif # Generate files lists and stub .ini files for each subpackage @@ -1975,6 +1987,11 @@ fi %changelog +* Thu Aug 6 2015 Remi Collet <remi@fedoraproject.org> 5.6.12-1 +- Update to 5.6.12 + http://www.php.net/releases/5_6_12.php +- switch FPM to listen on UDS on Fedora 21+ + * Sun Jul 12 2015 Remi Collet <remi@fedoraproject.org> 5.6.11-1 - Update to 5.6.11 http://www.php.net/releases/5_6_11.php |