Bugfixes for phar executable

3 files changed, 438 insertions, 237 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e6d8d697db3..e36ddce32944 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = php81
 	pkgver = 8.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.php.net/
 	arch = x86_64
+	arch = i686
 	license = PHP
 	checkdepends = procps-ng
 	makedepends = apache
@@ -29,6 +30,7 @@ pkgbase = php81
 	makedepends = pcre2
 	makedepends = libnsl
 	makedepends = oniguruma
+	makedepends = patchutils
 	source = https://php.net/distributions/php-8.1.0.tar.xz
 	source = apache.patch
 	source = apache.conf
@@ -37,7 +39,7 @@ pkgbase = php81
 	source = php.ini.patch
 	sha256sums = a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc
 	sha256sums = 702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca
-	sha256sums = ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce
+	sha256sums = 52bdc4a5fae96e2aab1de707001414b6a5a9a17823e1e3a47f0f1e9a9788dc3e
 	sha256sums = 96e0b05a5ec72ee0f907d29fbb9612414d9dfebeee1249cbf2f2318bacf2d37c
 	sha256sums = eb0c0aec5b5fb282df0bfefd4d5bbc229ee80a5c5da6760ecf52697a23cc7175
 	sha256sums = 6f73b6ac4b425ebc4505c7f75ca48763605b2c774c30bfa20072adcfbb1030cd
diff --git a/PKGBUILD b/PKGBUILD
index d79651335958..4610604b4c31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,16 @@
-pkgbase=php81
-_pkgbase=${pkgbase%81}
-_realpkg=${pkgbase}
-pkgname=("${pkgbase}"
-         "${_realpkg}-"{cgi,apache,fpm,embed,phpdbg,dblib,enchant,gd,imap,intl,sodium,odbc,pgsql,pspell,snmp,sqlite,tidy,xsl})
+_phpbase=81
+_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,sodium,odbc,pgsql,pspell,snmp,sqlite,tidy,xsl}"${_suffix}")
 pkgver=8.1.0
-pkgrel=1
-arch=('x86_64')
+pkgrel=2
+arch=('x86_64' 'i686')
 license=('PHP')
 url='https://www.php.net/'
 makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
