Bump PHP version and fixes

8 files changed, 187 insertions, 118 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0915ba06c7a..e6a8e895b5b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = php-zts
-	pkgver = 7.3.0
+	pkgver = 7.3.3
 	pkgrel = 1
 	url = http://www.php.net
 	arch = x86_64
@@ -27,23 +27,26 @@ pkgbase = php-zts
 	makedepends = postfix
 	makedepends = freetds
 	makedepends = pcre
-	source = https://php.net/distributions/php-7.3.0.tar.xz
-	source = https://php.net/distributions/php-7.3.0.tar.xz.asc
+	makedepends = libnsl
+	source = https://php.net/distributions/php-7.3.3.tar.xz
+	source = https://php.net/distributions/php-7.3.3.tar.xz.asc
 	source = apache.patch
 	source = apache.conf
 	source = php-fpm.patch
 	source = php-fpm.tmpfiles
 	source = php.ini.patch
-	validpgpkeys = B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
-	validpgpkeys = 1729F83938DA44E27BA0F4D3DBDB397470D12172
+	source = enchant-2.patch
+	source = freetype.patch
 	validpgpkeys = CBAF69F173A0FEA4B537F470D66C9593118BCCB6
-	sha512sums = d991101eb833d3a47833aa930341e75c56f26c4cb0249896728ebe209c6c02af1704fccc3052128d8f9fdffc60dcef0ece38a532697131141946898d8b1abcda
+	sha512sums = bad5fa35f5962fa23dbe01fe85f76ce80e431cf2f9719284c082bb1fa32af26407407a97d3bf999165a6158f83a9669e3dd641f6d70028ec644b74a414fb803d
 	sha512sums = SKIP
-	sha512sums = f3b7de6c18798ee8f1eb323de2da2553c0ee734a0beaac7ccb15d0f8e464a7c0e0b4da8a7da9b0b52d263fcd2e7bf8b067b00b9febb940f3252f0d930ede6604
+	sha512sums = a46a39c1b0376a94ce71d3eda92e61054d4060fb20706c5c6472183755683717e20d4ee5a887431df7d789b7b9bbf42ee63f8692d36c596bac9c3c1786ddf256
 	sha512sums = eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e
 	sha512sums = c9efb3f50770d6ddfa908b7f562355121f07ce528271e72ba188a4f1c788e264fc117c220053aaded42040825c03f3f17131a62a67d96cc91fd9da472e085deb
 	sha512sums = 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f
-	sha512sums = b3bc5defd4877016663c9051518bb67acc8ebcf32206b93df824de1ee0c4b724e6151fce4c6dd11b917361a3aa96c426d542b025e124b6b6cb625ddcc590ad78
+	sha512sums = f397afe7b909d97995b5cf041dfebf165e2c49947bfd749c1d873fdcd13dfc6920ae631d32e6b5bfe84455a8b74d4abede205dcf65e4237f8effac6bb82fe021
+	sha512sums = 06b49fb044fe8cdeef5109aa7bb6858906396e3f3643827cdb241264029579c71b0a7661d24b78b16573c54832505491c4b2a1fd77ae7c313cb082731c2efd9e
+	sha512sums = 97ca469d5234f5cc71af38bb99a60130fdab5f849ad1f49f112101779c7659ca4d6700aef72e0294c85bdcb18e487fc0cdda855cc51084b9e8cacb02ec0fb1eb
 
 pkgname = php-zts
 	pkgdesc = PHP with ZTS enabled
@@ -51,8 +54,9 @@ pkgname = php-zts
 	depends = curl
 	depends = libzip
 	depends = pcre
-	provides = php=7.3.0
-	provides = php-ldap=7.3.0
+	depends = argon2
+	provides = php=7.3.3
+	provides = php-ldap=7.3.3
 	conflicts = php
 	conflicts = php-ldap
 	replaces = php
@@ -62,7 +66,7 @@ pkgname = php-zts
 pkgname = php-zts-cgi
 	pkgdesc = CGI and FCGI SAPI for PHP
 	depends = php-zts
-	provides = php-cgi=7.3.0
+	provides = php-cgi=7.3.3
 	conflicts = php-cgi
 	replaces = php-cgi
 
@@ -70,7 +74,7 @@ pkgname = php-zts-apache
 	pkgdesc = Apache SAPI for PHP
 	depends = php-zts
 	depends = apache
-	provides = php-apache=7.3.0
+	provides = php-apache=7.3.3
 	conflicts = php-apache
 	replaces = php-apache
 	backup = etc/httpd/conf/extra/php7_module.conf
