applied libxml patch

3 files changed, 40 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e31f3ca0b864..30c7c96366a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 6.0.2
-# Wed Feb 22 15:34:55 UTC 2023
+# Thu Nov 23 15:33:16 UTC 2023
 pkgbase = php70
 	pkgdesc = PHP 7.0.33 compiled as to not conflict with mainline php
 	pkgver = 7.0.33
@@ -69,6 +69,7 @@ pkgbase = php70
 	source = php-makefile-patcher.php
 	source = php-apache.conf
 	source = https://php.net/distributions/php-7.0.33.tar.xz
+	source = php-libxml.patch
 	source = php55-phar-names.patch
 	source = openssl-sslv3-consts.patch
 	source = fpm-numeric-uid-gid.patch
@@ -88,6 +89,7 @@ pkgbase = php70
 	sha256sums = ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52
 	sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
 	sha256sums = ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96
+	sha256sums = e757f84d2d72ea39259450c32f3a83c72262da4294152ae3e9fbc0cada622bba
 	sha256sums = 70e3cc00d954fa2b466a0e8f356c68bbb1e92b36304deaffd34c53cb6ae5e979
 	sha256sums = aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6
 	sha256sums = d175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242
diff --git a/PKGBUILD b/PKGBUILD
index fc9587317257..74251bd5c265 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 ###############################################################################
 # Generated by arch-phpbs: https://github.com/lamskoy/arch-phpbs
 #
-# Maintaining/co-maintaining on AUR: php81 php80 php74 php73 php72 php71 php70 php55 php54 php53
+# Maintaining/co-maintaining on AUR: all packages from php53 up to php82
 #
 # Thanks to:
 #
@@ -9,9 +9,12 @@
 # AUR php70 and php71 Co-maintainer: William Gathoye <william@gathoye.be>
 # AUR php74 Co-maintainer: Tomasz Gruszka <tompear79@gmail.com>
 # AUR php73 Co-maintainer: Matt Harrison <matt@harrison.us.com>
-# AUR php73 Contirubutor: Pierre Schmitz <pierre@archlinux.de>
-# AUR php55 Original maintainer: Raphaël Doursenaud <rdoursenaud@gmail.com>
-# AUR php53 Original maintainer: Felix Yan <felixonmars@archlinux.org>
+# AUR php73 and php56 Contributor: Pierre Schmitz <pierre@archlinux.de>
+# AUR php56 Contributor:  Chris Severance aur.severach aATt spamgourmet dott com
+# AUR php56 Contributor:  Thore Bödecker <me@foxxx0.de>
+# AUR php56 Contributor:  Jörg Schuck <joerg_schuck [at] web.de>
+# AUR php55 Contributor: Raphaël Doursenaud <rdoursenaud@gmail.com>
+# AUR php53 Contriburor: Felix Yan <felixonmars@archlinux.org>
 ###############################################################################
 _phpbase="70"
 _suffix=""
@@ -133,6 +136,7 @@ source=(
     "php-makefile-patcher.php"
     "php-apache.conf"
     "https://php.net/distributions/php-${pkgver}.tar.xz"
+    "php-libxml.patch"
     "php55-phar-names.patch"
     "openssl-sslv3-consts.patch"
     "fpm-numeric-uid-gid.patch"
@@ -209,6 +213,7 @@ makedepends=(
 arch=(
 )
 _patches=(
+    "php-libxml.patch"
     "php55-phar-names.patch"
     "openssl-sslv3-consts.patch"
     "fpm-numeric-uid-gid.patch"
@@ -523,6 +528,8 @@ _build_sapi() {
 # BUILD them all
 ################################################################################
 build() {
+    export CFLAGS="${CFLAGS} -fPIC"
+    export CXXFLAGS="${CXXFLAGS} -fPIC"
     export EXTENSION_DIR="/usr/lib/${pkgbase}/modules"
     if ((_build_openssl_v10_patch)); then
         export PHP_OPENSSL_DIR="/usr/lib/openssl-1.0"
@@ -687,6 +694,8 @@ build() {
 }
 
 check() {
+    export CFLAGS="${CFLAGS} -fPIC"
+    export CXXFLAGS="${CXXFLAGS} -fPIC"
     pushd "build-cli"
     # Check if sendmail was configured correctly (FS#47600)
     export REPORT_EXIT_STATUS=1
@@ -1548,6 +1557,7 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             'ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52'
             '6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
             'ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96'
+            'e757f84d2d72ea39259450c32f3a83c72262da4294152ae3e9fbc0cada622bba'
             '70e3cc00d954fa2b466a0e8f356c68bbb1e92b36304deaffd34c53cb6ae5e979'
             'aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6'
             'd175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242'
diff --git a/php-libxml.patch b/php-libxml.patch
new file mode 100644
index 000000000000..7a9c2fe20bdf
--- /dev/null
+++ b/php-libxml.patch
@@ -0,0 +1,23 @@
+diff --git a/ext/dom/document.c b/ext/dom/document.c
+index 64da4f051b..3c71f03ba3 100644
+--- a/ext/dom/document.c
++++ b/ext/dom/document.c
+@@ -26,6 +26,7 @@
+ #ifdef LIBXML_SCHEMAS_ENABLED
+ #include <libxml/relaxng.h>
+ #include <libxml/xmlschemas.h>
++#include <libxml/xmlsave.h>
+ #endif
+ 
+ typedef struct _idsIterator idsIterator;
+diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
+index af1cc7d6ac..b484568bb1 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