Updated dependencies (master)

ci/centos-7-setup-devtoolset-11.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -ex
+sudo yum install -y centos-release-scl
+sudo rm -f /etc/yum.repos.d/CentOS-SCLo-scl.repo
+sudo sed -i 's,^#baseurl.*$,baseurl=https://vault.centos.org/7.9.2009/sclo/x86_64/rh/,' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
+sudo sed -i '/mirrorlist/d' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
+sudo yum update -y
+sudo yum install -y devtoolset-11
+if ! grep "source /opt/rh/devtoolset-11/enable" /usr/lib/rpm/find-debuginfo.sh; then
+  sed -i '1a\source /opt/rh/devtoolset-11/enable' /usr/lib/rpm/find-debuginfo.sh
+fi
+source /opt/rh/devtoolset-11/enable

ci/fix-buildhost.sh

@@ -1,3 +1,14 @@
+#!/usr/bin/env bash
+set -ex
+thisdir="$(dirname "$0")"
+
+if [ -f /etc/os-release ]; then
+  source /etc/os-release
+  if [ "$ID" = "centos" ] && [ "$VERSION_ID" = "7" ]; then
+    source "$thisdir"/centos-7-setup-devtoolset-11.sh
+  fi
+fi
+
 if [ "$(uname)" = "HP-UX" ]; then
   # /etc/profile contains tty code that won't work well when sourced and this VUE env var guards against running those bits
   # https://ftp.mirrorservice.org/sites/www.bitsavers.org/pdf/hp/9000_hpux/9.x/B1171-90044_HP_Visual_User_Environment_System_Administration_Manual_Nov91.pdf
@@ -10,3 +21,16 @@ if [ -f /etc/profile ]; then
   # e.g. ent-14014: custom build of ssh needed for build-artifacts-cache needed and /etc/profile has PATH=/opt/craig/bin:$PATH
   . /etc/profile
 fi
+
+mkdir -p ~/.ssh
+echo "build-artifacts-cache.cloud.cfengine.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGahpsY8Phk2+isBmuJQjjQVlh6BNL/Qetc14g26gowV" >> ~/.ssh/known_hosts
+
+# /etc/profile can contain tricky things, on suse for example it includes a call to tty which will fail in CI
+# so only source /etc/profile where we absolutely need it.
+if [ "$(uname)" = "HP-UX" ] || [ "$(uname)" = "SunOS" ]; then
+  if [ -f /etc/profile ]; then
+    # running on the proxied host or not we want to make sure local customizations are taken
+    # e.g. ent-14014: custom build of ssh needed for build-artifacts-cache needed and /etc/profile has PATH=/opt/craig/bin:$PATH
+    . /etc/profile
+  fi
+fi

ci/linux-install-jdk21.sh

