[arch-commits] Commit in php/trunk (PKGBUILD generate_patches php-fpm.patch)

[Pierre Schmitz]

    Date: Wednesday, December 18, 2019 @ 13:03:09
  Author: pierre
Revision: 371633

upgpkg: php 7.4.1-1

Modified:
  php/trunk/PKGBUILD
  php/trunk/generate_patches
  php/trunk/php-fpm.patch

------------------+
 PKGBUILD         |    8 ++++----
 generate_patches |    4 ++--
 php-fpm.patch    |   18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-18 10:03:17 UTC (rev 371632)
+++ PKGBUILD	2019-12-18 13:03:09 UTC (rev 371633)
@@ -20,8 +20,8 @@
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=7.4.0
-pkgrel=2
+pkgver=7.4.1
+pkgrel=1
 arch=('x86_64')
 license=('PHP')
 url='https://www.php.net/'
@@ -32,11 +32,11 @@
 source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
         'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch'
         'enchant-2.patch')
-sha256sums=('9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42'
+sha256sums=('561bb866bdd509094be00f4ece7c3543ec971c4d878645ee81437e291cffc762'
             'SKIP'
             'b4ea038f2863801175d6c4e74c685913feecdd5be3d49aff7d9b3fa92d8c4159'
             'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
-            '63191a39929f7c10899390c14d0eda62ce4a9b0fbb7602de540356e91888dbc2'
+            '41f23ebc2d986473b9a4eb3f233428349367b2baa2bb715c53e720cc34c9378c'
             '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
             '03beeb8b62a499805a4b912cb19d048635cb5542478753e58364bf24fb42ff3c'
             '92a048073713c3600713b3dd46e96b33a2dde2aef1fbdf175d83da1dc679a0c5')

Modified: generate_patches
===================================================================
--- generate_patches	2019-12-18 10:03:17 UTC (rev 371632)
+++ generate_patches	2019-12-18 13:03:09 UTC (rev 371633)
@@ -17,8 +17,8 @@
 
 sed \
 	-e 's#^listen =.*#listen = /run/php-fpm/php-fpm.sock#' \
-	-e 's#^;listen.acl_users =#listen.acl_users = @php_fpm_user@#' \
-	-e 's#^;listen.acl_groups =#listen.acl_groups = @php_fpm_group@#' \
+	-e 's#^;listen.owner =#listen.owner =#' \
+	-e 's#^;listen.group =#listen.group =#' \
 	-e 's#^;chdir =.*#;chdir = /srv/http#' \
 	-i.orig sapi/fpm/www.conf.in
 

Modified: php-fpm.patch
===================================================================
--- php-fpm.patch	2019-12-18 10:03:17 UTC (rev 371632)
+++ php-fpm.patch	2019-12-18 13:03:09 UTC (rev 371633)
@@ -41,17 +41,17 @@
  
  ; Set listen(2) backlog.
  ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-@@ -50,8 +50,8 @@
+@@ -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
  ; 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.