@@ -16,332 +21,526 @@ source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"
         'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch')
 
 prepare() {
-	cd ${srcdir}/${_pkgbase}-${pkgver}
-
-	patch -p0 -i ${srcdir}/apache.patch
-	patch -p0 -i ${srcdir}/php-fpm.patch
-	patch -p0 -i ${srcdir}/php.ini.patch
-	autoconf
-
-	rm tests/output/stream_isatty_*.phpt
+    cd ${srcdir}/${_pkgbase}-${pkgver}
+    patch -p0 -i ${srcdir}/apache.patch
+    patch -p0 -i ${srcdir}/php-fpm.patch
+    patch -p0 -i ${srcdir}/php.ini.patch
+    autoconf
+    rm tests/output/stream_isatty_*.phpt
 }
 
 build() {
-	# http://site.icu-project.org/download/61#TOC-Migration-Issues
+    # http://site.icu-project.org/download/61#TOC-Migration-Issues
         unset CPPFLAGS
-	CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
-
-	local _phpconfig="--srcdir=../${_pkgbase}-${pkgver} \
-		--config-cache \
-		--prefix=/usr \
-		--sbindir=/usr/bin \
-		--sysconfdir=/etc/${_realpkg} \
-		--localstatedir=/var \
-		--libdir=/usr/lib/${_realpkg} \
-		--datarootdir=/usr/share/${_realpkg} \
-		--datadir=/usr/share/${_realpkg} \
-		--program-suffix=${_realpkg#php} \
-		--with-layout=GNU \
-		--with-config-file-path=/etc/${_realpkg} \
-		--with-config-file-scan-dir=/etc/${_realpkg}/conf.d \
-		--disable-rpath \
-		--mandir=/usr/share/man \
-		"
-
-	local _phpextensions="\
-		--enable-bcmath=shared \
-		--enable-calendar=shared \
-		--enable-dba=shared \
-		--enable-exif=shared \
-		--enable-ftp=shared \
-		--enable-gd=shared \
-		--enable-intl=shared \
-		--enable-mbstring \
-		--enable-pcntl \
-		--enable-shmop=shared \
-		--enable-soap=shared \
-		--enable-sockets=shared \
-		--enable-sysvmsg=shared \
-		--enable-sysvsem=shared \
-		--enable-sysvshm=shared \
-		--with-bz2=shared \
-		--with-curl=shared \
-		--with-db4=/usr \
-		--with-enchant=shared \
-		--with-external-gd \
-		--with-external-pcre \
-		--with-ffi=shared \
-		--with-gdbm \
-		--with-gettext=shared \
-		--with-gmp=shared \
-		--with-iconv=shared \
-		--with-imap-ssl \
-		--with-imap=shared \
-		--with-kerberos \
-		--with-ldap=shared \
-		--with-ldap-sasl \
-		--with-mhash \
-		--with-mysql-sock=/run/mysqld/mysqld.sock \
-		--with-mysqli=shared,mysqlnd \
-		--with-openssl \
-		--with-password-argon2 \
-		--with-pdo-dblib=shared,/usr \
-		--with-pdo-mysql=shared,mysqlnd \
-		--with-pdo-odbc=shared,unixODBC,/usr \
-		--with-pdo-pgsql=shared \
-		--with-pdo-sqlite=shared \
-		--with-pgsql=shared \
-		--with-pspell=shared \
-		--with-readline \
-		--with-snmp=shared \
-		--with-sodium=shared \
-		--with-sqlite3=shared \
-		--with-tidy=shared \
-		--with-unixODBC=shared \
-		--with-xsl=shared \
-		--with-zlib \
-		--with-zip=shared \
-		"
+    CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
+    local _phpconfig="--srcdir=../${_pkgbase}-${pkgver} \
+        --config-cache \
+        --prefix=/usr \
+        --sbindir=/usr/bin \
+        --sysconfdir=/etc/${_realpkg} \
+        --localstatedir=/var \
+        --libdir=/usr/lib/${_realpkg} \
+        --datarootdir=/usr/share/${_realpkg} \
+        --datadir=/usr/share/${_realpkg} \
+        --program-suffix=${_realpkg#php} \
+        --with-layout=GNU \
+        --with-config-file-path=/etc/${_realpkg} \
+        --with-config-file-scan-dir=/etc/${_realpkg}/conf.d \
+        --disable-rpath \
+        --mandir=/usr/share/man \
+        "
+
+    local _phpextensions="\
+        --enable-bcmath=shared \
+        --enable-calendar=shared \
+        --enable-dba=shared \
+        --enable-exif=shared \
+        --enable-ftp=shared \
+        --enable-gd=shared \
+        --enable-intl=shared \
+        --enable-mbstring \
+        --enable-pcntl \
+        --enable-shmop=shared \
+        --enable-soap=shared \
+        --enable-sockets=shared \
+        --enable-sysvmsg=shared \
+        --enable-sysvsem=shared \
+        --enable-sysvshm=shared \
+        --with-bz2=shared \
+        --with-curl=shared \
+        --with-db4=/usr \
+        --with-enchant=shared \
+        --with-external-gd \
+        --with-external-pcre \
+        --with-ffi=shared \
+        --with-gdbm \
+        --with-gettext=shared \
+        --with-gmp=shared \
+        --with-iconv=shared \
+        --with-imap-ssl \
+        --with-imap=shared \
+        --with-kerberos \
+        --with-ldap=shared \
+        --with-ldap-sasl \
+        --with-mhash \
+        --with-mysql-sock=/run/mysqld/mysqld.sock \
+        --with-mysqli=shared,mysqlnd \
+        --with-openssl \
+        --with-password-argon2 \
+        --with-pdo-dblib=shared,/usr \
+        --with-pdo-mysql=shared,mysqlnd \
+        --with-pdo-odbc=shared,unixODBC,/usr \
+        --with-pdo-pgsql=shared \
+        --with-pdo-sqlite=shared \
+        --with-pgsql=shared \
+        --with-pspell=shared \
+        --with-readline \
+        --with-snmp=shared \
+        --with-sodium=shared \
+        --with-sqlite3=shared \
+        --with-tidy=shared \
+        --with-unixODBC=shared \
+        --with-xsl=shared \
+        --with-zlib \
+        --with-zip=shared \
+        "
 
     EXTENSION_DIR=/usr/lib/${_realpkg}/modules
-	export EXTENSION_DIR
-
-	mkdir ${srcdir}/build
-	cd ${srcdir}/build
-	ln -s ../${_pkgbase}-${pkgver}/configure
-	./configure ${_phpconfig} \
-		--enable-cgi \
-		--enable-fpm \
-		--with-fpm-systemd \
-		--with-fpm-acl \
-		--with-fpm-user=http \
-		--with-fpm-group=http \
-		--enable-embed=shared \
-		${_phpextensions}
-	make
-
-	# apache
-	# reuse the previous run; this will save us a lot of time
-	cp -a ${srcdir}/build ${srcdir}/build-apache
-	cd ${srcdir}/build-apache
-	./configure ${_phpconfig} \
-		--with-apxs2 \
-		${_phpextensions}
-	make
-
-	# phpdbg
-	cp -a ${srcdir}/build ${srcdir}/build-phpdbg
-	cd ${srcdir}/build-phpdbg
-	./configure ${_phpconfig} \
-		--enable-phpdbg \
-		${_phpextensions}
-	make
+    export EXTENSION_DIR
+
+    mkdir ${srcdir}/build
+    cd ${srcdir}/build
+    ln -s ../${_pkgbase}-${pkgver}/configure
+    ./configure ${_phpconfig} \
+        --enable-cgi \
+        --enable-fpm \
+        --with-fpm-systemd \
+        --with-fpm-acl \
+        --with-fpm-user=http \
+        --with-fpm-group=http \
+        --enable-embed=shared \
+        ${_phpextensions}
+    make
+
+    # apache
+    # reuse the previous run; this will save us a lot of time
+    cp -a ${srcdir}/build ${srcdir}/build-apache
+    cd ${srcdir}/build-apache
+    ./configure ${_phpconfig} \
+        --with-apxs2 \
+        ${_phpextensions}
+    make
+
+    # phpdbg
+    cp -a ${srcdir}/build ${srcdir}/build-phpdbg
+    cd ${srcdir}/build-phpdbg
+    ./configure ${_phpconfig} \
+        --enable-phpdbg \
+        ${_phpextensions}
+    make
 }
 
 #check() {
