[arch-commits] Commit in php/trunk (5 files)
Pierre Schmitz
pierre at archlinux.org
Fri Jan 1 18:00:11 UTC 2016
Date: Friday, January 1, 2016 @ 19:00:11
Author: pierre
Revision: 257431
Fix FS#47580
Modified:
php/trunk/PKGBUILD
php/trunk/apache.patch
php/trunk/generate_patches
php/trunk/php-fpm.patch
php/trunk/php.ini.patch
------------------+
PKGBUILD | 8 ++++----
apache.patch | 8 ++++----
generate_patches | 2 ++
php-fpm.patch | 27 +++++++++++++++++++--------
php.ini.patch | 4 ++--
5 files changed, 31 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-01-01 17:14:04 UTC (rev 257430)
+++ PKGBUILD 2016-01-01 18:00:11 UTC (rev 257431)
@@ -21,7 +21,7 @@
'php-tidy'
'php-xsl')
pkgver=7.0.1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -32,11 +32,11 @@
'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch')
sha256sums=('84fcb8b9c61f70db802d3b6636c6ba602470a375e593375c0c744483aa0c0357'
'SKIP'
- '672eb96207535775994dd1e189bd1bde2d51c565c55f7c5f3886be32db941eb6'
+ '2650ca4762cf6b0a0f2f3ca8bc1a73584f0c34b2796da10f86b75abad25ecac5'
'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
- 'c5f593f28ee15c7c08c2a2b577128667466e38e8e5de094cc02871a22ba61906'
+ '0f1d8f50c5e0cbced8f0bdcd02040d5446e899178bf0c385def33946f428d697'
'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
- 'a85a953f866b0d3b51412dc4114e0d8d07261fcf2f2951aeb078504d63d42b08')
+ '2c9cb38c397c2ad0b98e812a542a2fdfc03e119287bd7545dc48e382c435170a')
validpgpkeys=('1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763'
'6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3')
Modified: apache.patch
===================================================================
--- apache.patch 2016-01-01 17:14:04 UTC (rev 257430)
+++ apache.patch 2016-01-01 18:00:11 UTC (rev 257431)
@@ -1,5 +1,5 @@
---- sapi/apache2handler/config.m4.orig 2015-12-08 19:42:18.000000000 +0100
-+++ sapi/apache2handler/config.m4 2015-12-15 07:26:17.866096130 +0100
+--- sapi/apache2handler/config.m4.orig 2015-12-16 11:41:55.000000000 +0100
++++ sapi/apache2handler/config.m4 2016-01-01 18:56:23.530338559 +0100
@@ -122,7 +122,6 @@
PHP_BUILD_THREAD_SAFE
fi
@@ -8,8 +8,8 @@
if test -n "$APACHE_THREADED_MPM"; then
PHP_BUILD_THREAD_SAFE
fi
---- configure.orig 2015-12-08 19:42:18.000000000 +0100
-+++ configure 2015-12-15 07:26:18.146090579 +0100
+--- configure.orig 2015-12-16 11:41:54.000000000 +0100
++++ configure 2016-01-01 18:56:23.793665417 +0100
@@ -6875,7 +6875,6 @@
fi
Modified: generate_patches
===================================================================
--- generate_patches 2016-01-01 17:14:04 UTC (rev 257430)
+++ generate_patches 2016-01-01 18:00:11 UTC (rev 257431)
@@ -17,6 +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#^;chdir =.*#;chdir = /srv/http#' \
-i.orig sapi/fpm/www.conf.in
Modified: php-fpm.patch
===================================================================
--- php-fpm.patch 2016-01-01 17:14:04 UTC (rev 257430)
+++ php-fpm.patch 2016-01-01 18:00:11 UTC (rev 257431)
@@ -1,5 +1,5 @@
---- sapi/fpm/Makefile.frag.orig 2015-12-08 19:42:18.000000000 +0100
-+++ sapi/fpm/Makefile.frag 2015-12-15 07:26:18.149423847 +0100
+--- sapi/fpm/Makefile.frag.orig 2015-12-16 11:41:54.000000000 +0100
++++ sapi/fpm/Makefile.frag 2016-01-01 18:56:23.796998669 +0100
@@ -12,8 +12,8 @@
@echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
@@ -11,8 +11,8 @@
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
---- sapi/fpm/php-fpm.conf.in.orig 2015-12-08 19:42:18.000000000 +0100
-+++ sapi/fpm/php-fpm.conf.in 2015-12-15 07:26:18.152757113 +0100
+--- sapi/fpm/php-fpm.conf.in.orig 2015-12-16 11:41:54.000000000 +0100
++++ sapi/fpm/php-fpm.conf.in 2016-01-01 18:56:23.800331920 +0100
@@ -14,14 +14,14 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
@@ -30,8 +30,8 @@
; syslog_facility is used to specify what type of program is logging the
; message. This lets syslogd specify that messages from different facilities
---- sapi/fpm/www.conf.in.orig 2015-12-08 19:42:18.000000000 +0100
-+++ sapi/fpm/www.conf.in 2015-12-15 07:26:18.152757113 +0100
+--- sapi/fpm/www.conf.in.orig 2015-12-16 11:41:54.000000000 +0100
++++ sapi/fpm/www.conf.in 2016-01-01 18:56:23.803665171 +0100
@@ -33,7 +33,7 @@
; (IPv6 and IPv4-mapped) on a specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
@@ -41,6 +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
+ ; When POSIX Access Control Lists are supported you can set them using
+ ; these options, value is a comma separated list of user/group names.
@@ -352,7 +352,7 @@
; Chdir to this directory at the start.
; Note: relative path can be used.
@@ -50,8 +61,8 @@
; Redirect worker stdout and stderr into main error log. If not set, stdout and
; stderr will be redirected to /dev/null according to FastCGI specs.
---- sapi/fpm/php-fpm.service.in.orig 2015-12-08 19:42:18.000000000 +0100
-+++ sapi/fpm/php-fpm.service.in 2015-12-15 07:26:18.156090381 +0100
+--- sapi/fpm/php-fpm.service.in.orig 2015-12-16 11:41:54.000000000 +0100
++++ sapi/fpm/php-fpm.service.in 2016-01-01 18:56:23.803665171 +0100
@@ -4,7 +4,7 @@
[Service]
Modified: php.ini.patch
===================================================================
--- php.ini.patch 2016-01-01 17:14:04 UTC (rev 257430)
+++ php.ini.patch 2016-01-01 18:00:11 UTC (rev 257431)
@@ -1,5 +1,5 @@
---- php.ini-production.orig 2015-12-08 19:42:18.000000000 +0100
-+++ php.ini-production 2015-12-15 07:26:18.169423450 +0100
+--- php.ini-production.orig 2015-12-16 11:41:54.000000000 +0100
++++ php.ini-production 2016-01-01 18:56:23.820331428 +0100
@@ -720,7 +720,7 @@
; Directory in which the loadable extensions (modules) reside.
More information about the arch-commits
mailing list