From daa90022e978b9a22cc93f924e4f9b94c0aa10d9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Jun 2014 08:56:28 +0200 Subject: [PATCH] php: update patches for 5.5.13. --- srcpkgs/php/patches/php-fpm.conf.in.patch | 10 +++++----- srcpkgs/php/patches/php.ini.patch | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/php/patches/php-fpm.conf.in.patch b/srcpkgs/php/patches/php-fpm.conf.in.patch index 317c2024f2c..81eabf73fc9 100644 --- a/srcpkgs/php/patches/php-fpm.conf.in.patch +++ b/srcpkgs/php/patches/php-fpm.conf.in.patch @@ -1,5 +1,5 @@ ---- sapi/fpm/php-fpm.conf.in 2013-06-19 22:03:18.000000000 +0200 -+++ sapi/fpm/php-fpm.conf.in 2013-06-20 17:03:03.728835784 +0200 +--- sapi/fpm/php-fpm.conf.in 2014-04-29 10:04:30.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2014-05-01 07:36:14.762839158 +0200 @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) @@ -27,14 +27,14 @@ +listen = /run/php-fpm/php-fpm.sock ; Set listen(2) backlog. - ; Default Value: 128 (-1 on FreeBSD and OpenBSD) + ; Default Value: 65535 (-1 on FreeBSD and OpenBSD) @@ -167,9 +168,9 @@ ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user - ; mode is set to 0666 + ; mode is set to 0660 -;listen.owner = @php_fpm_user@ -;listen.group = @php_fpm_group@ --;listen.mode = 0666 +-;listen.mode = 0660 +listen.owner = @php_fpm_user@ +listen.group = @php_fpm_group@ +listen.mode = 0660 diff --git a/srcpkgs/php/patches/php.ini.patch b/srcpkgs/php/patches/php.ini.patch index b2e7d8f87c3..3c6d11785e8 100644 --- a/srcpkgs/php/patches/php.ini.patch +++ b/srcpkgs/php/patches/php.ini.patch @@ -1,6 +1,6 @@ ---- php.ini-production 2013-08-15 22:42:04.000000000 +0200 -+++ php.ini-production 2013-08-16 08:03:36.178726858 +0200 -@@ -305,7 +305,7 @@ +--- php.ini-production 2014-04-29 10:04:30.000000000 +0200 ++++ php.ini-production 2014-05-01 07:32:06.928871679 +0200 +@@ -296,7 +296,7 @@ ; or per-virtualhost web server configuration file. This directive is ; *NOT* affected by whether Safe Mode is turned On or Off. ; http://php.net/open-basedir @@ -9,7 +9,7 @@ ; This directive allows you to disable certain functions for security reasons. ; It receives a comma-delimited list of function names. This directive is -@@ -702,7 +702,7 @@ +@@ -693,7 +693,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -18,7 +18,7 @@ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -725,7 +725,7 @@ +@@ -716,7 +716,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -27,7 +27,7 @@ ; On windows: ; extension_dir = "ext" -@@ -863,50 +863,48 @@ +@@ -854,50 +854,48 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ;