Updated dependencies (3.21.x)

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

deps-packaging/apache/debian/rules

@@ -14,6 +14,10 @@ build-stamp:
 	dh_testdir
 
 	patch -p0 < $(CURDIR)/apachectl.patch
+
+	# Fixed implicit declaration of GNU extension gettid() (See ENT-13084)
+	patch -p1 < $(CURDIR)/fixed-implicit-decl-gettid.patch
+
 	./configure \
 --prefix=$(PREFIX)/httpd \
 --enable-so \

deps-packaging/apache/distfiles

@@ -1 +1 @@
-1fdf1667ebe313a04e9f4d35ea9f043a4e0ebb62ba5a3047abcad824224c3867  httpd-2.4.63.tar.gz
+5802224a30846f1471d19451a21f0274ad7f193169b9dc01ac56e53e554f63a3  httpd-2.4.64.tar.gz

deps-packaging/apache/fixed-implicit-decl-gettid.patch

@@ -0,0 +1,30 @@
+diff -ruN httpd-2.4.63/server/log.c httpd-2.4.63-modified/server/log.c
+--- httpd-2.4.63/server/log.c	2024-06-21 16:31:54.000000000 +0200
++++ httpd-2.4.63-modified/server/log.c	2025-06-30 16:51:30.836217481 +0200
+@@ -21,6 +21,8 @@
+  *
+  */
+
++#define _GNU_SOURCE /* gettid() */
++
+ #include "apr.h"
+ #include "apr_general.h"        /* for signal stuff */
+ #include "apr_strings.h"
+@@ -1461,7 +1463,7 @@
+
+     memset(buf, ' ', LOG_BYTES_BUFFER_SIZE - 1);
+     buf[LOG_BYTES_BUFFER_SIZE - 1] = '\0';
+-    
++
+     chars = buf; /* start character dump here */
+     hex   = buf + BYTES_LOGGED_PER_LINE + 1; /* start hex dump here */
+     while (*off < len && this_time < BYTES_LOGGED_PER_LINE) {
+@@ -1533,7 +1535,7 @@
+     }
+ }
+
+-AP_DECLARE(void) ap_log_data_(const char *file, int line, 
++AP_DECLARE(void) ap_log_data_(const char *file, int line,
+                               int module_index, int level,
+                               const server_rec *s, const char *label,
+                               const void *data, apr_size_t len,

deps-packaging/git/cfbuild-git.spec

@@ -1,4 +1,4 @@
-%define git_version 2.49.0
+%define git_version 2.50.1
 
 Summary: CFEngine Build Automation -- git
 Name: cfbuild-git
@@ -22,6 +22,20 @@ mkdir -p %{_builddir}
 
 %build
 
+case "$OS" in
+    rhel|centos)
+        if [ $(echo $OS_VERSION | cut -d. -f1) = 7 ]
+        then
+            # Fixes the following compilation error on rhel 7:
+            # 15:05:28 compat/posix.h:159:24: fatal error: sys/random.h: No such file or directory
+            # 15:05:28  #include <sys/random.h>
+            # 15:05:28                         ^
+            # 15:05:28 compilation terminated.
+            patch -p1 < %{_topdir}/SOURCES/fix_git_on_old_platforms.patch
+        fi
+        ;;
+esac
+
 make CURL_LDFLAGS="-lcurl"
 
 %install
@@ -36,6 +50,7 @@ rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/python*
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib64
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/perl5
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/share/perl5
+rm -rf ${RPM_BUILD_ROOT}%{prefix}/share/bash-completion
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/bin/scalar
 
 %clean
@@ -67,7 +82,3 @@ CFEngine Build Automation -- git
 %{prefix}/lib/git-core
 
 %changelog
-
-
-
-

deps-packaging/git/debian/rules

@@ -13,6 +13,10 @@ build-stamp:
 	dh_testdir
 
 	./configure --prefix=$(PREFIX) --with-openssl=$(PREFIX) --without-iconv --with-gitconfig=$(PREFIX)/config/gitconfig --with-gitattributes=$(PREFIX)/config/gitattributes --with-zlib=$(PREFIX) --with-curl=$(PREFIX) --libexecdir=$(PREFIX)/lib
+
+	if expr "$(OS)-$(OS_VERSION)" : "ubuntu-16.*" ; then patch -p1 < $(CURDIR)/fix_git_on_old_platforms.patch ; fi
+	if expr "$(OS)-$(OS_VERSION)" : "debian-9.*"  ; then patch -p1 < $(CURDIR)/fix_git_on_old_platforms.patch ; fi
+
 	make CURL_LDFLAGS="-lcurl"
 
 	touch build-stamp

deps-packaging/git/distfiles

@@ -1 +1 @@
-f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c  git-2.49.0.tar.gz
+522d1635f8b62b484b0ce24993818aad3cab8e11ebb57e196bda38a3140ea915  git-2.50.1.tar.gz

deps-packaging/git/fix_git_on_old_platforms.patch

@@ -0,0 +1,48 @@
+diff -ruN git-2.50.0/compat/posix.h git-2.50.0-modified/compat/posix.h
+--- git-2.50.0/compat/posix.h	2025-06-24 15:50:16.431161905 +0200
++++ git-2.50.0-modified/compat/posix.h	2025-06-24 15:56:12.823192406 +0200
+@@ -155,9 +155,9 @@
+ #ifdef HAVE_ARC4RANDOM_LIBBSD
+ #include <bsd/stdlib.h>
+ #endif
+-#ifdef HAVE_GETRANDOM
+-#include <sys/random.h>
+-#endif
++// #ifdef HAVE_GETRANDOM
++// #include <sys/random.h>
++// #endif
+ #ifdef NO_INTPTR_T
+ /*
+  * On I16LP32, ILP32 and LP64 "long" is the safe bet, however
+diff -ruN git-2.50.0/wrapper.c git-2.50.0-modified/wrapper.c
+--- git-2.50.0/wrapper.c	2025-06-16 07:42:57.000000000 +0200
++++ git-2.50.0-modified/wrapper.c	2025-06-24 15:56:09.560108133 +0200
+@@ -775,17 +775,17 @@
+ 	/* This function never returns an error. */
+ 	arc4random_buf(buf, len);
+ 	return 0;
+-#elif defined(HAVE_GETRANDOM)
+-	ssize_t res;
+-	char *p = buf;
+-	while (len) {
+-		res = getrandom(p, len, 0);
+-		if (res < 0)
+-			return -1;
+-		len -= res;
+-		p += res;
+-	}
+-	return 0;
++// #elif defined(HAVE_GETRANDOM)
++// 	ssize_t res;
++// 	char *p = buf;
++// 	while (len) {
++// 		res = getrandom(p, len, 0);
++// 		if (res < 0)
++// 			return -1;
++// 		len -= res;
++// 		p += res;
++// 	}
++// 	return 0;
+ #elif defined(HAVE_GETENTROPY)
+ 	int res;
+ 	char *p = buf;

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

deps-packaging/libcurl-hub/distfiles

@@ -1 +1 @@
-6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4  curl-8.14.1.tar.gz
+d85cfc79dc505ff800cb1d321a320183035011fa08cb301356425d86be8fc53c  curl-8.15.0.tar.gz

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

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

deps-packaging/libcurl/distfiles

@@ -1 +1 @@
-6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4  curl-8.14.1.tar.gz
+d85cfc79dc505ff800cb1d321a320183035011fa08cb301356425d86be8fc53c  curl-8.15.0.tar.gz

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
+-

deps-packaging/libxml2/cfbuild-libxml2.spec

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

deps-packaging/libxml2/distfiles

@@ -1 +1 @@
-6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833  libxml2-2.14.3.tar.xz
+03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b  libxml2-2.14.5.tar.xz

deps-packaging/openssl/cfbuild-openssl.spec

@@ -1,4 +1,4 @@
-%define openssl_version 3.0.16
+%define openssl_version 3.0.17
 
 Summary: CFEngine Build Automation -- openssl
 Name: cfbuild-openssl

deps-packaging/openssl/distfiles

@@ -1 +1 @@
-57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86  openssl-3.0.16.tar.gz
+dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce  openssl-3.0.17.tar.gz

deps-packaging/php/cfbuild-php.spec

@@ -1,4 +1,4 @@
-%define php_version 8.3.22
+%define php_version 8.3.23
 
 Summary: CFEngine Build Automation -- php
 Name: cfbuild-php

deps-packaging/php/distfiles

@@ -1 +1 @@
-8fc57c9df455354679e4a127defb60e1af8718ece4cd4827e500f5c7f2449103  php-8.3.22.tar.gz
+ac9f3d6e9bcf1d5c4d66d2d954f89852c17fd4c5eba5811a3a8db08f38c908c7  php-8.3.23.tar.gz