Updated to version 7.2.1

4 files changed, 81 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c7f5e96d028..37b74e2d4271 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Nov 12 01:49:02 UTC 2017
 pkgbase = php-zts
-	pkgver = 7.2.0RC6
+	pkgver = 7.2.1
 	pkgrel = 1
 	url = http://www.php.net
-	arch = i686
 	arch = x86_64
 	license = PHP
 	checkdepends = procps-ng
@@ -16,6 +13,7 @@ pkgbase = php-zts
 	makedepends = gd
 	makedepends = gmp
 	makedepends = icu
+	makedepends = libsodium
 	makedepends = libxslt
 	makedepends = libzip
 	makedepends = net-snmp
@@ -29,20 +27,22 @@ pkgbase = php-zts
 	makedepends = postfix
 	makedepends = freetds
 	makedepends = pcre
-	source = https://downloads.php.net/~pollita/php-7.2.0RC6.tar.xz
-	source = https://downloads.php.net/~pollita/php-7.2.0RC6.tar.xz.asc
+	source = https://php.net/distributions/php-7.2.1.tar.xz
+	source = https://php.net/distributions/php-7.2.1.tar.xz.asc
 	source = apache.patch
 	source = apache.conf
 	source = php-fpm.patch
 	source = php-fpm.tmpfiles
 	source = php.ini.patch
-	sha256sums = be4df00ff5b66e9f13c83e1d08d1d5384ae7ccc820e26f7e5f9e660011496a9e
-	sha256sums = SKIP
-	sha256sums = 07acff660e194197cfbcc955c0d362d6de063e6475668f3df03bfff023af11ed
-	sha256sums = ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce
-	sha256sums = d62ffe6a693336752d4decb2acba09b67bdf7cad19807eccf8795f9386303923
-	sha256sums = 640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5
-	sha256sums = 8ab87630a2e1e031a1f42ce6063a1d9646b0d4299a9260fe4ebeb5cfc38e6972
+	validpgpkeys = B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
+	validpgpkeys = 1729F83938DA44E27BA0F4D3DBDB397470D12172
+	sha512sums = 2445f2cff20214b521c48592e5ab42b770c291702178d7cb2a84912c81b7e5d2cc45948a3a4a7830194fa444708d544c73efbaa8e90c95ab77937f7feffb2ffc
+	sha512sums = SKIP
+	sha512sums = 65ea5cb38c1fc1874b2a4d08bc52443f9ed5dcc92cf99023a74292c78f9074516296f56c768f7efa8a1f0838feac47b356d3da6fdb1199419bebec3a93204ae6
+	sha512sums = eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e
+	sha512sums = 87453c9f41204bc7a20cbf2a85ee44965f7754529e2c17fb60bdfe42ded7a894d6e7fcc30fe6c650ea5f92f95920161522ef3ce0f355686a2fed7f0857abdd5c
+	sha512sums = 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f
+	sha512sums = 1606178f55dee8ca6a3cf47c7db486dca0c261bfffbaf4f69450a3497643910c65f8ee1543839ae4213d8b396afc6e5f86141accac553545c35fe234a50f56e6
 
 pkgname = php-zts
 	pkgdesc = PHP with ZTS enabled
@@ -50,8 +50,8 @@ pkgname = php-zts
 	depends = curl
 	depends = libzip
 	depends = pcre
-	provides = php=7.2.0RC6
-	provides = php-ldap=7.2.0RC6
+	provides = php=7.2.1
+	provides = php-ldap=7.2.1
 	conflicts = php
 	conflicts = php-ldap
 	replaces = php
@@ -61,7 +61,7 @@ pkgname = php-zts
 pkgname = php-zts-cgi
 	pkgdesc = CGI and FCGI SAPI for PHP
 	depends = php-zts
-	provides = php-cgi=7.2.0RC6
+	provides = php-cgi=7.2.1
 	conflicts = php-cgi
 	replaces = php-cgi
 
@@ -69,7 +69,7 @@ pkgname = php-zts-apache
 	pkgdesc = Apache SAPI for PHP
 	depends = php-zts
 	depends = apache
-	provides = php-apache=7.2.0RC6
+	provides = php-apache=7.2.1
 	conflicts = php-apache
 	replaces = php-apache
 	backup = etc/httpd/conf/extra/php7_module.conf
@@ -78,7 +78,7 @@ pkgname = php-zts-fpm
 	pkgdesc = FastCGI Process Manager for PHP
 	depends = php-zts
 	depends = systemd
