From 0e2292ac32487f800cd8a2fb5d7a52f16871d75c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 1 Sep 2025 07:05:16 +0000 Subject: [PATCH 1/4] Updated dependency 'git' from version 2.50.1 to 2.51.0 --- deps-packaging/git/cfbuild-git.spec | 2 +- deps-packaging/git/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec index 65b1a7541..529a3abcc 100644 --- a/deps-packaging/git/cfbuild-git.spec +++ b/deps-packaging/git/cfbuild-git.spec @@ -1,4 +1,4 @@ -%define git_version 2.50.1 +%define git_version 2.51.0 Summary: CFEngine Build Automation -- git Name: cfbuild-git diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles index 8d4fea0e8..c028613f3 100644 --- a/deps-packaging/git/distfiles +++ b/deps-packaging/git/distfiles @@ -1 +1 @@ -522d1635f8b62b484b0ce24993818aad3cab8e11ebb57e196bda38a3140ea915 git-2.50.1.tar.gz +3d531799d2cf2cac8e294ec6e3229e07bfca60dc6c783fe69e7712738bef7283 git-2.51.0.tar.gz From e7aa685d48ac144665b34be3c2eb9432386a4777 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 1 Sep 2025 07:05:20 +0000 Subject: [PATCH 2/4] Updated dependency 'php' from version 8.3.24 to 8.3.25 --- 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 4f6dc4bea..eb604cf2e 100644 --- a/deps-packaging/php/cfbuild-php.spec +++ b/deps-packaging/php/cfbuild-php.spec @@ -1,4 +1,4 @@ -%define php_version 8.3.24 +%define php_version 8.3.25 Summary: CFEngine Build Automation -- php Name: cfbuild-php diff --git a/deps-packaging/php/distfiles b/deps-packaging/php/distfiles index a1514b8c4..3e3527a7a 100644 --- a/deps-packaging/php/distfiles +++ b/deps-packaging/php/distfiles @@ -1 +1 @@ -b827c512b59270c3dc7e19614314fc345022c423e6443c960746310792d0de82 php-8.3.24.tar.gz +86711e98eccffb637dc319f0cdcde9188c1710633910beb1a3cbb3ae5ecc2e05 php-8.3.25.tar.gz From b0dd63480e34a33cd31ed99acf8080eadffe6172 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Wed, 3 Sep 2025 11:55:41 -0500 Subject: [PATCH 3/4] Bump cfbs to 5.1.1 which fixes python issues on older platforms Ticket: ENT-13212 Changelog: none (cherry picked from commit 55f59ab49f266d776ccce91fba785131d08e2cdc) --- packaging/cfengine-nova-hub/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/cfengine-nova-hub/requirements.txt b/packaging/cfengine-nova-hub/requirements.txt index 8eb40805e..0f620017c 100644 --- a/packaging/cfengine-nova-hub/requirements.txt +++ b/packaging/cfengine-nova-hub/requirements.txt @@ -1 +1 @@ -cfbs==5.0.0 +cfbs==5.1.1 From 9c5e6b4668160910cdfa26deca2321f8f7d0e6d4 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 5 Sep 2025 11:24:39 -0500 Subject: [PATCH 4/4] Adjusted libcurl spec file to honor SYSTEM_SSL setting from compile-options script This applies to redhat > 7 and suse >= 15 Ticket: ENT-12528 Changelog: none --- build-scripts/compile-options | 2 ++ deps-packaging/libcurl/cfbuild-libcurl.spec | 3 +-- deps-packaging/pkg-build-rpm | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-scripts/compile-options b/build-scripts/compile-options index 24df331b8..669429c8b 100644 --- a/build-scripts/compile-options +++ b/build-scripts/compile-options @@ -36,6 +36,8 @@ export PROJECT # Otherwise, we build it. if [ x"$SYSTEM_SSL" = x ] then + # default to using cfengine openssl + SYSTEM_SSL=0 # We don't bundle OpenSSL on some redhat-derived systems due to incompatability with libpam and our openssl. _OS_MAJOR_VERSION="$(echo "$OS_VERSION" | cut -d. -f1)" if [ "$OS" = "rhel" ] && expr "$_OS_MAJOR_VERSION" ">=" "8" >/dev/null diff --git a/deps-packaging/libcurl/cfbuild-libcurl.spec b/deps-packaging/libcurl/cfbuild-libcurl.spec index 90fb86865..1cf54bc57 100644 --- a/deps-packaging/libcurl/cfbuild-libcurl.spec +++ b/deps-packaging/libcurl/cfbuild-libcurl.spec @@ -18,8 +18,7 @@ AutoReqProv: no mkdir -p %{_builddir} %setup -q -n curl-%{curl_version} -# we don't bundle OpenSSL on RHEL 8 (and newer in the future) -%if %{?rhel}%{!?rhel:0} > 7 +%if "%{_system_ssl}" == "1" %define ssl_prefix /usr %else %define ssl_prefix %{prefix} diff --git a/deps-packaging/pkg-build-rpm b/deps-packaging/pkg-build-rpm index 14fc6d0fb..a26cdae63 100755 --- a/deps-packaging/pkg-build-rpm +++ b/deps-packaging/pkg-build-rpm @@ -113,6 +113,7 @@ fi # - argv[1] = --define # - argv[2] = a b eval $RPMBUILD_CMD -bb \ + --define "'_system_ssl $SYSTEM_SSL'" \ --define "'_topdir $BASEDIR/$PKGNAME'" \ --define "'version $VERSION'" \ --define "'buildprefix $BUILDPREFIX'" \