Update to php 7.2.12 + fix enchant and freetype-config deps

6 files changed, 99 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37b74e2d4271..ed86ee47f0e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = php-zts
-	pkgver = 7.2.1
+	pkgver = 7.2.12
 	pkgrel = 1
 	url = http://www.php.net
 	arch = x86_64
@@ -27,8 +27,8 @@ pkgbase = php-zts
 	makedepends = postfix
 	makedepends = freetds
 	makedepends = pcre
-	source = https://php.net/distributions/php-7.2.1.tar.xz
-	source = https://php.net/distributions/php-7.2.1.tar.xz.asc
+	source = https://php.net/distributions/php-7.2.12.tar.xz
+	source = https://php.net/distributions/php-7.2.12.tar.xz.asc
 	source = apache.patch
 	source = apache.conf
 	source = php-fpm.patch
@@ -36,13 +36,13 @@ pkgbase = php-zts
 	source = php.ini.patch
 	validpgpkeys = B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
 	validpgpkeys = 1729F83938DA44E27BA0F4D3DBDB397470D12172
-	sha512sums = 2445f2cff20214b521c48592e5ab42b770c291702178d7cb2a84912c81b7e5d2cc45948a3a4a7830194fa444708d544c73efbaa8e90c95ab77937f7feffb2ffc
+	sha512sums = bbeaed1278d0d2f1ecb2249dab1ebaab1489ef43be0797dac57d8b523d8e5d284166e6cbf52095f5d34eef447fbdeb0c6916caaa5770221a180ec064f4ffcad8
 	sha512sums = SKIP
-	sha512sums = 65ea5cb38c1fc1874b2a4d08bc52443f9ed5dcc92cf99023a74292c78f9074516296f56c768f7efa8a1f0838feac47b356d3da6fdb1199419bebec3a93204ae6
+	sha512sums = 9909867cf8c11e6e150c1f10a7ea2257873d55482efaab9ee68f76be3fea13c0d5438a9f47a68d605ec470a5d56b38a776d4f538a8858d9142e42fe3d60b7a37
 	sha512sums = eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e
-	sha512sums = 87453c9f41204bc7a20cbf2a85ee44965f7754529e2c17fb60bdfe42ded7a894d6e7fcc30fe6c650ea5f92f95920161522ef3ce0f355686a2fed7f0857abdd5c
+	sha512sums = c9efb3f50770d6ddfa908b7f562355121f07ce528271e72ba188a4f1c788e264fc117c220053aaded42040825c03f3f17131a62a67d96cc91fd9da472e085deb
 	sha512sums = 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f
-	sha512sums = 1606178f55dee8ca6a3cf47c7db486dca0c261bfffbaf4f69450a3497643910c65f8ee1543839ae4213d8b396afc6e5f86141accac553545c35fe234a50f56e6
+	sha512sums = 85000bcb4f5674bfcbac7f32aeb28c523904a23da716e7fd982ac225845843e0acb33c0b8552107c234b1dd106337ad0a6792253f200980b88a6f6239ec982d0
 
 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.1
-	provides = php-ldap=7.2.1
+	provides = php=7.2.12
+	provides = php-ldap=7.2.12
 	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.1
+	provides = php-cgi=7.2.12
 	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.1
+	provides = php-apache=7.2.12
 	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.1
+	provides = php-fpm=7.2.12
 	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.1
+	provides = php-embed=7.2.12
 	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.1
+	provides = php-phpdbg=7.2.12
 	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.1
+	provides = php-dblib=7.2.12
 	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.1
+	provides = php-enchant=7.2.12
 	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.1
+	provides = php-gd=7.2.12
 	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.1
+	provides = php-imap=7.2.12
 	conflicts = php-imap
 	replaces = php-imap
 
@@ -138,7 +138,7 @@ pkgname = php-zts-intl
 	pkgdesc = intl module for PHP
 	depends = php-zts
 	depends = icu
-	provides = php-intl=7.2.1
+	provides = php-intl=7.2.12
 	conflicts = php-intl
 	replaces = php-intl
 
@@ -146,7 +146,7 @@ pkgname = php-zts-sodium
 	pkgdesc = sodium module for PHP
 	depends = php-zts
 	depends = libsodium
-	provides = php-sodium=7.2.1
+	provides = php-sodium=7.2.12
 	conflicts = php-sodium
 	replaces = php-sodium
 
@@ -154,7 +154,7 @@ pkgname = php-zts-odbc
 	pkgdesc = ODBC modules for PHP
 	depends = php-zts
 	depends = unixodbc
-	provides = php-odbc=7.2.1
+	provides = php-odbc=7.2.12
 	conflicts = php-odbc
 	replaces = php-odbc
 
@@ -162,7 +162,7 @@ pkgname = php-zts-pgsql
 	pkgdesc = PostgreSQL modules for PHP
 	depends = php-zts
 	depends = postgresql-libs
