Skip to content

Commit d68e679

Browse files
authored
Merge pull request #2050 from cfengine/update-dependencies-action-master-1763967921
Updated dependencies (master)
2 parents 6a243e8 + f60c414 commit d68e679

13 files changed

+41
-32
lines changed

deps-packaging/git/cfbuild-git.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%define git_version 2.51.2
1+
%define git_version 2.52.0
22

33
Summary: CFEngine Build Automation -- git
44
Name: cfbuild-git
@@ -36,6 +36,9 @@ case "$OS" in
3636
;;
3737
esac
3838

39+
# On RHEL the macro PATH_MAX is in linux/limits.h, not limits.h
40+
patch -p1 < %{_topdir}/SOURCES/fixed-undeclared-identifier-PATH_MAX.patch
41+
3942
make CURL_LDFLAGS="-lcurl"
4043

4144
%install

deps-packaging/git/distfiles

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9b44c2b337ec838e10aad42439d390963904449710d30c9e7e4ba449f45da98f git-2.51.2.tar.gz
1+
6880cb1e737e26f81cf7db9957ab2b5bb2aa1490d87619480b860816e0c10c32 git-2.52.0.tar.gz
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--- git-2.52.0/t/unit-tests/clar/clar.h 2025-11-17 17:38:17.000000000 +0100
2+
+++ git-2.52.0-modified/t/unit-tests/clar/clar.h 2025-11-24 15:10:35.362508135 +0100
3+
@@ -10,6 +10,10 @@
4+
#include <stdlib.h>
5+
#include <limits.h>
6+
7+
+#ifndef PATH_MAX
8+
+#define PATH_MAX 4096
9+
+#endif
10+
+
11+
#if defined(_WIN32) && defined(CLAR_WIN32_LONGPATHS)
12+
# define CLAR_MAX_PATH 4096
13+
#elif defined(_WIN32)

deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%define curl_version 8.16.0
1+
%define curl_version 8.17.0
22

33
Summary: CFEngine Build Automation -- libcurl
44
Name: cfbuild-libcurl-hub
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a21e20476e39eca5a4fc5cfb00acf84bbc1f5d8443ec3853ad14c26b3c85b970 curl-8.16.0.tar.gz
1+
e8e74cdeefe5fb78b3ae6e90cd542babf788fa9480029cfcee6fd9ced42b7910 curl-8.17.0.tar.gz
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -ruN curl-8.17.0/configure curl-8.17.0-modified/configure
2+
--- curl-8.17.0/configure 2025-11-05 08:00:46.000000000 +0100
3+
+++ curl-8.17.0-modified/configure 2025-11-24 10:30:02.624381820 +0100
4+
@@ -44414,7 +44414,7 @@
5+
6+
case $host in
7+
*-hp-hpux*)
8+
- CFLAGS="$CFLAGS -mt"
9+
+ USE_THREADS_POSIX=""
10+
;;
11+
*)
12+
;;

deps-packaging/libcurl/cfbuild-libcurl.spec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%define curl_version 8.16.0
1+
%define curl_version 8.17.0
22

33
Summary: CFEngine Build Automation -- libcurl
44
Name: cfbuild-libcurl
@@ -46,9 +46,6 @@ mkdir -p %{_builddir}
4646

4747
%build
4848

49-
# Fix implicit declaration of function 'fopen' after upgrading to curl 8.16.0.
50-
patch -p1 < %{_topdir}/SOURCES/implicit-decl-fopen.patch
51-
5249
make
5350

5451
%install

deps-packaging/libcurl/distfiles

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a21e20476e39eca5a4fc5cfb00acf84bbc1f5d8443ec3853ad14c26b3c85b970 curl-8.16.0.tar.gz
1+
e8e74cdeefe5fb78b3ae6e90cd542babf788fa9480029cfcee6fd9ced42b7910 curl-8.17.0.tar.gz

deps-packaging/libcurl/hpux/build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ TTD=${BUILD_ROOT}/cfbuild-libcurl-devel${PREFIX}
99

1010
# Build
1111

12+
# This patch effectively reverts commit https://github.com/curl/curl/commit/74fdc1185f40c2fe2253043ff3f563fbbd4b43ed
13+
# that does not work for us, since we use the gcc compiler.
14+
$PATCH -p1 < 'Revert-configure-add-mt-for-pthread-support-on-HP-UX.patch'
15+
1216
# autotools on hpux 11.23 with gcc 4.2.3 uses -std=gnu99 which excludes _LARGEFILE_SOURCE required for fseeko()
1317
# see https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html for reference on _LARGEFILE_SOURCE
1418

deps-packaging/libcurl/implicit-decl-fopen.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)