Merge branch 'bump/php744' into 'master'

Bump PHP to 7.4.4

See merge request adelie/packages!423

1 files changed, 217 insertions, 220 deletions

diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD
index a8ef4976e..581104a84 100644
--- a/user/php7/APKBUILD
+++ b/user/php7/APKBUILD
@@ -8,10 +8,10 @@
 # ----------+---------+------------------------+---------
 # bcmath    | LGPL2   | ext/bcmath/libbcmath   | used
 # date      | MIT     | ext/date/lib           | used
-# gd        | BSD     | ext/gd/libgd           | used
+# gd        | BSD     | ext/gd/libgd           | not used
 # file      | BSD     | ext/fileinfo/libmagic  | used
 # libmbfl   | LGPLv2  | ext/mbstring/libmbfl   | used
-# oniguruma | BSD     | ext/mbstring/oniguruma | used
+# oniguruma | BSD     | ext/mbstring/oniguruma | not used
 # pcre      | BSD     | ext/pcre/pcrelib       | not used
 # sqlite3   | Public  | ext/sqlite3/libsqlite  | not used
 # libzip    | BSD     | ext/zip/lib            | not used
@@ -25,63 +25,68 @@
 
 pkgname=php7
 _pkgname=php
-pkgver=7.2.21
+pkgver=7.4.4
 pkgrel=0
-_apiver=20170718
+_apiver=20190902
+_zendver=20190902
+_pdover=20170320
 pkgdesc="The PHP7 language runtime engine"
 url="https://php.net/"
 arch="all"
 license="PHP-3.01 AND Zend-2.0 AND Custom:TSRM AND LGPL-2.1+ AND MIT AND Beerware AND Public-Domain AND BSD-3-Clause AND Apache-1.0 AND PostgreSQL AND BSD-2-Clause AND Zlib AND BSD-4-Clause"
 depends=""
 depends_dev="$pkgname=$pkgver-r$pkgrel autoconf icu-dev libedit-dev libxml2-dev
-	pcre-dev zlib-dev"
+	pcre2-dev zlib-dev"
 makedepends="autoconf
 	apache-httpd-dev
 	aspell-dev
+	automake
 	bison
 	bzip2-dev
+	cmd:which
 	curl-dev
 	db-dev
 	enchant-dev
 	freetds-dev
-	freetype-dev
 	gdbm-dev
 	gettext-tiny
 	gmp-dev
 	icu-dev
 	krb5-dev
 	libedit-dev
+	libgd-dev
 	libical-dev
-	libjpeg-turbo-dev
-	libpng-dev
 	openssl-dev
-	libwebp-dev
 	libxml2-dev
-	libxpm-dev
 	libxslt-dev
 	libzip-dev
 	net-snmp-dev
+	oniguruma-dev
 	openldap-dev
-	pcre-dev
+	pcre2-dev
 	postgresql-dev
 	re2c
 	sqlite-dev
 	unixodbc-dev
-	zlib-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-apache $pkgname-phpdbg
-	$pkgname-embed $pkgname-litespeed $pkgname-cgi $pkgname-fpm
+	zlib-dev
+	"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-phpdbg
+	$pkgname-embed $pkgname-cgi $pkgname-fpm $pkgname-apache
 	$pkgname-pear::noarch $pkgname-dbg"
 source="https://www.php.net/distributions/$_pkgname-$pkgver.tar.bz2
 	$_pkgname-fpm.initd
 	$_pkgname-fpm.logrotate
 	$_pkgname-module.conf
 	disabled-tests.list
-	install-pear.patch
+	enchant-2.patch
 	fpm-paths.patch
-	allow-build-recode-and-imap-together.patch
-	fix-tests-devserver.patch
-	pwbuflen.patch
-	enchant-2.patch"
+	getsockopt.patch
+	install-pear.patch
+	no-max-ent-size.patch
+	test-fixes.patch
+	zend_bool.patch
+	zip-glob-pathc.patch
+	"
 builddir="$srcdir/$_pkgname-$pkgver"
 _libdir="/usr/lib/$_pkgname"
 _extension_dir="$_libdir/modules"
@@ -105,137 +110,133 @@ _extension_confd="/etc/$_pkgname/conf.d"
 #   7.2.21-r0:
 #     - CVE-2019-11041
 #     - CVE-2019-11042
