[arch-commits] Commit in php/trunk (PKGBUILD generate_patches php-fpm.patch)
Pierre Schmitz
pierre at archlinux.org
Sat Nov 30 10:48:42 UTC 2019
Date: Saturday, November 30, 2019 @ 10:48:41
Author: pierre
Revision: 370173
upgpkg: php 7.4.0-2
Modified:
php/trunk/PKGBUILD
php/trunk/generate_patches
php/trunk/php-fpm.patch
------------------+
PKGBUILD | 10 +++++-----
generate_patches | 4 ++--
php-fpm.patch | 18 +++++++++---------
3 files changed, 16 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-30 10:45:43 UTC (rev 370172)
+++ PKGBUILD 2019-11-30 10:48:41 UTC (rev 370173)
@@ -21,7 +21,7 @@
'php-tidy'
'php-xsl')
pkgver=7.4.0
-pkgrel=1
+pkgrel=2
arch=('x86_64')
license=('PHP')
url='https://secure.php.net/'
@@ -36,7 +36,7 @@
'SKIP'
'b4ea038f2863801175d6c4e74c685913feecdd5be3d49aff7d9b3fa92d8c4159'
'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
- '41f23ebc2d986473b9a4eb3f233428349367b2baa2bb715c53e720cc34c9378c'
+ '63191a39929f7c10899390c14d0eda62ce4a9b0fbb7602de540356e91888dbc2'
'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
'03beeb8b62a499805a4b912cb19d048635cb5542478753e58364bf24fb42ff3c'
'92a048073713c3600713b3dd46e96b33a2dde2aef1fbdf175d83da1dc679a0c5')
@@ -164,10 +164,10 @@
}
check() {
- cd ${srcdir}/build
+ cd ${srcdir}/${pkgbase}-${pkgver}
# Check if sendmail was configured correctly (FS#47600)
- sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q '/usr/bin/sendmail'
+ ${srcdir}/build/sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q '/usr/bin/sendmail'
export REPORT_EXIT_STATUS=1
export NO_INTERACTION=1
@@ -174,7 +174,7 @@
export SKIP_ONLINE_TESTS=1
export SKIP_SLOW_TESTS=1
- sapi/cli/php -n ${srcdir}/${pkgbase}-${pkgver}/run-tests.php -n
+ ${srcdir}/build/sapi/cli/php -n run-tests.php -n -P {tests,Zend}
}
package_php() {
Modified: generate_patches
===================================================================
--- generate_patches 2019-11-30 10:45:43 UTC (rev 370172)
+++ generate_patches 2019-11-30 10:48:41 UTC (rev 370173)
@@ -17,8 +17,8 @@
sed \
-e 's#^listen =.*#listen = /run/php-fpm/php-fpm.sock#' \
- -e 's#^;listen.owner =#listen.owner =#' \
- -e 's#^;listen.group =#listen.group =#' \
+ -e 's#^;listen.acl_users =#listen.acl_users = @php_fpm_user@#' \
+ -e 's#^;listen.acl_groups =#listen.acl_groups = @php_fpm_group@#' \
-e 's#^;chdir =.*#;chdir = /srv/http#' \
-i.orig sapi/fpm/www.conf.in
Modified: php-fpm.patch
===================================================================
--- php-fpm.patch 2019-11-30 10:45:43 UTC (rev 370172)
+++ php-fpm.patch 2019-11-30 10:48:41 UTC (rev 370173)
@@ -41,17 +41,17 @@
; Set listen(2) backlog.
; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-@@ -44,8 +44,8 @@
- ; 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@
--;listen.group = @php_fpm_group@
-+listen.owner = @php_fpm_user@
-+listen.group = @php_fpm_group@
- ;listen.mode = 0660
+@@ -50,8 +50,8 @@
; 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
+-;listen.acl_users =
+-;listen.acl_groups =
++listen.acl_users = @php_fpm_user@
++listen.acl_groups = @php_fpm_group@
+
+ ; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
+ ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
@@ -370,7 +370,7 @@
; Chdir to this directory at the start.
; Note: relative path can be used.
More information about the arch-commits
mailing list