Updated dependencies (master)

Jenkinsfile

@@ -0,0 +1,69 @@
+def lemurs = ['autogen','install-dependencies','configure','compile','package']
+
+pipeline {
+  agent { label 'PACKAGES_x86_64_linux_redhat_7' }
+  environment {
+    REPOS = "buildscripts core"
+    PR_BASE = getPR_BASE()
+    PROJECT = "community"
+    BUILD_TYPE = "debug"
+    EXPLICIT_ROLE = "agent"
+  }
+  stages {
+    stage('Clean workspace') {
+      steps {
+        sh 'for r in $REPOS; do rm -rf "$(basename "$r")"; done'
+      }
+    }
+    stage('checkout core') {
+      steps {
+        dir('../core') {
+          checkout scmGit(branches: [[name: '*/master']], extensions: [ submodule(recursiveSubmodules: true) ], userRemoteConfigs: [[credentialsId: 'jenkins-github', url: 'https://github.com/cfengine/core']])
+        } // dir
+      } // checkout steps
+    } // checkout stage
+    stage('checkout masterfiles') {
+      steps {
+        dir('../masterfiles') {
+          checkout scmGit(branches: [[name: '*/master']], extensions: [ submodule(recursiveSubmodules: true) ], userRemoteConfigs: [[credentialsId: 'jenkins-github', url: 'https://github.com/cfengine/masterfiles']])
+        } // dir
+      } // checkout steps
+    } // checkout stage
+    stage('Environment check') {
+      steps {
+        sh '''
+env
+whoami
+pwd
+ls
+uname -a
+       '''
+      }
+    } // clean workspace
+    stage('lemurs') {
+    steps { script {
+      lemurs.each { lemur ->
+        stage("${lemur}") {
+          sh "bash build-scripts/${lemur}"
+        } // stage lemur
+      } // lemurs.each
+    } // script for lemurs
+    } // steps for lemurs
+    } // lemurs stage
+  } // stages
+} // pipeline
+//bash buildscripts/build-scripts/autogen
+//bash buildscripts/build-scripts/install-dependencies
+//bash buildscripts/build-scripts/configure
+//bash buildscripts/build-scripts/compile
+//bash buildscripts/build-scripts/package
+//'
+
+
+def getPR_BASE() {
+  if (env.CHANGE_ID) {
+    return "${pullRequest.base}"
+  } else {
+    return ""
+  }
+}

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

@@ -0,0 +1,13 @@
+#!/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 ./centos-7-setup-devtoolset-11.sh
+  fi
+fi
+
+mkdir -p ~/.ssh
+echo "build-artifacts-cache.cloud.cfengine.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGahpsY8Phk2+isBmuJQjjQVlh6BNL/Qetc14g26gowV" >> ~/.ssh/known_hosts

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/0010-Provide-timespec-for-centos-7.patch

@@ -0,0 +1,19 @@
+diff --git a/crypto/thread/arch/thread_posix.c b/crypto/thread/arch/thread_posix.c
+index 1b285a6..b3cc67a 100644
+--- a/crypto/thread/arch/thread_posix.c
++++ b/crypto/thread/arch/thread_posix.c
+@@ -9,6 +9,14 @@
+
+ #include <internal/thread_arch.h>
+
++#ifndef _STRUCT_TIMESPEC
++#define _STRUCT_TIMESPEC
++struct timespec {
++        time_t tv_sec;                 /* seconds */
++        long            tv_nsec;                /* nanoseconds */
++};
++#endif
++
+ #if defined(OPENSSL_THREADS_POSIX)
+ #define _GNU_SOURCE
+ #include <errno.h>

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.5
 
 Summary: CFEngine Build Automation -- php
 Name: cfbuild-php

deps-packaging/php/distfiles

@@ -1 +1 @@
-4fef7f44eff3c18e329504cb0d3eb30b41cf54e2db05cb4ebe8b78fc37d38ce1  php-8.5.4.tar.gz
+276279f637a875a514346b332bba6d8b06c036cf7979a858e5c55f72c4874884  php-8.5.5.tar.gz