Skip to content

Updated dependencies (3.24.x) #1825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: 3.24.x
Choose a base branch
from
2 changes: 1 addition & 1 deletion deps-packaging/apache/cfbuild-apache.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define apache_version 2.4.63
%define apache_version 2.4.65
%global __os_install_post %{nil}

Summary: CFEngine Build Automation -- apache
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/apache/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1fdf1667ebe313a04e9f4d35ea9f043a4e0ebb62ba5a3047abcad824224c3867 httpd-2.4.63.tar.gz
4f92861a50325c6d1046ebad5d814bff0d4169ada8cc265655f32b7f1ba4be1b httpd-2.4.65.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/git/cfbuild-git.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define git_version 2.50.0
%define git_version 2.50.1

Summary: CFEngine Build Automation -- git
Name: cfbuild-git
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/git/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da git-2.50.0.tar.gz
522d1635f8b62b484b0ce24993818aad3cab8e11ebb57e196bda38a3140ea915 git-2.50.1.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libcurl-hub/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4 curl-8.14.1.tar.gz
d85cfc79dc505ff800cb1d321a320183035011fa08cb301356425d86be8fc53c curl-8.15.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/libcurl/cfbuild-libcurl.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define curl_version 8.14.1
%define curl_version 8.15.0

Summary: CFEngine Build Automation -- libcurl
Name: cfbuild-libcurl
Expand Down
9 changes: 8 additions & 1 deletion deps-packaging/libcurl/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down Expand Up @@ -54,7 +61,7 @@ build-stamp:
CPPFLAGS="-I$(PREFIX)/include" \

make

touch build-stamp

install: build
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libcurl/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4 curl-8.14.1.tar.gz
d85cfc79dc505ff800cb1d321a320183035011fa08cb301356425d86be8fc53c curl-8.15.0.tar.gz
34 changes: 34 additions & 0 deletions deps-packaging/libcurl/fix-curl-windows.patch
Original file line number Diff line number Diff line change
@@ -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
-
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/cfbuild-libxml2.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define libxml_version 2.14.4
%define libxml_version 2.14.5

Summary: CFEngine Build Automation -- libxml2
Name: cfbuild-libxml2
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24175ec30a97cfa86bdf9befb7ccf4613f8f4b2713c5103e0dd0bc9c711a2773 libxml2-2.14.4.tar.xz
03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b libxml2-2.14.5.tar.xz
2 changes: 1 addition & 1 deletion deps-packaging/openssl/cfbuild-openssl.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define openssl_version 3.5.0
%define openssl_version 3.5.1

Summary: CFEngine Build Automation -- openssl
Name: cfbuild-openssl
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/openssl/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0 openssl-3.5.0.tar.gz
529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f openssl-3.5.1.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/openssl/source
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/openssl/openssl/releases/download/openssl-3.5.0/
https://github.com/openssl/openssl/releases/download/openssl-3.5.1/
2 changes: 1 addition & 1 deletion deps-packaging/php/cfbuild-php.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define php_version 8.3.22
%define php_version 8.3.23

Summary: CFEngine Build Automation -- php
Name: cfbuild-php
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/php/distfiles
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8fc57c9df455354679e4a127defb60e1af8718ece4cd4827e500f5c7f2449103 php-8.3.22.tar.gz
ac9f3d6e9bcf1d5c4d66d2d954f89852c17fd4c5eba5811a3a8db08f38c908c7 php-8.3.23.tar.gz
Loading