1
0
forked from ports/opt

php: update to 8.2.13

This commit is contained in:
Juergen Daubert 2023-11-24 11:44:11 +01:00
parent 0685eefc1e
commit 1d7381c722
28 changed files with 274 additions and 52 deletions

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/TitFYBI/KHhLTsO7JGR5hxrUaODs1UnES9TwYAnzJe2Aljl2C+i2ajMUMnfve+vciZXt3DNqcKXQ8nWbNR9ygc=
SHA256 (Pkgfile) = b4cd3eb1fb0bf483d1ca949a6049b4978e62c41de343755d3e154d53fafd732a
RWSE3ohX2g5d/X0PAXjD5XguAbFL2rq/aLjYyyGP0YGFYaanlEPK2PT6xfILiUyWmAyOVFwbwV/GObT+NP9K3RnahomI0Zg42wc=
SHA256 (Pkgfile) = d51b4180d03624d057be042760342a97b10c8d60cb28b99cbdb91c42a59aebd2
SHA256 (.footprint) = 7fa4482315662d626464b194385ae557ec401ff110bea6d24f6f48efc315ceba
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b
SHA256 (libxml2-2.12.patch) = ccbd0a55805ee931de45933e45514f6cb7c478ebf0d3213f702bb39715e8c36a

View File

