From 403b186684b508b455149bc3e882d7771a783b12 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 25 Sep 2025 12:24:49 +0000 Subject: [PATCH 1/5] Updated dependency 'libxml2' from version 2.14.6 to 2.15.0 --- deps-packaging/libxml2/cfbuild-libxml2.spec | 2 +- deps-packaging/libxml2/distfiles | 2 +- deps-packaging/libxml2/source | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec index c3f68a45b..50f4d9a44 100644 --- a/deps-packaging/libxml2/cfbuild-libxml2.spec +++ b/deps-packaging/libxml2/cfbuild-libxml2.spec @@ -1,4 +1,4 @@ -%define libxml_version 2.14.6 +%define libxml_version 2.15.0 Summary: CFEngine Build Automation -- libxml2 Name: cfbuild-libxml2 diff --git a/deps-packaging/libxml2/distfiles b/deps-packaging/libxml2/distfiles index be1e7edcc..d8f514d17 100644 --- a/deps-packaging/libxml2/distfiles +++ b/deps-packaging/libxml2/distfiles @@ -1 +1 @@ -7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a libxml2-2.14.6.tar.xz +5abc766497c5b1d6d99231f662e30c99402a90d03b06c67b62d6c1179dedd561 libxml2-2.15.0.tar.xz diff --git a/deps-packaging/libxml2/source b/deps-packaging/libxml2/source index 2351b96ba..1eb415526 100644 --- a/deps-packaging/libxml2/source +++ b/deps-packaging/libxml2/source @@ -1 +1 @@ -https://download.gnome.org/sources/libxml2/2.14/ +https://download.gnome.org/sources/libxml2/2.15/ From a00c6b1768584265ead961946e0e1f9c152b8b61 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 25 Sep 2025 12:24:52 +0000 Subject: [PATCH 2/5] Updated dependency 'php' from version 8.3.25 to 8.3.26 --- deps-packaging/php/cfbuild-php.spec | 2 +- deps-packaging/php/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/php/cfbuild-php.spec b/deps-packaging/php/cfbuild-php.spec index eb604cf2e..92f08c685 100644 --- a/deps-packaging/php/cfbuild-php.spec +++ b/deps-packaging/php/cfbuild-php.spec @@ -1,4 +1,4 @@ -%define php_version 8.3.25 +%define php_version 8.3.26 Summary: CFEngine Build Automation -- php Name: cfbuild-php diff --git a/deps-packaging/php/distfiles b/deps-packaging/php/distfiles index 3e3527a7a..91f7c9eb5 100644 --- a/deps-packaging/php/distfiles +++ b/deps-packaging/php/distfiles @@ -1 +1 @@ -86711e98eccffb637dc319f0cdcde9188c1710633910beb1a3cbb3ae5ecc2e05 php-8.3.25.tar.gz +c96dac9745db9216a299007d144b593f4e4e7d95b4618b2a9591e5e5585200d5 php-8.3.26.tar.gz From 06b2206a2ce58ed16247daabff7bee93927d543a Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Thu, 25 Sep 2025 10:08:55 +0200 Subject: [PATCH 3/5] Fixed duplicate case value when compiling libxml2 on AIX This is the error we got: ``` 00:01:07 xmlIO.c: In function 'xmlIOErr': 00:01:07 xmlIO.c:502:9: error: duplicate case value 00:01:07 case ENOTEMPTY: code = XML_IO_ENOTEMPTY; break; 00:01:07 ^~~~ 00:01:07 xmlIO.c:439:9: error: previously used here 00:01:07 case EEXIST: code = XML_IO_EEXIST; break; 00:01:07 ^~~~ ``` It appears that the `ENOTEMPTY` & `EEXITS` are defined as the same value. Defining `_LINUX_SOURCE_COMPAT` should give them unique values. ```C /* * AIX returns EEXIST where 4.3BSD used ENOTEMPTY; * but, the standards insist on unique errno values for each errno. * A unique value is reserved for users that want to code case * statements for systems that return either EEXIST or ENOTEMPTY. */ ``` Signed-off-by: Lars Erik Wik (cherry picked from commit 794e1fde6cc034d389d6eb6d8e2e6a109f1cd95e) --- deps-packaging/libxml2/cfbuild-libxml2.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec index 50f4d9a44..5e92f1bad 100644 --- a/deps-packaging/libxml2/cfbuild-libxml2.spec +++ b/deps-packaging/libxml2/cfbuild-libxml2.spec @@ -30,7 +30,7 @@ then chmod a+x configure fi ./configure --prefix=%{prefix} --without-python --enable-shared --disable-static --with-zlib=%{prefix} \ - CPPFLAGS="-I%{prefix}/include" \ + CPPFLAGS="-I%{prefix}/include -D_LINUX_SOURCE_COMPAT" \ LD_LIBRARY_PATH="%{prefix}/lib" LD_RUN_PATH="%{prefix}/lib" %build @@ -83,5 +83,3 @@ CFEngine Build Automation -- libxml2 -- development files %prefix/lib/pkgconfig %changelog - - From 9ac22d879cadac17b6ec65033e8ba5ceb8a0f965 Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Thu, 25 Sep 2025 10:56:37 +0200 Subject: [PATCH 4/5] Fixed wrong number of arguments specified for 'deprecated' attribute The was an issue with the GCC `__attribute__((deprecated))` syntax in the macro definition of `XML_DEPRECATED`. The problem was that older GCC versions don't accept a string message argument in the deprecated attribute. See https://gcc.gnu.org/gcc-4.5/changes.html Signed-off-by: Lars Erik Wik (cherry picked from commit 471357875742c6f642233e7dec1613834c2d5df3) --- deps-packaging/libxml2/cfbuild-libxml2.spec | 2 ++ deps-packaging/libxml2/hpux/build | 2 +- .../libxml2/no-arg-in-deprecated.patch | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 deps-packaging/libxml2/no-arg-in-deprecated.patch diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec index 5e92f1bad..7026e07c2 100644 --- a/deps-packaging/libxml2/cfbuild-libxml2.spec +++ b/deps-packaging/libxml2/cfbuild-libxml2.spec @@ -34,6 +34,8 @@ fi LD_LIBRARY_PATH="%{prefix}/lib" LD_RUN_PATH="%{prefix}/lib" %build + +patch -p1 < %{_topdir}/SOURCES/no-arg-in-deprecated.patch make %install diff --git a/deps-packaging/libxml2/hpux/build b/deps-packaging/libxml2/hpux/build index 5729b0c62..5e4a46e07 100755 --- a/deps-packaging/libxml2/hpux/build +++ b/deps-packaging/libxml2/hpux/build @@ -15,6 +15,7 @@ CPPFLAGS="-I${PREFIX}/include" mv configure configure.bak sed 's/ *-Wno-array-bounds//' configure.bak >configure chmod a+x configure +patch -p1 < no-arg-in-deprecated.patch ./configure CPPFLAGS="$CPPFLAGS" --prefix=${PREFIX} --without-python --without-iconv --without-lzma --without-zlib --with-iso8859x # Build @@ -38,4 +39,3 @@ rm -rf ${LXD}/share mkdir -p ${LX}/lib mv ${LXD}/lib/*.so* ${LX}/lib - diff --git a/deps-packaging/libxml2/no-arg-in-deprecated.patch b/deps-packaging/libxml2/no-arg-in-deprecated.patch new file mode 100644 index 000000000..71b6ec351 --- /dev/null +++ b/deps-packaging/libxml2/no-arg-in-deprecated.patch @@ -0,0 +1,17 @@ +diff -ruN libxml2-2.15.0/include/libxml/xmlexports.h libxml2-2.15.0-modified/include/libxml/xmlexports.h +--- libxml2-2.15.0/include/libxml/xmlexports.h 2025-09-15 13:55:59.000000000 +0200 ++++ libxml2-2.15.0-modified/include/libxml/xmlexports.h 2025-09-25 10:52:38.346569829 +0200 +@@ -55,8 +55,12 @@ + #ifndef XML_DEPRECATED + #if defined(IN_LIBXML) + #define XML_DEPRECATED +- #elif __GNUC__ * 100 + __GNUC_MINOR__ >= 301 ++ #elif __GNUC__ * 100 + __GNUC_MINOR__ >= 405 ++ /* GCC 4.5+ supports deprecated with message */ + #define XML_DEPRECATED __attribute__((deprecated("See https://gnome.pages.gitlab.gnome.org/libxml2/html/deprecated.html"))) ++ #elif __GNUC__ * 100 + __GNUC_MINOR__ >= 301 ++ /* GCC 3.1+ supports deprecated without message */ ++ #define XML_DEPRECATED __attribute__((deprecated)) + #elif defined(_MSC_VER) && _MSC_VER >= 1400 + /* Available since Visual Studio 2005 */ + #define XML_DEPRECATED __declspec(deprecated("See https://gnome.pages.gitlab.gnome.org/libxml2/html/deprecated.html")) From 175252066205d3b0b07bafabfeb6764669476fa9 Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Mon, 29 Sep 2025 10:43:39 +0200 Subject: [PATCH 5/5] Use patch tool found by detect-environment script The patch tool on PATH just outputs: ``` Hmm... I can't seem to find a patch in there anywhere. ``` Signed-off-by: Lars Erik Wik (cherry picked from commit 6883b1bc2aaae7d197294b63f5682ee41250b326) --- deps-packaging/libxml2/hpux/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps-packaging/libxml2/hpux/build b/deps-packaging/libxml2/hpux/build index 5e4a46e07..1fdb2e0bc 100755 --- a/deps-packaging/libxml2/hpux/build +++ b/deps-packaging/libxml2/hpux/build @@ -15,7 +15,7 @@ CPPFLAGS="-I${PREFIX}/include" mv configure configure.bak sed 's/ *-Wno-array-bounds//' configure.bak >configure chmod a+x configure -patch -p1 < no-arg-in-deprecated.patch +$PATCH -p1 < no-arg-in-deprecated.patch ./configure CPPFLAGS="$CPPFLAGS" --prefix=${PREFIX} --without-python --without-iconv --without-lzma --without-zlib --with-iso8859x # Build