diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 7355bb7f9..360973d86 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -23,26 +23,26 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=8.0.14 +pkgver=8.1.2 pkgrel=1 arch=('x86_64') license=('PHP') url='https://www.php.net/' -makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp' +makedepends=('apache' 'aspell' 'c-client' 'db' 'gdbm' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp' 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl' '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=('fbde8247ac200e4de73449d9fefc8b495d323b5be9c10cdb645fb431c91156e3' +sha256sums=('6b448242fd360c1a9f265b7263abf3da25d28f2b2b0f5465533b69be51a391dd' 'SKIP' '702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca' '4a2add00d93fa991ccdf6356090264c1059c79935642afff6e8d4a2107fa037e' - '2228131cc65139bd819b617bba06c2406e559c55fbfb38a29f9853ce48c58eeb' + 'aa55fa4fc5c2b2493065bbd00cfe3c97a1b22b3dc7d34f8fd303de18cafe844f' '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5' - 'b538a7c974adde626c35481e4a66d506dc12c598f369dfe79f3fcb9585d8b920') -validpgpkeys=('1729F83938DA44E27BA0F4D3DBDB397470D12172' - 'BFDDD28642824F8118EF77909B67A5C12229118F') + 'b3b3385f1c36e272671c7db238b2a69896e11a82db90dafd74964f2eabbfa2f2') +validpgpkeys=('F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD' + '39B641343D8C104B2B146DC3F9C39DC0B9698544') prepare() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -70,6 +70,7 @@ build() { --with-config-file-scan-dir=/etc/php/conf.d \ --disable-rpath \ --mandir=/usr/share/man \ + --disable-gcc-global-regs \ " local _phpextensions="\ @@ -180,7 +181,7 @@ check() { package_php() { pkgdesc='A general-purpose scripting language that is especially suited to web development' - depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma') + depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma' 'db' 'gdbm') replaces=('php-ldap') conflicts=('php-ldap') provides=("php-ldap=${pkgver}") diff --git a/extra/php/php-fpm.patch b/extra/php/php-fpm.patch index 4aa71ce18..b62fff115 100644 --- a/extra/php/php-fpm.patch +++ b/extra/php/php-fpm.patch @@ -52,7 +52,7 @@ ;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. -@@ -387,7 +387,7 @@ +@@ -395,7 +395,7 @@ ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch index 7918d5bf1..5c60b6e59 100644 --- a/extra/php/php.ini.patch +++ b/extra/php/php.ini.patch @@ -1,15 +1,15 @@ --- php.ini-production.orig +++ php.ini-production -@@ -765,7 +765,7 @@ +@@ -760,7 +760,7 @@ ; Directory in which the loadable extensions (modules) reside. - ; http://php.net/extension-dir + ; https://php.net/extension-dir -;extension_dir = "./" +extension_dir = "/usr/lib/php/modules/" ; On windows: ;extension_dir = "ext" -@@ -913,51 +913,44 @@ +@@ -908,51 +908,44 @@ ; deprecated in a future PHP major version. So, when it is possible, please ; move to the new ('extension=) syntax. ; @@ -58,7 +58,7 @@ ;extension=shmop - -; The MIBS data available in the PHP distribution must be installed. --; See http://www.php.net/manual/en/snmp.installation.php +-; See https://www.php.net/manual/en/snmp.installation.php ;extension=snmp - ;extension=soap