-	provides = php-fpm=7.2.0RC6
+	provides = php-fpm=7.2.1
 	conflicts = php-fpm
 	replaces = php-fpm
 	options = !emptydirs
@@ -89,7 +89,7 @@ pkgname = php-zts-embed
 	pkgdesc = Embedded PHP SAPI library
 	depends = php-zts
 	depends = libsystemd
-	provides = php-embed=7.2.0RC6
+	provides = php-embed=7.2.1
 	conflicts = php-embed
 	replaces = php-embed
 	options = !emptydirs
@@ -97,7 +97,7 @@ pkgname = php-zts-embed
 pkgname = php-zts-phpdbg
 	pkgdesc = Interactive PHP debugger
 	depends = php-zts
-	provides = php-phpdbg=7.2.0RC6
+	provides = php-phpdbg=7.2.1
 	conflicts = php-phpdbg
 	replaces = php-phpdbg
 	options = !emptydirs
@@ -106,7 +106,7 @@ pkgname = php-zts-dblib
 	pkgdesc = dblib module for PHP
 	depends = php-zts
 	depends = freetds
-	provides = php-dblib=7.2.0RC6
+	provides = php-dblib=7.2.1
 	conflicts = php-dblib
 	replaces = php-dblib
 
@@ -114,7 +114,7 @@ pkgname = php-zts-enchant
 	pkgdesc = enchant module for PHP
 	depends = php-zts
 	depends = enchant
-	provides = php-enchant=7.2.0RC6
+	provides = php-enchant=7.2.1
 	conflicts = php-enchant
 	replaces = php-enchant
 
@@ -122,7 +122,7 @@ pkgname = php-zts-gd
 	pkgdesc = gd module for PHP
 	depends = php-zts
 	depends = gd
-	provides = php-gd=7.2.0RC6
+	provides = php-gd=7.2.1
 	conflicts = php-gd
 	replaces = php-gd
 
@@ -130,7 +130,7 @@ pkgname = php-zts-imap
 	pkgdesc = imap module for PHP
 	depends = php-zts
 	depends = c-client
-	provides = php-imap=7.2.0RC6
+	provides = php-imap=7.2.1
 	conflicts = php-imap
 	replaces = php-imap
 
@@ -138,15 +138,23 @@ pkgname = php-zts-intl
 	pkgdesc = intl module for PHP
 	depends = php-zts
 	depends = icu
-	provides = php-intl=7.2.0RC6
+	provides = php-intl=7.2.1
 	conflicts = php-intl
 	replaces = php-intl
 
+pkgname = php-zts-sodium
+	pkgdesc = sodium module for PHP
+	depends = php-zts
+	depends = libsodium
+	provides = php-sodium=7.2.1
+	conflicts = php-sodium
+	replaces = php-sodium
+
 pkgname = php-zts-odbc
 	pkgdesc = ODBC modules for PHP
 	depends = php-zts
 	depends = unixodbc
-	provides = php-odbc=7.2.0RC6
+	provides = php-odbc=7.2.1
 	conflicts = php-odbc
 	replaces = php-odbc
 
@@ -154,7 +162,7 @@ pkgname = php-zts-pgsql
 	pkgdesc = PostgreSQL modules for PHP
 	depends = php-zts
 	depends = postgresql-libs
-	provides = php-pgsql=7.2.0RC6
+	provides = php-pgsql=7.2.1
 	conflicts = php-pgsql
 	replaces = php-pgsql
 
@@ -162,7 +170,7 @@ pkgname = php-zts-pspell
 	pkgdesc = pspell module for PHP
 	depends = php-zts
 	depends = aspell
-	provides = php-pspell=7.2.0RC6
+	provides = php-pspell=7.2.1
 	conflicts = php-pspell
 	replaces = php-pspell
 
@@ -170,7 +178,7 @@ pkgname = php-zts-snmp
 	pkgdesc = snmp module for PHP
 	depends = php-zts
 	depends = net-snmp
-	provides = php-snmp=7.2.0RC6
+	provides = php-snmp=7.2.1
 	conflicts = php-snmp
 	replaces = php-snmp
 
@@ -178,7 +186,7 @@ pkgname = php-zts-sqlite
 	pkgdesc = sqlite module for PHP
 	depends = php-zts
 	depends = sqlite
