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

[Pierre Schmitz]

    Date: Saturday, December 3, 2016 @ 08:11:06
  Author: pierre
Revision: 282771

upgpkg: php 7.1.0-2

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

---------------+
 PKGBUILD      |   20 +++++++++-----------
 apache.patch  |    2 +-
 php-fpm.patch |    6 +++---
 php.ini.patch |    4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-03 06:44:10 UTC (rev 282770)
+++ PKGBUILD	2016-12-03 08:11:06 UTC (rev 282771)
@@ -21,25 +21,24 @@
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=7.0.13
+pkgver=7.1.0
 pkgrel=2
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
 makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libmcrypt' 'libxslt' 'libzip' 'net-snmp'
-             'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds')
+             'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre')
 checkdepends=('procps-ng')
-source=("https://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
+source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
         'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch')
-sha256sums=('357ba7f93975d7d836abed0852dc3ed96a988af539e87750613294cbee82f1bf'
+sha256sums=('a810b3f29c21407c24caa88f50649320d20ba6892ae1923132598b8a0ca145b6'
             'SKIP'
-            '819f05d2fd5a75c96e93c863517ca77dbd021a1224dc2d8096f758fb2937df6a'
+            '786e3d550c96959e6d0b813595599492d29cd93ae36fcbca29cdea32b60e373b'
             'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
-            '136e197384255420c73678aef812e70aa86320f6dbefcc5a952df1a65fdd53fa'
+            '3dc0b9f86d7d89bbcd011ded1faaf298d595c45e6693c7f8bccb34838a50eefd'
             '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
-            'd37ce253f1096df1702fe2b0272a0919e8a02cc9e05b868d5f54b506fc6ce0d3')
-validpgpkeys=('1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763'
-              '6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3')
+            '78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c')
+validpgpkeys=('A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0')
 
 prepare() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
@@ -62,7 +61,6 @@
 		--disable-rpath \
 		--mandir=/usr/share/man \
 		--without-pear \
-		--enable-zend-signals \
 		"
 
 	local _phpextensions="\
@@ -172,7 +170,7 @@
 
 package_php() {
 	pkgdesc='A general-purpose scripting language that is especially suited to web development'
-	depends=('libxml2' 'curl' 'libzip')
+	depends=('libxml2' 'curl' 'libzip' 'pcre')
 	replaces=('php-ldap')
 	conflicts=('php-ldap')
 	provides=("php-ldap=${pkgver}")

Modified: apache.patch
===================================================================
--- apache.patch	2016-12-03 06:44:10 UTC (rev 282770)
+++ apache.patch	2016-12-03 08:11:06 UTC (rev 282771)
@@ -10,7 +10,7 @@
      fi
 --- configure.orig
 +++ configure
-@@ -6919,7 +6919,6 @@
+@@ -6920,7 +6920,6 @@
  
      fi
    else

Modified: php-fpm.patch
===================================================================
--- php-fpm.patch	2016-12-03 06:44:10 UTC (rev 282770)
+++ php-fpm.patch	2016-12-03 08:11:06 UTC (rev 282771)
@@ -22,7 +22,7 @@
  
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written
- ; in a local file.
+ ; into a local file.
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
  ; Default Value: log/php-fpm.log
 -;error_log = log/php-fpm.log
@@ -63,7 +63,7 @@
  ; stderr will be redirected to /dev/null according to FastCGI specs.
 --- sapi/fpm/php-fpm.service.in.orig
 +++ sapi/fpm/php-fpm.service.in
-@@ -4,7 +4,7 @@
+@@ -8,7 +8,7 @@
  
  [Service]
  Type=@php_fpm_systemd@
@@ -71,4 +71,4 @@
 +PIDFile=/run/php-fpm/php-fpm.pid
  ExecStart=@sbindir@/php-fpm --nodaemonize --fpm-config @sysconfdir@/php-fpm.conf
  ExecReload=/bin/kill -USR2 $MAINPID
- 
+ PrivateTmp=true

Modified: php.ini.patch
===================================================================
--- php.ini.patch	2016-12-03 06:44:10 UTC (rev 282770)
+++ php.ini.patch	2016-12-03 08:11:06 UTC (rev 282771)
@@ -1,6 +1,6 @@
 --- php.ini-production.orig
 +++ php.ini-production
-@@ -718,7 +718,7 @@
+@@ -733,7 +733,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -9,7 +9,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -868,47 +868,44 @@
+@@ -883,47 +883,44 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;