diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec index c3f68a45b..7026e07c2 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 @@ -30,10 +30,12 @@ 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 + +patch -p1 < %{_topdir}/SOURCES/no-arg-in-deprecated.patch make %install @@ -83,5 +85,3 @@ CFEngine Build Automation -- libxml2 -- development files %prefix/lib/pkgconfig %changelog - - 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/hpux/build b/deps-packaging/libxml2/hpux/build index 5729b0c62..1fdb2e0bc 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")) 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/ 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