Cleaned up PKGBUILD

9 files changed, 303 insertions, 358 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e17340dcdf0f..66bcce30537c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = php72
-	pkgdesc = php 7.2 compiled as to not conflict with mainline php
+	pkgdesc = php 7.2.34 compiled as to not conflict with mainline php
 	pkgver = 7.2.34
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.php.net
 	arch = i686
 	arch = x86_64
 	license = PHP
+	checkdepends = procps-ng
 	makedepends = apache
 	makedepends = aspell
 	makedepends = c-client
@@ -37,18 +38,18 @@ pkgbase = php72
 	source = php-fpm.patch
 	source = php-fpm.tmpfiles
 	source = php.ini.patch
-	source = enchant-2.patch
+	source = enchant.patch
 	source = php-freetype-2.9.1.patch
-	md5sums = adb64072b9b7e4634844a72512239a34
-	md5sums = 3bcefa76cf2f73f5f851a95c92e217a1
-	md5sums = 879e4a88a1707c05749f53196940e42a
-	md5sums = 13cda50a6a420d04ddc26935ded3164e
-	md5sums = 0677a10d2e721472d6fccb470356b322
-	md5sums = f248c783449f310291905b5551c57e48
-	md5sums = 406f7a3ef7f476e4a5c26e462e47b7c7
-	md5sums = 4bf0b1296fc95947a11bef36fe76102a
-	md5sums = e3883dce91ed21e23a3d7ae9fa80216d
-	md5sums = b40b82f55208eaead22dbfb64720b064
+	sha256sums = 409e11bc6a2c18707dfc44bc61c820ddfd81e17481470f3405ee7822d8379903
+	sha256sums = aa118bc3f15d33fc3e4c87de8fcd82ae1a7e66cb8469dfdb74bec1025acf56af
+	sha256sums = e438f7a429915d9fe5affce2a32315b670fa0f2b2638ca51e7072374d367ca07
+	sha256sums = a67ed00467fb886e73808a3246e7a6f6bfb60fa3c24a692e21a4dd474b8353fd
+	sha256sums = ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce
+	sha256sums = bdd47c439c81b46384332c8b0180e70b80d8b38d844f0dde9d1be329e4c62f18
+	sha256sums = 3217979d2ea17f9c6c9209e220d41a5f4e6a6b65fcc7cd5ab8d938f65ca2b59e
+	sha256sums = d47310dfa4c53fd30744e49b0bacfcabe055568a33af08e28bc5bc80a852b4c4
+	sha256sums = b11c3de747ef222696f5135556d624e3f7f0135a3cb1b06082f1ec8e9b7eeb0a
+	sha256sums = f9fe57f809ac13e0043d18b795ef777af3e8c710a83745b37b09db536f683d2a
 
 pkgname = php72
 	pkgdesc = A general-purpose scripting language that is especially suited to web development
@@ -56,136 +57,98 @@ pkgname = php72
 	depends = curl
 	depends = libzip
 	depends = pcre
-	provides = php72
-	conflicts = php72
 	backup = etc/php72/php.ini
 
 pkgname = php72-cgi
-	pkgdesc = php
+	pkgdesc = CGI and FCGI SAPI for PHP
 	depends = php72
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-apache
-	pkgdesc = php
+	pkgdesc = Apache SAPI for PHP
 	depends = php72
 	depends = apache
-	provides = php72-
-	conflicts = php72-
 	backup = etc/httpd/conf/extra/php72_module.conf
 
 pkgname = php72-fpm
-	pkgdesc = php
+	pkgdesc = FastCGI Process Manager for PHP
 	depends = php72
 	depends = systemd
-	provides = php72-
-	conflicts = php72-
 	options = !emptydirs
 	backup = etc/php72/php-fpm.conf
 	backup = etc/php72/php-fpm.d/www.conf
 
 pkgname = php72-embed
-	pkgdesc = php
+	pkgdesc = Embedded PHP SAPI library
 	depends = php72
 	depends = libsystemd
-	provides = php72-
-	conflicts = php72-
 	options = !emptydirs
 
 pkgname = php72-phpdbg
-	pkgdesc = php
+	pkgdesc = Interactive PHP debugger
 	depends = php72
-	provides = php72-
-	conflicts = php72-
 	options = !emptydirs
 
 pkgname = php72-dblib
-	pkgdesc = php
+	pkgdesc = dblib module for PHP
 	depends = php72
 	depends = freetds
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-enchant
-	pkgdesc = php
+	pkgdesc = enchant module for PHP
 	depends = php72
 	depends = enchant
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-gd
-	pkgdesc = php
+	pkgdesc = gd module for PHP
 	depends = php72
 	depends = gd
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-imap
-	pkgdesc = php
+	pkgdesc = imap module for PHP
 	depends = php72
 	depends = c-client
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-intl
-	pkgdesc = module for php
+	pkgdesc = intl module for PHP
 	depends = php72
 	depends = icu
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-odbc
-	pkgdesc = php
+	pkgdesc = ODBC modules for PHP
 	depends = php72
 	depends = unixodbc
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-pgsql
-	pkgdesc = php
+	pkgdesc = PostgreSQL modules for PHP
 	depends = php72
 	depends = postgresql-libs
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-pspell
-	pkgdesc = php
+	pkgdesc = pspell module for PHP
 	depends = php72
 	depends = aspell
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-snmp
-	pkgdesc = php
+	pkgdesc = snmp module for PHP
 	depends = php72
 	depends = net-snmp
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-sqlite
-	pkgdesc = php
+	pkgdesc = sqlite module for PHP
 	depends = php72
 	depends = sqlite
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-tidy
-	pkgdesc = php
+	pkgdesc = tidy module for PHP
 	depends = php72
 	depends = tidy
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-xsl
-	pkgdesc = php
+	pkgdesc = xsl module for PHP
 	depends = php72
 	depends = libxslt
