diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-02 03:37:03 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-02 03:37:03 +0000 |
| commit | 747fac818a9021f876837c839ce15c301b7e229f (patch) | |
| tree | f50f6f3b835a9aaa7ef6dc95db88643235ae314d /extra/php | |
| parent | 255df859dede38865f63ae0dd0633a4ea4fe9cac (diff) | |
Fri May 2 03:33:02 UTC 2014
Diffstat (limited to 'extra/php')
| -rw-r--r-- | extra/php/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/php/logrotate.d.php-fpm | 2 | ||||
| -rw-r--r-- | extra/php/php-fpm.conf.in.patch | 8 | ||||
| -rw-r--r-- | extra/php/php.ini.patch | 12 |
4 files changed, 18 insertions, 18 deletions
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index b1693331a..184dbecc3 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 211313 2014-04-18 17:28:16Z andyrtr $ +# $Id: PKGBUILD 211933 2014-05-01 11:34:12Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,8 +21,8 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.5.11 -pkgrel=2 +pkgver=5.5.12 +pkgrel=1 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -34,12 +34,12 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz" "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('9156fcd4b254cbfa9a7535f931da29d5' +md5sums=('b6a6e9c72589c265aafb7b3353a34030' 'SKIP' - '799cd5f91f5253f4b47ec4fd7fccf4f1' + '510f9092ebfe6e378e12817e197a88b6' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - '9f8263996836e27f5be1483e86ac2e33' - 'e036c721e5ad927cd1613c7475a58b3a' + '6bc1fc4ceee039d21ff3b56aa845cc5a' + '25bc67ad828e8147a817410b68d8016c' 'cc2940f5312ba42e7aa1ddfab74b84c4' 'c60343df74f8e1afb13b084d5c0e47ed') diff --git a/extra/php/logrotate.d.php-fpm b/extra/php/logrotate.d.php-fpm index 1895c5b97..2146ddd39 100644 --- a/extra/php/logrotate.d.php-fpm +++ b/extra/php/logrotate.d.php-fpm @@ -3,6 +3,6 @@ notifempty delaycompress postrotate - systemctl reload php-fpm.service || true + /bin/kill -SIGUSR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true endscript } diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch index 4bcdb73d5..81eabf73f 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 2013-11-12 15:17:27.000000000 +0100 -+++ sapi/fpm/php-fpm.conf.in 2013-11-12 17:27:21.283279538 +0100 +--- 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) @@ -31,10 +31,10 @@ @@ -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/extra/php/php.ini.patch b/extra/php/php.ini.patch index aa8100ecc..3c6d11785 100644 --- a/extra/php/php.ini.patch +++ b/extra/php/php.ini.patch @@ -1,6 +1,6 @@ ---- php.ini-production 2013-11-12 15:17:27.000000000 +0100 -+++ php.ini-production 2013-11-12 17:28:12.715321014 +0100 -@@ -306,7 +306,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 -@@ -703,7 +703,7 @@ +@@ -693,7 +693,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -18,7 +18,7 @@ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -726,7 +726,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" -@@ -864,50 +864,48 @@ +@@ -854,50 +854,48 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; |