-
-# Usage: add_ext [with|enable] name [extension dependencies...] [configure options...]
-add_ext() {
-	local ext="$1"
+#   7.4.4-r0:
+#     - CVE-2019-11043
+#     - CVE-2019-11045
+#     - CVE-2019-11046
+#     - CVE-2019-11047
+#     - CVE-2019-11050
+#     - CVE-2019-13224
+#     - CVE-2020-7059
+#     - CVE-2020-7060
+#     - CVE-2020-7062
+#     - CVE-2020-7063
+#     - CVE-2020-7064
+#     - CVE-2020-7066
+
+# Usage: _add_ext [with|enable] name [extension dependencies...] [configure options...]
+_add_ext() {
+	_ext="$1"
 	shift
-	# add_ext [with|enable] name -> --[with|enable]-name=shared
-	if [ "$ext" = "with" ] || [ "$ext" = "enable" ]; then
-		_configure_ext_opts="$_configure_ext_opts --$ext-$1=shared"
-		ext="$1"
+	# _add_ext [with|enable] name -> --[with|enable]-name=shared
+	case "$_ext" in
+	with|enable)
+		_configure_ext_opts="$_configure_ext_opts --$_ext-$1=shared"
+		_ext="$1"
 		shift
-	fi
+		;;
+	esac
 
-	case "$ext" in
-		phar) subpackages="$subpackages $pkgname-$ext:$ext";;
-		*) subpackages="$subpackages $pkgname-$ext:_extension";;
+	case "$_ext" in
+	phar) subpackages="$subpackages $pkgname-$_ext:$_ext";;
+	*) subpackages="$subpackages $pkgname-$_ext:_extension";;
 	esac
-	_extensions="$_extensions $ext"
+	_extensions="$_extensions $_ext"
 
-	local opt
-	local prev
-	for opt in $@; do
-		case "$opt" in
+	for _opt; do
+		case "$_opt" in
 		-*)
 			# Add more configure options
-			_configure_ext_opts="$_configure_ext_opts $opt"
+			_configure_ext_opts="$_configure_ext_opts $_opt"
 			;;
 		license:*)
 			# Add custom license
-			opt="$(printf '%s' "${opt#license:}" | sed 's/:/ AND /g')"
-			eval "_licenses_$ext='$opt'"
+			_opt="$(printf '%s' "${_opt#license:}" | sed 's/:/ AND /g')"
+			eval "_licenses_$_ext='$_opt'"
 			;;
 		*)
 			# Add dependencies
-			prev="$(eval echo \$_deps_$ext)"
-			eval "_deps_$ext='$prev $opt'"
+			eval "_deps_$_ext=\"\$_deps_$_ext $_opt\""
 			;;
-	esac
+		esac
 	done
 }
-enable_ext() { add_ext enable $@; }
-with_ext() { add_ext with $@; }
+_enable_ext() { _add_ext enable "$@"; }
+_with_ext() { _add_ext with "$@"; }
 
-enable_ext 'bcmath' \
+_enable_ext bcmath \
 	license:LGPL-2.0+:PHP-3.01
-with_ext 'bz2'
-enable_ext 'calendar'
-enable_ext 'ctype'
-with_ext 'curl'
-enable_ext 'dba' \
+_with_ext bz2
+_enable_ext calendar
+_enable_ext ctype
+_with_ext curl
+_enable_ext dba \
 	--with-db4 \
 	--with-dbmaker=shared \
 	--with-gdbm
-enable_ext 'dom'
-with_ext 'enchant'
-enable_ext 'exif' mbstring
-enable_ext 'fileinfo' \
+_enable_ext dom
+_with_ext enchant
+_enable_ext exif mbstring
+_enable_ext fileinfo \
 	license:PHP-3.0:BSD-2-Clause:BSD-3-Clause:Public-Domain
-enable_ext 'ftp'
-with_ext 'gd' \
-	--with-freetype-dir=/usr \
-	--disable-gd-jis-conv \
-	--with-jpeg-dir=/usr \
-	--with-png-dir=/usr \
-	--with-webp-dir=/usr \
-	--with-xpm-dir=/usr
-with_ext 'gettext'
-with_ext 'gmp'
-with_ext 'iconv'
-# Needs makedepeneds=imap-dev
-#with_ext 'imap' \
-#	--with-imap-ssl
-enable_ext 'intl'
-enable_ext 'json'
-with_ext 'ldap' \
+_enable_ext ftp
+_enable_ext gd \
+	--with-external-gd
+_with_ext gettext
+_with_ext gmp
+_with_ext iconv
+_enable_ext intl
+_enable_ext json
+_with_ext ldap \
 	--with-ldap-sasl
