diff --git a/.SRCINFO b/.SRCINFO index 490a9d263871042426d5450320a3b20f525ef90f..afaeedb8551d20e9b7c57b03578a9cff9dee5e08 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = php - pkgver = 8.2.13 - pkgrel = 2 + pkgver = 8.2.14 + pkgrel = 1 url = https://www.php.net/ arch = x86_64 license = PHP @@ -26,25 +26,23 @@ pkgbase = php makedepends = freetds makedepends = pcre2 makedepends = oniguruma - source = https://php.net/distributions/php-8.2.13.tar.xz - source = https://php.net/distributions/php-8.2.13.tar.xz.asc + source = https://php.net/distributions/php-8.2.14.tar.xz + source = https://php.net/distributions/php-8.2.14.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 = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b + sha256sums = 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583 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 @@ -55,7 +53,7 @@ pkgname = php depends = argon2 depends = oniguruma provides = php-interpreter=8.2 - provides = php-intl=8.2.13 + provides = php-intl=8.2.14 conflicts = php-intl replaces = php-intl backup = etc/php/php.ini diff --git a/PKGBUILD b/PKGBUILD index dd60957db71ab1fe869bd80ecceaf19bb13a3f6c..8e369d4fc41ca40a67ca4fceae608d59d35143d6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,8 +18,8 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=8.2.13 -pkgrel=2 +pkgver=8.2.14 +pkgrel=1 arch=('x86_64') license=('PHP') url='https://www.php.net/' @@ -28,16 +28,14 @@ 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' - 'libxml2.patch') -sha256sums=('2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b' + 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch') +sha256sums=('763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583' 'SKIP' '702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca' '4a2add00d93fa991ccdf6356090264c1059c79935642afff6e8d4a2107fa037e' '78b8074461cdfc5d4e0ba428a8387f308d60720c8ad35c6176801e5088f02090' '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5' - '70cba88753160fe5e7fe8429ea5aa7a9f8327d7a069a8c846e3249bb88f854e1' - '5066d4d3f68df7fa3f46582c757d646056e85401699758ec721767236568ca08') + '70cba88753160fe5e7fe8429ea5aa7a9f8327d7a069a8c846e3249bb88f854e1') validpgpkeys=('1198C0117593497A5EC5C199286AF1F9897469DC' '39B641343D8C104B2B146DC3F9C39DC0B9698544' 'E60913E4DF209907D8E30D96659A97C9CF2A795A') @@ -49,7 +47,6 @@ 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 deleted file mode 100644 index a3b20fb84b9ff622e860eec1714486f5f65d9931..0000000000000000000000000000000000000000 --- a/libxml2.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 -