diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec index 529a3abcc..026b5b2a3 100644 --- a/deps-packaging/git/cfbuild-git.spec +++ b/deps-packaging/git/cfbuild-git.spec @@ -1,4 +1,4 @@ -%define git_version 2.51.0 +%define git_version 2.51.1 Summary: CFEngine Build Automation -- git Name: cfbuild-git diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles index c028613f3..6eb1f7fc2 100644 --- a/deps-packaging/git/distfiles +++ b/deps-packaging/git/distfiles @@ -1 +1 @@ -3d531799d2cf2cac8e294ec6e3229e07bfca60dc6c783fe69e7712738bef7283 git-2.51.0.tar.gz +b049d79e6a6cb3d81334bf689af6301f4d4c884191dfae65d2bb314a90384831 git-2.51.1.tar.gz diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec index 7026e07c2..f5443db8b 100644 --- a/deps-packaging/libxml2/cfbuild-libxml2.spec +++ b/deps-packaging/libxml2/cfbuild-libxml2.spec @@ -1,4 +1,4 @@ -%define libxml_version 2.15.0 +%define libxml_version 2.15.1 Summary: CFEngine Build Automation -- libxml2 Name: cfbuild-libxml2 @@ -35,7 +35,6 @@ fi %build -patch -p1 < %{_topdir}/SOURCES/no-arg-in-deprecated.patch make %install diff --git a/deps-packaging/libxml2/distfiles b/deps-packaging/libxml2/distfiles index d8f514d17..e82cd0269 100644 --- a/deps-packaging/libxml2/distfiles +++ b/deps-packaging/libxml2/distfiles @@ -1 +1 @@ -5abc766497c5b1d6d99231f662e30c99402a90d03b06c67b62d6c1179dedd561 libxml2-2.15.0.tar.xz +c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c libxml2-2.15.1.tar.xz diff --git a/deps-packaging/libxml2/hpux/build b/deps-packaging/libxml2/hpux/build index 1fdb2e0bc..490032753 100755 --- a/deps-packaging/libxml2/hpux/build +++ b/deps-packaging/libxml2/hpux/build @@ -15,7 +15,6 @@ 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 diff --git a/deps-packaging/libxml2/no-arg-in-deprecated.patch b/deps-packaging/libxml2/no-arg-in-deprecated.patch deleted file mode 100644 index 71b6ec351..000000000 --- a/deps-packaging/libxml2/no-arg-in-deprecated.patch +++ /dev/null @@ -1,17 +0,0 @@ -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"))