@ -4,13 +4,16 @@
# Depends on: apache libpcre2
name=mod_php
version=8.2.12
version=8.2.13
release=1
source=(https://php.net/distributions/php-$version.tar.xz)
source=(https://php.net/distributions/php-$version.tar.xz
libxml2-2.12.patch)
build() {
cd php-$version
patch -p1 -i $SRC/libxml2-2.12.patch
# to be compatible with our other php ports, don't build
# for a threaded MPM (ZTS). Use only the prefork MPM!
sed -i '/APACHE_THREADED_MPM=/d' configure

View File

@ -0,0 +1,52 @@
From 6a76e5d0a2dcf46b4ab74cc3ffcbfeb860c4fdb3 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Fri, 17 Nov 2023 19:45:40 +0100
Subject: [PATCH] Fix GH-12702: libxml2 2.12.0 issue building from src
Fixes GH-12702.
Co-authored-by: nono303 <github@nono303.net>
---
NEWS | 3 +++
ext/dom/document.c | 1 +
ext/libxml/php_libxml.h | 1 +
3 files changed, 5 insertions(+)
diff --git a/NEWS b/NEWS
index 8c2485d1a6549..60696c704feae 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ PHP NEWS
- Intl:
. Fixed bug GH-12635 (Test bug69398.phpt fails with ICU 74.1). (nielsdos)
+- LibXML:
+ . Fixed bug GH-12702 (libxml2 2.12.0 issue building from src). (nono303)
+
- PCRE:
. Fixed bug GH-12628 (The gh11374 test fails on Alpinelinux). (nielsdos)
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 59f00897a69aa..8312d6c59399f 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -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>
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index c0775a07f5dcc..a1011f0b17858 100644
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@ -35,6 +35,7 @@ extern zend_module_entry libxml_module_entry;
#include "zend_smart_str.h"
#include <libxml/tree.h>
+#include <libxml/parser.h>
#define LIBXML_SAVE_NOEMPTYTAG 1<<2

View File

@ -1,6 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/b9pxc2nxSr28L+GYgY8gfLPP+dk7rK1KtHKKzZu9yCsu9SzeXHb+Y+X1X5T+Oa+CWf98kO/k2oEYhheMHj52A4=
SHA256 (Pkgfile) = 829968f6a8144f420f02dcb1b9beb6684922efc96b4d476e19887809dd819a33
RWSE3ohX2g5d/TMntJH+dMWldbkth1XRqv2x7dmX2wmtqoHDEDeojw3CrUP3cptUEcK/Yg33N73eUB4HNV1VQRt4cawdxkEaMgg=
SHA256 (Pkgfile) = 68d851d9b5785bf7e387c711bef4e86b23cbe1e49d13f9945e89a8b180580abe
SHA256 (.footprint) = 073d817f449e60b58f4c904bd4ef54ddad9bd0ab946ee178956622bf76d5501b
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b
SHA256 (php-fcgi) = 058feaf2d8ad8ed61a4191512eb2151b8ed87fd92ce469ee8bab1812c0cb6471
SHA256 (libxml2-2.12.patch) = ccbd0a55805ee931de45933e45514f6cb7c478ebf0d3213f702bb39715e8c36a

View File

@ -4,14 +4,16 @@
# Depends on: libpcre2 libxml2
name=php-fcgi
version=8.2.12
version=8.2.13
release=1
source=(https://php.net/distributions/php-$version.tar.xz
php-fcgi)
php-fcgi libxml2-2.12.patch)
build() {
cd php-$version
patch -p1 -i $SRC/libxml2-2.12.patch
local PHP_CONFIG="
--prefix=/usr \
--with-config-file-path=/etc/php \

View File

@ -0,0 +1,52 @@
From 6a76e5d0a2dcf46b4ab74cc3ffcbfeb860c4fdb3 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Fri, 17 Nov 2023 19:45:40 +0100
Subject: [PATCH] Fix GH-12702: libxml2 2.12.0 issue building from src
Fixes GH-12702.
Co-authored-by: nono303 <github@nono303.net>
---
NEWS | 3 +++
ext/dom/document.c | 1 +
ext/libxml/php_libxml.h | 1 +
3 files changed, 5 insertions(+)
diff --git a/NEWS b/NEWS
index 8c2485d1a6549..60696c704feae 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ PHP NEWS
- Intl:
. Fixed bug GH-12635 (Test bug69398.phpt fails with ICU 74.1). (nielsdos)
+- LibXML:
+ . Fixed bug GH-12702 (libxml2 2.12.0 issue building from src). (nono303)
+
- PCRE:
. Fixed bug GH-12628 (The gh11374 test fails on Alpinelinux). (nielsdos)
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 59f00897a69aa..8312d6c59399f 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -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>
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index c0775a07f5dcc..a1011f0b17858 100644
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@ -35,6 +35,7 @@ extern zend_module_entry libxml_module_entry;
#include "zend_smart_str.h"
#include <libxml/tree.h>
+#include <libxml/parser.h>
#define LIBXML_SAVE_NOEMPTYTAG 1<<2

View File

@ -1,6 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/RIb8Q4QfnfJGr+x1F8Lf2iQhJYEDcB3zEncnUqHKvLXxYzhdev98WkrjfP/8D7hYTo+SSkaeq3RSF/gZYxeiwQ=
SHA256 (Pkgfile) = 1186cd79cb2d7effe53c8e8f1284080b59f32da730147a294dc7cef30b760a26
RWSE3ohX2g5d/c7c/jDqXA+xIPgXdwV+ajzDgDGvEIMsHiWrGFL3hPSXyYWprCV9QQbHM0vcgcWo8YwCBmBDXmDVfJglTJj8LQk=
SHA256 (Pkgfile) = a4725d2211301c9353298bf9c9b8019ec55174d53840eec2d2bd99ce643b6422
SHA256 (.footprint) = a26b7d8af42742c284dd40e96fb4c4d1ba451ac9bf4f714c8f12fb6975ffa5fe
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b
SHA256 (php-fpm) = 0dff1add3241de5ae058c3339d98c900b2a4082007dc3d93485cb46ca642dade
SHA256 (libxml2-2.12.patch) = ccbd0a55805ee931de45933e45514f6cb7c478ebf0d3213f702bb39715e8c36a

View File

@ -4,14 +4,16 @@
# Depends on: libpcre2 libxml2
name=php-fpm
version=8.2.12
version=8.2.13
release=1
source=(https://php.net/distributions/php-$version.tar.xz
php-fpm)
php-fpm libxml2-2.12.patch)
build() {
cd php-$version
patch -p1 -i $SRC/libxml2-2.12.patch
local PHP_CONFIG="
--prefix=/usr \
--sysconfdir=/etc/php \

View File

@ -0,0 +1,52 @@
From 6a76e5d0a2dcf46b4ab74cc3ffcbfeb860c4fdb3 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Fri, 17 Nov 2023 19:45:40 +0100
Subject: [PATCH] Fix GH-12702: libxml2 2.12.0 issue building from src
Fixes GH-12702.
Co-authored-by: nono303 <github@nono303.net>
---
NEWS | 3 +++
ext/dom/document.c | 1 +
ext/libxml/php_libxml.h | 1 +
3 files changed, 5 insertions(+)
diff --git a/NEWS b/NEWS
index 8c2485d1a6549..60696c704feae 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ PHP NEWS
- Intl:
. Fixed bug GH-12635 (Test bug69398.phpt fails with ICU 74.1). (nielsdos)
+- LibXML:
+ . Fixed bug GH-12702 (libxml2 2.12.0 issue building from src). (nono303)
+
- PCRE:
. Fixed bug GH-12628 (The gh11374 test fails on Alpinelinux). (nielsdos)
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 59f00897a69aa..8312d6c59399f 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -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>
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index c0775a07f5dcc..a1011f0b17858 100644
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@ -35,6 +35,7 @@ extern zend_module_entry libxml_module_entry;
#include "zend_smart_str.h"
#include <libxml/tree.h>
+#include <libxml/parser.h>
#define LIBXML_SAVE_NOEMPTYTAG 1<<2

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/Z/Gy+JgQeSkI2qrwUq3M/HQxoQxWcDkCt2DVRcShP0TwqBdCC5ZQqHeY2X/6YZcjkqD+HoDaeDvfpRjoEGUXgc=
SHA256 (Pkgfile) = 3ea0eef8fba2ad9b4ede61d2ad5e7e9ed8e9919f94905efea9f568cddbf13cac
RWSE3ohX2g5d/T5t5L2zEjx8A4L5nVpxH8krzdmTfnktmkcx1pBOotmVLAOonvIEAVXDWusI248uqtS1DCIDQ7GYKOr2YRE77Q4=
SHA256 (Pkgfile) = c09e2a7e30e67931dceb8a92dc68bf94d7ed09cc102c3759c01c0c691b3103c4
SHA256 (.footprint) = 4b6e9e791f10bb007a541c6a4cfe6a189d549592939bdf3e04c5bd0f25a4bfa0
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b

View File

@ -3,7 +3,7 @@
# Maintainer: Juergen Daubert, jue at crux dot nu
name=php-ftp
version=8.2.12
version=8.2.13
release=1
source=(https://www.php.net/distributions/php-$version.tar.xz)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/VWXjYyd+/ZKhKlDpuyWxiamlwpTduLDmPTcAkjatxPHVmjCrpgDJXBAMl59qDp78YzL/lnfMb7wp0NgJGw1kgE=
SHA256 (Pkgfile) = 2b409168de3ac60e436f497f3b0850f513b4acd69d48066a1647b7f357486377
RWSE3ohX2g5d/ezHt03RGKTLHpP/Kj7tiyXHtwKJ8TuOgXmr+TYf50lsaXCQRPaQJSRa6qUVbOV4K+HGGeoZ7JrRW6T2dwaoEA4=
SHA256 (Pkgfile) = 0e6a9ffcfdd3d27c11ae1443eca05f6f52dc7bc68cb7cb82d66d917d6a337738
SHA256 (.footprint) = 09e41333252c613bbc54155a95e91919aedf35e3fe90607f941528ac9f1a39bb
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b

View File

@ -4,7 +4,7 @@
# Depends on: libgd
name=php-gd
version=8.2.12
version=8.2.13
release=1
source=(https://www.php.net/distributions/php-$version.tar.xz)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/XrHEj+U6ct4KxRpZ8iq6qBiFL2wj32OhXUKps99gvMa1Qu2qoETzC6tsK9wreDiv9Uq8oluSOO1TPIV+NkJKAU=
SHA256 (Pkgfile) = 17865dfebb965ac24042a57aa64c83f9b501391cea4e9bab37e9585bcfd563e7
RWSE3ohX2g5d/VgTb1MEydzeRbINMfVPJFpNv+0vgDD7XEQ8w/dYcBM9ToizTqmySbM25/uFUTL4W0dyYH+U21iC5Zfe6+kJrA0=
SHA256 (Pkgfile) = 37473c080dc1ba709b7545b959ad943a64fab26674b2e0744f83b14e3b8c416b
SHA256 (.footprint) = f2188408bdd37cf12c2eb9ef545b934e6a10d8faf52d3b961cd6c7649bdfaf9a
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b

View File

@ -3,7 +3,7 @@
# Maintainer: Juergen Daubert, jue at crux dot nu
name=php-gettext
version=8.2.12
version=8.2.13
release=1
source=(https://www.php.net/distributions/php-$version.tar.xz)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/f5N53tLpMzt1QmdEIHjGXWi2lcxLqv9ggrpTdRNoLZQk1xuyiL0i0EvBk1y9VcyBN2R3Bd4bR1gs1LKRN8+IQc=
SHA256 (Pkgfile) = 964f1aa10f8a79105bf4522d0786a0c5db8edc2f6889fb5e367d2ac1bc3ca5b5
RWSE3ohX2g5d/bRevQQUuFHmwhG9qdqEcx4BXP7843aGhXyJMJFHAR2QSC7cX1K4hOnZpLLcw2kKEprmpxu9n1ccCkjpwg8PcAM=
SHA256 (Pkgfile) = 33f1061de076cbc667660d64d5a57fec3344bec40857b8d7acdef15529cd6eff
SHA256 (.footprint) = 4a444295762f936750fb32f977171aecc73d9347bf51bace13d7f9dfc200812e
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b

View File

@ -4,7 +4,7 @@
# Depends on: oniguruma libpcre2
name=php-mbstring
version=8.2.12
version=8.2.13
release=1
source=(https://www.php.net/distributions/php-$version.tar.xz)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/SiHRhrjgvH0jKYnLwTnXmSLpoVdEt/GZdV0arTq38lOmYOL7OMXfpHN8EwORtdSdgmed74dbDxPyNoBiLNwfwI=
SHA256 (Pkgfile) = dbab17a1687a1758562ac83d23ec3593d63447632952f3701e04142872f7664e
RWSE3ohX2g5d/btnYKi2v1sS5grFoJ+Bc80/ZytD4cp8iTX7gJYb9vRA85UJM5BXOsNR8kGrZI+tG3j0xEmQNmEkWQhERYNzoQY=
SHA256 (Pkgfile) = 24e7c93ca5c75b88b9e457462082241cbc9b97c8533c01588a073d26b3e2e4ec
SHA256 (.footprint) = 0500f66a60a1c3d5951694c22f29e7e34a6dbc8e5a1487119ff56db1ea7cdda3
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b

View File

@ -4,7 +4,7 @@
# Depends on: mariadb
name=php-mysql
version=8.2.12
version=8.2.13
release=1
source=(https://php.net/distributions/php-$version.tar.xz)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/RwvhZfEG+TdrztLUeur+H0w7E/APizZd3G7K8iTOL8wf60PQsPlCqSqyMXmXFqe3jZHL7DyOyUDKB4Z+UGaZgI=
SHA256 (Pkgfile) = 2a73605879f3c7447c2feb2264c30d857b06b11fdf2e5547823426aeac7099ae
RWSE3ohX2g5d/ZJ7uROdSEWMXqYTrWS0XUxlgFpm87UOCFvKGI7UG7JsGi69LMyABneclZ9Vj1cOSzJNmCrBVp5ZPAAkgRHLuwc=
SHA256 (Pkgfile) = 4c6c701314a6afa98b1688146f4410674fc9657bc1c324e7d9a4d509e469bc2a
SHA256 (.footprint) = 1a0e33807dcda8d11408be8b6356860cac8daea5a94d4e9a87e535fbf778f04e
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b

View File

@ -3,7 +3,7 @@
# Maintainer: Juergen Daubert, jue at crux dot nu
name=php-sockets
version=8.2.12
version=8.2.13
release=1
source=(https://www.php.net/distributions/php-$version.tar.xz)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/ax461xDpF1bH0y9aVYGmd3g1nSUEItqcKoGwhySdG36rAtMScscQSeYH8+JjJcBHAkFBGtiQoDOSpNq20hyJA8=
SHA256 (Pkgfile) = 54b9b1d5264df3d83b585299ea731b02df62a5abf8c859d93c67b3be1d8b3df3
RWSE3ohX2g5d/QWi92jwH+NG6g5pZZCtd3TYV5+OYShLqU4IM42XCvkBaII4Xkd6fruHjVE/q22vG29Vx2FKOa13odNns8Z8xgk=
SHA256 (Pkgfile) = 2c02c449dd6551fd596f9ce044bd9ccbce8db5988a0ed444c7008b6fec0d5ea1
SHA256 (.footprint) = e626528b1bc2b3ce187cc979172f24c489075e0bc584aeb1d082b2f7197d6e49
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b

View File

@ -4,7 +4,7 @@
# Depends on: sqlite3
name=php-sqlite3
version=8.2.12
version=8.2.13
release=1
source=(https://php.net/distributions/php-$version.tar.xz)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/Zj9EXEoxXhk1aY1gVL05LHfJHl/yGGksT7B2XhoLovl0a5+rmPC2vVHZMh74AZdPHxGXIg5oDq6POnlHj2vqQ8=
SHA256 (Pkgfile) = f94879842539a30584e5b48794f3148c41c46fd1a70d533bafef6f1267012ef7
RWSE3ohX2g5d/cS4Hp8DGzPR6RMyUmKBX89x3JPWXGrqotqRnNH/kZjQWSK4obl2FseetvLEfl0AXw+WDHYbg+neI38jKYhpRAg=
SHA256 (Pkgfile) = ed9a080aa81fc4539deaeea62fc35178448124c8efa5f9d14d7fd80cc4a90900
SHA256 (.footprint) = 0ba08044c2d47be4c86015de875a10f15dfee8367b932c5466a0212da28e4203
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b

View File

@ -4,7 +4,7 @@
# Depends on: libzip
name=php-zip
version=8.2.12
version=8.2.13
release=1
source=(https://www.php.net/distributions/php-$version.tar.xz)

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/b7jboy1/2DBgo7c9DxGvEGENJEkZxgaukULff2ttTwOeU0QNa3Fa31++dQeapY047eMps9S19QrdZ5HWFj6VQA=
SHA256 (Pkgfile) = abb8a58f5dcbad98b3aff2238435ad5f1842893669896de842f17e527223986a
RWSE3ohX2g5d/RpGMMLE9Po3MZbJr8oCZ11s8lqcXakY7/inZeprHgaYdF+nWRIxE7yYBHZM0AzeUe94vzztMYJMShUVMFLqUwI=
SHA256 (Pkgfile) = 9095b1e15401e723721df3da81c4cda513e0cdce8355bb2c3c72b7abf79d822d
SHA256 (.footprint) = b82a00569ce9feb88ad50fc062ec07b9d78d9a5bd9056da14dcdbf0eba5b1115
SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b
SHA256 (libxml2-2.12.patch) = ccbd0a55805ee931de45933e45514f6cb7c478ebf0d3213f702bb39715e8c36a

View File

@ -4,13 +4,16 @@
# Depends on: bzip2 libpcre2 libxml2 curl db gdbm
name=php
version=8.2.12
version=8.2.13
release=1
source=(https://php.net/distributions/php-$version.tar.xz)
source=(https://php.net/distributions/php-$version.tar.xz
libxml2-2.12.patch)
build() {
cd php-$version
patch -p1 -i $SRC/libxml2-2.12.patch
local PHP_CONFIG="
--prefix=/usr \
--mandir=/usr/share/man \

52
php/libxml2-2.12.patch Normal file
View File

@ -0,0 +1,52 @@
From 6a76e5d0a2dcf46b4ab74cc3ffcbfeb860c4fdb3 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Fri, 17 Nov 2023 19:45:40 +0100
Subject: [PATCH] Fix GH-12702: libxml2 2.12.0 issue building from src
Fixes GH-12702.
Co-authored-by: nono303 <github@nono303.net>
---
NEWS | 3 +++
ext/dom/document.c | 1 +
ext/libxml/php_libxml.h | 1 +
3 files changed, 5 insertions(+)
diff --git a/NEWS b/NEWS
index 8c2485d1a6549..60696c704feae 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ PHP NEWS
- Intl:
. Fixed bug GH-12635 (Test bug69398.phpt fails with ICU 74.1). (nielsdos)
+- LibXML:
+ . Fixed bug GH-12702 (libxml2 2.12.0 issue building from src). (nono303)
+
- PCRE:
. Fixed bug GH-12628 (The gh11374 test fails on Alpinelinux). (nielsdos)
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 59f00897a69aa..8312d6c59399f 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -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>
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index c0775a07f5dcc..a1011f0b17858 100644
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@ -35,6 +35,7 @@ extern zend_module_entry libxml_module_entry;
#include "zend_smart_str.h"
#include <libxml/tree.h>
+#include <libxml/parser.h>
#define LIBXML_SAVE_NOEMPTYTAG 1<<2