@@ -79,7 +83,7 @@ pkgname = php-zts-fpm
 	pkgdesc = FastCGI Process Manager for PHP
 	depends = php-zts
 	depends = systemd
-	provides = php-fpm=7.3.0
+	provides = php-fpm=7.3.3
 	conflicts = php-fpm
 	replaces = php-fpm
 	options = !emptydirs
@@ -90,7 +94,7 @@ pkgname = php-zts-embed
 	pkgdesc = Embedded PHP SAPI library
 	depends = php-zts
 	depends = libsystemd
-	provides = php-embed=7.3.0
+	provides = php-embed=7.3.3
 	conflicts = php-embed
 	replaces = php-embed
 	options = !emptydirs
@@ -98,7 +102,7 @@ pkgname = php-zts-embed
 pkgname = php-zts-phpdbg
 	pkgdesc = Interactive PHP debugger
 	depends = php-zts
-	provides = php-phpdbg=7.3.0
+	provides = php-phpdbg=7.3.3
 	conflicts = php-phpdbg
 	replaces = php-phpdbg
 	options = !emptydirs
@@ -107,7 +111,7 @@ pkgname = php-zts-dblib
 	pkgdesc = dblib module for PHP
 	depends = php-zts
 	depends = freetds
-	provides = php-dblib=7.3.0
+	provides = php-dblib=7.3.3
 	conflicts = php-dblib
 	replaces = php-dblib
 
@@ -115,7 +119,7 @@ pkgname = php-zts-enchant
 	pkgdesc = enchant module for PHP
 	depends = php-zts
 	depends = enchant
-	provides = php-enchant=7.3.0
+	provides = php-enchant=7.3.3
 	conflicts = php-enchant
 	replaces = php-enchant
 
@@ -123,7 +127,7 @@ pkgname = php-zts-gd
 	pkgdesc = gd module for PHP
 	depends = php-zts
 	depends = gd
-	provides = php-gd=7.3.0
+	provides = php-gd=7.3.3
 	conflicts = php-gd
 	replaces = php-gd
 
@@ -131,7 +135,7 @@ pkgname = php-zts-imap
 	pkgdesc = imap module for PHP
 	depends = php-zts
 	depends = c-client
-	provides = php-imap=7.3.0
+	provides = php-imap=7.3.3
 	conflicts = php-imap
 	replaces = php-imap
 
@@ -139,7 +143,7 @@ pkgname = php-zts-intl
 	pkgdesc = intl module for PHP
 	depends = php-zts
 	depends = icu
-	provides = php-intl=7.3.0
+	provides = php-intl=7.3.3
 	conflicts = php-intl
 	replaces = php-intl
 
@@ -147,7 +151,7 @@ pkgname = php-zts-sodium
 	pkgdesc = sodium module for PHP
 	depends = php-zts
 	depends = libsodium
-	provides = php-sodium=7.3.0
+	provides = php-sodium=7.3.3
 	conflicts = php-sodium
 	replaces = php-sodium
 
@@ -155,7 +159,7 @@ pkgname = php-zts-odbc
 	pkgdesc = ODBC modules for PHP
 	depends = php-zts
 	depends = unixodbc
-	provides = php-odbc=7.3.0
+	provides = php-odbc=7.3.3
 	conflicts = php-odbc
 	replaces = php-odbc
 
@@ -163,7 +167,7 @@ pkgname = php-zts-pgsql
 	pkgdesc = PostgreSQL modules for PHP
 	depends = php-zts
 	depends = postgresql-libs
-	provides = php-pgsql=7.3.0
+	provides = php-pgsql=7.3.3
 	conflicts = php-pgsql
 	replaces = php-pgsql
 
@@ -171,7 +175,7 @@ pkgname = php-zts-pspell
 	pkgdesc = pspell module for PHP
 	depends = php-zts
 	depends = aspell
-	provides = php-pspell=7.3.0
+	provides = php-pspell=7.3.3
 	conflicts = php-pspell
 	replaces = php-pspell
 
@@ -179,7 +183,7 @@ pkgname = php-zts-snmp
 	pkgdesc = snmp module for PHP
 	depends = php-zts
 	depends = net-snmp
-	provides = php-snmp=7.3.0
+	provides = php-snmp=7.3.3
 	conflicts = php-snmp
 	replaces = php-snmp
 
@@ -187,7 +191,7 @@ pkgname = php-zts-sqlite
 	pkgdesc = sqlite module for PHP
 	depends = php-zts
 	depends = sqlite
