Merge pull request #1804 from cfengine/update-dependencies-action-master-1753081725

larsewi · web-flow · commit 2b732a6e17c5 · 2025-07-23T10:37:36.000+02:00
Updated dependencies (master)
diff --git a/deps-packaging/apache/cfbuild-apache.spec b/deps-packaging/apache/cfbuild-apache.spec
@@ -1,4 +1,4 @@
-%define apache_version 2.4.63
+%define apache_version 2.4.64
 %global __os_install_post %{nil}
 
 Summary: CFEngine Build Automation -- apache
diff --git a/deps-packaging/apache/distfiles b/deps-packaging/apache/distfiles
@@ -1 +1 @@
-1fdf1667ebe313a04e9f4d35ea9f043a4e0ebb62ba5a3047abcad824224c3867  httpd-2.4.63.tar.gz
+5802224a30846f1471d19451a21f0274ad7f193169b9dc01ac56e53e554f63a3  httpd-2.4.64.tar.gz
diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec
@@ -1,4 +1,4 @@
-%define git_version 2.50.0
+%define git_version 2.50.1
 
 Summary: CFEngine Build Automation -- git
 Name: cfbuild-git
diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles
@@ -1 +1 @@
-920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da  git-2.50.0.tar.gz
+522d1635f8b62b484b0ce24993818aad3cab8e11ebb57e196bda38a3140ea915  git-2.50.1.tar.gz
diff --git 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.14.1
+%define curl_version 8.15.0
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl-hub
diff --git a/deps-packaging/libcurl-hub/distfiles b/deps-packaging/libcurl-hub/distfiles
@@ -1 +1 @@
-6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4  curl-8.14.1.tar.gz
+d85cfc79dc505ff800cb1d321a320183035011fa08cb301356425d86be8fc53c  curl-8.15.0.tar.gz
diff --git a/deps-packaging/libcurl/cfbuild-libcurl.spec b/deps-packaging/libcurl/cfbuild-libcurl.spec
@@ -1,4 +1,4 @@
-%define curl_version 8.14.1
+%define curl_version 8.15.0
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl
diff --git a/deps-packaging/libcurl/debian/rules b/deps-packaging/libcurl/debian/rules
@@ -26,6 +26,13 @@ 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) \
@@ -54,7 +61,7 @@ build-stamp:
 				CPPFLAGS="-I$(PREFIX)/include" \
 
 	make
-	
+
 	touch build-stamp
 
 install: build
diff --git a/deps-packaging/libcurl/distfiles b/deps-packaging/libcurl/distfiles
@@ -1 +1 @@
-6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4  curl-8.14.1.tar.gz
+d85cfc79dc505ff800cb1d321a320183035011fa08cb301356425d86be8fc53c  curl-8.15.0.tar.gz
diff --git a/deps-packaging/libcurl/fix-curl-windows.patch b/deps-packaging/libcurl/fix-curl-windows.patch
@@ -0,0 +1,34 @@
+diff -ruN curl-8.15.0/configure curl-8.15.0-modified/configure
+--- curl-8.15.0/configure	2025-07-16 08:22:04.000000000 +0200
++++ curl-8.15.0-modified/configure	2025-07-21 16:35:32.470568787 +0200
+@@ -41895,12 +41895,20 @@
+   printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h
+ 
+ fi
+-ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
+-if test "x$ac_cv_func_if_nametoindex" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
+ 
+-fi
++# Below causes issues 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                   ^
++
++# ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
++# if test "x$ac_cv_func_if_nametoindex" = xyes
++# then :
++#   printf "%s\n" "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
++#
++# fi
+ ac_fn_c_check_func "$LINENO" "mach_absolute_time" "ac_cv_func_mach_absolute_time"
+ if test "x$ac_cv_func_mach_absolute_time" = xyes
+ then :
+@@ -48385,4 +48393,3 @@
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${curl_buildinfo}" >&5
+ printf "%s\n" "$as_me: ${curl_buildinfo}" >&6;}
+ fi
+-
diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec
@@ -1,4 +1,4 @@
-%define libxml_version 2.14.4
+%define libxml_version 2.14.5
 
 Summary: CFEngine Build Automation -- libxml2
 Name: cfbuild-libxml2
diff --git a/deps-packaging/libxml2/distfiles b/deps-packaging/libxml2/distfiles
@@ -1 +1 @@
-24175ec30a97cfa86bdf9befb7ccf4613f8f4b2713c5103e0dd0bc9c711a2773  libxml2-2.14.4.tar.xz
+03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b  libxml2-2.14.5.tar.xz
diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec
@@ -1,4 +1,4 @@
-%define openssl_version 3.5.0
+%define openssl_version 3.5.1
 
 Summary: CFEngine Build Automation -- openssl
 Name: cfbuild-openssl
diff --git a/deps-packaging/openssl/distfiles b/deps-packaging/openssl/distfiles
@@ -1 +1 @@
-344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0  openssl-3.5.0.tar.gz
+529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f  openssl-3.5.1.tar.gz
diff --git a/deps-packaging/openssl/source b/deps-packaging/openssl/source
@@ -1 +1 @@
-https://github.com/openssl/openssl/releases/download/openssl-3.5.0/
+https://github.com/openssl/openssl/releases/download/openssl-3.5.1/
diff --git a/deps-packaging/php/cfbuild-php.spec b/deps-packaging/php/cfbuild-php.spec
@@ -1,4 +1,4 @@
-%define php_version 8.4.8
+%define php_version 8.4.10
 
 Summary: CFEngine Build Automation -- php
 Name: cfbuild-php
diff --git a/deps-packaging/php/distfiles b/deps-packaging/php/distfiles
@@ -1 +1 @@
-26d5ae014925b7dee3a61ec02422795f008fbb3a36f9355edaee2d9d78b89b07  php-8.4.8.tar.gz
+bd25c40ece60d1b3c879c11f517d335b8d6a872174c32ebb088b9494d8bb2cf2  php-8.4.10.tar.gz

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define apache_version 2.4.63`
	`1`	`+%define apache_version 2.4.64`
`2`	`2`	`%global __os_install_post %{nil}`
`3`	`3`
`4`	`4`	`Summary: CFEngine Build Automation -- apache`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-1fdf1667ebe313a04e9f4d35ea9f043a4e0ebb62ba5a3047abcad824224c3867 httpd-2.4.63.tar.gz`
	`1`	`+5802224a30846f1471d19451a21f0274ad7f193169b9dc01ac56e53e554f63a3 httpd-2.4.64.tar.gz`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define git_version 2.50.0`
	`1`	`+%define git_version 2.50.1`
`2`	`2`
`3`	`3`	`Summary: CFEngine Build Automation -- git`
`4`	`4`	`Name: cfbuild-git`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da git-2.50.0.tar.gz`
	`1`	`+522d1635f8b62b484b0ce24993818aad3cab8e11ebb57e196bda38a3140ea915 git-2.50.1.tar.gz`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define curl_version 8.14.1`
	`1`	`+%define curl_version 8.15.0`
`2`	`2`
`3`	`3`	`Summary: CFEngine Build Automation -- libcurl`
`4`	`4`	`Name: cfbuild-libcurl-hub`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4 curl-8.14.1.tar.gz`
	`1`	`+d85cfc79dc505ff800cb1d321a320183035011fa08cb301356425d86be8fc53c curl-8.15.0.tar.gz`