* update php to 8.4.3-1

This commit is contained in:
Alexander Baldeck 2025-02-04 19:33:31 +01:00
parent 92d638c2d1
commit 98c017ced0
7 changed files with 115 additions and 80 deletions

View File

@ -1,5 +1,5 @@
pkgbase = php
pkgver = 8.3.15
pkgver = 8.4.3
pkgrel = 1
url = https://www.php.net/
arch = x86_64
@ -10,7 +10,6 @@ pkgbase = php
license = PHP-3.01
checkdepends = procps-ng
makedepends = apache
makedepends = aspell
makedepends = enchant
makedepends = gd
makedepends = gmp
@ -19,6 +18,7 @@ pkgbase = php
makedepends = libxslt
makedepends = libzip
makedepends = net-snmp
makedepends = argon2
makedepends = postgresql-libs
makedepends = sqlite
makedepends = systemd
@ -31,23 +31,23 @@ pkgbase = php
makedepends = pcre2
makedepends = oniguruma
options = !lto
source = https://php.net/distributions/php-8.3.15.tar.xz
source = https://php.net/distributions/php-8.3.15.tar.xz.asc
source = https://php.net/distributions/php-8.4.3.tar.xz
source = https://php.net/distributions/php-8.4.3.tar.xz.asc
source = apache.patch
source = apache.conf
source = php-fpm.patch
source = php-fpm.tmpfiles
source = php.ini.patch
validpgpkeys = 1198C0117593497A5EC5C199286AF1F9897469DC
validpgpkeys = AFD8691FDAEDF03BDF6E460563F15A9B715376CA
validpgpkeys = C28D937575603EB4ABB725861C0779DC5C0A9DE4
sha256sums = 3df5d45637283f759eef8fc3ce03de829ded3e200c3da278936a684955d2f94f
validpgpkeys = 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6
validpgpkeys = 0616E93D95AF471243E26761770426E17EBBB3DD
sha256sums = 5c42173cbde7d0add8249c2e8a0c19ae271f41d8c47d67d72bdf91a88dcc7e4b
sha256sums = SKIP
sha256sums = 702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca
sha256sums = 74d33ad3e9fa2f0aaf6ceeddd59ec78d35e66673db74b1053cc3e6105478ba8a
sha256sums = 4a2add00d93fa991ccdf6356090264c1059c79935642afff6e8d4a2107fa037e
sha256sums = 78b8074461cdfc5d4e0ba428a8387f308d60720c8ad35c6176801e5088f02090
sha256sums = 640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5
sha256sums = bf1de5ae6014f0593dacca2c046eb5a2d7c179733859854713b6813ebc629b08
sha256sums = 52a045005f8b241b54f447c22b5d573f3e994481cfc21c2fc111c4a38df55430
pkgname = php
pkgdesc = A general-purpose scripting language that is especially suited to web development
@ -57,8 +57,8 @@ pkgname = php
depends = pcre2
depends = argon2
depends = oniguruma
provides = php-interpreter=8.3
provides = php-intl=8.3.15
provides = php-interpreter=8.4
provides = php-intl=8.4.3
conflicts = php-intl
replaces = php-intl
backup = etc/php/php.ini
@ -66,20 +66,20 @@ pkgname = php
pkgname = php-cgi
pkgdesc = CGI and FCGI SAPI for PHP
depends = php
provides = php-cgi-interpreter=8.3
provides = php-cgi-interpreter=8.4
pkgname = php-apache
pkgdesc = Apache SAPI for PHP
depends = php
depends = apache
provides = php-apache-interpreter=8.3
provides = php-apache-interpreter=8.4
backup = etc/httpd/conf/extra/php_module.conf
pkgname = php-fpm
pkgdesc = FastCGI Process Manager for PHP
depends = php
depends = systemd
provides = php-fpm-interpreter=8.3
provides = php-fpm-interpreter=8.4
options = !emptydirs
backup = etc/php/php-fpm.conf
backup = etc/php/php-fpm.d/www.conf
@ -87,78 +87,71 @@ pkgname = php-fpm
pkgname = php-embed
pkgdesc = Embedded PHP SAPI library
depends = php
depends = systemd-libs
provides = php-embed-interpreter=8.3
provides = php-embed-interpreter=8.4
options = !emptydirs
pkgname = php-phpdbg
pkgdesc = Interactive PHP debugger
depends = php
provides = php-phpdbg-interpreter=8.3
provides = php-phpdbg-interpreter=8.4
options = !emptydirs
pkgname = php-dblib
pkgdesc = dblib module for PHP
depends = php
depends = freetds
provides = php-dblib-interpreter=8.3
provides = php-dblib-interpreter=8.4
pkgname = php-enchant
pkgdesc = enchant module for PHP
depends = php
depends = enchant
provides = php-enchant-interpreter=8.3
provides = php-enchant-interpreter=8.4
pkgname = php-gd
pkgdesc = gd module for PHP
depends = php
depends = gd
provides = php-gd-interpreter=8.3
provides = php-gd-interpreter=8.4
pkgname = php-sodium
pkgdesc = sodium module for PHP
depends = php
depends = libsodium
provides = php-sodium-interpreter=8.3
provides = php-sodium-interpreter=8.4
pkgname = php-odbc
pkgdesc = ODBC modules for PHP
depends = php
depends = unixodbc
provides = php-odbc-interpreter=8.3
provides = php-odbc-interpreter=8.4
pkgname = php-pgsql
pkgdesc = PostgreSQL modules for PHP
depends = php
depends = postgresql-libs
provides = php-pgsql-interpreter=8.3
pkgname = php-pspell
pkgdesc = pspell module for PHP
depends = php
depends = aspell
provides = php-pspell-interpreter=8.3
provides = php-pgsql-interpreter=8.4
pkgname = php-snmp
pkgdesc = snmp module for PHP
depends = php
depends = net-snmp
provides = php-snmp-interpreter=8.3
provides = php-snmp-interpreter=8.4
pkgname = php-sqlite
pkgdesc = sqlite module for PHP
depends = php
depends = sqlite
provides = php-sqlite-interpreter=8.3
provides = php-sqlite-interpreter=8.4
pkgname = php-tidy
pkgdesc = tidy module for PHP
depends = php
depends = tidy
provides = php-tidy-interpreter=8.3
provides = php-tidy-interpreter=8.4
pkgname = php-xsl
pkgdesc = xsl module for PHP
depends = php
depends = libxslt
provides = php-xsl-interpreter=8.3
provides = php-xsl-interpreter=8.4