-	provides = php-pgsql=7.2.1
+	provides = php-pgsql=7.2.12
 	conflicts = php-pgsql
 	replaces = php-pgsql
 
@@ -170,7 +170,7 @@ pkgname = php-zts-pspell
 	pkgdesc = pspell module for PHP
 	depends = php-zts
 	depends = aspell
-	provides = php-pspell=7.2.1
+	provides = php-pspell=7.2.12
 	conflicts = php-pspell
 	replaces = php-pspell
 
@@ -178,7 +178,7 @@ pkgname = php-zts-snmp
 	pkgdesc = snmp module for PHP
 	depends = php-zts
 	depends = net-snmp
-	provides = php-snmp=7.2.1
+	provides = php-snmp=7.2.12
 	conflicts = php-snmp
 	replaces = php-snmp
 
@@ -186,7 +186,7 @@ pkgname = php-zts-sqlite
 	pkgdesc = sqlite module for PHP
 	depends = php-zts
 	depends = sqlite
-	provides = php-sqlite=7.2.1
+	provides = php-sqlite=7.2.12
 	conflicts = php-sqlite
 	replaces = php-sqlite
 
@@ -194,7 +194,7 @@ pkgname = php-zts-tidy
 	pkgdesc = tidy module for PHP
 	depends = php-zts
 	depends = tidy
-	provides = php-tidy=7.2.1
+	provides = php-tidy=7.2.12
 	conflicts = php-tidy
 	replaces = php-tidy
 
@@ -202,7 +202,7 @@ pkgname = php-zts-xsl
 	pkgdesc = xsl module for PHP
 	depends = php-zts
 	depends = libxslt
-	provides = php-xsl=7.2.1
+	provides = php-xsl=7.2.12
 	conflicts = php-xsl
 	replaces = php-xsl
 
diff --git a/PKGBUILD b/PKGBUILD
index 35dd2113520a..1f2ae36a5d61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,6 @@
 # Maintainer:  Andrew Shelyakov <andrew.shelyakov@ya.ru>
+# Contributor: Aleksey Vasilenko <aleksey.vasilenko@gmail.com>
+# Contributor: Iliya Ivanov <i.ivanov@proforge.org>
 
 _pkgbase='php'
 pkgbase="${_pkgbase}-zts"
@@ -21,7 +23,7 @@ pkgname=("${pkgbase}"
          "${pkgbase}-sqlite"
          "${pkgbase}-tidy"
          "${pkgbase}-xsl")
-pkgver=7.2.1
+pkgver=7.2.12
 pkgrel=1
 arch=('x86_64')
 license=('PHP')
@@ -31,13 +33,13 @@ makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libso
 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')
-sha512sums=('2445f2cff20214b521c48592e5ab42b770c291702178d7cb2a84912c81b7e5d2cc45948a3a4a7830194fa444708d544c73efbaa8e90c95ab77937f7feffb2ffc'
+sha512sums=('bbeaed1278d0d2f1ecb2249dab1ebaab1489ef43be0797dac57d8b523d8e5d284166e6cbf52095f5d34eef447fbdeb0c6916caaa5770221a180ec064f4ffcad8'
             'SKIP'
-            '65ea5cb38c1fc1874b2a4d08bc52443f9ed5dcc92cf99023a74292c78f9074516296f56c768f7efa8a1f0838feac47b356d3da6fdb1199419bebec3a93204ae6'
+            '9909867cf8c11e6e150c1f10a7ea2257873d55482efaab9ee68f76be3fea13c0d5438a9f47a68d605ec470a5d56b38a776d4f538a8858d9142e42fe3d60b7a37'
             'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
-            '87453c9f41204bc7a20cbf2a85ee44965f7754529e2c17fb60bdfe42ded7a894d6e7fcc30fe6c650ea5f92f95920161522ef3ce0f355686a2fed7f0857abdd5c'
+            'c9efb3f50770d6ddfa908b7f562355121f07ce528271e72ba188a4f1c788e264fc117c220053aaded42040825c03f3f17131a62a67d96cc91fd9da472e085deb'
             '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
-            '1606178f55dee8ca6a3cf47c7db486dca0c261bfffbaf4f69450a3497643910c65f8ee1543839ae4213d8b396afc6e5f86141accac553545c35fe234a50f56e6')
+            '85000bcb4f5674bfcbac7f32aeb28c523904a23da716e7fd982ac225845843e0acb33c0b8552107c234b1dd106337ad0a6792253f200980b88a6f6239ec982d0')
 validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
               '1729F83938DA44E27BA0F4D3DBDB397470D12172')
 
diff --git a/apache.patch b/apache.patch
index 81b2cd8f7538..9c4584983133 100644
--- a/apache.patch
+++ b/apache.patch
@@ -10,7 +10,7 @@
      fi
 --- configure.orig
 +++ configure
