updated patch

4 files changed, 21 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54244dec0a42..1907d47c4561 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Nov 21 14:45:10 UTC 2016
+# Mon Nov 21 15:03:36 UTC 2016
 pkgbase = php54
 	pkgdesc = A general-purpose scripting language that is especially suited to web development
 	pkgver = 5.4.45
@@ -44,9 +44,9 @@ pkgbase = php54
 	source = php-fpm.service
 	source = php-fpm.tmpfiles
 	sha256sums = 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582
-	sha256sums = 25e94a6caa31b7bbef7e4e7f0e79087f6b53aa45f138efbe3a279704aa3c0484
+	sha256sums = e86842c3ddf499b5d27ffe5a29197a9bb2276f611b3cb6ed2351e5719e973b54
 	sha256sums = 8b5b15f1c348d8897d837ea9894157d9630dc542bbb0dbc7ad93c5dc0235d1d5
-	sha256sums = a03c39a495a959eccab1534cc442199d1d06ded4d5acc135c40f395b49c3a449
+	sha256sums = a04d3b5ef6df6942cef218cc29c8005b4320ea859c9aea50fb6d6f8b3e350f8d
 	sha256sums = c4caad0b782d175e3a463199903eb491e3f2f925e6068b72d9ce7bd9184014ba
 	sha256sums = 92dc7a165e9e84b46b1a510c0d89642a8d3f0fc6787c0e7c3c4ba5080c06d1b3
 	sha256sums = ff65ed80264ff16e8ff8230d603a899947411538d96773dc098b399ab6c95919
diff --git a/PKGBUILD b/PKGBUILD
index c73efff66322..1d3f614c9d96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -437,9 +437,9 @@ package_php54-xsl() {
 }
 
 sha256sums=('4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582'
-            '25e94a6caa31b7bbef7e4e7f0e79087f6b53aa45f138efbe3a279704aa3c0484'
+            'e86842c3ddf499b5d27ffe5a29197a9bb2276f611b3cb6ed2351e5719e973b54'
             '8b5b15f1c348d8897d837ea9894157d9630dc542bbb0dbc7ad93c5dc0235d1d5'
-            'a03c39a495a959eccab1534cc442199d1d06ded4d5acc135c40f395b49c3a449'
+            'a04d3b5ef6df6942cef218cc29c8005b4320ea859c9aea50fb6d6f8b3e350f8d'
             'c4caad0b782d175e3a463199903eb491e3f2f925e6068b72d9ce7bd9184014ba'
             '92dc7a165e9e84b46b1a510c0d89642a8d3f0fc6787c0e7c3c4ba5080c06d1b3'
             'ff65ed80264ff16e8ff8230d603a899947411538d96773dc098b399ab6c95919')
diff --git a/php-fpm.conf.in.patch b/php-fpm.conf.in.patch
index 33ee4a266fb1..f82e7c1ebd81 100644
--- a/php-fpm.conf.in.patch
+++ b/php-fpm.conf.in.patch
@@ -1,12 +1,12 @@
---- sapi/fpm/php-fpm.conf.in.orig	2014-05-05 09:58:32.055383183 +0200
-+++ sapi/fpm/php-fpm.conf.in	2014-05-05 10:00:54.398714767 +0200
+--- sapi/fpm/php-fpm.conf.in	2015-09-01 22:09:37.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in	2016-11-21 16:01:35.849314621 +0100
 @@ -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)
  ;  - @prefix@ otherwise
 -;include=etc/fpm.d/*.conf
 +include=/etc/php54/fpm.d/*.conf
-
+ 
  ;;;;;;;;;;;;;;;;;;
  ; Global Options ;
 @@ -22,7 +22,7 @@
@@ -15,7 +15,7 @@
  ; Default Value: none
 -;pid = run/php-fpm.pid
 +pid = /run/php54-fpm/php-fpm.pid
-
+ 
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written
 @@ -42,7 +42,7 @@
@@ -24,7 +24,7 @@
  ; Default Value: php-fpm
 -;syslog.ident = php-fpm
 +syslog.ident = php54-fpm
-
+ 
  ; Log level
  ; Possible Values: alert, error, warning, notice, debug
 @@ -156,7 +156,8 @@
@@ -34,11 +34,11 @@
 -listen = 127.0.0.1:9000
 +;listen = 127.0.0.1:9000
 +listen = /run/php54-fpm/php-fpm.sock
-
+ 
  ; Set listen(2) backlog.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
 @@ -167,9 +168,9 @@
- ; BSD-derived systems allow connections regardless of permissions.
+ ; BSD-derived systems allow connections regardless of permissions. 
  ; Default Values: user and group are set as the running user
  ;                 mode is set to 0660
 -;listen.owner = @php_fpm_user@
@@ -47,7 +47,7 @@
 +listen.owner = @php_fpm_user@
 +listen.group = @php_fpm_group@
 +listen.mode = 0660
-
+  
  ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
  ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
 @@ -177,7 +178,7 @@
@@ -56,15 +56,17 @@
  ; Default Value: any
 -;listen.allowed_clients = 127.0.0.1
 +listen.allowed_clients = 127.0.0.1
-
+ 
  ; Specify the nice(2) priority to apply to the pool processes (only if set)
  ; The value can vary from -19 (highest priority) to 20 (lower priority)
-@@ -466,7 +467,7 @@
+@@ -466,8 +467,8 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
 -;chdir = /var/www
+- 
 +;chdir = /srv/http
-
++
  ; Redirect worker stdout and stderr into main error log. If not set, stdout and
  ; stderr will be redirected to /dev/null according to FastCGI specs.
+ ; Note: on highloaded environement, this can cause some delay in the page
diff --git a/php.ini.patch b/php.ini.patch
index e1d403eddd59..d3c64dafc923 100644
--- a/php.ini.patch
+++ b/php.ini.patch
@@ -100,8 +100,8 @@
 -;extension=php_pspell.dll
 -;extension=php_shmop.dll
 -
--; The MIBS data available in the PHP distribution must be installed.
--; See http://www.php.net/manual/en/snmp.installation.php
+-; The MIBS data available in the PHP distribution must be installed. 
+-; See http://www.php.net/manual/en/snmp.installation.php 
 -;extension=php_snmp.dll
 -
 -;extension=php_soap.dll
@@ -152,6 +152,6 @@
 +;extension=xmlrpc.so
 +;extension=xsl.so
 +;extension=zip.so
-
+ 
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;