-enable_ext 'mbstring' \
+_enable_ext mbstring \
 	license:PHP-3.01:OLDAP-2.8:BSD-2-Clause:Public-Domain:LGPL-2.0-only:LGPL-2.1-only
-add_ext 'mysqli' mysqlnd openssl \
+_add_ext mysqli mysqlnd openssl \
 	--with-mysqli=shared,mysqlnd \
 	--with-mysql-sock=/run/mysqld/mysqld.sock
-enable_ext 'mysqlnd' openssl
-add_ext 'odbc' \
+_enable_ext mysqlnd openssl
+_add_ext odbc \
 	--with-unixODBC=shared,/usr
-enable_ext 'opcache'
-with_ext 'openssl' \
+_enable_ext opcache
+_with_ext openssl \
 	--with-system-ciphers \
 	--with-kerberos
-enable_ext 'pcntl'
-enable_ext 'pdo'
-add_ext 'pdo_dblib' pdo \
+_enable_ext pcntl
+_enable_ext pdo
+_add_ext pdo_dblib pdo \
 	--with-pdo-dblib=shared
-add_ext 'pdo_mysql' pdo mysqlnd \
+_add_ext pdo_mysql pdo mysqlnd \
 	--with-pdo-mysql=shared,mysqlnd
-add_ext 'pdo_odbc' pdo \
+_add_ext pdo_odbc pdo \
 	license:PHP-3.0 \
 	--with-pdo-odbc=shared,unixODBC,/usr
-add_ext 'pdo_pgsql' pdo \
+_add_ext pdo_pgsql pdo \
 	--with-pdo-pgsql=shared
-add_ext 'pdo_sqlite' pdo \
+_add_ext pdo_sqlite pdo \
 	--with-pdo-sqlite=shared,/usr
-with_ext 'pgsql'
-enable_ext 'phar'
-enable_ext 'posix'
-with_ext 'pspell'
-# Needs makedepends=recode-dev
-#with_ext 'recode'
-enable_ext 'session'
-enable_ext 'shmop'
-enable_ext 'simplexml'
-with_ext 'snmp'
-enable_ext 'soap' \
+_with_ext pgsql
+_enable_ext phar
+_enable_ext posix
+_with_ext pspell
+_enable_ext session
+_enable_ext shmop
+_enable_ext simplexml
+_with_ext snmp
+_enable_ext soap \
 	license:PHP-3.01:PHP-2.02
-# Needs makedepends=libsodium-dev
-#with_ext 'sodium'
-enable_ext 'sockets'
-add_ext 'sqlite3' \
+_enable_ext sockets
+_add_ext sqlite3 \
 	--with-sqlite3=shared,/usr
-enable_ext 'sysvmsg'
-enable_ext 'sysvsem'
-enable_ext 'sysvshm'
-# Needs makedepends=tidyhtml-dev
-#with_ext 'tidy'
-enable_ext 'tokenizer'
-enable_ext 'wddx' xml
-enable_ext 'xml'
-enable_ext 'xmlreader' dom
-with_ext 'xmlrpc' xml
-enable_ext 'xmlwriter'
-with_ext 'xsl' dom
-enable_ext 'zip' \
-	--with-libzip=/usr
+_enable_ext sysvmsg
+_enable_ext sysvsem
+_enable_ext sysvshm
+_enable_ext tokenizer
+_enable_ext xml
+_enable_ext xmlreader dom
+_with_ext xmlrpc xml
+_enable_ext xmlwriter
+_with_ext xsl dom
+_with_ext zip
 
 # secfixes:
 #   7.2.5-r0:
@@ -248,13 +249,23 @@ enable_ext 'zip' \
 
 prepare() {
 	default_prepare
-	update_config_sub
 
-	local vapi="$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h)"
-	if [ "$vapi" != "$_apiver" ]; then
-		error "Upstreram API version is now $vapi. Expecting $_apiver"
-		error "After updating _apiver, all 3rd-party extensions must be rebuilt."
-		return 1
+	_vapi="$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h)"
+	if [ "$_vapi" != "$_apiver" ]; then
+		error "Upstream API version $_vapi != $_apiver"
+		die "All third-party extensions must be rebuilt"
+	fi
+
+	_zapi="$(sed -n '/#define ZEND_MODULE_API_NO/{s/^[^0-9]*//;p;}' Zend/zend_modules.h)"
+	if [ "$_zapi" != "$_zendver" ]; then
+		error "Upstream Zend API version $_zapi != $_zendver"
+		die "All third-party extensions must be rebuilt"
+	fi
+
+	_papi="$(sed -n '/#define PDO_DRIVER_API/{s/.*[	]//;p}' ext/pdo/php_pdo_driver.h)"
+	if [ "$_papi" != "$_pdover" ]; then
+		error "Upstream PDO API version $_papi != $_pdover"
+		die "All third-party extensions must be rebuilt"
 	fi
 
 	# https://bugs.php.net/63362 - Not needed but installed headers.
@@ -271,21 +282,17 @@ prepare() {
 	# Fix some bogus permissions.
 	find . -name '*.[ch]' -exec chmod 644 {} +
 
-	# XXX: Delete failing tests.
-	sed -n '/^[^#]/p' "$srcdir/disabled-tests.list" | while read item; do
-		rm $item
+	# XXX: Disable failing tests.
+	sed -n '/^[^#]/p' "$srcdir/disabled-tests.list" | while read _test; do
+		mv "$_test" "${_test}d"
 	done
 
 	autoconf
 }
 
-# Notes:
-# * gd-jis-conv breaks any non-latin font rendering (vakartel).
-# * libxml cannot be build as shared.
-# * Doesn't work with system-provided onigurama, some tests fail (invalid code
-#   point); probably because bundled onigurama is version 5.x, but we have 6.x.
 _build() {
-	EXTENSION_DIR=$_extension_dir PCRE_INCDIR="/usr/include" ./configure \
+	# libxml cannot be build as shared.
+	EXTENSION_DIR="$_extension_dir" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -301,56 +308,61 @@ _build() {
 		--with-config-file-path=/etc/$_pkgname \
 		--with-config-file-scan-dir=$_extension_confd \
 		--disable-short-tags \
-		--with-icu-dir=/usr \
 		--with-libedit \
 		--without-readline \
-		--enable-libxml \
-			--with-libxml-dir=/usr \
-		--with-pcre-regex=/ \
+		--with-external-pcre \
 		--with-zlib \
 			--with-zlib-dir=/usr \
 		$_configure_ext_opts \
-		$@
+		"$@"
 
 	make
 }
 
 build() {
-	# phpdbg
-	_build --enable-phpdbg \
-		--enable-phpdbg-webhelper \
-		--disable-cgi \
-		--disable-cli
+	export CFLAGS="$CFLAGS -fno-strict-aliasing -Wno-pointer-sign"
 
 	# apache-httpd module
-	_build --disable-phpdbg \
+	_build --disable-fpm \
+		--disable-embed \
+		--disable-phpdbg \
 		--disable-cgi \
 		--disable-cli \
 		--with-apxs2
 	mv libs/libphp7.so sapi/apache2handler/mod_php.so
 
-	# cgi, cli, fpm, embed, litespeed
-	_build --disable-phpdbg \
-		--enable-fpm \
-		--enable-embed \
-		--with-litespeed
+	_build --enable-fpm=yes \
+		--enable-embed=yes \
+		--enable-phpdbg=yes \
+		--enable-phpdbg-webhelper=yes
 }
 
 check() {
 	# PHP is so stupid that it's not able to resolve dependencies
 	# between extensions and load them in correct order, so we must
 	# help it...
-	# opcache is Zend extension, it's handled specially in Makefile
-	local php_modules="$(_extensions_by_load_order \
-		| grep -vx opcache \
-		| xargs -n 1 printf "'$builddir/modules/%s.la' ")"
-	sed -i "/^PHP_TEST_SHARED_EXTENSIONS/,/extension=/ \
-		s|in \$(PHP_MODULES)\"*|in $php_modules|" Makefile
+	#
+	# * opcache is Zend extension, it's handled specially in Makefile
+	# * skip pdo_dblib since it slowly tries to connect to nonexistent
+	# * ditto snmp
+
+	cat > php-check.ini <<-EOF
+	extension_dir=$builddir/modules
+	$(_extensions_by_load_order \
+		| grep -vxe opcache -e pdo_dblib -e snmp \
+		| sed -e 's/^/extension=/' -e 's/$/.so/')
+	EOF
+
+	# Note: We use the combination of PHPRC=... and
+	# PHP_MODULES=(nothing) so we can set the module load order
+	# correctly. Cf. test-fixes.patch
 
 	NO_INTERACTION=1 REPORT_EXIT_STATUS=1 \
 		SKIP_SLOW_TESTS=1 SKIP_ONLINE_TESTS=1 TEST_TIMEOUT=10 \
+		TEST_PHP_ARGS="-j$JOBS -W test.log" \
 		TZ= LANG= LC_ALL= \
-		make test
+		PHPRC="$builddir"/php-check.ini \
+		make test PHP_MODULES=
 
 	echo 'NOTE: We have skipped quite a lot tests, see disabled-tests.list.'
 }
@@ -376,14 +388,13 @@ doc() {
 	cd "$builddir"
 
 	mkdir -p "$subpkgdir/usr/share/doc/$_pkgname"
-	cp CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS \
-		README* UPGRADING* \
+	cp EXTENSIONS LICENSE NEWS README* UPGRADING* \
 		"$subpkgdir/usr/share/doc/$_pkgname/"
 }
 
 apache() {
 	pkgdesc="PHP7 Module for apache-httpd"
-	depends="$pkgname apache-httpd"
+	depends="$pkgname=$pkgver-r$pkgrel apache-httpd"
 
 	install -D -m 755 "$builddir"/sapi/apache2handler/mod_php.so \
 		"$subpkgdir"/usr/libexec/apache2/mod_php.so
@@ -393,37 +404,26 @@ apache() {
 
 phpdbg() {
 	pkgdesc="Interactive PHP7 debugger"
-	#depends="$pkgname" ?
 
-	install -Dm755 "$builddir"/sapi/phpdbg/phpdbg \
-		"$subpkgdir"/usr/bin/phpdbg
+	_mv "$pkgdir"/usr/bin/phpdbg "$subpkgdir"/usr/bin/
 }
 
 embed() {
 	pkgdesc="PHP7 Embedded Library"
-	#depends="$pkgname" ?
 
 	_mv "$pkgdir"/usr/lib/libphp*.so "$subpkgdir"/usr/lib/
 }
 
-litespeed() {
-	pkgdesc="PHP7 LiteSpeed SAPI"
-	#depends="$pkgname" ?
-
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/lsphp "$subpkgdir"/usr/bin
-}
-
 cgi() {
 	pkgdesc="PHP7 Common Gateway Interface"
-	depends="$pkgname"
+	depends="$pkgname=$pkgver-r$pkgrel"
 
 	_mv "$pkgdir"/usr/bin/php-cgi "$subpkgdir"/usr/bin/
 }
 
 fpm() {
 	pkgdesc="PHP7 FastCGI Process Manager"
-	depends="$pkgname"
+	depends="$pkgname=$pkgver-r$pkgrel"
 	cd "$pkgdir"
 
 	_mv var "$subpkgdir"/
@@ -431,9 +431,9 @@ fpm() {
 	_mv usr/sbin "$subpkgdir"/usr/
 	_mv etc/$_pkgname/php-fpm* "$subpkgdir"/etc/$_pkgname/
 
-	local file; for file in php-fpm.conf php-fpm.d/www.conf; do
-		mv "$subpkgdir"/etc/$_pkgname/$file.default \
-			"$subpkgdir"/etc/$_pkgname/$file
+	for _file in php-fpm.conf php-fpm.d/www.conf; do
+		mv "$subpkgdir/etc/$_pkgname/$_file.default" \
+			"$subpkgdir/etc/$_pkgname/$_file"
 	done
 
 	install -D -m 755 "$srcdir"/$_pkgname-fpm.initd \
@@ -447,7 +447,7 @@ fpm() {
 
 pear() {
 	pkgdesc="PHP7 Extension and Application Repository"
-	depends="$pkgname $pkgname-xml"
+	depends="$pkgname=$pkgver-r$pkgrel $pkgname-xml=$pkgver-r$pkgrel"
 	cd "$pkgdir"
 
 	# pecl needs xml extension and since we build it as shared, it must be
@@ -455,8 +455,8 @@ pear() {
 	sed -i 's/\$INCARG/& -d extension=xml.so/' usr/bin/pecl
 
 	mkdir -p "$subpkgdir"/usr/bin
-	local file; for file in pecl pear peardev; do
-		mv usr/bin/$file "$subpkgdir"/usr/bin/$file
+	for _file in pecl pear peardev; do
+		mv "usr/bin/$_file" "$subpkgdir/usr/bin/$_file"
 	done
 
 	_mv etc/php/pear.conf "$subpkgdir"/etc/php/
@@ -475,73 +475,70 @@ phar() {
 }
 
 _extension() {
-	local ext="${subpkgname#$pkgname-}"
-	local extdesc="$(head -n1 "$builddir"/ext/$ext/CREDITS 2>/dev/null ||:)"
-	depends="$pkgname"
-	local dep; for dep in $(eval echo \$_deps_$ext); do
-		depends="$depends $pkgname-$dep"
+	_ext="${subpkgname#$pkgname-}"
+
+	depends="$pkgname=$pkgver-r$pkgrel"
+	for _dep in $(eval echo \$_deps_$_ext); do
+		depends="$depends $pkgname-$_dep=$pkgver-r$pkgrel"
 	done
-	pkgdesc="PHP7 extension: ${extdesc:-$ext}"
-	if [ -n "$(eval echo \$_licenses_$ext)" ]; then
-		license="$(eval echo \$_licenses_$ext)"
-	fi
 
-	local load_order=$(_extension_load_order "$ext")
+	pkgdesc="$(head -n1 "$builddir/_ext/$_ext/CREDITS" 2>/dev/null ||:)"
+	pkgdesc="PHP7 extension: ${pkgdesc:-$_ext}"
 
-	# extension prefix
-	local prefix=
-	[ "$ext" = "opcache" ] && prefix="zend_"
+	if [ -n "$(eval echo \$_licenses_$_ext)" ]; then
+		license="$(eval echo \$_licenses_$_ext)"
+	fi
 
-	_mv "$pkgdir"/$_extension_dir/$ext.so \
-		"$subpkgdir"/$_extension_dir/
+	_mv "$pkgdir/$_extension_dir/$_ext.so" \
+		"$subpkgdir/$_extension_dir/"
 
-	mkdir -p "$subpkgdir"/$_extension_confd
-	echo "${prefix}extension=$ext.so" \
-		> "$subpkgdir"/$_extension_confd/$(printf %02d $load_order)_$ext.ini
+	_load_order="$(printf %02d "$(_extension_load_order "$_ext")")"
+	case "$_ext" in
+	opcache) _prefix=zend_;;
+	*) _prefix=;;
+	esac
+	mkdir -p "$subpkgdir/$_extension_confd"
+	cat > "$subpkgdir/$_extension_confd/${_load_order}_$_ext.ini" <<-EOF
+		${_prefix}extension=$_ext.so
+	EOF
 }
 
 # Prints a load order (0-based integer) for the given extension name. Extension
 # with lower load order should be loaded before exts with higher load order.
-# It's based on number of dependencies of the extension (with exception for
-# "imap"), which is flawed, but simple and good enough for now.
+# It's based on number of dependencies of the extension which is flawed,
+# but simple and good enough for now.
 _extension_load_order() {
-	local ext="$1"
-	local deps="$(eval echo \$_deps_$ext)"
-
-	case "$ext" in
-		# This must be loaded after recode, even though it does
-		# not depend on it.
-		imap) echo 1;;
-		# depends=$pkgname
-		phar) echo 1;;
-		*) echo "$deps" | wc -w;;
+	_ext="$1"
+	case "$_ext" in
+	# depends=$pkgname
+	phar) echo 1;;
+	*) echo "$(eval echo \$_deps_$_ext)" | wc -w;;
 	esac
 }
 
 # Prints $_extensions sorted by load order and name.
 _extensions_by_load_order() {
-	local deps list ext
-
-	for ext in $_extensions; do
-		list="$list $(_extension_load_order $ext);$ext"
-	done
-	printf '%s\n' $list | sort -t ';' -k 1 | sed -E 's/\d+;//'
+	for _ext in $_extensions; do
+		printf '%s\n' "$(_extension_load_order $_ext);$_ext"
+	done | sort -t ';' -k 1 | sed -E 's/[0-9]+;//'
 }
 
 _mv() {
-	local dest; for dest; do true; done  # get last argument
-	mkdir -p "$dest"
-	mv $@
+	for _dest; do true; done  # get last argument
+	mkdir -p "$_dest"
+	mv "$@"
 }
 
-sha512sums="b234305f04bd621d355450ba38b34558a5b08403571749ac3b04ffa60d7639e847750109bef09a14f616110ba175b970d68cbae0d0b671c2dfeac6917f12f21d  php-7.2.21.tar.bz2
+sha512sums="5676023858ffbef4997c2ed99ce1689de2b56d09a0925b8fc6527d56e7f6031b380e433e417e44f84196e713d84c16b33212ed6d116b5c347d1d60586288c248  php-7.4.4.tar.bz2
 cb3ba48fbd412f12d98ef1f88b509b40bc4ca44a16779a06d43e4db3cb8d24d54404b9e11ca941b5339af8d3281ca9c8ea3ba5ced4339f91fb40608b5ce9a647  php-fpm.initd
 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb  php-fpm.logrotate
 a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48  php-module.conf
-b1008eabc86fcff88336fe2961e3229c159c930a05d97359136c381c5c1cc572a33110308a3e5ef5e31c60327f76c9ef02b375cd2ea8ff9caa7deeddc216f4ce  disabled-tests.list
-f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505  install-pear.patch
+587057aaf93feec2936e2851dbb42ba78310fc012e340d90c58a8912437a8b6a15585895490c31ac31cf36969ea1f2999993c5ca42031c378f31fb83d361fd73  disabled-tests.list
+2fb8e1dce0e71a968c53869b01369bb681e4e043e87d342cd96cb7c09e8c2ca0aad9752d8e0781de54488bee54717ba0de5ef9eba28f16cd7e6b914e03c53bc6  enchant-2.patch
 a77dd3bdf9dc7a0f2c06ff3e7c425d062bbaa29902c17402ce98701dc99499be863ad543aa5e6a7d1c249702d6afb193398dd3199ae58e42b32b95d434fb1883  fpm-paths.patch
-f8ecae241a90cbc3e98aa4deb3d5d35ef555f51380e29f4e182a8060dffeb84be74f030a14c6b452668471030d78964f52795ca74275db05543ccad20ef1f2cc  allow-build-recode-and-imap-together.patch
-f8bb322e56df79dd9f391737fb8737945cc730b14c7dc2ae8688979c565a9b97f5f2a12c9fcd0d8124624a9d09bd10228147d9e999bb94909bbe249f0a50646c  fix-tests-devserver.patch
-8e538063d872f6770a57cdb844226a771ccda3d387dd1f199bb08c274b94fbe12ec0ef6df75c32071f308cb8f4ab51b91b520c7c2ed687adf96d0d322788e463  pwbuflen.patch
-03de56676449ddc1ba1fc9c4fee2b2ed620cd1a8ce52d288c91b42e081182871ade55c8dbbe1c8286bc4eadcd92d497a62ac7b689ea8d6b1bcb5eb25225595c4  enchant-2.patch"
+821bf6fde83302e7613429a61066e2bd3ca4e998dcb7c11e39f4ae84829056537501b47a051e1feba752f72d98644b9a214633db9ccb16d137d3242d145acfe0  getsockopt.patch
+951fa8445c20513aa48bf7c7d773c6b4012322e7e7592c13d965758e761b9898c484f0dbc5ae565c05787e6ab868769c97c71504624b10c9570e1d4214f75b10  install-pear.patch
+5fd358dfd660901c8ffdaffe0bce398ab020f8c1beb89e26ba1b21646212fe132927d52ae088220d0b9c53017cfc67f4c9b88f7602df61d36eba5768ce94e355  no-max-ent-size.patch
+9160e5c6b8bf2d87299f38421caf498519eb42243118570754a5764b5e682c546309548e76df6163df49e841ff51fb07e50fadeed1687da5d73dec1810c393ee  test-fixes.patch
+0cd6b8739533511c0d1edcb1ecff4d8d21a6b51d21f77c382645cf31d1645eeb2ebd80e2720557ceefa58f538385e097402bdc50e613dc7699bd8f033aefa543  zend_bool.patch
+1b22dfa547bd1e14e065966f5268adda771c4ad039b83acee30772cd95f0f0b1a320d75fc6ab71a0bc6ca5ce04d58d9f410767c4fae4d5e16537393c78439f21  zip-glob-pathc.patch"