diff --git a/.SRCINFO b/.SRCINFO index 9630afa6c20fed9620005ed22ad9cef138b38ef6..6f2e6809e79754f2d7e9c47bfe558f3728e96537 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = php - pkgver = 8.2.12 + pkgver = 8.2.13 pkgrel = 1 url = https://www.php.net/ arch = x86_64 @@ -26,23 +26,25 @@ pkgbase = php makedepends = freetds makedepends = pcre2 makedepends = oniguruma - source = https://php.net/distributions/php-8.2.12.tar.xz - source = https://php.net/distributions/php-8.2.12.tar.xz.asc + source = https://php.net/distributions/php-8.2.13.tar.xz + source = https://php.net/distributions/php-8.2.13.tar.xz.asc source = apache.patch source = apache.conf source = php-fpm.patch source = php-fpm.tmpfiles source = php.ini.patch + source = libxml2.patch validpgpkeys = 1198C0117593497A5EC5C199286AF1F9897469DC validpgpkeys = 39B641343D8C104B2B146DC3F9C39DC0B9698544 validpgpkeys = E60913E4DF209907D8E30D96659A97C9CF2A795A - sha256sums = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132 + sha256sums = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b sha256sums = SKIP sha256sums = 702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca sha256sums = 4a2add00d93fa991ccdf6356090264c1059c79935642afff6e8d4a2107fa037e sha256sums = 78b8074461cdfc5d4e0ba428a8387f308d60720c8ad35c6176801e5088f02090 sha256sums = 640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5 sha256sums = 70cba88753160fe5e7fe8429ea5aa7a9f8327d7a069a8c846e3249bb88f854e1 + sha256sums = 5066d4d3f68df7fa3f46582c757d646056e85401699758ec721767236568ca08 pkgname = php pkgdesc = A general-purpose scripting language that is especially suited to web development @@ -53,7 +55,7 @@ pkgname = php depends = argon2 depends = oniguruma provides = php-interpreter=8.2 - provides = php-intl=8.2.12 + provides = php-intl=8.2.13 conflicts = php-intl replaces = php-intl backup = etc/php/php.ini diff --git a/PKGBUILD b/PKGBUILD index fca62f897f2c10108eb962dd60093a1e3570da08..0a9cc2ed622fc25b46fbe97818cbc0787282b7b8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,7 +18,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=8.2.12 +pkgver=8.2.13 pkgrel=1 arch=('x86_64') license=('PHP') @@ -28,14 +28,16 @@ makedepends=('apache' 'aspell' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' '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=('e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132' + 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch' + 'libxml2.patch') +sha256sums=('2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b' 'SKIP' '702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca' '4a2add00d93fa991ccdf6356090264c1059c79935642afff6e8d4a2107fa037e' '78b8074461cdfc5d4e0ba428a8387f308d60720c8ad35c6176801e5088f02090' '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5' - '70cba88753160fe5e7fe8429ea5aa7a9f8327d7a069a8c846e3249bb88f854e1') + '70cba88753160fe5e7fe8429ea5aa7a9f8327d7a069a8c846e3249bb88f854e1' + '5066d4d3f68df7fa3f46582c757d646056e85401699758ec721767236568ca08') validpgpkeys=('1198C0117593497A5EC5C199286AF1F9897469DC' '39B641343D8C104B2B146DC3F9C39DC0B9698544' 'E60913E4DF209907D8E30D96659A97C9CF2A795A') @@ -47,6 +49,7 @@ prepare() { patch -p0 -i "${srcdir}/apache.patch" patch -p0 -i "${srcdir}/php-fpm.patch" patch -p0 -i "${srcdir}/php.ini.patch" + patch -p1 -i "${srcdir}/libxml2.patch" autoconf # Disable failing tests diff --git a/libxml2.patch b/libxml2.patch new file mode 100644 index 0000000000000000000000000000000000000000..a3b20fb84b9ff622e860eec1714486f5f65d9931 --- /dev/null +++ b/libxml2.patch @@ -0,0 +1,20 @@ +--- a/ext/dom/document.c 2023-11-21 10:55:59.000000000 +0100 ++++ b/ext/dom/document.c 2023-11-21 15:40:35.000000000 +0100 +@@ -23,6 +23,7 @@ + #if defined(HAVE_LIBXML) && defined(HAVE_DOM) + #include "php_dom.h" + #include <libxml/SAX.h> ++#include <libxml/xmlsave.h> + #ifdef LIBXML_SCHEMAS_ENABLED + #include <libxml/relaxng.h> + #include <libxml/xmlschemas.h> +--- a/ext/libxml/php_libxml.h 2023-11-21 10:55:59.000000000 +0100 ++++ b/ext/libxml/php_libxml.h 2023-11-21 15:40:35.000000000 +0100 +@@ -35,6 +35,7 @@ + + #include "zend_smart_str.h" + #include <libxml/tree.h> ++#include <libxml/parser.h> + + #define LIBXML_SAVE_NOEMPTYTAG 1<<2 +