-	provides = php-sqlite=7.3.0
+	provides = php-sqlite=7.3.3
 	conflicts = php-sqlite
 	replaces = php-sqlite
 
@@ -195,7 +199,7 @@ pkgname = php-zts-tidy
 	pkgdesc = tidy module for PHP
 	depends = php-zts
 	depends = tidy
-	provides = php-tidy=7.3.0
+	provides = php-tidy=7.3.3
 	conflicts = php-tidy
 	replaces = php-tidy
 
@@ -203,7 +207,7 @@ pkgname = php-zts-xsl
 	pkgdesc = xsl module for PHP
 	depends = php-zts
 	depends = libxslt
-	provides = php-xsl=7.3.0
+	provides = php-xsl=7.3.3
 	conflicts = php-xsl
 	replaces = php-xsl
 
diff --git a/PKGBUILD b/PKGBUILD
index c57bc1e4dee6..f656d21262b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,4 @@
-# Maintainer:  Andrew Shelyakov <andrew.shelyakov@ya.ru>
-# Contributor: Aleksey Vasilenko <aleksey.vasilenko@gmail.com>
-# Contributor: Iliya Ivanov <i.ivanov@proforge.org>
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 _pkgbase='php'
 pkgbase="${_pkgbase}-zts"
@@ -23,39 +21,46 @@ pkgname=("${pkgbase}"
          "${pkgbase}-sqlite"
          "${pkgbase}-tidy"
          "${pkgbase}-xsl")
-pkgver=7.3.0
+
+pkgver=7.3.3
 pkgrel=1
 arch=('x86_64')
 license=('PHP')
 url='http://www.php.net'
 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')