@@ -9,15 +9,15 @@ install_jdk() {
   baseurl=https://download.oracle.com/java/21/archive/
   major_version=21
   baseurl="https://download.oracle.com/java/${major_version}/archive/"
-  version=21.0.10
+  version=21.0.11
   if uname -m | grep aarch64; then
     tarball=jdk-${version}_linux-aarch64_bin.tar.gz
     # checksum from https://download.oracle.com/java/${major_version}/archive/jdk-${version}_linux-aarch64_bin.tar.gz.sha256
-    sha=edaf800c6deb1e7daeb448ef9c6a047551fd681942cb9e37e2729ae1a3918d1d
+    sha=2ebe89cad767abba83fb0b8cedd2d2d9bcbf947315fde78f7263a57a24f43b96
   else
     tarball=jdk-${version}_linux-x64_bin.tar.gz
     # checksum from https://download.oracle.com/java/${major_version}/latest/jdk-${version}_linux-x64_bin.tar.gz.sha256
-    sha=773eff7191d996d3b6ce3a99c21ce69cf2d836fd07277106313732a098d4309a
+    sha=e1c25a83f9e2e374c93e0c29cc3d98a947621ae0fefa4a8d932951eb160c47c3
   fi
   wget --quiet "$baseurl$tarball"
   echo "$sha  $tarball" | sha256sum --check -

deps-packaging/apache/cfbuild-apache.spec

@@ -1,4 +1,4 @@
-%define apache_version 2.4.66
+%define apache_version 2.4.67
 %global __os_install_post %{nil}
 
 Summary: CFEngine Build Automation -- apache

deps-packaging/apache/distfiles

@@ -1 +1 @@
-442184763b60936471b88a91275f79d2407733b7aac27e345f270e8bc31c3d49  httpd-2.4.66.tar.gz
+10a578d199c3930250534fac629995f34ef7571709a7c88c45239e1fdc88cf77  httpd-2.4.67.tar.gz

deps-packaging/git/cfbuild-git.spec

@@ -1,4 +1,4 @@
-%define git_version 2.53.0
+%define git_version 2.54.0
 
 Summary: CFEngine Build Automation -- git
 Name: cfbuild-git

deps-packaging/git/distfiles

@@ -1 +1 @@
-429dc0f5fe5f14109930cdbbb588c5d6ef5b8528910f0d738040744bebdc6275  git-2.53.0.tar.gz
+45e8107643a44e3ce46f5665beb35af3932fb0d70017687905ab5d4e3aafa8eb  git-2.54.0.tar.gz

deps-packaging/libexpat/cfbuild-libexpat.spec

@@ -1,4 +1,4 @@
-%define expat_version 2.7.5
+%define expat_version 2.8.1
 
 Summary: CFEngine Build Automation -- libexpat
 Name: cfbuild-libexpat

deps-packaging/libexpat/distfiles

@@ -1 +1 @@
-1032dfef4ff17f70464827daa28369b20f6584d108bc36f17ab1676e1edd2f91  expat-2.7.5.tar.xz
+10b195ee78160a908388180a8fe3603d4e9a12f4755fbf5f3816b23a9d750da0  expat-2.8.1.tar.xz

deps-packaging/libexpat/source

@@ -1 +1 @@
-https://github.com/libexpat/libexpat/releases/download/R_2_7_5/
+https://github.com/libexpat/libexpat/releases/download/R_2_8_1/

deps-packaging/libxml2/cfbuild-libxml2.spec

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

deps-packaging/libxml2/distfiles

@@ -1 +1 @@
-c8b9bc81f8b590c33af8cc6c336dbff2f53409973588a351c95f1c621b13d09d  libxml2-2.15.2.tar.xz
+78262a6e7ac170d6528ebfe2efccdf220191a5af6a6cd61ea4a9a9a5042c7a07  libxml2-2.15.3.tar.xz

deps-packaging/nghttp2/cfbuild-nghttp2.spec

@@ -1,4 +1,4 @@
-%define nghttp2_version 1.68.1
+%define nghttp2_version 1.69.0
 
 Summary: CFEngine Build Automation -- nghttp2
 Name: cfbuild-nghttp2

deps-packaging/nghttp2/distfiles

@@ -1 +1 @@
-6abd7ab0a7f1580d5914457cb3c85eb80455657ee5119206edbd7f848c14f0b2  nghttp2-1.68.1.tar.xz
+1fb324b6ec2c56f6bde0658f4139ffd8209fa9e77ce98fd7a5f63af8d0e508ad  nghttp2-1.69.0.tar.xz

deps-packaging/nghttp2/source

@@ -1 +1 @@
-https://github.com/nghttp2/nghttp2/releases/download/v1.68.1/
+https://github.com/nghttp2/nghttp2/releases/download/v1.69.0/

deps-packaging/openssl/cfbuild-openssl.spec

@@ -1,4 +1,4 @@
-%define openssl_version 3.6.1
+%define openssl_version 4.0.0
 
 Summary: CFEngine Build Automation -- openssl
 Name: cfbuild-openssl
@@ -59,6 +59,11 @@ then
     then
         HACK_FLAGS=-D_GNU_SOURCE                              # CentOS 4 issue
     fi
+    if [ "$OS_VERSION_MAJOR" = "7" ]
+    then
+        # apparently our build doesn't quite work with devtoolset on centos so give it a hint where to find libraries with -L/opt/rh/devtoolset-11/root/usr/lib64
+        HACK_FLAGS="-L/opt/rh/devtoolset-11/root/usr/lib64"
+    fi
 fi
 
 if [ x$SYS = "xAIX" ]; then
@@ -163,8 +168,8 @@ CFEngine Build Automation -- openssl -- development files
 %{prefix}/bin/openssl
 
 %dir %{prefix}/lib
-%{prefix}/lib/libssl.so.3
-%{prefix}/lib/libcrypto.so.3
+%{prefix}/lib/libssl.so.4
+%{prefix}/lib/libcrypto.so.4
 %{prefix}/ssl/openssl.cnf
 %{prefix}/ssl/ct_log_list.cnf
 %{prefix}/ssl/ct_log_list.cnf.dist

deps-packaging/openssl/distfiles

@@ -1 +1 @@
-b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e  openssl-3.6.1.tar.gz
+c32cf49a959c4f345f9606982dd36e7d28f7c58b19c2e25d75624d2b3d2f79ac  openssl-4.0.0.tar.gz

deps-packaging/openssl/mingw/debian/rules

@@ -22,7 +22,6 @@ endif
 build: build-stamp
 build-stamp:
 	dh_testdir
-	patch -p1 < $(CURDIR)/0001-Explicitly-define-SIO_UDP_NETRESET-for-MinGW-builds.patch
 
 	# Removed "no-psk" from the options, mingw builds breaks with it
 	CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- ./Configure \

deps-packaging/openssl/source

@@ -1 +1 @@
-https://github.com/openssl/openssl/releases/download/openssl-3.6.1/
+https://github.com/openssl/openssl/releases/download/openssl-4.0.0/

deps-packaging/php/cfbuild-php.spec

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

deps-packaging/php/distfiles

@@ -1 +1 @@
-4fef7f44eff3c18e329504cb0d3eb30b41cf54e2db05cb4ebe8b78fc37d38ce1  php-8.5.4.tar.gz
+169aaa21c2834b38df8e39169f43bc5bea8d4059a816cfbc59be08fc2bae60cd  php-8.5.6.tar.gz

deps-packaging/rsync/cfbuild-rsync.spec

@@ -1,4 +1,4 @@
-%define rsync_version 3.4.1
+%define rsync_version 3.4.2
 
 Summary: CFEngine Build Automation -- rsync
 Name: cfbuild-rsync

deps-packaging/rsync/distfiles

@@ -1 +1 @@
-2924bcb3a1ed8b551fc101f740b9f0fe0a202b115027647cf69850d65fd88c52  rsync-3.4.1.tar.gz
+ff10aa2c151cd4b2dbbe6135126dbc854046113d2dfb49572a348233267eb315  rsync-3.4.2.tar.gz