From abc097747ffb50f3bd57e81c006b587064632a53 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 24 Nov 2023 01:00:25 +0000 Subject: [PATCH] extra/php-legacy to 8.1.26-1 --- extra/php-legacy/.SRCINFO | 12 +++++++----- extra/php-legacy/PKGBUILD | 21 +++++++++------------ extra/php-legacy/libxml2.patch | 20 ++++++++++++++++++++ 3 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 extra/php-legacy/libxml2.patch diff --git a/extra/php-legacy/.SRCINFO b/extra/php-legacy/.SRCINFO index d3d2eada5..6197c90d7 100644 --- a/extra/php-legacy/.SRCINFO +++ b/extra/php-legacy/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = php-legacy - pkgver = 8.1.25 + pkgver = 8.1.26 pkgrel = 1 url = https://www.php.net/ arch = x86_64 @@ -29,18 +29,19 @@ pkgbase = php-legacy makedepends = libnsl makedepends = oniguruma makedepends = patchelf - source = https://php.net/distributions/php-8.1.25.tar.xz - source = https://php.net/distributions/php-8.1.25.tar.xz.asc + source = https://php.net/distributions/php-8.1.26.tar.xz + source = https://php.net/distributions/php-8.1.26.tar.xz.asc source = apache.conf source = php-fpm.tmpfiles source = apache.patch source = php-fpm.patch source = php.ini.patch source = php-legacy.patch + source = libxml2.patch validpgpkeys = F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD validpgpkeys = 39B641343D8C104B2B146DC3F9C39DC0B9698544 validpgpkeys = 2C16C765DBE54A088130F1BC4B9B5F600B55F3B4 - sha256sums = 66fdba064aa119b1463a7969571d42f4642690275d8605ab5149bcc5107e2484 + sha256sums = 17f87133596449327451ad4b8d9911bfaea59ff5109f3a6f2bb679f967a8ea0f sha256sums = SKIP sha256sums = 2173046ac22ac50c7a6721306d3f79b2086f66a7a6ff5d8af249a474763197a1 sha256sums = f3236ca866095d5e42e51e3fa600082ccd0afcfb7f1aecbeb286ef9d4f0dd564 @@ -48,6 +49,7 @@ pkgbase = php-legacy sha256sums = 7322cc296780908b55fe6d601d403b0e506a2a7ce5359141cb4132f84778243d sha256sums = 99a8bea56335941a645efce4a22917b7147b070686f34b9f3e56d8c238d785fa sha256sums = a1859005c9fad835079470e6fb3c0721b9bd024c8f3ae1f34cb082ec41c63194 + sha256sums = 5066d4d3f68df7fa3f46582c757d646056e85401699758ec721767236568ca08 pkgname = php-legacy pkgdesc = A general-purpose scripting language that is especially suited to web development @@ -59,7 +61,7 @@ pkgname = php-legacy depends = oniguruma depends = gdbm provides = php-interpreter=8.1 - provides = php-legacy-intl=8.1.25 + provides = php-legacy-intl=8.1.26 conflicts = php-legacy-intl replaces = php-legacy-intl backup = etc/php-legacy/php.ini diff --git a/extra/php-legacy/PKGBUILD b/extra/php-legacy/PKGBUILD index b4acb2318..b46b05361 100644 --- a/extra/php-legacy/PKGBUILD +++ b/extra/php-legacy/PKGBUILD @@ -21,7 +21,7 @@ pkgname=('php-legacy' 'php-legacy-sqlite' 'php-legacy-tidy' 'php-legacy-xsl') -pkgver=8.1.25 +pkgver=8.1.26 pkgrel=1 arch=('x86_64') license=('PHP') @@ -30,23 +30,19 @@ makedepends=('apache' 'aspell' 'gdbm' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'li 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl' 'oniguruma' 'patchelf') checkdepends=('procps-ng') -source=( - "https://php.net/distributions/php-${pkgver}.tar.xz"{,.asc} - 'apache.conf' - 'php-fpm.tmpfiles' - 'apache.patch' - 'php-fpm.patch' - 'php.ini.patch' - 'php-legacy.patch' -) -sha256sums=('66fdba064aa119b1463a7969571d42f4642690275d8605ab5149bcc5107e2484' +source=("https://php.net/distributions/php-${pkgver}.tar.xz"{,.asc} + 'apache.conf' 'php-fpm.tmpfiles' 'apache.patch' 'php-fpm.patch' 'php.ini.patch' 'php-legacy.patch' + 'libxml2.patch') + +sha256sums=('17f87133596449327451ad4b8d9911bfaea59ff5109f3a6f2bb679f967a8ea0f' 'SKIP' '2173046ac22ac50c7a6721306d3f79b2086f66a7a6ff5d8af249a474763197a1' 'f3236ca866095d5e42e51e3fa600082ccd0afcfb7f1aecbeb286ef9d4f0dd564' '702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca' '7322cc296780908b55fe6d601d403b0e506a2a7ce5359141cb4132f84778243d' '99a8bea56335941a645efce4a22917b7147b070686f34b9f3e56d8c238d785fa' - 'a1859005c9fad835079470e6fb3c0721b9bd024c8f3ae1f34cb082ec41c63194') + 'a1859005c9fad835079470e6fb3c0721b9bd024c8f3ae1f34cb082ec41c63194' + '5066d4d3f68df7fa3f46582c757d646056e85401699758ec721767236568ca08') validpgpkeys=('F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD' '39B641343D8C104B2B146DC3F9C39DC0B9698544' '2C16C765DBE54A088130F1BC4B9B5F600B55F3B4') @@ -59,6 +55,7 @@ prepare() { patch -p0 -i "${srcdir}/php-fpm.patch" patch -p0 -i "${srcdir}/php.ini.patch" patch -p0 -i "${srcdir}/php-legacy.patch" + patch -p1 -i "${srcdir}/libxml2.patch" autoconf # Disable failing tests diff --git a/extra/php-legacy/libxml2.patch b/extra/php-legacy/libxml2.patch new file mode 100644 index 000000000..a3b20fb84 --- /dev/null +++ b/extra/php-legacy/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 ++#include + #ifdef LIBXML_SCHEMAS_ENABLED + #include + #include +--- 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 ++#include + + #define LIBXML_SAVE_NOEMPTYTAG 1<<2 +