-	provides = php72-
-	conflicts = php72-
 
 pkgname = php72-sodium
-	pkgdesc = php
+	pkgdesc = sodium module for PHP
 	depends = php72
 	depends = libsodium
-	provides = php72-
-	conflicts = php72-
diff --git a/PKGBUILD b/PKGBUILD
index a3282f10b1ea..684b91520614 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,73 @@
-_phpbase=72
+# Build props
+phpbase=72
 pkgver=7.2.34
-pkgrel=4
-_suffix=
-pkgbase=php${_phpbase}${_suffix}
-_pkgbase=${pkgbase%$_phpbase$_suffix}
-if [ -z "${_suffix}" ]; then
-  _realpkg=${pkgbase}
-else
-  _realpkg=${pkgbase%$_suffix}
-fi
-pkgname=("${pkgbase}" "${_realpkg}-"{cgi,apache,fpm,embed,phpdbg,dblib,enchant,gd,imap,intl,odbc,pgsql,pspell,snmp,sqlite,tidy,xsl,sodium}"${_suffix}")
-pkgdesc="php 7.2 compiled as to not conflict with mainline php"
+pkgrel=5
+
+# Custom suffix
+suffix=
+
+# Const props
 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' 'freetds' 'pcre' 'libsodium' 'patchutils')
