[arch-commits] Commit in php/trunk (PKGBUILD php-fpm.conf.in.patch php.ini.patch)
Pierre Schmitz
pierre at archlinux.org
Thu Jan 22 17:36:07 UTC 2015
Date: Thursday, January 22, 2015 @ 18:36:07
Author: pierre
Revision: 229652
upgpkg: php 5.6.5-1
Modified:
php/trunk/PKGBUILD
php/trunk/php-fpm.conf.in.patch
php/trunk/php.ini.patch
-----------------------+
PKGBUILD | 11 +++++++----
php-fpm.conf.in.patch | 18 +++++++++---------
php.ini.patch | 18 +++++++++---------
3 files changed, 25 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-01-22 17:32:28 UTC (rev 229651)
+++ PKGBUILD 2015-01-22 17:36:07 UTC (rev 229652)
@@ -22,7 +22,7 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.6.4
+pkgver=5.6.5
pkgrel=1
arch=('i686' 'x86_64')
license=('PHP')
@@ -35,14 +35,15 @@
"http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz.asc"
'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('bf824c5e5c7f49ca5f7350d72cba4881'
+md5sums=('541a480e1f8747219074c99f3e9edbcc'
'SKIP'
- 'c0da10d91c06b07489f495e78116ab1b'
+ '942f9d8af9bcab2487ca710ef42ef1de'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
- '6bc1fc4ceee039d21ff3b56aa845cc5a'
+ '16b5e2e4da59f15bea4c2db78a7bc8dc'
'25bc67ad828e8147a817410b68d8016c'
'cc2940f5312ba42e7aa1ddfab74b84c4'
'c60343df74f8e1afb13b084d5c0e47ed')
+validpgpkeys=('6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3')
prepare() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -238,6 +239,8 @@
rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
# remove empty directory
rmdir ${pkgdir}/usr/include/php/include
+ # fix broken link
+ ln -sf phar.phar ${pkgdir}/usr/bin/phar
}
package_php-cgi() {
Modified: php-fpm.conf.in.patch
===================================================================
--- php-fpm.conf.in.patch 2015-01-22 17:32:28 UTC (rev 229651)
+++ php-fpm.conf.in.patch 2015-01-22 17:36:07 UTC (rev 229652)
@@ -1,5 +1,5 @@
---- 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
+--- sapi/fpm/php-fpm.conf.in 2015-01-21 01:40:37.000000000 +0100
++++ sapi/fpm/php-fpm.conf.in 2015-01-22 16:22:09.076969777 +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)
@@ -18,8 +18,8 @@
; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -156,7 +156,8 @@
- ; specific port;
+@@ -161,7 +161,8 @@
+ ; (IPv6 and IPv4-mapped) on a specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
-listen = 127.0.0.1:9000
@@ -28,7 +28,7 @@
; Set listen(2) backlog.
; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -167,9 +168,9 @@
+@@ -172,9 +173,9 @@
; BSD-derived systems allow connections regardless of permissions.
; Default Values: user and group are set as the running user
; mode is set to 0660
@@ -38,10 +38,10 @@
+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
-@@ -466,7 +467,7 @@
+ ; 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
+@@ -476,7 +477,7 @@
; Chdir to this directory at the start.
; Note: relative path can be used.
; Default Value: current directory or / when chroot
Modified: php.ini.patch
===================================================================
--- php.ini.patch 2015-01-22 17:32:28 UTC (rev 229651)
+++ php.ini.patch 2015-01-22 17:36:07 UTC (rev 229652)
@@ -1,15 +1,15 @@
---- php.ini-production 2014-06-21 10:44:15.326264658 +0200
-+++ php.ini-production 2014-06-21 10:46:29.652897480 +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.
+--- php.ini-production 2015-01-21 01:40:37.000000000 +0100
++++ php.ini-production 2015-01-22 16:23:17.311890258 +0100
+@@ -295,7 +295,7 @@
+ ; and below. This directive makes most sense if used in a per-directory
+ ; or per-virtualhost web server configuration file.
; http://php.net/open-basedir
-;open_basedir =
+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/
; This directive allows you to disable certain functions for security reasons.
- ; It receives a comma-delimited list of function names. This directive is
-@@ -709,7 +709,7 @@
+ ; It receives a comma-delimited list of function names.
+@@ -708,7 +708,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -732,7 +732,7 @@
+@@ -731,7 +731,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
@@ -27,7 +27,7 @@
; On windows:
; extension_dir = "ext"
-@@ -870,49 +870,48 @@
+@@ -869,49 +869,48 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
More information about the arch-commits
mailing list