-	provides = php-sqlite=7.2.0RC6
+	provides = php-sqlite=7.2.1
 	conflicts = php-sqlite
 	replaces = php-sqlite
 
@@ -186,7 +194,7 @@ pkgname = php-zts-tidy
 	pkgdesc = tidy module for PHP
 	depends = php-zts
 	depends = tidy
-	provides = php-tidy=7.2.0RC6
+	provides = php-tidy=7.2.1
 	conflicts = php-tidy
 	replaces = php-tidy
 
@@ -194,7 +202,7 @@ pkgname = php-zts-xsl
 	pkgdesc = xsl module for PHP
 	depends = php-zts
 	depends = libxslt
-	provides = php-xsl=7.2.0RC6
+	provides = php-xsl=7.2.1
 	conflicts = php-xsl
 	replaces = php-xsl
 
diff --git a/PKGBUILD b/PKGBUILD
index fa9f9325dbdc..35dd2113520a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,6 +13,7 @@ pkgname=("${pkgbase}"
          "${pkgbase}-gd"
          "${pkgbase}-imap"
          "${pkgbase}-intl"
+         "${pkgbase}-sodium"
          "${pkgbase}-odbc"
          "${pkgbase}-pgsql"
          "${pkgbase}-pspell"
@@ -20,24 +21,25 @@ pkgname=("${pkgbase}"
          "${pkgbase}-sqlite"
          "${pkgbase}-tidy"
          "${pkgbase}-xsl")
-pkgver=7.2.0RC6
+pkgver=7.2.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('PHP')
 url='http://www.php.net'
-makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libxslt' 'libzip' 'net-snmp'
+makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
              'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre')
 checkdepends=('procps-ng')