+             'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre' 'libnsl')
 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=('d991101eb833d3a47833aa930341e75c56f26c4cb0249896728ebe209c6c02af1704fccc3052128d8f9fdffc60dcef0ece38a532697131141946898d8b1abcda'
+        'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch'
+        'enchant-2.patch' 'freetype.patch')
+sha512sums=('bad5fa35f5962fa23dbe01fe85f76ce80e431cf2f9719284c082bb1fa32af26407407a97d3bf999165a6158f83a9669e3dd641f6d70028ec644b74a414fb803d'
             'SKIP'
-            'f3b7de6c18798ee8f1eb323de2da2553c0ee734a0beaac7ccb15d0f8e464a7c0e0b4da8a7da9b0b52d263fcd2e7bf8b067b00b9febb940f3252f0d930ede6604'
+            'a46a39c1b0376a94ce71d3eda92e61054d4060fb20706c5c6472183755683717e20d4ee5a887431df7d789b7b9bbf42ee63f8692d36c596bac9c3c1786ddf256'
             'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
             'c9efb3f50770d6ddfa908b7f562355121f07ce528271e72ba188a4f1c788e264fc117c220053aaded42040825c03f3f17131a62a67d96cc91fd9da472e085deb'
             '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
-            'b3bc5defd4877016663c9051518bb67acc8ebcf32206b93df824de1ee0c4b724e6151fce4c6dd11b917361a3aa96c426d542b025e124b6b6cb625ddcc590ad78')
-validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
-              '1729F83938DA44E27BA0F4D3DBDB397470D12172'
-              'CBAF69F173A0FEA4B537F470D66C9593118BCCB6'
-             )
+            'f397afe7b909d97995b5cf041dfebf165e2c49947bfd749c1d873fdcd13dfc6920ae631d32e6b5bfe84455a8b74d4abede205dcf65e4237f8effac6bb82fe021'
+            '06b49fb044fe8cdeef5109aa7bb6858906396e3f3643827cdb241264029579c71b0a7661d24b78b16573c54832505491c4b2a1fd77ae7c313cb082731c2efd9e'
+            '97ca469d5234f5cc71af38bb99a60130fdab5f849ad1f49f112101779c7659ca4d6700aef72e0294c85bdcb18e487fc0cdda855cc51084b9e8cacb02ec0fb1eb')
+validpgpkeys=('CBAF69F173A0FEA4B537F470D66C9593118BCCB6')
 
 prepare() {
 	cd ${srcdir}/${_pkgbase}-${pkgver}
 
-	patch -p0 -i ${srcdir}/apache.patch
+#	patch -p0 -i ${srcdir}/apache.patch
 	patch -p0 -i ${srcdir}/php-fpm.patch
 	patch -p0 -i ${srcdir}/php.ini.patch
+	patch -p1 -i ${srcdir}/enchant-2.patch
+	patch -p1 -i ${srcdir}/freetype.patch
+	autoconf
 
 	rm tests/output/stream_isatty_*.phpt
 }
 
 build() {
+	# http://site.icu-project.org/download/61#TOC-Migration-Issues
+	CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
 	local _phpconfig="--srcdir=../${_pkgbase}-${pkgver} \
 		--config-cache \
 		--prefix=/usr \
@@ -105,6 +110,7 @@ build() {
 		--with-mysql-sock=/run/mysqld/mysqld.sock \
 		--with-mysqli=shared,mysqlnd \
 		--with-openssl \
+		--with-password-argon2 \
 		--with-pcre-regex=/usr \
 		--with-pdo-dblib=shared,/usr \
 		--with-pdo-mysql=shared,mysqlnd \
@@ -177,14 +183,14 @@ check() {
 
 package_php-zts() {
 	pkgdesc='PHP with ZTS enabled'
-	depends=('libxml2' 'curl' 'libzip' 'pcre')
+	depends=('libxml2' 'curl' 'libzip' 'pcre' 'argon2')
 	replaces=("${_pkgbase}" 'php-ldap')
 	conflicts=("${_pkgbase}" 'php-ldap')
 	provides=("${_pkgbase}=${pkgver}" "php-ldap=${pkgver}")
 	backup=('etc/php/php.ini')
 
 	cd ${srcdir}/build
-	make INSTALL_ROOT=${pkgdir} install-{modules,cli,build,headers,programs,pharcmd}
+	make -j1 INSTALL_ROOT=${pkgdir} install-{modules,cli,build,headers,programs,pharcmd}
 	install -D -m644 ${srcdir}/${_pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
 	install -d -m755 ${pkgdir}/etc/php/conf.d/
 
@@ -204,7 +210,7 @@ package_php-zts-cgi() {
 	provides=("${_pkgbase}-cgi=${pkgver}")
 
 	cd ${srcdir}/build
-	make INSTALL_ROOT=${pkgdir} install-cgi
+	make -j1 INSTALL_ROOT=${pkgdir} install-cgi
 }
 
 package_php-zts-apache() {
diff --git a/apache.patch b/apache.patch
index 3eb43d6918e8..c2e64d950295 100644
--- a/apache.patch
+++ b/apache.patch
@@ -8,65 +8,3 @@
      if test -n "$APACHE_THREADED_MPM"; then
        PHP_BUILD_THREAD_SAFE
      fi
---- configure.orig
-+++ configure
-@@ -6877,7 +6877,6 @@
- 
-     fi
-   else
--    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
-     if test -n "$APACHE_THREADED_MPM"; then
- 
-   enable_maintainer_zts=yes
-@@ -30550,6 +30549,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
-@@ -34679,15 +34681,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`
-@@ -36350,15 +36353,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/enchant-2.patch b/enchant-2.patch
new file mode 100644
index 000000000000..75be01369ffb
--- /dev/null
+++ b/enchant-2.patch
@@ -0,0 +1,61 @@
+--- php-7.1.13/ext/enchant/config.m4.orig	2018-01-03 02:32:29.000000000 +0000
++++ php-7.1.13/ext/enchant/config.m4	2018-01-21 22:10:03.788875780 +0000
+@@ -14,9 +14,9 @@
+ 	    ENCHANT_SEARCH_DIRS="/usr/local /usr"
+ 	fi
+ 	for i in $ENCHANT_SEARCH_DIRS; do
+-		if test -f $i/include/enchant/enchant.h; then
++		if test -f $i/include/enchant-2/enchant.h; then
+ 			ENCHANT_DIR=$i
+-			ENCHANT_INCDIR=$i/include/enchant
++			ENCHANT_INCDIR=$i/include/enchant-2
+ 		elif test -f $i/include/enchant.h; then
+ 			ENCHANT_DIR=$i
+ 			ENCHANT_INCDIR=$i/include
+@@ -31,7 +31,7 @@
+ 
+ 	AC_DEFINE(HAVE_ENCHANT,1,[ ])
+ 	PHP_SUBST(ENCHANT_SHARED_LIBADD)
+-	PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
++	PHP_ADD_LIBRARY_WITH_PATH(enchant-2, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
+ 	PHP_ADD_INCLUDE($ENCHANT_INCDIR)
+ 	PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
+ 	[
+--- php-7.2.1/ext/enchant/enchant.c.orig	2018-01-02 22:36:05.000000000 +0000
++++ php-7.2.1/ext/enchant/enchant.c	2018-01-21 22:34:50.205791491 +0000
+@@ -741,7 +741,7 @@
+ 			for (i = 0; i < n_sugg; i++) {
+ 				add_next_index_string(sugg, suggs[i]);
+ 			}
+-			enchant_dict_free_suggestions(pdict->pdict, suggs);
++			enchant_dict_free_string_list(pdict->pdict, suggs);
+ 		}
+ 
+ 
+@@ -798,7 +798,7 @@
+ 			add_next_index_string(return_value, suggs[i]);
+ 		}
+ 
+-		enchant_dict_free_suggestions(pdict->pdict, suggs);
++		enchant_dict_free_string_list(pdict->pdict, suggs);
+ 	}
+ }
+ /* }}} */
+@@ -818,7 +818,7 @@
+ 
+ 	PHP_ENCHANT_GET_DICT;
+ 
+-	enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
++	enchant_dict_add(pdict->pdict, word, wordlen);
+ }
+ /* }}} */
+ 
+@@ -856,7 +856,7 @@
+ 
+ 	PHP_ENCHANT_GET_DICT;
+ 
+-	RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
++	RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen));
+ }
+ /* }}} */
+ 
diff --git a/freetype.patch b/freetype.patch
new file mode 100644
index 000000000000..f88695d65e2f
--- /dev/null
+++ b/freetype.patch
@@ -0,0 +1,38 @@
+diff -u -r php-7.2.5/ext/gd/config.m4 php-7.2.5-freetype/ext/gd/config.m4
+--- php-7.2.5/ext/gd/config.m4	2018-04-24 17:09:54.000000000 +0200
++++ php-7.2.5-freetype/ext/gd/config.m4	2018-05-09 14:49:03.647108948 +0200
+@@ -186,6 +186,9 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++
++    AC_MSG_CHECKING([for freetype])
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+       if test -f "$i/bin/freetype-config"; then
+         FREETYPE2_DIR=$i
+@@ -194,13 +197,20 @@
+       fi
+     done
+ 
+-    if test -z "$FREETYPE2_DIR"; then
++    if test -n "$FREETYPE2_CONFIG"; then
++      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++      AC_MSG_RESULT([found in $FREETYPE2_DIR])
++    elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then
++      FREETYPE2_DIR=pkg-config
++      FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags`
++      FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs`
++      AC_MSG_RESULT([found by pkg-config])
++    else
++      AC_MSG_RESULT([not found])
+       AC_MSG_ERROR([freetype-config not found.])
+     fi
+ 
+-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+-    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+-
+     PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
+     PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
+     AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
diff --git a/generate_patches b/generate_patches
index 2a64a44fd62d..8567951594b3 100755
--- a/generate_patches
+++ b/generate_patches
@@ -4,18 +4,10 @@
 
 makepkg -o --nodeps --noprepare --skipinteg
 
-pushd src/${_pkgbase}-${pkgver}
+pushd src/${pkgbase}-${pkgver}
 
 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
 
 sed \
@@ -44,7 +36,6 @@ sed \
 	-i php.ini-production
 
 diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch
-diff -u configure.orig configure | filterdiff --clean --remove-timestamps >> ../../apache.patch
 
 diff -u sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag | filterdiff --clean --remove-timestamps > ../../php-fpm.patch
 diff -u sapi/fpm/php-fpm.conf.in.orig sapi/fpm/php-fpm.conf.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch
diff --git a/php.ini.patch b/php.ini.patch
index 5d4273d43264..edb0d85c5570 100644
--- a/php.ini.patch
+++ b/php.ini.patch
@@ -1,6 +1,6 @@
 --- php.ini-production.orig
 +++ php.ini-production
-@@ -900,48 +900,44 @@
+@@ -902,48 +902,44 @@
  ; deprecated in a future PHP major version. So, when it is possible, please
  ; move to the new ('extension=<ext>) syntax.
  ;
diff --git a/php.patch b/php.patch
new file mode 100644
index 000000000000..28c1c7c117f9
--- /dev/null
+++ b/php.patch
@@ -0,0 +1,31 @@
+--- configure.orig
++++ configure
+@@ -7008,27 +7008,7 @@
+     ;;
+   esac
+ 
+-  if test "$APACHE_VERSION" -lt 2004001; then
+-    APXS_MPM=`$APXS -q MPM_NAME`
+-    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  fi
++enable_maintainer_zts=yes
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+