Added patches for autoconf and libxml

4 files changed, 65 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3dca3a1a69a..80eca167ab9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 6.0.2
-# Wed Feb 22 16:27:39 UTC 2023
+# Generated by makepkg 6.1.0
+# Wed Mar 27 14:52:48 UTC 2024
 pkgbase = php54
 	pkgdesc = PHP 5.4.45 compiled as to not conflict with mainline php
 	pkgver = 5.4.45
-	pkgrel = 8
+	pkgrel = 9
 	url = http://www.php.net
 	arch = x86_64
 	license = PHP
@@ -68,7 +68,9 @@ pkgbase = php54
 	source = php-apache.conf
 	source = https://php.net/distributions/php-5.4.45.tar.bz2
 	source = https://github.com/unicode-org/icu/releases/download/release-64-1/icu4c-64_1-src.tgz
+	source = php-libxml.patch
 	source = php54-phar-names.patch
+	source = php56-autoconf.patch
 	source = openssl-1.0.patch
 	source = openssl-sslv3.patch
 	source = openssl-sslv3-consts.patch
@@ -92,7 +94,9 @@ pkgbase = php54
 	sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
 	sha256sums = 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582
 	sha256sums = 92f1b7b9d51b396679c17f35a2112423361b8da3c1b9de00aa94fd768ae296e6
+	sha256sums = e757f84d2d72ea39259450c32f3a83c72262da4294152ae3e9fbc0cada622bba
 	sha256sums = 91dfb4bb0bf4503ac9302ffb103f239a9f5efcb2b4fcba965b27c11b850a8a29
+	sha256sums = 6393ea65ccf8bc4b3b1c06bf3f158473a223a11bb5eb7819155aac1b394e166e
 	sha256sums = 8a5e1a2a563c38f237b0ed735918ecf82c30edd3f7beae5d99be041585901d27
 	sha256sums = e49744c78d6413ab6e93e3786d70c2d1cbdbb62e5bcfdb85c05efcf16fecfb96
 	sha256sums = aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6
diff --git a/PKGBUILD b/PKGBUILD
index d9d24427240c..ee8b793cff90 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,14 +9,17 @@
 # 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="54"
 _suffix=""
 pkgver="5.4.45"
-pkgrel="8"
+pkgrel="9"
 pkgbase="php54"
 pkgdesc="PHP 5.4.45 compiled as to not conflict with mainline php"
 _cppflags=" -DU_USING_ICU_NAMESPACE=1  -DOPENSSL_NO_SSL3=1  -DOPENSSL_NO_SSL2=1  -DU_DEFINE_FALSE_AND_TRUE=1 "
@@ -133,7 +136,9 @@ source=(
     "php-apache.conf"
     "https://php.net/distributions/php-${pkgver}.tar.bz2"
     "https://github.com/unicode-org/icu/releases/download/release-${_pkgver_icu}/icu4c-${_pkgver_icu/-/_}-src.tgz"
+    "php-libxml.patch"
     "php54-phar-names.patch"
+    "php56-autoconf.patch"
     "openssl-1.0.patch"
     "openssl-sslv3.patch"
     "openssl-sslv3-consts.patch"
@@ -211,7 +216,9 @@ makedepends=(
 arch=(
 )
 _patches=(
+    "php-libxml.patch"
     "php54-phar-names.patch"
+    "php56-autoconf.patch"
     "openssl-1.0.patch"
     "openssl-sslv3.patch"
     "openssl-sslv3-consts.patch"
@@ -523,6 +530,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 +696,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
@@ -865,7 +876,7 @@ package_php54-cgi() {
 package_php54-apache() {
     _sapi="apache"
     _build_mod_php_so="libphp${_suffix_so}.so"
-    _build_mod_php_module="php_module${_suffix_so}"
+    _build_mod_php_module="php${_suffix_so}_module"
     _build_build_php_script_name="php${_suffix_so}-script"
     _apache_module_conf="${pkgbase}-module.conf"
     pkgdesc="Apache SAPI for ${pkgbase}"
@@ -1549,7 +1560,9 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             '6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
             '4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582'
             '92f1b7b9d51b396679c17f35a2112423361b8da3c1b9de00aa94fd768ae296e6'
+            'e757f84d2d72ea39259450c32f3a83c72262da4294152ae3e9fbc0cada622bba'
             '91dfb4bb0bf4503ac9302ffb103f239a9f5efcb2b4fcba965b27c11b850a8a29'
+            '6393ea65ccf8bc4b3b1c06bf3f158473a223a11bb5eb7819155aac1b394e166e'
             '8a5e1a2a563c38f237b0ed735918ecf82c30edd3f7beae5d99be041585901d27'
             'e49744c78d6413ab6e93e3786d70c2d1cbdbb62e5bcfdb85c05efcf16fecfb96'
             'aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6'
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
diff --git a/php56-autoconf.patch b/php56-autoconf.patch
new file mode 100644
index 000000000000..28aae881484f
--- /dev/null
+++ b/php56-autoconf.patch
@@ -0,0 +1,16 @@
+--- a/TSRM/threads.m4
++++ b/TSRM/threads.m4
+@@ -133,12 +133,12 @@
+         ac_cv_pthreads_cflags=$flag
+         break
+       fi
+     done
+   fi
+-fi
+ ])
++fi
+
+ AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
+ ac_cv_pthreads_lib=
+ if test "$pthreads_working" != "yes"; then
+   for lib in pthread pthreads c_r; do