-source=("https://downloads.php.net/~pollita/${_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=('be4df00ff5b66e9f13c83e1d08d1d5384ae7ccc820e26f7e5f9e660011496a9e'
+sha512sums=('2445f2cff20214b521c48592e5ab42b770c291702178d7cb2a84912c81b7e5d2cc45948a3a4a7830194fa444708d544c73efbaa8e90c95ab77937f7feffb2ffc'
             'SKIP'
-            '07acff660e194197cfbcc955c0d362d6de063e6475668f3df03bfff023af11ed'
-            'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
-            'd62ffe6a693336752d4decb2acba09b67bdf7cad19807eccf8795f9386303923'
-            '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
-            '8ab87630a2e1e031a1f42ce6063a1d9646b0d4299a9260fe4ebeb5cfc38e6972')
-validpgpkeys=('1729F83938DA44E27BA0F4D3DBDB397470D12172')
+            '65ea5cb38c1fc1874b2a4d08bc52443f9ed5dcc92cf99023a74292c78f9074516296f56c768f7efa8a1f0838feac47b356d3da6fdb1199419bebec3a93204ae6'
+            'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
+            '87453c9f41204bc7a20cbf2a85ee44965f7754529e2c17fb60bdfe42ded7a894d6e7fcc30fe6c650ea5f92f95920161522ef3ce0f355686a2fed7f0857abdd5c'
+            '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
+            '1606178f55dee8ca6a3cf47c7db486dca0c261bfffbaf4f69450a3497643910c65f8ee1543839ae4213d8b396afc6e5f86141accac553545c35fe234a50f56e6')
+validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
+              '1729F83938DA44E27BA0F4D3DBDB397470D12172')
 
 prepare() {
 	cd ${srcdir}/${_pkgbase}-${pkgver}
@@ -45,6 +47,8 @@ prepare() {
 	patch -p0 -i ${srcdir}/apache.patch
 	patch -p0 -i ${srcdir}/php-fpm.patch
 	patch -p0 -i ${srcdir}/php.ini.patch
+
+	rm tests/output/stream_isatty_*.phpt
 }
 
 build() {
@@ -107,6 +111,7 @@ build() {
 		--with-pspell=shared \
 		--with-readline \
 		--with-snmp=shared \
+		--with-sodium=shared \
 		--with-sqlite3=shared,/usr \
 		--with-tidy=shared \
 		--with-unixODBC=shared,/usr \
@@ -182,7 +187,7 @@ package_php-zts() {
 	# remove static modules
 	rm -f ${pkgdir}/usr/lib/php/modules/*.a
 	# remove modules provided by sub packages
-	rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,imap,intl,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+	rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,imap,intl,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
 	# remove empty directory
 	rmdir ${pkgdir}/usr/include/php/include
 }
@@ -299,6 +304,16 @@ package_php-zts-intl() {
 	install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
 }
 
+package_php-zts-sodium() {
+	pkgdesc='sodium module for PHP'
+	depends=("${pkgbase}" 'libsodium')
+	replaces=("${_pkgbase}-sodium")
+	conflicts=("${_pkgbase}-sodium")
+	provides=("${_pkgbase}-sodium=${pkgver}")
+
+	install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/php/modules/sodium.so
+}
+
 package_php-zts-odbc() {
 	pkgdesc='ODBC modules for PHP'
 	depends=("${pkgbase}" 'unixodbc')
diff --git a/generate_patches b/generate_patches
index de45eb7234a0..3288fcb55727 100755
--- a/generate_patches
+++ b/generate_patches
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
 
 . PKGBUILD
 
@@ -26,10 +26,10 @@ sed \
 	-e 's#^PIDFile=.*#PIDFile=/run/php-fpm/php-fpm.pid#' \
 	-i.orig sapi/fpm/php-fpm.service.in
 
-extensions=";extension=bcmath\n;extension=bz2\n;extension=calendar\nextension=curl\n;extension=dba\n;extension=enchant\n;extension=exif\n;extension=ftp\n;extension=gd\n;extension=gettext\n;extension=gmp\n;extension=iconv\n;extension=imap\n;extension=intl\n;extension=ldap\n;extension=mysqli\n;extension=odbc\n;zend_extension=opcache\n;extension=pdo_dblib\n;extension=pdo_mysql\n;extension=pdo_odbc\n;extension=pdo_pgsql\n;extension=pdo_sqlite\n;extension=pgsql\n;extension=pspell\n;extension=shmop\n;extension=snmp\n;extension=soap\n;extension=sockets\n;extension=sqlite3\n;extension=sysvmsg\n;extension=sysvsem\n;extension=sysvshm\n;extension=tidy\n;extension=xmlrpc\n;extension=xsl\nextension=zip\n"
+extensions=";extension=bcmath\n;extension=bz2\n;extension=calendar\nextension=curl\n;extension=dba\n;extension=enchant\n;extension=exif\n;extension=ftp\n;extension=gd\n;extension=gettext\n;extension=gmp\n;extension=iconv\n;extension=imap\n;extension=intl\n;extension=sodium\n;extension=ldap\n;extension=mysqli\n;extension=odbc\n;zend_extension=opcache\n;extension=pdo_dblib\n;extension=pdo_mysql\n;extension=pdo_odbc\n;extension=pdo_pgsql\n;extension=pdo_sqlite\n;extension=pgsql\n;extension=pspell\n;extension=shmop\n;extension=snmp\n;extension=soap\n;extension=sockets\n;extension=sqlite3\n;extension=sysvmsg\n;extension=sysvsem\n;extension=sysvshm\n;extension=tidy\n;extension=xmlrpc\n;extension=xsl\nextension=zip\n"
 
 sed \
-	-r ":a;N;\$!ba;s/;extension=bz2\n.+;?extension=[a-z]+\n/${extensions}/g" \
+	-r ":a;N;\$!ba;s/; Notes for Windows environments :\n.+;?extension=\w+\n/${extensions}/g" \
 	-i.orig php.ini-production
 sed \
 	-e 's#^; extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \
diff --git a/php.ini.patch b/php.ini.patch
index 3cc0d81e13ce..e0248fcb1050 100644
--- a/php.ini.patch
+++ b/php.ini.patch
@@ -9,10 +9,17 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -890,40 +890,43 @@
- ;   extension folders as well as the separate PECL DLL download (PHP 5+).
- ;   Be sure to appropriately set the extension_dir directive.
+@@ -883,47 +883,44 @@
+ ; deprecated in a future PHP major version. So, when it is possible, please
+ ; move to the new ('extension=<ext>) syntax.
  ;
+-; Notes for Windows environments :
+-;
+-; - ODBC support is built in, so no dll is needed for it.
+-; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
+-;   extension folders as well as the separate PECL DLL download (PHP 5+).
+-;   Be sure to appropriately set the extension_dir directive.
+-;
 +;extension=bcmath
  ;extension=bz2
 -;extension=curl
@@ -32,6 +39,7 @@
  ;extension=imap
 -;extension=interbase
 +;extension=intl
++;extension=sodium
  ;extension=ldap
 -;extension=mbstring
 -;extension=exif      ; Must be after mbstring as it depends on it