summaryrefslogtreecommitdiff
path: root/extra/php
diff options
context:
space:
mode:
Diffstat (limited to 'extra/php')
-rw-r--r--extra/php/PKGBUILD8
-rw-r--r--extra/php/php-fpm.conf.in.patch10
2 files changed, 9 insertions, 9 deletions
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 19e1b6663..8e4e6cd4e 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163752 2012-07-19 05:20:23Z pierre $
+# $Id: PKGBUILD 165374 2012-08-16 20:54:57Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.4.5
+pkgver=5.4.6
pkgrel=1
arch=('i686' 'x86_64')
license=('PHP')
@@ -33,11 +33,11 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('ffcc7f4dcf2b79d667fe0c110e6cb724'
+md5sums=('c9aa0f4996d1b91ee9e45afcfaeb5d2e'
'0b0bc7a917fc592bdf11dcd3c5c255e9'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
'6d46667e00d65933ec0c958279c0a803'
- '825e580dd5708d959b50944afa1b12b6'
+ '5c1f4c967b66ce3eaf819b46951dcbf5'
'f56b5bb7e93c802ae8519182fbea3387'
'86c73d481f3099e740e602869bacf637'
'c60343df74f8e1afb13b084d5c0e47ed')
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index 0b17182fd..d618fca4e 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
---- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in 2012-03-01 19:50:48.549947258 +0100
+--- sapi/fpm/php-fpm.conf.in 2012-08-15 06:26:05.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in 2012-08-16 14:17:41.809663595 +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 arguement)
@@ -18,7 +18,7 @@
; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -140,7 +140,8 @@
+@@ -148,7 +148,8 @@
; specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
@@ -28,7 +28,7 @@
; Set listen(2) backlog.
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -151,9 +152,9 @@
+@@ -159,9 +160,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
@@ -41,7 +41,7 @@
; List of ipv4 addresses of FastCGI clients which are allowed to connect.
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -442,7 +443,7 @@
+@@ -458,7 +459,7 @@
; Chdir to this directory at the start.
; Note: relative path can be used.
; Default Value: current directory or / when chroot