View File

@ -14,32 +14,31 @@ pkgname=('php'
'php-sodium'
'php-odbc'
'php-pgsql'
'php-pspell'
'php-snmp'
'php-sqlite'
'php-tidy'
'php-xsl')
pkgver=8.3.15
pkgver=8.4.3
pkgrel=1
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
license=('PHP-3.01')
url='https://www.php.net/'
makedepends=('apache' 'aspell' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
makedepends=('apache' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp' 'argon2'
'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2'
'oniguruma')
checkdepends=('procps-ng')
source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch')
sha256sums=('3df5d45637283f759eef8fc3ce03de829ded3e200c3da278936a684955d2f94f'
sha256sums=('5c42173cbde7d0add8249c2e8a0c19ae271f41d8c47d67d72bdf91a88dcc7e4b'
'SKIP'
'702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca'
'74d33ad3e9fa2f0aaf6ceeddd59ec78d35e66673db74b1053cc3e6105478ba8a'
'4a2add00d93fa991ccdf6356090264c1059c79935642afff6e8d4a2107fa037e'
'78b8074461cdfc5d4e0ba428a8387f308d60720c8ad35c6176801e5088f02090'
'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
'bf1de5ae6014f0593dacca2c046eb5a2d7c179733859854713b6813ebc629b08')
validpgpkeys=('1198C0117593497A5EC5C199286AF1F9897469DC'
'AFD8691FDAEDF03BDF6E460563F15A9B715376CA'
'C28D937575603EB4ABB725861C0779DC5C0A9DE4')
'52a045005f8b241b54f447c22b5d573f3e994481cfc21c2fc111c4a38df55430')
validpgpkeys=('AFD8691FDAEDF03BDF6E460563F15A9B715376CA'
'9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6'
'0616E93D95AF471243E26761770426E17EBBB3DD')
_interpreter=${pkgver%.*}
# LTO is incompatible with global registers and results in reduced performance:
# https://gitlab.archlinux.org/archlinux/packaging/packages/php/-/merge_requests/3
@ -98,13 +97,13 @@ build() {
--with-gettext=shared \
--with-gmp=shared \
--with-iconv=shared \
--with-kerberos \
--with-ldap=shared \
--with-ldap-sasl \
--with-mhash \
--with-mysql-sock=/run/mysqld/mysqld.sock \
--with-mysqli=shared \
--with-openssl \
--with-openssl-argon2 \
--with-password-argon2 \
--with-pdo-dblib=shared,/usr \
--with-pdo-mysql=shared \
@ -112,7 +111,6 @@ build() {
--with-pdo-pgsql=shared \
--with-pdo-sqlite=shared \
--with-pgsql=shared \
--with-pspell=shared \
--with-readline \
--with-snmp=shared \
--with-sodium=shared \
@ -191,9 +189,7 @@ package_php() {
# remove static modules
rm -f "${pkgdir}/usr/lib/php/modules/"*.a
# remove modules provided by sub packages
rm -f "${pkgdir}/usr/lib/php/modules/"{enchant,gd,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"
rm -f "${pkgdir}/usr/lib/php/modules/"{enchant,gd,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
}
package_php-cgi() {
@ -230,7 +226,7 @@ package_php-fpm() {
package_php-embed() {
pkgdesc='Embedded PHP SAPI library'
depends=('php' 'systemd-libs')
depends=('php')
provides=("php-embed-interpreter=${_interpreter}")
options=('!emptydirs')
@ -298,14 +294,6 @@ package_php-pgsql() {
install -D -m755 "${srcdir}/build/modules/pdo_pgsql.so" "${pkgdir}/usr/lib/php/modules/pdo_pgsql.so"
}
package_php-pspell() {
pkgdesc='pspell module for PHP'
depends=('php' 'aspell')
provides=("php-pspell-interpreter=${_interpreter}")
install -D -m755 "${srcdir}/build/modules/pspell.so" "${pkgdir}/usr/lib/php/modules/pspell.so"
}
package_php-snmp() {
pkgdesc='snmp module for PHP'
depends=('php' 'net-snmp')

View File

@ -1,10 +1,11 @@
--- sapi/apache2handler/config.m4.orig
+++ sapi/apache2handler/config.m4
@@ -114,7 +114,6 @@
PHP_BUILD_THREAD_SAFE
fi
else
- APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'`
if test -n "$APACHE_THREADED_MPM"; then
PHP_BUILD_THREAD_SAFE
fi
@@ -122,7 +122,7 @@
AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [
APACHE_THREADED_MPM=yes
- enable_zts=yes
+ enable_zts=no
], [APACHE_THREADED_MPM=no])
AC_CONFIG_COMMANDS([apache2handler], [AS_VAR_IF([enable_zts], [yes],,

View File

@ -6,7 +6,7 @@ makepkg -o --nodeps --noprepare --skipinteg
pushd "src/${pkgbase}-${pkgver}"
sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4
sed -E 's/(enable_zts=)yes/\1no/g' -i.orig sapi/apache2handler/config.m4
sed 's/.conf.default/.conf/g' -i.orig sapi/fpm/Makefile.frag
@ -53,7 +53,6 @@ availableExtensions=(
pdo_pgsql
pdo_sqlite
pgsql
pspell
shmop
snmp
soap

View File

@ -0,0 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
uiQPA0QDZA==
=67ZA
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -0,0 +1,13 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mDMEZiANXBYJKwYBBAHaRw8BAQdARP8nnoCEXdWhbte9/J1LeQZVMQ3vPM7ADToq
ZGNvXDe0JkNhbHZpbiBCdWNrbGV5IChQSFApIDxjYWx2aW5iQHBocC5uZXQ+iJME
ExYKADsWIQSdf5mgy48FyKaVjWJWqXr3YAo5pgUCZiANXAIbAwULCQgHAgIiAgYV
CgkICwIEFgIDAQIeBwIXgAAKCRBWqXr3YAo5ppvGAP9TWg8OSAuIZqsBwxd62k01
YbG08JClqfB8/aPeoEqPcQEA++VwjC5BppelKywM6CtYtxR0tM+zt3OjjKlN400A
wga4OARmIA1cEgorBgEEAZdVAQUBAQdA+SOq91v3irC1wiZR9kesStsulsJ+liFC
01oLuT9OhwEDAQgHiHgEGBYKACAWIQSdf5mgy48FyKaVjWJWqXr3YAo5pgUCZiAN
XAIbDAAKCRBWqXr3YAo5pkbYAP9oqokC5fA5yWPdi3fXGEl4K66tkebIOa5Pbm23
Hng4PwEAplx8F6SVD7tfszojqJDf5W4w4q0F0wknPSCLjCuldAQ=
=anm6
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,6 +1,6 @@
--- php.ini-production.orig
+++ php.ini-production
@@ -775,7 +775,7 @@
@@ -761,7 +761,7 @@
; Directory in which the loadable extensions (modules) reside.
; https://php.net/extension-dir
@ -9,7 +9,7 @@
; On windows:
;extension_dir = "ext"
@@ -923,57 +923,43 @@
@@ -909,48 +909,42 @@
; deprecated in a future PHP major version. So, when it is possible, please
; move to the new ('extension=<ext>) syntax.
;
@ -21,12 +21,6 @@
-;
+;extension=bcmath
;extension=bz2
-
-; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used
-; otherwise it results in segfault when unloading after using SASL.
-; See https://github.com/php/php-src/issues/8620 for more info.
-;extension=ldap
-
-;extension=curl
+;extension=calendar
+extension=curl
@ -41,25 +35,20 @@
;extension=gmp
+;extension=iconv
;extension=intl
-;extension=imap
;extension=ldap
-;extension=mbstring
-;extension=exif ; Must be after mbstring as it depends on it
+;extension=ldap
;extension=mysqli
-;extension=oci8_12c ; Use with Oracle Database 12c Instant Client
-;extension=oci8_19 ; Use with Oracle Database 19 Instant Client
;extension=odbc
-;extension=openssl
-;extension=pdo_firebird
+;zend_extension=opcache
+;extension=pdo_dblib
;extension=pdo_mysql
-;extension=pdo_oci
;extension=pdo_odbc
;extension=pdo_pgsql
;extension=pdo_sqlite
;extension=pgsql
+;extension=pspell
;extension=shmop
-
-; The MIBS data available in the PHP distribution must be installed.