diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec index feb64f187..97d17f27d 100644 --- a/deps-packaging/git/cfbuild-git.spec +++ b/deps-packaging/git/cfbuild-git.spec @@ -1,4 +1,4 @@ -%define git_version 2.51.2 +%define git_version 2.52.0 Summary: CFEngine Build Automation -- git Name: cfbuild-git @@ -36,6 +36,9 @@ case "$OS" in ;; esac +# On RHEL the macro PATH_MAX is in linux/limits.h, not limits.h +patch -p1 < %{_topdir}/SOURCES/fixed-undeclared-identifier-PATH_MAX.patch + make CURL_LDFLAGS="-lcurl" %install diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles index 73b8fd425..4f127da0e 100644 --- a/deps-packaging/git/distfiles +++ b/deps-packaging/git/distfiles @@ -1 +1 @@ -9b44c2b337ec838e10aad42439d390963904449710d30c9e7e4ba449f45da98f git-2.51.2.tar.gz +6880cb1e737e26f81cf7db9957ab2b5bb2aa1490d87619480b860816e0c10c32 git-2.52.0.tar.gz diff --git a/deps-packaging/git/fixed-undeclared-identifier-PATH_MAX.patch b/deps-packaging/git/fixed-undeclared-identifier-PATH_MAX.patch new file mode 100644 index 000000000..698c66274 --- /dev/null +++ b/deps-packaging/git/fixed-undeclared-identifier-PATH_MAX.patch @@ -0,0 +1,13 @@ +--- git-2.52.0/t/unit-tests/clar/clar.h 2025-11-17 17:38:17.000000000 +0100 ++++ git-2.52.0-modified/t/unit-tests/clar/clar.h 2025-11-24 15:10:35.362508135 +0100 +@@ -10,6 +10,10 @@ + #include + #include + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + #if defined(_WIN32) && defined(CLAR_WIN32_LONGPATHS) + # define CLAR_MAX_PATH 4096 + #elif defined(_WIN32) diff --git a/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec b/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec index 3da0d58e3..bc9a1045d 100644 --- a/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec +++ b/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec @@ -1,4 +1,4 @@ -%define curl_version 8.16.0 +%define curl_version 8.17.0 Summary: CFEngine Build Automation -- libcurl Name: cfbuild-libcurl-hub diff --git a/deps-packaging/libcurl-hub/distfiles b/deps-packaging/libcurl-hub/distfiles index 6c6fbc50a..06c2470ca 100644 --- a/deps-packaging/libcurl-hub/distfiles +++ b/deps-packaging/libcurl-hub/distfiles @@ -1 +1 @@ -a21e20476e39eca5a4fc5cfb00acf84bbc1f5d8443ec3853ad14c26b3c85b970 curl-8.16.0.tar.gz +e8e74cdeefe5fb78b3ae6e90cd542babf788fa9480029cfcee6fd9ced42b7910 curl-8.17.0.tar.gz diff --git a/deps-packaging/libcurl/Revert-configure-add-mt-for-pthread-support-on-HP-UX.patch b/deps-packaging/libcurl/Revert-configure-add-mt-for-pthread-support-on-HP-UX.patch new file mode 100644 index 000000000..f3e94a9d3 --- /dev/null +++ b/deps-packaging/libcurl/Revert-configure-add-mt-for-pthread-support-on-HP-UX.patch @@ -0,0 +1,12 @@ +diff -ruN curl-8.17.0/configure curl-8.17.0-modified/configure +--- curl-8.17.0/configure 2025-11-05 08:00:46.000000000 +0100 ++++ curl-8.17.0-modified/configure 2025-11-24 10:30:02.624381820 +0100 +@@ -44414,7 +44414,7 @@ + + case $host in + *-hp-hpux*) +- CFLAGS="$CFLAGS -mt" ++ USE_THREADS_POSIX="" + ;; + *) + ;; diff --git a/deps-packaging/libcurl/cfbuild-libcurl.spec b/deps-packaging/libcurl/cfbuild-libcurl.spec index f1533f65a..592d6c389 100644 --- a/deps-packaging/libcurl/cfbuild-libcurl.spec +++ b/deps-packaging/libcurl/cfbuild-libcurl.spec @@ -1,4 +1,4 @@ -%define curl_version 8.16.0 +%define curl_version 8.17.0 Summary: CFEngine Build Automation -- libcurl Name: cfbuild-libcurl @@ -46,9 +46,6 @@ mkdir -p %{_builddir} %build -# Fix implicit declaration of function 'fopen' after upgrading to curl 8.16.0. -patch -p1 < %{_topdir}/SOURCES/implicit-decl-fopen.patch - make %install diff --git a/deps-packaging/libcurl/distfiles b/deps-packaging/libcurl/distfiles index 6c6fbc50a..06c2470ca 100644 --- a/deps-packaging/libcurl/distfiles +++ b/deps-packaging/libcurl/distfiles @@ -1 +1 @@ -a21e20476e39eca5a4fc5cfb00acf84bbc1f5d8443ec3853ad14c26b3c85b970 curl-8.16.0.tar.gz +e8e74cdeefe5fb78b3ae6e90cd542babf788fa9480029cfcee6fd9ced42b7910 curl-8.17.0.tar.gz diff --git a/deps-packaging/libcurl/hpux/build b/deps-packaging/libcurl/hpux/build index e6c35c198..f23768514 100755 --- a/deps-packaging/libcurl/hpux/build +++ b/deps-packaging/libcurl/hpux/build @@ -9,6 +9,10 @@ TTD=${BUILD_ROOT}/cfbuild-libcurl-devel${PREFIX} # Build +# This patch effectively reverts commit https://github.com/curl/curl/commit/74fdc1185f40c2fe2253043ff3f563fbbd4b43ed +# that does not work for us, since we use the gcc compiler. +$PATCH -p1 < 'Revert-configure-add-mt-for-pthread-support-on-HP-UX.patch' + # autotools on hpux 11.23 with gcc 4.2.3 uses -std=gnu99 which excludes _LARGEFILE_SOURCE required for fseeko() # see https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html for reference on _LARGEFILE_SOURCE diff --git a/deps-packaging/libcurl/implicit-decl-fopen.patch b/deps-packaging/libcurl/implicit-decl-fopen.patch deleted file mode 100644 index e8320bdf1..000000000 --- a/deps-packaging/libcurl/implicit-decl-fopen.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ruN curl-8.16.0/lib/curl_mem_undef.h curl-8.16.0-modified/lib/curl_mem_undef.h ---- curl-8.16.0/lib/curl_mem_undef.h 2025-09-10 07:43:43.000000000 +0200 -+++ curl-8.16.0-modified/lib/curl_mem_undef.h 2025-09-24 16:51:34.546034324 +0200 -@@ -44,6 +44,8 @@ - #undef socketpair - #endif - -+#ifdef CURLDEBUG -+ - #undef fopen - #ifdef CURL_FOPEN - #define fopen(fname, mode) CURL_FOPEN(fname, mode) -@@ -51,5 +53,7 @@ - #undef fdopen - #undef fclose - -+#endif /* CURLDEBUG */ -+ - #undef HEADER_CURL_MEMORY_H - #undef HEADER_CURL_MEMDEBUG_H diff --git a/deps-packaging/postgresql/cfbuild-postgresql.spec b/deps-packaging/postgresql/cfbuild-postgresql.spec index 823f53c90..21b4bd55d 100644 --- a/deps-packaging/postgresql/cfbuild-postgresql.spec +++ b/deps-packaging/postgresql/cfbuild-postgresql.spec @@ -1,4 +1,4 @@ -%define postgresql_version 18.0 +%define postgresql_version 18.1 Summary: CFEngine Build Automation -- postgresql Name: cfbuild-postgresql diff --git a/deps-packaging/postgresql/distfiles b/deps-packaging/postgresql/distfiles index 05289fecb..8d560ab9a 100644 --- a/deps-packaging/postgresql/distfiles +++ b/deps-packaging/postgresql/distfiles @@ -1 +1 @@ -0d5b903b1e5fe361bca7aa9507519933773eb34266b1357c4e7780fdee6d6078 postgresql-18.0.tar.bz2 +ff86675c336c46e98ac991ebb306d1b67621ece1d06787beaade312c2c915d54 postgresql-18.1.tar.bz2 diff --git a/deps-packaging/postgresql/source b/deps-packaging/postgresql/source index f29303ceb..2ff595371 100644 --- a/deps-packaging/postgresql/source +++ b/deps-packaging/postgresql/source @@ -1 +1 @@ -https://ftp.postgresql.org/pub/source/v18.0/ +https://ftp.postgresql.org/pub/source/v18.1/