From 72e09fa33e26250c09283e18c9aa27eefc4a56cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Apr 2026 07:36:12 +0000 Subject: [PATCH 01/36] Updated dependency 'libcurl' from version 8.17.0 to 8.19.0 --- deps-packaging/libcurl/cfbuild-libcurl.spec | 2 +- deps-packaging/libcurl/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libcurl/cfbuild-libcurl.spec b/deps-packaging/libcurl/cfbuild-libcurl.spec index 592d6c389..7125f41ab 100644 --- a/deps-packaging/libcurl/cfbuild-libcurl.spec +++ b/deps-packaging/libcurl/cfbuild-libcurl.spec @@ -1,4 +1,4 @@ -%define curl_version 8.17.0 +%define curl_version 8.19.0 Summary: CFEngine Build Automation -- libcurl Name: cfbuild-libcurl diff --git a/deps-packaging/libcurl/distfiles b/deps-packaging/libcurl/distfiles index 06c2470ca..6c16bd08b 100644 --- a/deps-packaging/libcurl/distfiles +++ b/deps-packaging/libcurl/distfiles @@ -1 +1 @@ -e8e74cdeefe5fb78b3ae6e90cd542babf788fa9480029cfcee6fd9ced42b7910 curl-8.17.0.tar.gz +2a2c11db4c122691aa23b4363befda1bfd801770bfebf41e1d21cee4f2ab0f71 curl-8.19.0.tar.gz From 07da545a676327bb5c13b8c63881d22d4247bbcc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Apr 2026 07:36:12 +0000 Subject: [PATCH 02/36] Updated dependency 'libcurl-hub' from version 8.17.0 to 8.19.0 --- deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec | 2 +- deps-packaging/libcurl-hub/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec b/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec index bc9a1045d..ac8a9f798 100644 --- 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.17.0 +%define curl_version 8.19.0 Summary: CFEngine Build Automation -- libcurl Name: cfbuild-libcurl-hub diff --git a/deps-packaging/libcurl-hub/distfiles b/deps-packaging/libcurl-hub/distfiles index 06c2470ca..6c16bd08b 100644 --- a/deps-packaging/libcurl-hub/distfiles +++ b/deps-packaging/libcurl-hub/distfiles @@ -1 +1 @@ -e8e74cdeefe5fb78b3ae6e90cd542babf788fa9480029cfcee6fd9ced42b7910 curl-8.17.0.tar.gz +2a2c11db4c122691aa23b4363befda1bfd801770bfebf41e1d21cee4f2ab0f71 curl-8.19.0.tar.gz From 68e0d55a06221b2f0050b9b21a873e21137dce02 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Apr 2026 07:36:14 +0000 Subject: [PATCH 03/36] Updated dependency 'php' from version 8.5.4 to 8.5.5 --- deps-packaging/php/cfbuild-php.spec | 2 +- deps-packaging/php/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/php/cfbuild-php.spec b/deps-packaging/php/cfbuild-php.spec index d75aa112f..3aaa0051b 100644 --- a/deps-packaging/php/cfbuild-php.spec +++ b/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 diff --git a/deps-packaging/php/distfiles b/deps-packaging/php/distfiles index 162142d29..e9bfa3695 100644 --- a/deps-packaging/php/distfiles +++ b/deps-packaging/php/distfiles @@ -1 +1 @@ -4fef7f44eff3c18e329504cb0d3eb30b41cf54e2db05cb4ebe8b78fc37d38ce1 php-8.5.4.tar.gz +276279f637a875a514346b332bba6d8b06c036cf7979a858e5c55f72c4874884 php-8.5.5.tar.gz From 975527c324128f5cde88e44bd114ff63a21c6ae7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 20 Apr 2026 07:37:17 +0000 Subject: [PATCH 04/36] Updated dependency 'openssl' from version 3.6.1 to 4.0.0 (cherry picked from commit a422f99cd25a6b9803fe73fc6b77df20183b6b85) --- deps-packaging/openssl/cfbuild-openssl.spec | 2 +- deps-packaging/openssl/distfiles | 2 +- deps-packaging/openssl/source | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec index 6efacc0c9..d74ec8446 100644 --- a/deps-packaging/openssl/cfbuild-openssl.spec +++ b/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 diff --git a/deps-packaging/openssl/distfiles b/deps-packaging/openssl/distfiles index 51bfdf889..460505ce9 100644 --- a/deps-packaging/openssl/distfiles +++ b/deps-packaging/openssl/distfiles @@ -1 +1 @@ -b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e openssl-3.6.1.tar.gz +c32cf49a959c4f345f9606982dd36e7d28f7c58b19c2e25d75624d2b3d2f79ac openssl-4.0.0.tar.gz diff --git a/deps-packaging/openssl/source b/deps-packaging/openssl/source index eab874077..0c863cbb7 100644 --- a/deps-packaging/openssl/source +++ b/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/ From fa3fb86b3f429c2f01322c690a15f4e8a0a9ccf7 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 16 Apr 2026 08:20:02 -0500 Subject: [PATCH 05/36] fix: remove openssl patch for mingw that was applied to 3.6.2 The patch was applied to 3.6.2 at https://github.com/openssl/openssl/commit/a7b47bda72465ece33a70382d8da08a47e3b64aa Ticket: none Changelog: none (cherry picked from commit b9e64ff99d88cffe89a11541e4f780f931829058) --- ...ne-SIO_UDP_NETRESET-for-MinGW-builds.patch | 42 ------------------- deps-packaging/openssl/mingw/debian/rules | 1 - 2 files changed, 43 deletions(-) delete mode 100644 deps-packaging/openssl/0001-Explicitly-define-SIO_UDP_NETRESET-for-MinGW-builds.patch diff --git a/deps-packaging/openssl/0001-Explicitly-define-SIO_UDP_NETRESET-for-MinGW-builds.patch b/deps-packaging/openssl/0001-Explicitly-define-SIO_UDP_NETRESET-for-MinGW-builds.patch deleted file mode 100644 index 18a8f94a7..000000000 --- a/deps-packaging/openssl/0001-Explicitly-define-SIO_UDP_NETRESET-for-MinGW-builds.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 40d8060c0e8af7c7d3f0d70a7e2d3bf96a15fc10 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alexander=20Hansen=20F=C3=A6r=C3=B8y?= -Date: Wed, 28 Jan 2026 17:55:02 +0100 -Subject: [PATCH 001/670] Explicitly define `SIO_UDP_NETRESET` for MinGW - builds. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This patch explicitly defines the value `SIO_UDP_NETRESET` according to -both what Windows and ReactOS does. - -Fixes: #29818. - -Reviewed-by: Eugene Syromiatnikov -Reviewed-by: Saša Nedvědický -MergeDate: Thu Feb 5 08:54:17 2026 -(Merged from https://github.com/openssl/openssl/pull/29826) ---- - ssl/quic/quic_reactor.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/ssl/quic/quic_reactor.c b/ssl/quic/quic_reactor.c -index a754f28..deec428 100644 ---- a/ssl/quic/quic_reactor.c -+++ b/ssl/quic/quic_reactor.c -@@ -76,6 +76,12 @@ void ossl_quic_reactor_cleanup(QUIC_REACTOR *rtor) - } - - #if defined(OPENSSL_SYS_WINDOWS) -+ -+/* Work around for MinGW builds. */ -+#if defined(__MINGW32__) && !defined(SIO_UDP_NETRESET) -+#define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR, 15) -+#endif -+ - /* - * On Windows recvfrom() may return WSAECONNRESET when destination port - * used in preceding call to sendto() is no longer reachable. The reset --- -2.52.0 - diff --git a/deps-packaging/openssl/mingw/debian/rules b/deps-packaging/openssl/mingw/debian/rules index 66e49dc93..6c3b901fe 100755 --- a/deps-packaging/openssl/mingw/debian/rules +++ b/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 \ From 4e9ca9a5ece8c23b34febf1a1f720484ad0192f7 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 17 Apr 2026 10:05:45 -0500 Subject: [PATCH 06/36] Revert "Updated dependency 'libcurl' from version 8.17.0 to 8.19.0" This reverts commit 1d495d68f03c2cfd7501db49b8e6f18fef1e9522. libcurl needs at least Windows Vista which we are not using yet: https://northerntech.atlassian.net/browse/ENT-13881 --- deps-packaging/libcurl/cfbuild-libcurl.spec | 2 +- deps-packaging/libcurl/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libcurl/cfbuild-libcurl.spec b/deps-packaging/libcurl/cfbuild-libcurl.spec index 7125f41ab..592d6c389 100644 --- a/deps-packaging/libcurl/cfbuild-libcurl.spec +++ b/deps-packaging/libcurl/cfbuild-libcurl.spec @@ -1,4 +1,4 @@ -%define curl_version 8.19.0 +%define curl_version 8.17.0 Summary: CFEngine Build Automation -- libcurl Name: cfbuild-libcurl diff --git a/deps-packaging/libcurl/distfiles b/deps-packaging/libcurl/distfiles index 6c16bd08b..06c2470ca 100644 --- a/deps-packaging/libcurl/distfiles +++ b/deps-packaging/libcurl/distfiles @@ -1 +1 @@ -2a2c11db4c122691aa23b4363befda1bfd801770bfebf41e1d21cee4f2ab0f71 curl-8.19.0.tar.gz +e8e74cdeefe5fb78b3ae6e90cd542babf788fa9480029cfcee6fd9ced42b7910 curl-8.17.0.tar.gz From 1f483afea85858f23d067c4e267e2278db731f99 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 17 Apr 2026 10:06:27 -0500 Subject: [PATCH 07/36] Revert "Updated dependency 'libcurl-hub' from version 8.17.0 to 8.19.0" This reverts commit c01f45405dafac9035df81534ee5ceac683d0431. libcurl needs at least Windows Vista which we are not using yet: https://northerntech.atlassian.net/browse/ENT-13881 --- deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec | 2 +- deps-packaging/libcurl-hub/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec b/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec index ac8a9f798..bc9a1045d 100644 --- 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.19.0 +%define curl_version 8.17.0 Summary: CFEngine Build Automation -- libcurl Name: cfbuild-libcurl-hub diff --git a/deps-packaging/libcurl-hub/distfiles b/deps-packaging/libcurl-hub/distfiles index 6c16bd08b..06c2470ca 100644 --- a/deps-packaging/libcurl-hub/distfiles +++ b/deps-packaging/libcurl-hub/distfiles @@ -1 +1 @@ -2a2c11db4c122691aa23b4363befda1bfd801770bfebf41e1d21cee4f2ab0f71 curl-8.19.0.tar.gz +e8e74cdeefe5fb78b3ae6e90cd542babf788fa9480029cfcee6fd9ced42b7910 curl-8.17.0.tar.gz From 29ddf2e48cab78c982c89704879c8481939cd05f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 20 Apr 2026 07:37:17 +0000 Subject: [PATCH 08/36] Updated dependency 'nghttp2' from version 1.68.1 to 1.69.0 (cherry picked from commit 67fec117472442fab09e0f6a030274c7da1d3919) --- deps-packaging/nghttp2/cfbuild-nghttp2.spec | 2 +- deps-packaging/nghttp2/distfiles | 2 +- deps-packaging/nghttp2/source | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps-packaging/nghttp2/cfbuild-nghttp2.spec b/deps-packaging/nghttp2/cfbuild-nghttp2.spec index 06c9ffbb3..9181c500e 100644 --- a/deps-packaging/nghttp2/cfbuild-nghttp2.spec +++ b/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 diff --git a/deps-packaging/nghttp2/distfiles b/deps-packaging/nghttp2/distfiles index 82cbf8784..713246209 100644 --- a/deps-packaging/nghttp2/distfiles +++ b/deps-packaging/nghttp2/distfiles @@ -1 +1 @@ -6abd7ab0a7f1580d5914457cb3c85eb80455657ee5119206edbd7f848c14f0b2 nghttp2-1.68.1.tar.xz +1fb324b6ec2c56f6bde0658f4139ffd8209fa9e77ce98fd7a5f63af8d0e508ad nghttp2-1.69.0.tar.xz diff --git a/deps-packaging/nghttp2/source b/deps-packaging/nghttp2/source index 3bce8feda..5202c92a7 100644 --- a/deps-packaging/nghttp2/source +++ b/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/ From 895c4336ce38a3bcb561151b3e949f325f8c7d52 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 20 Apr 2026 07:37:16 +0000 Subject: [PATCH 09/36] Updated dependency 'libxml2' from version 2.15.2 to 2.15.3 (cherry picked from commit 12501c9fbd8676b2a710cb3cd0a203e4e3abe895) --- deps-packaging/libxml2/cfbuild-libxml2.spec | 2 +- deps-packaging/libxml2/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec index dee239d1d..90559aee5 100644 --- a/deps-packaging/libxml2/cfbuild-libxml2.spec +++ b/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 diff --git a/deps-packaging/libxml2/distfiles b/deps-packaging/libxml2/distfiles index 5b301b300..035bb2aaa 100644 --- a/deps-packaging/libxml2/distfiles +++ b/deps-packaging/libxml2/distfiles @@ -1 +1 @@ -c8b9bc81f8b590c33af8cc6c336dbff2f53409973588a351c95f1c621b13d09d libxml2-2.15.2.tar.xz +78262a6e7ac170d6528ebfe2efccdf220191a5af6a6cd61ea4a9a9a5042c7a07 libxml2-2.15.3.tar.xz From ed48047d75ff43013a275b5ac16faede2b59b862 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 23 Apr 2026 12:33:19 -0500 Subject: [PATCH 10/36] fix: openssl 4.0.0 on centos-7 needs two fixes due to old gcc 4.8.5 there Ticket: none Changelog: none --- deps-packaging/openssl/cfbuild-openssl.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec index d74ec8446..bb6487fff 100644 --- a/deps-packaging/openssl/cfbuild-openssl.spec +++ b/deps-packaging/openssl/cfbuild-openssl.spec @@ -59,6 +59,12 @@ then then HACK_FLAGS=-D_GNU_SOURCE # CentOS 4 issue fi + if [ "$OS_VERSION_MAJOR" = "7" ] + then + # https://github.com/openssl/openssl/commit/232f17f065e089cab931d2babbed548e5958e6b2 introduced a skip of new b64 encoder which uses avx2, centos-7 gcc 4.8.2 lacks full support for the avx2 related code so we leverage _M_ARM64EC macro + # also, gcc 4.8.2 does not support some c99 constructs like in loop variable initialization so explicitly choose c99. + HACK_FLAGS="-D_M_ARM64EC -std=c99" + fi fi if [ x$SYS = "xAIX" ]; then From 9fa1e41e04acc26f7b82e94ba817f2697009c1f9 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 23 Apr 2026 17:01:13 -0500 Subject: [PATCH 11/36] fix: centos-7 openssl 4.0.0 build issues work in progress, still more issues are present Ticket: none Changelog: none --- .../0010-Provide-timespec-for-centos-7.patch | 19 +++++++++++++++++++ deps-packaging/openssl/cfbuild-openssl.spec | 11 ++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 deps-packaging/openssl/0010-Provide-timespec-for-centos-7.patch diff --git a/deps-packaging/openssl/0010-Provide-timespec-for-centos-7.patch b/deps-packaging/openssl/0010-Provide-timespec-for-centos-7.patch new file mode 100644 index 000000000..5183a9a91 --- /dev/null +++ b/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 + ++#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 diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec index bb6487fff..ffd50e24e 100644 --- a/deps-packaging/openssl/cfbuild-openssl.spec +++ b/deps-packaging/openssl/cfbuild-openssl.spec @@ -7,6 +7,7 @@ Release: 1 Source0: openssl-%{openssl_version}.tar.gz Patch0: 0006-Add-latomic-on-AIX-7.patch Patch1: 0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch +Patch2: 0010-Provide-timespec-for-centos-7.patch License: MIT Group: Other Url: https://cfengine.com @@ -23,6 +24,12 @@ mkdir -p %{_builddir} %patch0 -p1 %patch1 -p1 +# for some reason linux/time.h is not included and timespec struct is not defined which causes an error in crypto/thread/arch/thread_posix.c +if [ "$OS_VERSION_MAJOR" = "7" ] +then +%patch2 -p1 +fi + %build if [ -z "$MAKE" ] @@ -63,7 +70,9 @@ then then # https://github.com/openssl/openssl/commit/232f17f065e089cab931d2babbed548e5958e6b2 introduced a skip of new b64 encoder which uses avx2, centos-7 gcc 4.8.2 lacks full support for the avx2 related code so we leverage _M_ARM64EC macro # also, gcc 4.8.2 does not support some c99 constructs like in loop variable initialization so explicitly choose c99. - HACK_FLAGS="-D_M_ARM64EC -std=c99" + # as described in crypto/sleep.c if nanosleep is unavailable, define OPENSSL_USE_USLEEP + # in crypto/thread/arch/thread_posix.c deadline_ts is unused so skip that warning as error + HACK_FLAGS="-D_M_ARM64EC -std=c99 -DOPENSSL_USE_USLEEP -Wno-unused-variable" fi fi From a700f78d8bbf207a0cd1a79d5cc441de91cccf9e Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 24 Apr 2026 17:44:47 -0500 Subject: [PATCH 12/36] wip: centos-7 devtoolset-11 install/setup and openssl-4.0.0 build --- ci/centos-7-setup-devtoolset-11.sh | 7 +++++++ deps-packaging/openssl/cfbuild-openssl.spec | 18 ++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) create mode 100644 ci/centos-7-setup-devtoolset-11.sh diff --git a/ci/centos-7-setup-devtoolset-11.sh b/ci/centos-7-setup-devtoolset-11.sh new file mode 100644 index 000000000..74069b3a4 --- /dev/null +++ b/ci/centos-7-setup-devtoolset-11.sh @@ -0,0 +1,7 @@ +sudo yum install -y centos-release-scl +rm /etc/yum.repos.d/CentOS-SCLo-scl.repo +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 +sed -i ',mirrorlist,d' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo +sudo yum update +sudo yum install -y devtoolset-11 +# add source /opt/rh/devtoolset-11/enable to /usr/lib/rpm/find-debuginfo.sh at the top of the file just after the shebang diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec index ffd50e24e..1be73b2f9 100644 --- a/deps-packaging/openssl/cfbuild-openssl.spec +++ b/deps-packaging/openssl/cfbuild-openssl.spec @@ -7,7 +7,6 @@ Release: 1 Source0: openssl-%{openssl_version}.tar.gz Patch0: 0006-Add-latomic-on-AIX-7.patch Patch1: 0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch -Patch2: 0010-Provide-timespec-for-centos-7.patch License: MIT Group: Other Url: https://cfengine.com @@ -24,12 +23,6 @@ mkdir -p %{_builddir} %patch0 -p1 %patch1 -p1 -# for some reason linux/time.h is not included and timespec struct is not defined which causes an error in crypto/thread/arch/thread_posix.c -if [ "$OS_VERSION_MAJOR" = "7" ] -then -%patch2 -p1 -fi - %build if [ -z "$MAKE" ] @@ -68,11 +61,8 @@ then fi if [ "$OS_VERSION_MAJOR" = "7" ] then - # https://github.com/openssl/openssl/commit/232f17f065e089cab931d2babbed548e5958e6b2 introduced a skip of new b64 encoder which uses avx2, centos-7 gcc 4.8.2 lacks full support for the avx2 related code so we leverage _M_ARM64EC macro - # also, gcc 4.8.2 does not support some c99 constructs like in loop variable initialization so explicitly choose c99. - # as described in crypto/sleep.c if nanosleep is unavailable, define OPENSSL_USE_USLEEP - # in crypto/thread/arch/thread_posix.c deadline_ts is unused so skip that warning as error - HACK_FLAGS="-D_M_ARM64EC -std=c99 -DOPENSSL_USE_USLEEP -Wno-unused-variable" + # 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 @@ -178,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 From 6fc20ff85afbcabc135ba8461e45263f516e63b2 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 17:04:52 -0500 Subject: [PATCH 13/36] devtoolset-11 fixups --- ci/centos-7-setup-devtoolset-11.sh | 8 ++++---- ci/fix-buildhost.sh | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) mode change 100644 => 100755 ci/centos-7-setup-devtoolset-11.sh create mode 100755 ci/fix-buildhost.sh diff --git a/ci/centos-7-setup-devtoolset-11.sh b/ci/centos-7-setup-devtoolset-11.sh old mode 100644 new mode 100755 index 74069b3a4..178ab132e --- a/ci/centos-7-setup-devtoolset-11.sh +++ b/ci/centos-7-setup-devtoolset-11.sh @@ -1,7 +1,7 @@ sudo yum install -y centos-release-scl -rm /etc/yum.repos.d/CentOS-SCLo-scl.repo -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 -sed -i ',mirrorlist,d' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo +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 sudo yum install -y devtoolset-11 -# add source /opt/rh/devtoolset-11/enable to /usr/lib/rpm/find-debuginfo.sh at the top of the file just after the shebang +sed -i '1a\source /opt/rh/devtoolset-11/enable' /usr/lib/rpm/find-debuginfo.sh diff --git a/ci/fix-buildhost.sh b/ci/fix-buildhost.sh new file mode 100755 index 000000000..854e96846 --- /dev/null +++ b/ci/fix-buildhost.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +thisdir=$(dirname "$0")" + +if [ -f /etc/os-release ]; then + source /etc/os-release + if [ "$ID" = "centos" ] && [ "VERSION_ID" = "7" ]; then + + ./centos-7-setup-devtoolset-11.sh + fi +fi From f8bb4329ca10dd06751416f7ade00a17b93f3307 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 17:27:46 -0500 Subject: [PATCH 14/36] experiment --- Jenkinsfile | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..68bcb8c23 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,60 @@ +pipeline { + agent { label 'PACKAGES_ia64_hpux_11.23' } + 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('Environment check') { + steps { + sh 'env +whoami +pwd +ls +uname -a +' + } + } +# stage('Checkout repositories'){ +# steps { +# script { +# if (env.CHANGE_ID) { +# sh "echo \"${pullRequest.title}\" > pull-request-title" +# sh "echo \"${pullRequest.body}\" > pull-request-body" +# } +# } +# sh "curl -O https://raw.githubusercontent.com/cfengine/buildscripts/refs/heads/master/ci/create-revisions-file.sh" +# sh "chmod u+x ./create-revisions-file.sh" +# sh "./create-revisions-file.sh" +# sh "cat revisions" +# sh "curl -O https://gitlab.com/Northern.tech/OpenSource/GODS/-/raw/master/parallel_git_rev_fetch.sh" +# sh "chmod u+x ./parallel_git_rev_fetch.sh" +# +# withCredentials([sshUserPrivateKey(credentialsId:"jenkins-github", keyFileVariable: "key")]) { +# sh 'export GIT_SSH_COMMAND="ssh -i $key"; ./parallel_git_rev_fetch.sh revisions' +# } +# } +# } +# stage('Build') { +# steps { +# sh ' +#PROJECT=community +#export PROJECT +#BUILD_TYPE=debug +#export BUILD_TYPE +#EXPLICIT_ROLE=agent +#export EXPLICIT_ROLE +#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 +#' From c0c3b1cd2c92d69438ee08c5a09ea17f5827eb41 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 17:36:53 -0500 Subject: [PATCH 15/36] libre --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68bcb8c23..498e129f3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,12 +15,13 @@ pipeline { } stage('Environment check') { steps { - sh 'env + sh ''' +env whoami pwd ls uname -a -' + ''' } } # stage('Checkout repositories'){ From 0466cc4ed5aafab63e9100e2704ec22328ec66bc Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 17:38:24 -0500 Subject: [PATCH 16/36] libre --- Jenkinsfile | 72 +++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 498e129f3..5f1f04c55 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,38 +24,40 @@ uname -a ''' } } -# stage('Checkout repositories'){ -# steps { -# script { -# if (env.CHANGE_ID) { -# sh "echo \"${pullRequest.title}\" > pull-request-title" -# sh "echo \"${pullRequest.body}\" > pull-request-body" -# } -# } -# sh "curl -O https://raw.githubusercontent.com/cfengine/buildscripts/refs/heads/master/ci/create-revisions-file.sh" -# sh "chmod u+x ./create-revisions-file.sh" -# sh "./create-revisions-file.sh" -# sh "cat revisions" -# sh "curl -O https://gitlab.com/Northern.tech/OpenSource/GODS/-/raw/master/parallel_git_rev_fetch.sh" -# sh "chmod u+x ./parallel_git_rev_fetch.sh" -# -# withCredentials([sshUserPrivateKey(credentialsId:"jenkins-github", keyFileVariable: "key")]) { -# sh 'export GIT_SSH_COMMAND="ssh -i $key"; ./parallel_git_rev_fetch.sh revisions' -# } -# } -# } -# stage('Build') { -# steps { -# sh ' -#PROJECT=community -#export PROJECT -#BUILD_TYPE=debug -#export BUILD_TYPE -#EXPLICIT_ROLE=agent -#export EXPLICIT_ROLE -#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 -#' +/* + stage('Checkout repositories'){ + steps { + script { + if (env.CHANGE_ID) { + sh "echo \"${pullRequest.title}\" > pull-request-title" + sh "echo \"${pullRequest.body}\" > pull-request-body" + } + } + sh "curl -O https://raw.githubusercontent.com/cfengine/buildscripts/refs/heads/master/ci/create-revisions-file.sh" + sh "chmod u+x ./create-revisions-file.sh" + sh "./create-revisions-file.sh" + sh "cat revisions" + sh "curl -O https://gitlab.com/Northern.tech/OpenSource/GODS/-/raw/master/parallel_git_rev_fetch.sh" + sh "chmod u+x ./parallel_git_rev_fetch.sh" + + withCredentials([sshUserPrivateKey(credentialsId:"jenkins-github", keyFileVariable: "key")]) { + sh 'export GIT_SSH_COMMAND="ssh -i $key"; ./parallel_git_rev_fetch.sh revisions' + } + } + } + stage('Build') { + steps { + sh ' +PROJECT=community +export PROJECT +BUILD_TYPE=debug +export BUILD_TYPE +EXPLICIT_ROLE=agent +export EXPLICIT_ROLE +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 +' +*/ From fa848f454c7dd5b018b46ed815704689d0b89bf7 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 17:39:00 -0500 Subject: [PATCH 17/36] libre --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5f1f04c55..66a63ec2c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,6 +24,8 @@ uname -a ''' } } + } +} /* stage('Checkout repositories'){ steps { From 560346cfd9334859b91bcd0dec5e2dabdeac8ce6 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 17:40:06 -0500 Subject: [PATCH 18/36] libre --- Jenkinsfile | 72 ++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 66a63ec2c..2b5ef2d9b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,40 +26,38 @@ uname -a } } } -/* - stage('Checkout repositories'){ - steps { - script { - if (env.CHANGE_ID) { - sh "echo \"${pullRequest.title}\" > pull-request-title" - sh "echo \"${pullRequest.body}\" > pull-request-body" - } - } - sh "curl -O https://raw.githubusercontent.com/cfengine/buildscripts/refs/heads/master/ci/create-revisions-file.sh" - sh "chmod u+x ./create-revisions-file.sh" - sh "./create-revisions-file.sh" - sh "cat revisions" - sh "curl -O https://gitlab.com/Northern.tech/OpenSource/GODS/-/raw/master/parallel_git_rev_fetch.sh" - sh "chmod u+x ./parallel_git_rev_fetch.sh" - - withCredentials([sshUserPrivateKey(credentialsId:"jenkins-github", keyFileVariable: "key")]) { - sh 'export GIT_SSH_COMMAND="ssh -i $key"; ./parallel_git_rev_fetch.sh revisions' - } - } - } - stage('Build') { - steps { - sh ' -PROJECT=community -export PROJECT -BUILD_TYPE=debug -export BUILD_TYPE -EXPLICIT_ROLE=agent -export EXPLICIT_ROLE -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 -' -*/ +// stage('Checkout repositories'){ +// steps { +// script { +// if (env.CHANGE_ID) { +// sh "echo \"${pullRequest.title}\" > pull-request-title" +// sh "echo \"${pullRequest.body}\" > pull-request-body" +// } +// } +// sh "curl -O https://raw.githubusercontent.com/cfengine/buildscripts/refs/heads/master/ci/create-revisions-file.sh" +// sh "chmod u+x ./create-revisions-file.sh" +// sh "./create-revisions-file.sh" +// sh "cat revisions" +// sh "curl -O https://gitlab.com/Northern.tech/OpenSource/GODS/-/raw/master/parallel_git_rev_fetch.sh" +// sh "chmod u+x ./parallel_git_rev_fetch.sh" +// +// withCredentials([sshUserPrivateKey(credentialsId:"jenkins-github", keyFileVariable: "key")]) { +// sh 'export GIT_SSH_COMMAND="ssh -i $key"; ./parallel_git_rev_fetch.sh revisions' +// } +// } +// } +// stage('Build') { +// steps { +// sh ' +//PROJECT=community +//export PROJECT +//BUILD_TYPE=debug +//export BUILD_TYPE +//EXPLICIT_ROLE=agent +//export EXPLICIT_ROLE +//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 +//' From b459e1fc5e0e3bc0ac9274b98489b39d8a0efe42 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 17:40:47 -0500 Subject: [PATCH 19/36] libre --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2b5ef2d9b..6008f52da 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,9 +3,9 @@ pipeline { environment { REPOS = "buildscripts core" PR_BASE = getPR_BASE() - PROJECT = community - BUILD_TYPE = debug - EXPLICIT_ROLE = agent + PROJECT = "community" + BUILD_TYPE = "debug" + EXPLICIT_ROLE = "agent" } stages { stage('Clean workspace') { From a5a6ad760eb25d4d8228a03dcee603e35f94bfd3 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 17:42:09 -0500 Subject: [PATCH 20/36] libre --- Jenkinsfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 6008f52da..95e7ef3a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -61,3 +61,12 @@ uname -a //bash buildscripts/build-scripts/compile //bash buildscripts/build-scripts/package //' + + +def getPR_BASE() { + if (env.CHANGE_ID) { + return "${pullRequest.base}" + } else { + return "" + } +} From 2d35181cde78b6328a76ac1c2e41e29fbdc1c761 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 17:45:03 -0500 Subject: [PATCH 21/36] libre --- Jenkinsfile | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 95e7ef3a2..83a6cced6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,38 +23,14 @@ ls uname -a ''' } + } // clean workspace + stage('autogen') { + steps { + sh 'bash build-scripts/autogen' + } } - } -} -// stage('Checkout repositories'){ -// steps { -// script { -// if (env.CHANGE_ID) { -// sh "echo \"${pullRequest.title}\" > pull-request-title" -// sh "echo \"${pullRequest.body}\" > pull-request-body" -// } -// } -// sh "curl -O https://raw.githubusercontent.com/cfengine/buildscripts/refs/heads/master/ci/create-revisions-file.sh" -// sh "chmod u+x ./create-revisions-file.sh" -// sh "./create-revisions-file.sh" -// sh "cat revisions" -// sh "curl -O https://gitlab.com/Northern.tech/OpenSource/GODS/-/raw/master/parallel_git_rev_fetch.sh" -// sh "chmod u+x ./parallel_git_rev_fetch.sh" -// -// withCredentials([sshUserPrivateKey(credentialsId:"jenkins-github", keyFileVariable: "key")]) { -// sh 'export GIT_SSH_COMMAND="ssh -i $key"; ./parallel_git_rev_fetch.sh revisions' -// } -// } -// } -// stage('Build') { -// steps { -// sh ' -//PROJECT=community -//export PROJECT -//BUILD_TYPE=debug -//export BUILD_TYPE -//EXPLICIT_ROLE=agent -//export EXPLICIT_ROLE + } // stages +} // pipeline //bash buildscripts/build-scripts/autogen //bash buildscripts/build-scripts/install-dependencies //bash buildscripts/build-scripts/configure From 0086b385c19158ba61f2047f09c6f88eac6dc861 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 19:24:29 -0500 Subject: [PATCH 22/36] centos-7 devtoolset-11 --- ci/centos-7-setup-devtoolset-11.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/centos-7-setup-devtoolset-11.sh b/ci/centos-7-setup-devtoolset-11.sh index 178ab132e..3ba8fe66e 100755 --- a/ci/centos-7-setup-devtoolset-11.sh +++ b/ci/centos-7-setup-devtoolset-11.sh @@ -2,6 +2,9 @@ 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 +sudo yum update -y sudo yum install -y devtoolset-11 -sed -i '1a\source /opt/rh/devtoolset-11/enable' /usr/lib/rpm/find-debuginfo.sh +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 From 78bf439c2ed67e11ed4346230508934757fd1451 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 19:27:26 -0500 Subject: [PATCH 23/36] c7 --- ci/centos-7-setup-devtoolset-11.sh | 2 ++ ci/fix-buildhost.sh | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ci/centos-7-setup-devtoolset-11.sh b/ci/centos-7-setup-devtoolset-11.sh index 3ba8fe66e..75609b3c4 100755 --- a/ci/centos-7-setup-devtoolset-11.sh +++ b/ci/centos-7-setup-devtoolset-11.sh @@ -1,3 +1,5 @@ +#!/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 diff --git a/ci/fix-buildhost.sh b/ci/fix-buildhost.sh index 854e96846..f73f267a1 100755 --- a/ci/fix-buildhost.sh +++ b/ci/fix-buildhost.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash -thisdir=$(dirname "$0")" +set -ex +thisdir="$(dirname "$0")" if [ -f /etc/os-release ]; then source /etc/os-release - if [ "$ID" = "centos" ] && [ "VERSION_ID" = "7" ]; then - - ./centos-7-setup-devtoolset-11.sh + if [ "$ID" = "centos" ] && [ "$VERSION_ID" = "7" ]; then + source ./centos-7-setup-devtoolset-11.sh fi fi From 7f8ec28068974eb8b1ef28d170304ceac9373aca Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 19:28:17 -0500 Subject: [PATCH 24/36] c7 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 83a6cced6..74d452483 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent { label 'PACKAGES_ia64_hpux_11.23' } + agent { label 'PACKAGES_x86_64_linux_redhat_7' } environment { REPOS = "buildscripts core" PR_BASE = getPR_BASE() From ce3f8bce4730d4088cfdda0ecadf5d95fe236743 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 19:41:57 -0500 Subject: [PATCH 25/36] build-artifacts-cache ssh public key --- ci/fix-buildhost.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/fix-buildhost.sh b/ci/fix-buildhost.sh index f73f267a1..a92542624 100755 --- a/ci/fix-buildhost.sh +++ b/ci/fix-buildhost.sh @@ -8,3 +8,6 @@ if [ -f /etc/os-release ]; 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 From 939504a23b466d557482c209c46bfa6e9ccf79cb Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 19:51:20 -0500 Subject: [PATCH 26/36] wack jenkinsfile --- Jenkinsfile | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 74d452483..c8acd5280 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,11 @@ +def steps = [ +'autogen', +'install-dependencies', +'configure', +'compile', +'package' +] + pipeline { agent { label 'PACKAGES_x86_64_linux_redhat_7' } environment { @@ -24,11 +32,17 @@ uname -a ''' } } // clean workspace - stage('autogen') { + stage('build') { steps { - sh 'bash build-scripts/autogen' - } - } + script { + steps.each { step -> + stage("${step}") { + sh 'bash build-scripts/${step}' + } // stage step + } // steps.each + } // script + } // steps + } // stage build } // stages } // pipeline //bash buildscripts/build-scripts/autogen From e557535fb73c49854560f5ef4eb0aae8f1b99323 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 19:57:26 -0500 Subject: [PATCH 27/36] lemurs --- Jenkinsfile | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8acd5280..57f4b2e65 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -def steps = [ +def lemurs = [ 'autogen', 'install-dependencies', 'configure', @@ -32,17 +32,13 @@ uname -a ''' } } // clean workspace - stage('build') { - steps { - script { - steps.each { step -> - stage("${step}") { - sh 'bash build-scripts/${step}' - } // stage step - } // steps.each - } // script - } // steps - } // stage build + script { + lemurs.each { lemur -> + stage("${lemur}") { + sh 'bash build-scripts/${lemur}' + } // stage lemur + } // lemurs.each + } // script for lemurs } // stages } // pipeline //bash buildscripts/build-scripts/autogen From 2d3fc6de6aeeec14fe63858dd5b9adf84b11aff9 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 19:58:06 -0500 Subject: [PATCH 28/36] libre --- Jenkinsfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 57f4b2e65..90a7868b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,4 @@ -def lemurs = [ -'autogen', -'install-dependencies', -'configure', -'compile', -'package' -] +def lemurs = ['autogen','install-dependencies','configure','compile','package'] pipeline { agent { label 'PACKAGES_x86_64_linux_redhat_7' } From 5ba84aeb1d631fa8fafd76d0a11c2622ef47da39 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 19:59:08 -0500 Subject: [PATCH 29/36] lemurs --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 90a7868b0..72bffe734 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,6 +26,7 @@ uname -a ''' } } // clean workspace + stage('lemurs') { script { lemurs.each { lemur -> stage("${lemur}") { @@ -33,6 +34,7 @@ uname -a } // stage lemur } // lemurs.each } // script for lemurs + } // lemurs stage } // stages } // pipeline //bash buildscripts/build-scripts/autogen From 4e0279bb2a64a5d8dc8116ff882c780fd7252751 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 20:00:20 -0500 Subject: [PATCH 30/36] steps for lemurs --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 72bffe734..5d60be325 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,13 +27,14 @@ uname -a } } // clean workspace stage('lemurs') { - script { + 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 From b03fdde3608a2293557c2365a3c5a86aa98070bc Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 20:02:21 -0500 Subject: [PATCH 31/36] libre --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5d60be325..83e519227 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ uname -a steps { script { lemurs.each { lemur -> stage("${lemur}") { - sh 'bash build-scripts/${lemur}' + sh 'bash build-scripts/$lemur' } // stage lemur } // lemurs.each } // script for lemurs From 362d7673d5c791e6f94e0de4ca5352393d438b3a Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 20:04:00 -0500 Subject: [PATCH 32/36] lemurs please --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 83e519227..5b6bde448 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ uname -a steps { script { lemurs.each { lemur -> stage("${lemur}") { - sh 'bash build-scripts/$lemur' + sh "bash build-scripts/${lemur}" } // stage lemur } // lemurs.each } // script for lemurs From 10824ba6d12fe62c96eb410bc93f6813f47c1b64 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 20:08:15 -0500 Subject: [PATCH 33/36] libre --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5b6bde448..63c0ae8c8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,6 +15,13 @@ pipeline { sh 'for r in $REPOS; do rm -rf "$(basename "$r")"; done' } } + stage('checkout core') { + steps { + dir('../core') { + checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[credentialsId: 'jenkins-github', url: 'https://github.com/cfengine/core']]) + } // dir + } // checkout steps + } // checkout stage stage('Environment check') { steps { sh ''' From d5bc3eeceb5c485acb48426ab8b3aa47232c9407 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 20:11:26 -0500 Subject: [PATCH 34/36] libre --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 63c0ae8c8..4b50599d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,6 +22,13 @@ pipeline { } // dir } // checkout steps } // checkout stage + stage('checkout masterfiles') { + steps { + dir('../masterfiles') { + checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[credentialsId: 'jenkins-github', url: 'https://github.com/cfengine/masterfiles']]) + } // dir + } // checkout steps + } // checkout stage stage('Environment check') { steps { sh ''' From 1189ebb5e820e1e36b371ac141a2dc86043a01dd Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 20:21:27 -0500 Subject: [PATCH 35/36] recursiveSubmodules --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4b50599d7..cd8337f65 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,14 +18,14 @@ pipeline { stage('checkout core') { steps { dir('../core') { - checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[credentialsId: 'jenkins-github', url: 'https://github.com/cfengine/core']]) + checkout scmGit(branches: [[name: '*/master']], extensions: [ 'recursiveSubmodules' ], 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: [], userRemoteConfigs: [[credentialsId: 'jenkins-github', url: 'https://github.com/cfengine/masterfiles']]) + checkout scmGit(branches: [[name: '*/master']], extensions: [ 'recursiveSubmodules' ], userRemoteConfigs: [[credentialsId: 'jenkins-github', url: 'https://github.com/cfengine/masterfiles']]) } // dir } // checkout steps } // checkout stage From e00ad121e094fde2d774fd2a21cc3b8c5f6a1e8a Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 20:27:55 -0500 Subject: [PATCH 36/36] submodule --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cd8337f65..6a1498027 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,14 +18,14 @@ pipeline { stage('checkout core') { steps { dir('../core') { - checkout scmGit(branches: [[name: '*/master']], extensions: [ 'recursiveSubmodules' ], userRemoteConfigs: [[credentialsId: 'jenkins-github', url: 'https://github.com/cfengine/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: [ 'recursiveSubmodules' ], userRemoteConfigs: [[credentialsId: 'jenkins-github', url: 'https://github.com/cfengine/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