Merge pull request #1902 from cfengine/update-dependencies-action-3.21.x-1757919928

Updated dependencies (3.21.x)

Author: larsewi

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

@@ -1,4 +1,4 @@
-%define curl_version 8.15.0
+%define curl_version 8.16.0
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl-hub

deps-packaging/libcurl-hub/distfiles

@@ -1 +1 @@
-d85cfc79dc505ff800cb1d321a320183035011fa08cb301356425d86be8fc53c  curl-8.15.0.tar.gz
+a21e20476e39eca5a4fc5cfb00acf84bbc1f5d8443ec3853ad14c26b3c85b970  curl-8.16.0.tar.gz

deps-packaging/libcurl/cfbuild-libcurl.spec

@@ -1,4 +1,4 @@
-%define curl_version 8.15.0
+%define curl_version 8.16.0
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl
@@ -45,6 +45,9 @@ 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

deps-packaging/libcurl/debian/rules

@@ -26,13 +26,6 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	# Fixes following issue on Windows build
-	# 15:44:06 url.c: In function 'zonefrom_url':
-	# 15:44:06 url.c:1802:18: error: implicit declaration of function 'if_nametoindex' [-Werror=implicit-function-declaration]
-	# 15:44:06        scopeidx = if_nametoindex(zoneid);
-	# 15:44:06                   ^
-	if [ "$(OS)" = mingw ]; then patch -p1 < "$(CURDIR)"/fix-curl-windows.patch; fi
-
 	./configure --with-sysroot=$(PREFIX) \
 				--host=$(DEB_HOST_GNU_TYPE) \
 				$(PTHREAD) \
@@ -61,7 +54,7 @@ build-stamp:
 				CPPFLAGS="-I$(PREFIX)/include" \
 
 	make
-
+	
 	touch build-stamp
 
 install: build

deps-packaging/libcurl/distfiles

@@ -1 +1 @@
-d85cfc79dc505ff800cb1d321a320183035011fa08cb301356425d86be8fc53c  curl-8.15.0.tar.gz
+a21e20476e39eca5a4fc5cfb00acf84bbc1f5d8443ec3853ad14c26b3c85b970  curl-8.16.0.tar.gz

deps-packaging/libcurl/fix-curl-windows.patch

@@ -0,0 +1,20 @@
+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

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

@@ -1,4 +1,4 @@
-%define libxml_version 2.14.5
+%define libxml_version 2.14.6
 
 Summary: CFEngine Build Automation -- libxml2
 Name: cfbuild-libxml2

deps-packaging/libxml2/cfbuild-libxml2.spec

@@ -1 +1 @@
-03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b  libxml2-2.14.5.tar.xz
+7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a  libxml2-2.14.6.tar.xz