-@@ -7018,7 +7018,6 @@
+@@ -7019,7 +7019,6 @@
  
      fi
    else
@@ -18,3 +18,55 @@
      if test -n "$APACHE_THREADED_MPM"; then
  
    enable_maintainer_zts=yes
+@@ -30232,6 +30231,9 @@
+ 		if test -f $i/include/enchant/enchant.h; then
+ 			ENCHANT_DIR=$i
+ 			ENCHANT_INCDIR=$i/include/enchant
++		elif test -f $i/include/enchant-2/enchant.h; then
++			ENCHANT_DIR=$i
++			ENCHANT_INCDIR=$i/include/enchant-2
+ 		elif test -f $i/include/enchant.h; then
+ 			ENCHANT_DIR=$i
+ 			ENCHANT_INCDIR=$i/include
+@@ -34362,15 +34364,16 @@
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/bin/freetype-config"; then
+-        FREETYPE2_DIR=$i
+-        FREETYPE2_CONFIG="$i/bin/freetype-config"
++
++	if test -d "$i/include/freetype2"; then
++		FREETYPE2_DIR=$i/include/freetype2
++		FREETYPE2_CONFIG="pkg-config freetype2"
+         break
+       fi
+     done
+ 
+     if test -z "$FREETYPE2_DIR"; then
+-      as_fn_error $? "freetype-config not found." "$LINENO" 5
++		as_fn_error $? "freetype2 not found." "$LINENO" 5
+     fi
+ 
+     FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+@@ -36033,15 +36036,16 @@
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/bin/freetype-config"; then
+-        FREETYPE2_DIR=$i
+-        FREETYPE2_CONFIG="$i/bin/freetype-config"
++
++	if test -d "$i/include/freetype2"; then
++		FREETYPE2_DIR=$i/include/freetype2
++		FREETYPE2_CONFIG="pkg-config freetype2"
+         break
+       fi
+     done
+ 
+     if test -z "$FREETYPE2_DIR"; then
+-      as_fn_error $? "freetype-config not found." "$LINENO" 5
++		as_fn_error $? "freetype2 not found." "$LINENO" 5
+     fi
+ 
+     FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
diff --git a/generate_patches b/generate_patches
index 3288fcb55727..2a64a44fd62d 100755
--- a/generate_patches
+++ b/generate_patches
@@ -6,7 +6,15 @@ makepkg -o --nodeps --noprepare --skipinteg
 
 pushd src/${_pkgbase}-${pkgver}
 
-sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4 -i.orig configure
+sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4
+
+sed \
+	-e '/APACHE_THREADED_MPM=/d' \
+	-e '/elif test -f $i\/include\/enchant.h; then/i\\t\telif test -f $i/include/enchant-2/enchant.h; then\n\t\t\tENCHANT_DIR=$i\n\t\t\tENCHANT_INCDIR=$i/include/enchant-2' \
+	-e '/for i in $PHP_FREETYPE_DIR \/usr\/local \/usr; do/a\\n\tif test -d "$i/include/freetype2"; then\n\t\tFREETYPE2_DIR=$i/include/freetype2\n\t\tFREETYPE2_CONFIG="pkg-config freetype2"' \
+	-e '/if test -f "$i\/bin\/freetype-config"; then/, +2d' \
+	-e '/freetype-config not found/c\\t\tas_fn_error $? "freetype2 not found." "$LINENO" 5' \
+	-i.orig configure
 
 sed 's/.conf.default/.conf/g' -i.orig sapi/fpm/Makefile.frag
 
diff --git a/php-fpm.patch b/php-fpm.patch
index d32d3920d681..c827d2e73ed0 100644
--- a/php-fpm.patch
+++ b/php-fpm.patch
@@ -9,7 +9,7 @@
 +		$(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/"
 --- sapi/fpm/php-fpm.conf.in.orig
 +++ sapi/fpm/php-fpm.conf.in
@@ -52,7 +52,7 @@
  ;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.
-@@ -356,7 +356,7 @@
+@@ -362,7 +362,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
diff --git a/php.ini.patch b/php.ini.patch
index e0248fcb1050..2c84444a6ed2 100644
--- a/php.ini.patch
+++ b/php.ini.patch
@@ -15,7 +15,6 @@
  ;
 -; 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.
@@ -45,9 +44,9 @@
 -;extension=exif      ; Must be after mbstring as it depends on it
  ;extension=mysqli
 -;extension=oci8_12c  ; Use with Oracle Database 12c Instant Client
+ ;extension=odbc
 -;extension=openssl
 -;extension=pdo_firebird
-+;extension=odbc
 +;zend_extension=opcache
 +;extension=pdo_dblib
  ;extension=pdo_mysql