Update to PHP 7.3.4 & allow multicore compilation

5 files changed, 45 insertions, 33 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f656d21262b3..27c927717359 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=("${pkgbase}"
          "${pkgbase}-tidy"
          "${pkgbase}-xsl")
 
-pkgver=7.3.3
+pkgver=7.3.4
 pkgrel=1
 arch=('x86_64')
 license=('PHP')
@@ -33,21 +33,22 @@ 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'
         'enchant-2.patch' 'freetype.patch')
-sha512sums=('bad5fa35f5962fa23dbe01fe85f76ce80e431cf2f9719284c082bb1fa32af26407407a97d3bf999165a6158f83a9669e3dd641f6d70028ec644b74a414fb803d'
+sha256sums=('6fe79fa1f8655f98ef6708cde8751299796d6c1e225081011f4104625b923b83'
             'SKIP'
-            'a46a39c1b0376a94ce71d3eda92e61054d4060fb20706c5c6472183755683717e20d4ee5a887431df7d789b7b9bbf42ee63f8692d36c596bac9c3c1786ddf256'
-            'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
-            'c9efb3f50770d6ddfa908b7f562355121f07ce528271e72ba188a4f1c788e264fc117c220053aaded42040825c03f3f17131a62a67d96cc91fd9da472e085deb'
-            '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
-            'f397afe7b909d97995b5cf041dfebf165e2c49947bfd749c1d873fdcd13dfc6920ae631d32e6b5bfe84455a8b74d4abede205dcf65e4237f8effac6bb82fe021'
-            '06b49fb044fe8cdeef5109aa7bb6858906396e3f3643827cdb241264029579c71b0a7661d24b78b16573c54832505491c4b2a1fd77ae7c313cb082731c2efd9e'
-            '97ca469d5234f5cc71af38bb99a60130fdab5f849ad1f49f112101779c7659ca4d6700aef72e0294c85bdcb18e487fc0cdda855cc51084b9e8cacb02ec0fb1eb')
-validpgpkeys=('CBAF69F173A0FEA4B537F470D66C9593118BCCB6')
+            '54d9e3682c6b4621ee654e5c8df4ad95d790a3bccdd284afcff83e5bb7043fb1'
+            '80c00b40b0de794d87fb0183cdce2f3c93869c849f7534e8ced42ca6c625f2f7'
+            '3de3c76930874c81824c23aa033cb9e66631659fd31f925d7c58f0479aeb18a9'
+            '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
+            '4c4dd05358f614adfa9c539a3ed61134764fced358c92dde109aac3ab78496c9'
+            '3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32'
+            '07c4648669dc05afc3c1ad5a4739768079c423b817eabf5296ca3d1ea5ffd163')
+validpgpkeys=('CBAF69F173A0FEA4B537F470D66C9593118BCCB6'
+              'F38252826ACD957EF380D39F2F7956BC5DA04B5D')
 
 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
@@ -190,7 +191,7 @@ package_php-zts() {
 	backup=('etc/php/php.ini')
 
 	cd ${srcdir}/build
-	make -j1 INSTALL_ROOT=${pkgdir} install-{modules,cli,build,headers,programs,pharcmd}
+	make 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/
 
@@ -210,7 +211,7 @@ package_php-zts-cgi() {
 	provides=("${_pkgbase}-cgi=${pkgver}")
 
 	cd ${srcdir}/build
-	make -j1 INSTALL_ROOT=${pkgdir} install-cgi
+	make INSTALL_ROOT=${pkgdir} install-cgi
 }
 
 package_php-zts-apache() {
diff --git a/apache.conf b/apache.conf
index b516b5e66ffa..945574788ed4 100644
--- a/apache.conf
+++ b/apache.conf
@@ -1,13 +1,11 @@
 # Required modules: dir_module, php7_module
-
 <IfModule dir_module>
-	<IfModule php7_module>
-		DirectoryIndex index.php index.html
-		<FilesMatch "\.php$">
-			SetHandler application/x-httpd-php
-		</FilesMatch>
-		<FilesMatch "\.phps$">
-			SetHandler application/x-httpd-php-source
-		</FilesMatch>
-	</IfModule>
+	LoadModule php7_module modules/libphp7.so
+	DirectoryIndex index.php index.html
+	<FilesMatch "\.php$">
+		SetHandler application/x-httpd-php
+	</FilesMatch>
+	<FilesMatch "\.phps$">
+		SetHandler application/x-httpd-php-source
+	</FilesMatch>
 </IfModule>
diff --git a/apache.patch b/apache.patch
index c2e64d950295..3e5f90978311 100644
--- a/apache.patch
+++ b/apache.patch
@@ -1,10 +1,21 @@
 --- sapi/apache2handler/config.m4.orig
 +++ sapi/apache2handler/config.m4
-@@ -113,7 +113,6 @@
-       PHP_BUILD_THREAD_SAFE
-     fi
-   else
+@@ -107,17 +107,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
+-      PHP_BUILD_THREAD_SAFE
+-    fi
+-  else
 -    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
-     if test -n "$APACHE_THREADED_MPM"; then
-       PHP_BUILD_THREAD_SAFE
-     fi
+-    if test -n "$APACHE_THREADED_MPM"; then
+-      PHP_BUILD_THREAD_SAFE
+-    fi
+-  fi
++PHP_BUILD_THREAD_SAFE
+   AC_MSG_RESULT(yes)
+   PHP_SUBST(APXS)
+ else
diff --git a/generate_patches b/generate_patches
index 8567951594b3..d3f04eb307a9 100755
--- a/generate_patches
+++ b/generate_patches
@@ -4,9 +4,11 @@
 
 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 '/if test "$APACHE_VERSION" -lt 2004001; then/i PHP_BUILD_THREAD_SAFE' \
+	-e '/if test "$APACHE_VERSION" -lt 2004001; then/,+10d' \
+	-i.orig sapi/apache2handler/config.m4
 
 sed 's/.conf.default/.conf/g' -i.orig sapi/fpm/Makefile.frag
 
diff --git a/php.ini.patch b/php.ini.patch
index edb0d85c5570..395cee840792 100644
--- a/php.ini.patch
+++ b/php.ini.patch
@@ -1,6 +1,6 @@
 --- php.ini-production.orig
 +++ php.ini-production
-@@ -902,48 +902,44 @@
+@@ -903,48 +903,44 @@
  ; deprecated in a future PHP major version. So, when it is possible, please
  ; move to the new ('extension=<ext>) syntax.
  ;