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

[Pierre Schmitz]

    Date: Friday, March 17, 2017 @ 16:07:05
  Author: pierre
Revision: 291004

upgpkg: php 7.1.3-1

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

---------------+
 PKGBUILD      |    8 ++++----
 php-fpm.patch |   20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-17 16:05:15 UTC (rev 291003)
+++ PKGBUILD	2017-03-17 16:07:05 UTC (rev 291004)
@@ -21,8 +21,8 @@
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=7.1.2
-pkgrel=3
+pkgver=7.1.3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -31,11 +31,11 @@
 checkdepends=('procps-ng')
 source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
         'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch')
-sha256sums=('d815a0c39fd57bab1434a77ff0610fb507c22f790c66cd6f26e27030c4b3e971'
+sha256sums=('e4887c2634778e37fd962fbdf5c4a7d32cd708482fe07b448804625570cb0bb0'
             'SKIP'
             '258b33b6531b1128d9804c8b608b6013423a421edcf764747042d07e79ec6df3'
             'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
-            '236fdf535389b5b1b60db5c63f91705832191f7de2cf812d79b1cd8744c97c6d'
+            '7d982a3cefb3eaec0b3458340e4991c2959c10d1518ecb7c1d041884b14efc73'
             '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
             '78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c')
 validpgpkeys=('A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0'

Modified: php-fpm.patch
===================================================================
--- php-fpm.patch	2017-03-17 16:05:15 UTC (rev 291003)
+++ php-fpm.patch	2017-03-17 16:07:05 UTC (rev 291004)
@@ -1,16 +1,16 @@
 --- sapi/fpm/Makefile.frag.orig
 +++ sapi/fpm/Makefile.frag
-@@ -12,8 +12,8 @@
- 
- 	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
- 	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d || :
--	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
--	@$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default || :
-+	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
-+	@$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf || :
- 
+@@ -15,8 +15,8 @@
+ 	else \
+ 		echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
+ 		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+-		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+-		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
+ 	fi
+ 	
  	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
 --- sapi/fpm/php-fpm.conf.in.orig
 +++ sapi/fpm/php-fpm.conf.in
 @@ -14,14 +14,14 @@