-#	
+#    
 #    unset CPPFLAGS
-#	cd ${srcdir}/build
+#    cd ${srcdir}/build
 
-	# Check if sendmail was configured correctly (FS#47600)
-#	sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q '/usr/bin/sendmail'
+    # Check if sendmail was configured correctly (FS#47600)
+#    sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q '/usr/bin/sendmail'
 
-#	export REPORT_EXIT_STATUS=1
-#	export NO_INTERACTION=1
-#	export SKIP_ONLINE_TESTS=1
-#	export SKIP_SLOW_TESTS=1
-#	export TEST_PHP_ARGS="-j$(nproc)"
-#	export TESTS='tests Zend'
+#    export REPORT_EXIT_STATUS=1
+#    export NO_INTERACTION=1
+#    export SKIP_ONLINE_TESTS=1
+#    export SKIP_SLOW_TESTS=1
+#    export TEST_PHP_ARGS="-j$(nproc)"
+#    export TESTS='tests Zend'
 #
 #        make test
 #}
 
+if [ -z "${_suffix}" ]; then
 package_php81() {
-	pkgdesc='A general-purpose scripting language that is especially suited to web development'
-	depends=('libxml2' 'hspell' 'nuspell' 'libvoikko' 'curl' 'libzip' 'pcre2' 'argon2')
-	replaces=('php81-ldap')
-	conflicts=('php81-ldap')
-	provides=("php81-ldap=${pkgver}" "php81")
+pkgdesc='A general-purpose scripting language that is especially suited to web development'
+    depends=('libxml2' 'hspell' 'nuspell' 'libvoikko' 'curl' 'libzip' 'pcre2' 'argon2')
+    replaces=("${_realpkg}-ldap")
+    conflicts=("${_realpkg}-ldap")
+    provides=("${_realpkg}-ldap=${pkgver}" "${_realpkg}")
+    backup=("etc/${_realpkg}/php.ini")
+
+    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/
+
+    # remove static modules
+    rm -f ${pkgdir}/usr/lib/${_realpkg}/modules/*.a
+    # remove modules provided by sub packages
+    rm -f ${pkgdir}/usr/lib/${_realpkg}/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
+
+    # move include directory
+    mv ${pkgdir}/usr/include/php ${pkgdir}/usr/include/${_realpkg}
+
+    # fix phar symlink
+    #rm ${pkgdir}/usr/bin/phar
+    ln -sf phar${_phpbase}.phar ${pkgdir}/usr/bin/phar${_phpbase}
+
+    # rename executables
+    #mv ${pkgdir}/usr/bin/phar.phar ${pkgdir}/usr/bin/phar.phar${_phpbase}
+
+    # rename man pages
+    #mv ${pkgdir}/usr/share/man/man1/{phar,phar80}.1
+    #mv ${pkgdir}/usr/share/man/man1/phar.{phar,phar80}.1
+
+    # fix paths in executables
+    sed -i "/^includedir=/c \includedir=/usr/include/${_realpkg}" ${pkgdir}/usr/bin/phpize${_phpbase}
+    sed -i "/^include_dir=/c \include_dir=/usr/include/${_realpkg}" ${pkgdir}/usr/bin/php-config${_phpbase}
+
+    # make phpize use php-config
+    _tmpsed="/^\[  --with-php-config=/c \[  --with-php-config=PATH  Path to php-config [php-config${_phpbase}]], php-config${_phpbase}, no)"
+    sed -i "${_tmpsed}" ${pkgdir}/usr/lib/${_realpkg}/build/phpize.m4
+}
+else
+package_php81-el() {
+pkgdesc='A general-purpose scripting language that is especially suited to web development'
+    depends=('libxml2' 'hspell' 'nuspell' 'libvoikko' 'curl' 'libzip' 'pcre2' 'argon2')
+    replaces=("${_realpkg}-ldap")
+    conflicts=("${_realpkg}-ldap")
+    provides=("${_realpkg}-ldap=${pkgver}" "${_realpkg}")
     backup=("etc/${_realpkg}/php.ini")
 
-	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/
+    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/
 
-	# remove static modules
-	rm -f ${pkgdir}/usr/lib/${_realpkg}/modules/*.a
-	# remove modules provided by sub packages
-	rm -f ${pkgdir}/usr/lib/${_realpkg}/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
+    # remove static modules
+    rm -f ${pkgdir}/usr/lib/${_realpkg}/modules/*.a
+    # remove modules provided by sub packages
+    rm -f ${pkgdir}/usr/lib/${_realpkg}/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
 
-	# move include directory
-	mv ${pkgdir}/usr/include/php ${pkgdir}/usr/include/${_realpkg}
+    # move include directory
+    mv ${pkgdir}/usr/include/php ${pkgdir}/usr/include/${_realpkg}
 
-	# fix phar symlink
-	#rm ${pkgdir}/usr/bin/phar
-	ln -sf phar.phar81 ${pkgdir}/usr/bin/phar81
+    # fix phar symlink
+    #rm ${pkgdir}/usr/bin/phar
+    ln -sf phar${_phpbase}.phar ${pkgdir}/usr/bin/phar${_phpbase}
 
-	# rename executables
-	#mv ${pkgdir}/usr/bin/phar.phar ${pkgdir}/usr/bin/phar.phar81
+    # rename executables
+    #mv ${pkgdir}/usr/bin/phar.phar ${pkgdir}/usr/bin/phar.phar${_phpbase}
 
-	# rename man pages
-	#mv ${pkgdir}/usr/share/man/man1/{phar,phar81}.1
-	#mv ${pkgdir}/usr/share/man/man1/phar.{phar,phar81}.1
+    # rename man pages
+    #mv ${pkgdir}/usr/share/man/man1/{phar,phar80}.1
+    #mv ${pkgdir}/usr/share/man/man1/phar.{phar,phar80}.1
 
-	# fix paths in executables
-	sed -i "/^includedir=/c \includedir=/usr/include/${_realpkg}" ${pkgdir}/usr/bin/phpize81
-	sed -i "/^include_dir=/c \include_dir=/usr/include/${_realpkg}" ${pkgdir}/usr/bin/php-config81
+    # fix paths in executables
+    sed -i "/^includedir=/c \includedir=/usr/include/${_realpkg}" ${pkgdir}/usr/bin/phpize${_phpbase}
+    sed -i "/^include_dir=/c \include_dir=/usr/include/${_realpkg}" ${pkgdir}/usr/bin/php-config${_phpbase}
 
-	# make phpize use php-config81
-	sed -i "/^\[  --with-php-config=/c \[  --with-php-config=PATH  Path to php-config [php-config81]], php-config81, no)" ${pkgdir}/usr/lib/${_realpkg}/build/phpize.m4
+    # make phpize use php-config
+    _tmpsed="/^\[  --with-php-config=/c \[  --with-php-config=PATH  Path to php-config [php-config${_phpbase}]], php-config${_phpbase}, no)"
+    sed -i "${_tmpsed}" ${pkgdir}/usr/lib/${_realpkg}/build/phpize.m4
 }
+fi
+    
+if [ -z "${_suffix}" ]; then
 
 package_php81-cgi() {
-	pkgdesc='CGI and FCGI SAPI for PHP'
-	depends=("${pkgbase}")
+    pkgdesc='CGI and FCGI SAPI for PHP'
+    depends=("${pkgbase}")
 
-	cd ${srcdir}/build
-	make -j1 INSTALL_ROOT=${pkgdir} install-cgi
+    cd ${srcdir}/build
+    make -j1 INSTALL_ROOT=${pkgdir} install-cgi
 }
 
 package_php81-apache() {
-	pkgdesc='Apache SAPI for PHP'
-	depends=("${pkgbase}" 'apache' 'libnsl')
-	backup=("etc/httpd/conf/extra/${_realpkg}_module.conf")
+    pkgdesc='Apache SAPI for PHP'
+    depends=("${pkgbase}" 'apache' 'libnsl')
+    backup=("etc/httpd/conf/extra/${_realpkg}_module.conf")
 
-	install -D -m755 ${srcdir}/build-apache/libs/libphp.so ${pkgdir}/usr/lib/httpd/modules/lib${_realpkg}.so
-	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/${_realpkg}_module.conf
+    install -D -m755 ${srcdir}/build-apache/libs/libphp.so ${pkgdir}/usr/lib/httpd/modules/lib${_realpkg}.so
+    install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/${_realpkg}_module.conf
 }
 
 package_php81-fpm() {
-	pkgdesc='FastCGI Process Manager for PHP'
-	depends=("${pkgbase}" 'systemd')
-	backup=("etc/${_realpkg}/php-fpm.conf" "etc/${_realpkg}/php-fpm.d/www.conf")
-	options=('!emptydirs')
-
-	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
+    pkgdesc='FastCGI Process Manager for PHP'
+    depends=("${pkgbase}" 'systemd')
+    backup=("etc/${_realpkg}/php-fpm.conf" "etc/${_realpkg}/php-fpm.d/www.conf")
+    options=('!emptydirs')
+
+    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
 }
 
 package_php81-embed() {
-	pkgdesc='Embedded PHP SAPI library'
-	depends=("${pkgbase}" 'systemd-libs' 'libnsl')
-	options=('!emptydirs')
+    pkgdesc='Embedded PHP SAPI library'
+    depends=("${pkgbase}" 'systemd-libs' 'libnsl')
+    options=('!emptydirs')
 
-	cd ${srcdir}/build
-	make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
-	mv ${pkgdir}/usr/lib/libphp.so ${pkgdir}/usr/lib/libphp-81.so
+    cd ${srcdir}/build
+    make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
+    mv ${pkgdir}/usr/lib/libphp.so ${pkgdir}/usr/lib/libphp-${_phpbase}.so
 }
 
 package_php81-phpdbg() {
-	pkgdesc='Interactive PHP debugger'
-	depends=("${pkgbase}")
-	options=('!emptydirs')
+    pkgdesc='Interactive PHP debugger'
+    depends=("${pkgbase}")
+    options=('!emptydirs')
 
-	cd ${srcdir}/build-phpdbg
-	make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
+    cd ${srcdir}/build-phpdbg
+    make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
 }
 
 package_php81-dblib() {
-	pkgdesc='dblib module for PHP'
-	depends=("${pkgbase}" 'freetds')
+    pkgdesc='dblib module for PHP'
+    depends=("${pkgbase}" 'freetds')
 
-	install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/usr/lib/${_realpkg}/modules/pdo_dblib.so
+    install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/usr/lib/${_realpkg}/modules/pdo_dblib.so
 }
 
 package_php81-enchant() {
-	pkgdesc='enchant module for PHP'
-	depends=("${pkgbase}" 'enchant')
+    pkgdesc='enchant module for PHP'
+    depends=("${pkgbase}" 'enchant')
 
-	install -D -m755 ${srcdir}/build/modules/enchant.so ${pkgdir}/usr/lib/${_realpkg}/modules/enchant.so
+    install -D -m755 ${srcdir}/build/modules/enchant.so ${pkgdir}/usr/lib/${_realpkg}/modules/enchant.so
 }
 
 package_php81-gd() {
-	pkgdesc='gd module for PHP'
-	depends=("${pkgbase}" 'gd')
+    pkgdesc='gd module for PHP'
+    depends=("${pkgbase}" 'gd')
 
-	install -D -m755 ${srcdir}/build/modules/gd.so ${pkgdir}/usr/lib/${_realpkg}/modules/gd.so
+    install -D -m755 ${srcdir}/build/modules/gd.so ${pkgdir}/usr/lib/${_realpkg}/modules/gd.so
 }
 
 package_php81-imap() {
-	pkgdesc='imap module for PHP'
-	depends=("${pkgbase}" 'c-client')
+    pkgdesc='imap module for PHP'
+    depends=("${pkgbase}" 'c-client')
 
-	install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/usr/lib/${_realpkg}/modules/imap.so
+    install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/usr/lib/${_realpkg}/modules/imap.so
 }
 
 package_php81-intl() {
-	pkgdesc='intl module for PHP'
-	depends=("${pkgbase}" 'icu')
+    pkgdesc='intl module for PHP'
+    depends=("${pkgbase}" 'icu')
 
-	install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/${_realpkg}/modules/intl.so
+    install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/${_realpkg}/modules/intl.so
 }
 
 package_php81-sodium() {
-	pkgdesc='sodium module for PHP'
-	depends=("${pkgbase}" 'libsodium')
+    pkgdesc='sodium module for PHP'
+    depends=("${pkgbase}" 'libsodium')
 
-	install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/${_realpkg}/modules/sodium.so
+    install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/${_realpkg}/modules/sodium.so
 }
 
 package_php81-odbc() {
-	pkgdesc='ODBC modules for PHP'
-	depends=("${pkgbase}" 'unixodbc')
+    pkgdesc='ODBC modules for PHP'
+    depends=("${pkgbase}" 'unixodbc')
 
-	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}/usr/lib/${_realpkg}/modules/odbc.so
+    install -D -m755 ${srcdir}/build/modules/pdo_odbc.so ${pkgdir}/usr/lib/${_realpkg}/modules/pdo_odbc.so
 }
 
 package_php81-pgsql() {
-	pkgdesc='PostgreSQL modules for PHP'
-	depends=("${pkgbase}" 'postgresql-libs')
+    pkgdesc='PostgreSQL modules for PHP'
+    depends=("${pkgbase}" 'postgresql-libs')
 
-	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
+    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
 }
 
 package_php81-pspell() {
-	pkgdesc='pspell module for PHP'
-	depends=("${pkgbase}" 'aspell')
+    pkgdesc='pspell module for PHP'
+    depends=("${pkgbase}" 'aspell')
 
-	install -D -m755 ${srcdir}/build/modules/pspell.so ${pkgdir}/usr/lib/${_realpkg}/modules/pspell.so
+    install -D -m755 ${srcdir}/build/modules/pspell.so ${pkgdir}/usr/lib/${_realpkg}/modules/pspell.so
 }
 
 package_php81-snmp() {
-	pkgdesc='snmp module for PHP'
-	depends=("${pkgbase}" 'net-snmp')
+    pkgdesc='snmp module for PHP'
+    depends=("${pkgbase}" 'net-snmp')
 
-	install -D -m755 ${srcdir}/build/modules/snmp.so ${pkgdir}/usr/lib/${_realpkg}/modules/snmp.so
+    install -D -m755 ${srcdir}/build/modules/snmp.so ${pkgdir}/usr/lib/${_realpkg}/modules/snmp.so
 }
 
 package_php81-sqlite() {
-	pkgdesc='sqlite module for PHP'
-	depends=("${pkgbase}" 'sqlite')
+    pkgdesc='sqlite module for PHP'
+    depends=("${pkgbase}" 'sqlite')
 
-	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
+    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
 }
 
 package_php81-tidy() {
-	pkgdesc='tidy module for PHP'
-	depends=("${pkgbase}" 'tidy')
+    pkgdesc='tidy module for PHP'
+    depends=("${pkgbase}" 'tidy')
 
-	install -D -m755 ${srcdir}/build/modules/tidy.so ${pkgdir}/usr/lib/${_realpkg}/modules/tidy.so
+    install -D -m755 ${srcdir}/build/modules/tidy.so ${pkgdir}/usr/lib/${_realpkg}/modules/tidy.so
 }
 
 package_php81-xsl() {
-	pkgdesc='xsl module for PHP'
-	depends=("${pkgbase}" 'libxslt')
+    pkgdesc='xsl module for PHP'
+    depends=("${pkgbase}" 'libxslt')
+
+    install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/usr/lib/${_realpkg}/modules/xsl.so
+}
+else
+
+
+
 
-	install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/usr/lib/${_realpkg}/modules/xsl.so
+package_php81-cgi-el() {
+    pkgdesc='CGI and FCGI SAPI for PHP'
+    depends=("${pkgbase}")
+
+    cd ${srcdir}/build
+    make -j1 INSTALL_ROOT=${pkgdir} install-cgi
+}
+
+package_php81-apache-el() {
+    pkgdesc='Apache SAPI for PHP'
+    depends=("${pkgbase}" 'apache' 'libnsl')
+    backup=("etc/httpd/conf/extra/${_realpkg}_module.conf")
+
+    install -D -m755 ${srcdir}/build-apache/libs/libphp.so ${pkgdir}/usr/lib/httpd/modules/lib${_realpkg}.so
+    install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/${_realpkg}_module.conf
+}
+
+package_php81-fpm-el() {
+    pkgdesc='FastCGI Process Manager for PHP'
+    depends=("${pkgbase}" 'systemd')
+    backup=("etc/${_realpkg}/php-fpm.conf" "etc/${_realpkg}/php-fpm.d/www.conf")
+    options=('!emptydirs')
+
+    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
+}
+
+package_php81-embed-el() {
+    pkgdesc='Embedded PHP SAPI library'
+    depends=("${pkgbase}" 'systemd-libs' 'libnsl')
+    options=('!emptydirs')
+
+    cd ${srcdir}/build
+    make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
+    mv ${pkgdir}/usr/lib/libphp.so ${pkgdir}/usr/lib/libphp-${_phpbase}.so
 }
+
+package_php81-phpdbg-el() {
+    pkgdesc='Interactive PHP debugger'
+    depends=("${pkgbase}")
+    options=('!emptydirs')
+
+    cd ${srcdir}/build-phpdbg
+    make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
+}
+
+package_php81-dblib-el() {
+    pkgdesc='dblib module for PHP'
+    depends=("${pkgbase}" 'freetds')
+
+    install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/usr/lib/${_realpkg}/modules/pdo_dblib.so
+}
+
+package_php81-enchant-el() {
+    pkgdesc='enchant module for PHP'
+    depends=("${pkgbase}" 'enchant')
+
+    install -D -m755 ${srcdir}/build/modules/enchant.so ${pkgdir}/usr/lib/${_realpkg}/modules/enchant.so
+}
+
+package_php81-gd-el() {
+    pkgdesc='gd module for PHP'
+    depends=("${pkgbase}" 'gd')
+
+    install -D -m755 ${srcdir}/build/modules/gd.so ${pkgdir}/usr/lib/${_realpkg}/modules/gd.so
+}
+
+package_php81-imap-el() {
+    pkgdesc='imap module for PHP'
+    depends=("${pkgbase}" 'c-client')
+
+    install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/usr/lib/${_realpkg}/modules/imap.so
+}
+
+package_php81-intl-el() {
+    pkgdesc='intl module for PHP'
+    depends=("${pkgbase}" 'icu')
+
+    install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/${_realpkg}/modules/intl.so
+}
+
+package_php81-sodium-el() {
+    pkgdesc='sodium module for PHP'
+    depends=("${pkgbase}" 'libsodium')
+
+    install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/${_realpkg}/modules/sodium.so
+}
+
+package_php81-odbc-el() {
+    pkgdesc='ODBC modules for PHP'
+    depends=("${pkgbase}" 'unixodbc')
+
+    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
+}
+
+package_php81-pgsql-el() {
+    pkgdesc='PostgreSQL modules for PHP'
+    depends=("${pkgbase}" 'postgresql-libs')
+
+    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
+}
+
+package_php81-pspell-el() {
+    pkgdesc='pspell module for PHP'
+    depends=("${pkgbase}" 'aspell')
+
+    install -D -m755 ${srcdir}/build/modules/pspell.so ${pkgdir}/usr/lib/${_realpkg}/modules/pspell.so
+}
+
+package_php81-snmp-el() {
+    pkgdesc='snmp module for PHP'
+    depends=("${pkgbase}" 'net-snmp')
+
+    install -D -m755 ${srcdir}/build/modules/snmp.so ${pkgdir}/usr/lib/${_realpkg}/modules/snmp.so
+}
+
+package_php81-sqlite-el() {
+    pkgdesc='sqlite module for PHP'
+    depends=("${pkgbase}" 'sqlite')
+
+    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
+}
+
+package_php81-tidy-el() {
+    pkgdesc='tidy module for PHP'
+    depends=("${pkgbase}" 'tidy')
+
+    install -D -m755 ${srcdir}/build/modules/tidy.so ${pkgdir}/usr/lib/${_realpkg}/modules/tidy.so
+}
+
+package_php81-xsl-el() {
+    pkgdesc='xsl module for PHP'
+    depends=("${pkgbase}" 'libxslt')
+
+    install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/usr/lib/${_realpkg}/modules/xsl.so
+}
+
+fi
 sha256sums=('a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc'
             '702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca'
-            'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
+            '52bdc4a5fae96e2aab1de707001414b6a5a9a17823e1e3a47f0f1e9a9788dc3e'
             '96e0b05a5ec72ee0f907d29fbb9612414d9dfebeee1249cbf2f2318bacf2d37c'
             'eb0c0aec5b5fb282df0bfefd4d5bbc229ee80a5c5da6760ecf52697a23cc7175'
             '6f73b6ac4b425ebc4505c7f75ca48763605b2c774c30bfa20072adcfbb1030cd')
diff --git a/apache.conf b/apache.conf
index b516b5e66ffa..1ff98e95061e 100644
--- a/apache.conf
+++ b/apache.conf
@@ -1,7 +1,7 @@
-# Required modules: dir_module, php7_module
+# Required modules: dir_module, php8_module
 
 <IfModule dir_module>
-	<IfModule php7_module>
+	<IfModule php8_module>
 		DirectoryIndex index.php index.html
 		<FilesMatch "\.php$">
 			SetHandler application/x-httpd-php