-#checkdepends=('procps-ng')
-source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz" 'intl.patch' 'icu.patch'
-        'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch' 'enchant-2.patch' 'php-freetype-2.9.1.patch' )
+checkdepends=('procps-ng')
+
+# Calculated props
+_base="php"
+program_suffix="${phpbase}${suffix}"
+pkgdesc="${_base} ${pkgver} compiled as to not conflict with mainline ${_base}"
+pkgbase="${_base}${program_suffix}"
+pkgname=("${pkgbase}" "${_base}${phpbase}-"{cgi,apache,fpm,embed,phpdbg,dblib,enchant,gd,imap,intl,odbc,pgsql,pspell,snmp,sqlite,tidy,xsl,sodium}${suffix})
+# Has "php" string
+
+# Source
+source=("https://php.net/distributions/${_base}-${pkgver}.tar.xz" 'intl.patch' 'icu.patch'
+        'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch' 'enchant.patch' 'php-freetype-2.9.1.patch' )
+        
+# Version specific"
+name_libapache_source="libphp7.so"
+name_libembed_source="libphp7.so"
+
+# Dirs
+dir_config="etc/${pkgbase}"
+dir_lib="usr/lib/${pkgbase}"
+
+# Binary names
+name_phpconfig="php-config${program_suffix}"
+name_phpize="phpize${program_suffix}"
+name_phar="phar${program_suffix}"
+
+# Conf names
+name_apache_module_conf="${pkgbase/-/_}_module.conf"
+
 
 prepare() {
-    cd ${srcdir}/${_pkgbase}-${pkgver}
+    cd "${_base}-${pkgver}"
     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}/enchant.patch
     patch -p1 -i ${srcdir}/php-freetype-2.9.1.patch
     patch -p1 -i ${srcdir}/intl.patch
     patch -p1 -i ${srcdir}/icu.patch
 }
 
 build() {
-    local _phpconfig="--srcdir=../${_pkgbase}-${pkgver} \
+    local _phpconfig="--srcdir=../${_base}-${pkgver} \
         --config-cache \
         --prefix=/usr \
         --sbindir=/usr/bin \
-        --sysconfdir=/etc/${_realpkg} \
+        --sysconfdir=/${dir_config} \
         --localstatedir=/var \
-                --libdir=/usr/lib/${_realpkg} \
-                --datarootdir=/usr/share/${_realpkg} \
-                --datadir=/usr/share/${_realpkg} \
-                --program-suffix=${_realpkg#php} \
+                --libdir=/${dir_lib} \
+                --datarootdir=/usr/share/${pkgbase} \
+                --datadir=/usr/share/${pkgbase} \
+                --program-suffix=${program_suffix} \
         --with-layout=GNU \
-        --with-config-file-path=/etc/${_realpkg} \
-        --with-config-file-scan-dir=/etc/${_realpkg}/conf.d \
+        --with-config-file-path=/${dir_config} \
+        --with-config-file-scan-dir=/${dir_config}/conf.d \
         --disable-rpath \
         --without-pear \
         "
@@ -105,11 +128,12 @@ build() {
         --enable-pcntl \
         "
 
-    EXTENSION_DIR=/usr/lib/${_realpkg}/modules
+    EXTENSION_DIR="/${dir_lib}/modules"
     export EXTENSION_DIR
+    
     mkdir ${srcdir}/build
-    cd ${srcdir}/build
-    ln -s ../${_pkgbase}-${pkgver}/configure
+    cd ${srcdir}/build    
+    ln -s ../${_base}-${pkgver}/configure
     ./configure ${_phpconfig} \
         --enable-cgi \
         --enable-fpm \
@@ -140,7 +164,7 @@ build() {
 }
 
 check() {
-   cd ${srcdir}/${_pkgbase}-${pkgver}
+   cd "${_base}-${pkgver}"
 
    # Check if sendmail was configured correctly (FS#47600)
    ${srcdir}/build/sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q '/usr/bin/sendmail'
@@ -156,318 +180,211 @@ check() {
 package_php72() {
     pkgdesc='A general-purpose scripting language that is especially suited to web development'
     depends=('libxml2' 'curl' 'libzip' 'pcre')
-    backup=("etc/${_realpkg}/php.ini")
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}")
-      conflicts=("${_realpkg}")
-    fi
+    backup=("${dir_config}/php.ini")
+    #provides=("${pkgbase}=${pkgver}")
 
     cd ${srcdir}/build
     make -j1 INSTALL_ROOT=${pkgdir} install-{modules,cli,build,headers,programs,pharcmd}
-    install -D -m644 ${srcdir}/${_pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/${_realpkg}/php.ini
-    install -d -m755 ${pkgdir}/etc/${_realpkg}/conf.d/
+    install -D -m644 ${srcdir}/${_base}-${pkgver}/php.ini-production ${pkgdir}/${dir_config}/php.ini
+    install -d -m755 ${pkgdir}/${dir_config}/conf.d/
 
     # remove static modules
-    rm -f ${pkgdir}/usr/lib/${_realpkg}/modules/*.a
+    rm -f ${pkgdir}/${dir_lib}/modules/*.a
     # remove modules provided by sub packages
-    rm -f ${pkgdir}/usr/lib/${_realpkg}/modules/{enchant,gd,imap,intl,sodium,mcrypt,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+    rm -f ${pkgdir}/${dir_lib}/modules/{enchant,gd,imap,intl,sodium,mcrypt,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
 
     # move include directory
-    mv ${pkgdir}/usr/include/php ${pkgdir}/usr/include/${_realpkg}
+    mv ${pkgdir}/usr/include/php ${pkgdir}/usr/include/${pkgbase}
 
     # fix phar symlink
-    rm ${pkgdir}/usr/bin/phar
-    ln -sf phar.${_realpkg/php/phar} ${pkgdir}/usr/bin/${_realpkg/php/phar}
+    rm ${pkgdir}/usr/bin/phar  
+    ln -sf ${name_phar}.phar ${pkgdir}/usr/bin/${name_phar}
 
     # rename executables
-    mv ${pkgdir}/usr/bin/phar.{phar,${_realpkg/php/phar}}
+    mv ${pkgdir}/usr/bin/phar.phar ${pkgdir}/usr/bin/${name_phar}.phar
+
 
     # rename man pages
-    mv ${pkgdir}/usr/share/man/man1/{phar,${_realpkg/php/phar}}.1
-    mv ${pkgdir}/usr/share/man/man1/phar.{phar,${_realpkg/php/phar}}.1
+    mv ${pkgdir}/usr/share/man/man1/{phar,${name_phar}}.1
+    mv ${pkgdir}/usr/share/man/man1/phar.{phar,${name_phar}}.1
 
     # fix paths in executables
-    sed -i "/^includedir=/c \includedir=/usr/include/${_realpkg}" ${pkgdir}/usr/bin/${_realpkg/php/phpize}
-    sed -i "/^include_dir=/c \include_dir=/usr/include/${_realpkg}" ${pkgdir}/usr/bin/${_realpkg/php/php-config}
+    sed -i "/^includedir=/c \includedir=/usr/include/${pkgbase}" ${pkgdir}/usr/bin/${name_phpize}
+    sed -i "/^include_dir=/c \include_dir=/usr/include/${pkgbase}" ${pkgdir}/usr/bin/${name_phpconfig}
 
-    # make phpize use php-config72
-    sed -i "/^\[  --with-php-config=/c \[  --with-php-config=PATH  Path to php-config [${_realpkg/php/php-config}]], ${_realpkg/php/php-config}, no)" ${pkgdir}/usr/lib/${_realpkg}/build/phpize.m4
+    # make phpize use php-config${phpbase}
+    sed -i "/^\[  --with-php-config=/c \[  --with-php-config=PATH  Path to php-config [${name_phpconfig}]], ${name_phpconfig}, no)" ${pkgdir}/${dir_lib}/build/phpize.m4
 }
 
 package_php72-cgi() {
-    _ext=cgi
-    _desc='CGI and FCGI SAPI for'
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"    
-    depends=("${pkgbase}")  
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-
-    cd "${srcdir}/build"
+    pkgdesc='CGI and FCGI SAPI for PHP'
+    depends=("${pkgbase}")
+    #provides=("${pkgbase}-cgi=${pkgver}")
+
+    cd ${srcdir}/build
     make -j1 INSTALL_ROOT=${pkgdir} install-cgi
 }
 
 package_php72-apache() {
-    _ext=apache
-    _desc='Apache SAPI for PHP for'
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='Apache SAPI for PHP'
     depends=("${pkgbase}" 'apache')
-    backup=("etc/httpd/conf/extra/${_realpkg}_module.conf")
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-
-    install -D -m755 ${srcdir}/build-apache/libs/libphp7.so ${pkgdir}/usr/lib/httpd/modules/lib${_realpkg}.so
-    install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/${_realpkg}_module.conf
+    backup=("etc/httpd/conf/extra/${name_apache_module_conf}")
+    #provides=("${pkgbase}-apache=${pkgver}")
+        echo "# End of LoadModule in httpd.conf - see ArchWiki Apache HTTP Server"
+        echo "LoadModule php7_module modules/lib${pkgbase}.so"
+        echo "AddHandler php7-script .php"
+        echo "# End of Include List"
+        echo "Include conf/extra/${name_apache_module_conf}"
+    install -D -m755 ${srcdir}/build-apache/libs/${name_libapache_source} ${pkgdir}/usr/lib/httpd/modules/lib${pkgbase}.so
+    install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/${name_apache_module_conf}
 }
 
 package_php72-fpm() {
-    _ext=fpm
-    _desc='FastCGI Process Manager for'
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='FastCGI Process Manager for PHP'
     depends=("${pkgbase}" 'systemd')
-    backup=("etc/${_realpkg}/php-fpm.conf" "etc/${_realpkg}/php-fpm.d/www.conf")
+    backup=("${dir_config}/php-fpm.conf" "${dir_config}/php-fpm.d/www.conf")
     options=('!emptydirs')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
+    #provides=("${pkgbase}-fpm=${pkgver}")
 
-    cd "${srcdir}/build"
+    cd ${srcdir}/build
     make -j1 INSTALL_ROOT=${pkgdir} install-fpm
-    install -D -m644 sapi/fpm/php-fpm.service ${pkgdir}/usr/lib/systemd/system/${_realpkg}-fpm.service
-    install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/${_realpkg}-fpm.conf
+    install -D -m644 sapi/fpm/php-fpm.service ${pkgdir}/usr/lib/systemd/system/${pkgbase}-fpm.service
+    install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}-fpm.conf
 }
 
 package_php72-embed() {
-    _ext=embed
-    _desc="Embedded PHP SAPI library for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='Embedded PHP SAPI library'
     depends=("${pkgbase}" 'libsystemd')
     options=('!emptydirs')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-    
-    cd "${srcdir}/build"
+    #provides=("${pkgbase}-embed=${pkgver}")
+
+    cd ${srcdir}/build
     make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
-    # move libphp7.so to libphp-71.so -- note well: this is to prevent ldconfig
-    # from complaining about libphp7.so not being a symbolic link if another php7 is installed.
-    mv ${pkgdir}/usr/lib/libphp7.so ${pkgdir}/usr/lib/libphp-71.so
+    mv ${pkgdir}/usr/lib/${name_libembed_source} ${pkgdir}/usr/lib/libphp${program_suffix}.so
 }
 
 package_php72-phpdbg() {
-    _ext=phpdbg
-    _desc="Interactive PHP debugger for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='Interactive PHP debugger'
     depends=("${pkgbase}")
     options=('!emptydirs')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-    
-    cd "${srcdir}/build"-phpdbg
+    #provides=("${pkgbase}-phpdbg=${pkgver}")
+
+    cd ${srcdir}/build-phpdbg
     make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
 }
 
 package_php72-dblib() {
-    _ext=dblib
-    _desc="${_ext} module for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='dblib module for PHP'
     depends=("${pkgbase}" 'freetds')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-    
-    install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/usr/lib/${_realpkg}/modules/pdo_dblib.so
+    #provides=("${pkgbase}-dblib=${pkgver}")
+
+    install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/${dir_lib}/modules/pdo_dblib.so
 }
 
 package_php72-enchant() {
-    _ext=enchant
-    _desc="${_ext} module for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='enchant module for PHP'
     depends=("${pkgbase}" 'enchant')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-    
-    install -D -m755 "${srcdir}/build/modules/${_ext}.so" "${pkgdir}/usr/lib/${_realpkg}/modules/${_ext}.so"
-}
+    #provides=("${pkgbase}-enchant=${pkgver}")
 
+    install -D -m755 ${srcdir}/build/modules/enchant.so ${pkgdir}/${dir_lib}/modules/enchant.so
+}
 
 package_php72-gd() {
-    _ext=gd
-    _desc="${_ext} module for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='gd module for PHP'
     depends=("${pkgbase}" 'gd')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-    
-    install -D -m755 "${srcdir}/build/modules/${_ext}.so" "${pkgdir}/usr/lib/${_realpkg}/modules/${_ext}.so"
+    #provides=("${pkgbase}-gd=${pkgver}")
+
+    install -D -m755 ${srcdir}/build/modules/gd.so ${pkgdir}/${dir_lib}/modules/gd.so
 }
 
 package_php72-imap() {
-    _ext=imap
-    _desc="${_ext} module for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='imap module for PHP'
     depends=("${pkgbase}" 'c-client')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-    
-    install -D -m755 "${srcdir}/build/modules/${_ext}.so" "${pkgdir}/usr/lib/${_realpkg}/modules/${_ext}.so"
+    #provides=("${pkgbase}-imap=${pkgver}")
+
+    install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/${dir_lib}/modules/imap.so
 }
 
 package_php72-intl() {
-    _ext=intl
-    pkgdesc="${_ext} module for ${_pkgbase}${_suffix}"
+    pkgdesc='intl module for PHP'
     depends=("${pkgbase}" 'icu')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-    
-    install -D -m755 "${srcdir}/build/modules/${_ext}.so" "${pkgdir}/usr/lib/${_realpkg}/modules/${_ext}.so"
-}
+    #provides=("${pkgbase}-intl=${pkgver}")
 
-package_php72-odbc() {
-    _ext=mcrypt
-    _desc="${_ext} module for"   
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"    
-    depends=("${pkgbase}" 'libmcrypt' 'libtool')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-
-    install -D -m755 "${srcdir}/build/modules/${_ext}.so" "${pkgdir}/usr/lib/${_realpkg}/modules/${_ext}.so"
+    install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/${dir_lib}/modules/intl.so
 }
 
 package_php72-odbc() {
-    _ext=odbc
-    _desc="ODBC modules for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='ODBC modules for PHP'
     depends=("${pkgbase}" 'unixodbc')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi  
+    #provides=("${pkgbase}-odbc=${pkgver}")
 
-    install -D -m755 ${srcdir}/build/modules/odbc.so ${pkgdir}/usr/lib/${_realpkg}/modules/odbc.so
-    install -D -m755 ${srcdir}/build/modules/pdo_odbc.so ${pkgdir}/usr/lib/${_realpkg}/modules/pdo_odbc.so
+    install -D -m755 ${srcdir}/build/modules/odbc.so ${pkgdir}/${dir_lib}/modules/odbc.so
+    install -D -m755 ${srcdir}/build/modules/pdo_odbc.so ${pkgdir}/${dir_lib}/modules/pdo_odbc.so
 }
 
 package_php72-pgsql() {
-    _ext=pgsql
-    _desc="PostgreSQL modules for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='PostgreSQL modules for PHP'
     depends=("${pkgbase}" 'postgresql-libs')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-    
-    install -D -m755 ${srcdir}/build/modules/pgsql.so ${pkgdir}/usr/lib/${_realpkg}/modules/pgsql.so
-    install -D -m755 ${srcdir}/build/modules/pdo_pgsql.so ${pkgdir}/usr/lib/${_realpkg}/modules/pdo_pgsql.so
+    #provides=("${pkgbase}-pgsql=${pkgver}")
+
+    install -D -m755 ${srcdir}/build/modules/pgsql.so ${pkgdir}/${dir_lib}/modules/pgsql.so
+    install -D -m755 ${srcdir}/build/modules/pdo_pgsql.so ${pkgdir}/${dir_lib}/modules/pdo_pgsql.so
 }
 
 package_php72-pspell() {
-    _ext=pspell
-    _desc="${_ext} module for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='pspell module for PHP'
     depends=("${pkgbase}" 'aspell')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi 
-    
-    install -D -m755 "${srcdir}/build/modules/${_ext}.so" "${pkgdir}/usr/lib/${_realpkg}/modules/${_ext}.so"
+    #provides=("${pkgbase}-pspell=${pkgver}")
+
+    install -D -m755 ${srcdir}/build/modules/pspell.so ${pkgdir}/${dir_lib}/modules/pspell.so
 }
 
 package_php72-snmp() {
-    _ext=snmp
-    _desc="${_ext} module for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='snmp module for PHP'
     depends=("${pkgbase}" 'net-snmp')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi  
-    
-    install -D -m755 "${srcdir}/build/modules/${_ext}.so" "${pkgdir}/usr/lib/${_realpkg}/modules/${_ext}.so"
-}
+    #provides=("${pkgbase}-snmp=${pkgver}")
 
-package_php72-sodium() {
-    _ext=sodium
-    _desc="${_ext} module for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
-    depends=("${pkgbase}" 'libsodium')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-    
-    install -D -m755 "${srcdir}/build/modules/${_ext}.so" "${pkgdir}/usr/lib/${_realpkg}/modules/${_ext}.so"
+    install -D -m755 ${srcdir}/build/modules/snmp.so ${pkgdir}/${dir_lib}/modules/snmp.so
 }
 
 package_php72-sqlite() {
-    _ext=sqlite
-    _desc="${_ext} modules for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='sqlite module for PHP'
     depends=("${pkgbase}" 'sqlite')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi    
-
-    install -D -m755 ${srcdir}/build/modules/sqlite3.so ${pkgdir}/usr/lib/${_realpkg}/modules/sqlite3.so
-    install -D -m755 ${srcdir}/build/modules/pdo_sqlite.so ${pkgdir}/usr/lib/${_realpkg}/modules/pdo_sqlite.so
+    #provides=("${pkgbase}-sqlite=${pkgver}")
+    install -D -m755 ${srcdir}/build/modules/sqlite3.so ${pkgdir}/${dir_lib}/modules/sqlite3.so
+    install -D -m755 ${srcdir}/build/modules/pdo_sqlite.so ${pkgdir}/${dir_lib}/modules/pdo_sqlite.so
 }
 
 package_php72-tidy() {
-    _ext=tidy
-    _desc="${_ext} module for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='tidy module for PHP'
     depends=("${pkgbase}" 'tidy')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi
-    
-    install -D -m755 "${srcdir}/build/modules/${_ext}.so" "${pkgdir}/usr/lib/${_realpkg}/modules/${_ext}.so"
+    #provides=("${pkgbase}-tidy=${pkgver}")
+    install -D -m755 ${srcdir}/build/modules/tidy.so ${pkgdir}/${dir_lib}/modules/tidy.so
 }
 
 package_php72-xsl() {
-    _ext=xsl
-    _desc="${_ext} module for"
-    pkgdesc="${_desc} ${_pkgbase}${_suffix}"
+    pkgdesc='xsl module for PHP'
     depends=("${pkgbase}" 'libxslt')
-    if [ -n "${_suffix}" ]; then
-      provides=("${_realpkg}-${_ext}")
-      conflicts=("${_realpkg}-${_ext}")
-    fi  
-    
-    install -D -m755 "${srcdir}/build/modules/${_ext}.so" "${pkgdir}/usr/lib/${_realpkg}/modules/${_ext}.so"
+    #provides=("${pkgbase}-xsl=${pkgver}")
+    install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/${dir_lib}/modules/xsl.so
+}
+
+package_php72-sodium() {
+    pkgdesc='sodium module for PHP'
+    depends=("${pkgbase}" 'libsodium')
+    #provides=("${pkgbase}-sodium=${pkgver}")
+    install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/${dir_lib}/modules/sodium.so
 }
 
-md5sums=('adb64072b9b7e4634844a72512239a34'
-         '3bcefa76cf2f73f5f851a95c92e217a1'
-         '879e4a88a1707c05749f53196940e42a'
-         '13cda50a6a420d04ddc26935ded3164e'
-         '0677a10d2e721472d6fccb470356b322'
-         'f248c783449f310291905b5551c57e48'
-         '406f7a3ef7f476e4a5c26e462e47b7c7'
-         '4bf0b1296fc95947a11bef36fe76102a'
-         'e3883dce91ed21e23a3d7ae9fa80216d'
-         'b40b82f55208eaead22dbfb64720b064')
+sha256sums=('409e11bc6a2c18707dfc44bc61c820ddfd81e17481470f3405ee7822d8379903'
+            'aa118bc3f15d33fc3e4c87de8fcd82ae1a7e66cb8469dfdb74bec1025acf56af'
+            'e438f7a429915d9fe5affce2a32315b670fa0f2b2638ca51e7072374d367ca07'
+            'a67ed00467fb886e73808a3246e7a6f6bfb60fa3c24a692e21a4dd474b8353fd'
+            'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
+            'bdd47c439c81b46384332c8b0180e70b80d8b38d844f0dde9d1be329e4c62f18'
+            '3217979d2ea17f9c6c9209e220d41a5f4e6a6b65fcc7cd5ab8d938f65ca2b59e'
+            'd47310dfa4c53fd30744e49b0bacfcabe055568a33af08e28bc5bc80a852b4c4'
+            'b11c3de747ef222696f5135556d624e3f7f0135a3cb1b06082f1ec8e9b7eeb0a'
+            'f9fe57f809ac13e0043d18b795ef777af3e8c710a83745b37b09db536f683d2a')
diff --git a/apache.patch b/apache.patch
index 81b2cd8f7538..3eef19ebecc8 100644
--- a/apache.patch
+++ b/apache.patch
@@ -10,7 +10,7 @@
      fi
 --- configure.orig
 +++ configure
-@@ -7018,7 +7018,6 @@
+@@ -7021,7 +7021,6 @@
  
      fi
    else
diff --git a/enchant-2.patch b/enchant.patch
index 93c0ce5c269e..93c0ce5c269e 100644
--- a/enchant-2.patch
+++ b/enchant.patch
diff --git a/generate_patches b/generate_patches
new file mode 100755
index 000000000000..6ef746525b8f
--- /dev/null
+++ b/generate_patches
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+. PKGBUILD
+
+makepkg -o --nodeps --noprepare --skipinteg
+
+pushd src/${_base}-${pkgver}
+
+sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4
+sed '/APACHE_THREADED_MPM=/d' -i.orig configure
+
+sed 's/.conf.default/.conf/g' -i.orig sapi/fpm/Makefile.frag
+
+sed \
+	-e "s#run/php-fpm.pid#/run/${_base}${phpbase}${suffix}-fpm/php-fpm.pid#" \
+	-e 's#^;error_log =.*#error_log = syslog#' \
+	-i.orig sapi/fpm/php-fpm.conf.in
+
+sed \
+	-e "s#^listen =.*#listen = /run/${_base}${phpbase}${suffix}-fpm/php-fpm.sock#" \
+	-e 's#^;listen.owner =#listen.owner =#' \
+	-e 's#^;listen.group =#listen.group =#' \
+	-e 's#^;chdir =.*#;chdir = /srv/http#' \
+	-i.orig sapi/fpm/www.conf.in
+
+sed \
+	-e "s#^PIDFile=.*#PIDFile=/run/${_base}${phpbase}${suffix}-fpm/php-fpm.pid#" \
+    -e "s#^ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize#ExecStart=@EXPANDED_SBINDIR@/php-fpm${phpbase}${suffix} --nodaemonize#" \
+	-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=ffi\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=sodium\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/; Notes for Windows environments :\n.+;?extension=\w+\n/${extensions}/g" \
+	-i.orig php.ini-production
+
+sed \
+	-e 's#^; extension_dir = "\./"$#extension_dir = "BIG_BAD_MODULES"#g' \
+	-i php.ini-production
+
+sed \
+	-e 's#^;extension_dir = "\./"$#extension_dir = "BIG_BAD_MODULES"#g' \
+	-i php.ini-production
+	
+sed \
+	-e "s#BIG_BAD_MODULES#/usr/lib/${_base}${phpbase}${suffix}/modules#g" \
+	-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 -u sapi/fpm/www.conf.in.orig sapi/fpm/www.conf.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch
+diff -u sapi/fpm/php-fpm.service.in.orig sapi/fpm/php-fpm.service.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch
+
+diff -u php.ini-production.orig php.ini-production | filterdiff --clean --remove-timestamps > ../../php.ini.patch
+
+popd
+
+echo "d /run/${_base}${phpbase}${suffix}-fpm 755 root root" > php-fpm.tmpfiles
+
+
diff --git a/icu.patch b/icu.patch
index 31182ff86017..1b06e0f0196e 100644
--- a/icu.patch
+++ b/icu.patch
@@ -1,5 +1,5 @@
---- 7.2.34/ext/intl/breakiterator/codepointiterator_internal.cpp	2020-09-30 08:15:54.000000000 +0300
-+++ 7.2.34/ext/intl/breakiterator/codepointiterator_internal.cpp	2021-11-30 20:43:09.078705667 +0200
+--- 7.2.34/ext/intl/breakiterator/codepointiterator_internal.cpp
++++ 7.2.34/ext/intl/breakiterator/codepointiterator_internal.cpp
 @@ -74,7 +74,11 @@
  	clearCurrentCharIter();
  }
@@ -12,8 +12,8 @@
  {
  	if (typeid(*this) != typeid(that)) {
  		return FALSE;
---- 7.2.34/ext/intl/breakiterator/codepointiterator_internal.h	2020-09-30 08:15:54.000000000 +0300
-+++ 7.2.34/ext/intl/breakiterator/codepointiterator_internal.h	2021-11-30 20:45:34.371317671 +0200
+--- 7.2.34/ext/intl/breakiterator/codepointiterator_internal.h
++++ 7.2.34/ext/intl/breakiterator/codepointiterator_internal.h
 @@ -36,8 +36,11 @@
  
  		virtual ~CodePointBreakIterator();
@@ -27,8 +27,8 @@
  		virtual CodePointBreakIterator* clone(void) const;
  
  		virtual UClassID getDynamicClassID(void) const;
---- 7.2.34/ext/intl/locale/locale_methods.c	2020-09-30 08:15:54.000000000 +0300
-+++ 7.2.34/ext/intl/locale/locale_methods.c	2021-11-30 20:46:15.912078221 +0200
+--- 7.2.34/ext/intl/locale/locale_methods.c
++++ 7.2.34/ext/intl/locale/locale_methods.c
 @@ -1333,7 +1333,7 @@
  		if( token && (token==cur_lang_tag) ){
  			/* check if the char. after match is SEPARATOR */
diff --git a/intl.patch b/intl.patch
index 3fbde6e68272..bc7e2e55ffef 100644
--- a/intl.patch
+++ b/intl.patch
@@ -1,7 +1,7 @@
 diff -urNp php-7.2.34-orig/ext/intl/breakiterator/codepointiterator_internal.cpp php-7.2.34-dwok/ext/intl/breakiterator/codepointiterator_internal.cpp
---- php-7.2.34-orig/ext/intl/breakiterator/codepointiterator_internal.cpp	2020-12-08 21:09:55.961605638 +0100
-+++ php-7.2.34-dwok/ext/intl/breakiterator/codepointiterator_internal.cpp	2020-12-08 21:10:55.378507625 +0100
-@@ -59,7 +59,7 @@ CodePointBreakIterator& CodePointBreakIt
+--- php-7.2.34-orig/ext/intl/breakiterator/codepointiterator_internal.cpp
++++ php-7.2.34-dwok/ext/intl/breakiterator/codepointiterator_internal.cpp
+@@ -59,7 +59,7 @@
  		return *this;
  	}
  
@@ -10,7 +10,7 @@ diff -urNp php-7.2.34-orig/ext/intl/breakiterator/codepointiterator_internal.cpp
  
  	//don't bother copying the character iterator, getText() is deprecated
  	clearCurrentCharIter();
-@@ -79,17 +79,17 @@ CodePointBreakIterator::~CodePointBreakI
+@@ -79,17 +79,17 @@
  UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
  {
  	if (typeid(*this) != typeid(that)) {
@@ -31,7 +31,7 @@ diff -urNp php-7.2.34-orig/ext/intl/breakiterator/codepointiterator_internal.cpp
  }
  
  CodePointBreakIterator* CodePointBreakIterator::clone(void) const
-@@ -110,7 +110,7 @@ CharacterIterator& CodePointBreakIterato
+@@ -110,7 +110,7 @@
  
  UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
  {
@@ -40,7 +40,7 @@ diff -urNp php-7.2.34-orig/ext/intl/breakiterator/codepointiterator_internal.cpp
  }
  
  void CodePointBreakIterator::setText(const UnicodeString &text)
-@@ -129,7 +129,7 @@ void CodePointBreakIterator::setText(UTe
+@@ -129,7 +129,7 @@
  		return;
  	}
  
@@ -49,7 +49,7 @@ diff -urNp php-7.2.34-orig/ext/intl/breakiterator/codepointiterator_internal.cpp
  
  	clearCurrentCharIter();
  }
-@@ -281,7 +281,7 @@ CodePointBreakIterator &CodePointBreakIt
+@@ -281,7 +281,7 @@
  	}
  
  	int64_t pos = utext_getNativeIndex(this->fText);
@@ -59,9 +59,9 @@ diff -urNp php-7.2.34-orig/ext/intl/breakiterator/codepointiterator_internal.cpp
  		return *this;
  	}
 diff -urNp php-7.2.34-orig/ext/intl/collator/collator_sort.c php-7.2.34-dwok/ext/intl/collator/collator_sort.c
---- php-7.2.34-orig/ext/intl/collator/collator_sort.c	2020-12-08 21:09:56.025606610 +0100
-+++ php-7.2.34-dwok/ext/intl/collator/collator_sort.c	2020-12-08 21:10:14.265883512 +0100
-@@ -346,7 +346,7 @@ static void collator_sort_internal( int
+--- php-7.2.34-orig/ext/intl/collator/collator_sort.c
++++ php-7.2.34-dwok/ext/intl/collator/collator_sort.c
+@@ -346,7 +346,7 @@
   */
  PHP_FUNCTION( collator_sort )
  {
@@ -70,7 +70,7 @@ diff -urNp php-7.2.34-orig/ext/intl/collator/collator_sort.c php-7.2.34-dwok/ext
  }
  /* }}} */
  
-@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_ke
+@@ -540,7 +540,7 @@
   */
  PHP_FUNCTION( collator_asort )
  {
@@ -80,9 +80,9 @@ diff -urNp php-7.2.34-orig/ext/intl/collator/collator_sort.c php-7.2.34-dwok/ext
  /* }}} */
  
 diff -urNp php-7.2.34-orig/ext/intl/dateformat/dateformat_attr.c php-7.2.34-dwok/ext/intl/dateformat/dateformat_attr.c
---- php-7.2.34-orig/ext/intl/dateformat/dateformat_attr.c	2020-12-08 21:09:56.021606549 +0100
-+++ php-7.2.34-dwok/ext/intl/dateformat/dateformat_attr.c	2020-12-08 21:10:31.234141105 +0100
-@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern )
+--- php-7.2.34-orig/ext/intl/dateformat/dateformat_attr.c
++++ php-7.2.34-dwok/ext/intl/dateformat/dateformat_attr.c
+@@ -88,7 +88,7 @@
  	UChar  value_buf[64];
  	uint32_t    length = USIZE( value_buf );
  	UChar* value  = value_buf;
@@ -91,7 +91,7 @@ diff -urNp php-7.2.34-orig/ext/intl/dateformat/dateformat_attr.c php-7.2.34-dwok
  
  	DATE_FORMAT_METHOD_INIT_VARS;
  
-@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern )
+@@ -131,7 +131,7 @@
  	size_t      value_len = 0;
  	int32_t     slength = 0;
  	UChar*	    svalue  = NULL;
@@ -100,7 +100,7 @@ diff -urNp php-7.2.34-orig/ext/intl/dateformat/dateformat_attr.c php-7.2.34-dwok
  
  
  	DATE_FORMAT_METHOD_INIT_VARS;
-@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient )
+@@ -227,7 +227,7 @@
   */
  PHP_FUNCTION( datefmt_set_lenient )
  {
@@ -110,9 +110,9 @@ diff -urNp php-7.2.34-orig/ext/intl/dateformat/dateformat_attr.c php-7.2.34-dwok
  	DATE_FORMAT_METHOD_INIT_VARS;
  
 diff -urNp php-7.2.34-orig/ext/intl/normalizer/normalizer_normalize.c php-7.2.34-dwok/ext/intl/normalizer/normalizer_normalize.c
---- php-7.2.34-orig/ext/intl/normalizer/normalizer_normalize.c	2020-12-08 21:09:55.957605577 +0100
-+++ php-7.2.34-dwok/ext/intl/normalizer/normalizer_normalize.c	2020-12-08 21:10:22.970015649 +0100
-@@ -179,7 +179,7 @@ PHP_FUNCTION( normalizer_is_normalized )
+--- php-7.2.34-orig/ext/intl/normalizer/normalizer_normalize.c
++++ php-7.2.34-dwok/ext/intl/normalizer/normalizer_normalize.c
+@@ -179,7 +179,7 @@
  	int		uinput_len = 0;
  	UErrorCode	status = U_ZERO_ERROR;
  
@@ -122,9 +122,9 @@ diff -urNp php-7.2.34-orig/ext/intl/normalizer/normalizer_normalize.c php-7.2.34
  	intl_error_reset( NULL );
  
 diff -urNp php-7.2.34-orig/ext/intl/timezone/timezone_class.cpp php-7.2.34-dwok/ext/intl/timezone/timezone_class.cpp
---- php-7.2.34-orig/ext/intl/timezone/timezone_class.cpp	2020-12-08 21:09:55.965605699 +0100
-+++ php-7.2.34-dwok/ext/intl/timezone/timezone_class.cpp	2020-12-08 21:10:40.162276637 +0100
-@@ -323,7 +323,7 @@ static HashTable *TimeZone_get_debug_inf
+--- php-7.2.34-orig/ext/intl/timezone/timezone_class.cpp
++++ php-7.2.34-dwok/ext/intl/timezone/timezone_class.cpp
+@@ -323,7 +323,7 @@
  
  	int32_t rawOffset, dstOffset;
  	UDate now = Calendar::getNow();
@@ -134,9 +134,9 @@ diff -urNp php-7.2.34-orig/ext/intl/timezone/timezone_class.cpp php-7.2.34-dwok/
  		return debug_info;
  	}
 diff -urNp php-7.2.34-orig/ext/intl/timezone/timezone_methods.cpp php-7.2.34-dwok/ext/intl/timezone/timezone_methods.cpp
---- php-7.2.34-orig/ext/intl/timezone/timezone_methods.cpp	2020-12-08 21:09:55.965605699 +0100
-+++ php-7.2.34-dwok/ext/intl/timezone/timezone_methods.cpp	2020-12-08 21:10:48.322400508 +0100
-@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_ti
+--- php-7.2.34-orig/ext/intl/timezone/timezone_methods.cpp
++++ php-7.2.34-dwok/ext/intl/timezone/timezone_methods.cpp
+@@ -95,7 +95,7 @@
  		RETURN_NULL();
  	}
  
diff --git a/php-fpm.patch b/php-fpm.patch
index 3e4ca06cc154..d9feb53b005d 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
@@ -19,7 +19,7 @@
  ; Default Value: none
 -;pid = run/php-fpm.pid
 +;pid = /run/php72-fpm/php-fpm.pid
-
+ 
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written
  ; into a local file.
@@ -27,7 +27,7 @@
  ; Default Value: log/php-fpm.log
 -;error_log = log/php-fpm.log
 +error_log = syslog
-
+ 
  ; syslog_facility is used to specify what type of program is logging the
  ; message. This lets syslogd specify that messages from different facilities
 --- sapi/fpm/www.conf.in.orig
@@ -38,7 +38,7 @@
  ; Note: This value is mandatory.
 -listen = 127.0.0.1:9000
 +listen = /run/php72-fpm/php-fpm.sock
-
+ 
  ; Set listen(2) backlog.
  ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
 @@ -44,8 +44,8 @@
@@ -52,19 +52,19 @@
  ;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
 -;chdir = /var/www
 +;chdir = /srv/http
-
+ 
  ; Redirect worker stdout and stderr into main error log. If not set, stdout and
  ; stderr will be redirected to /dev/null according to FastCGI specs.
 --- sapi/fpm/php-fpm.service.in.orig
 +++ sapi/fpm/php-fpm.service.in
-@@ -8,7 +8,7 @@
-
+@@ -8,8 +8,8 @@
+ 
  [Service]
  Type=@php_fpm_systemd@
 -PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
@@ -73,3 +73,4 @@
 +ExecStart=@EXPANDED_SBINDIR@/php-fpm72 --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
  ExecReload=/bin/kill -USR2 $MAINPID
  PrivateTmp=true
+ 
diff --git a/php.ini.patch b/php.ini.patch
index b2975943a695..0d7a91c59c11 100644
--- a/php.ini.patch
+++ b/php.ini.patch
@@ -1,15 +1,15 @@
 --- php.ini-production.orig
 +++ php.ini-production
-@@ -734,7 +734,7 @@
+@@ -731,7 +731,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
 -; extension_dir = "./"
-+extension_dir = "/usr/lib/php72/modules/"
++extension_dir = "/usr/lib/php72/modules"
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -883,47 +883,44 @@
+@@ -880,47 +880,45 @@
  ; deprecated in a future PHP major version. So, when it is possible, please
  ; move to the new ('extension=<ext>) syntax.
  ;
@@ -29,6 +29,7 @@
 +;extension=dba
 +;extension=enchant
 +;extension=exif
++;extension=ffi
 +;extension=ftp
 +;extension=gd
  ;extension=gettext
@@ -38,7 +39,6 @@
  ;extension=imap
 -;extension=interbase
 +;extension=intl
-+;extension=sodium
  ;extension=ldap
 -;extension=mbstring
 -;extension=exif      ; Must be after mbstring as it depends on it
@@ -64,6 +64,7 @@
 -
  ;extension=soap
  ;extension=sockets
++;extension=sodium
  ;extension=sqlite3
 +;extension=sysvmsg
 +;extension=sysvsem