diff --git a/build-scripts/compile-options b/build-scripts/compile-options index 79e9dd876..39a3f20cb 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/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec index 3a4187e27..27a2fcdcb 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 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/pcre2/cfbuild-pcre2.spec b/deps-packaging/pcre2/cfbuild-pcre2.spec index 9f4e79db1..e5b1821d8 100644 --- a/deps-packaging/pcre2/cfbuild-pcre2.spec +++ b/deps-packaging/pcre2/cfbuild-pcre2.spec @@ -1,4 +1,4 @@ -%define pcre2_version 10.45 +%define pcre2_version 10.46 Summary: CFEngine Build Automation -- pcre2 Name: cfbuild-pcre2 diff --git a/deps-packaging/pcre2/distfiles b/deps-packaging/pcre2/distfiles index 1cbd8cf87..644d6e16e 100644 --- a/deps-packaging/pcre2/distfiles +++ b/deps-packaging/pcre2/distfiles @@ -1 +1 @@ -0e138387df7835d7403b8351e2226c1377da804e0737db0e071b48f07c9d12ee pcre2-10.45.tar.gz +8d28d7f2c3b970c3a4bf3776bcbb5adfc923183ce74bc8df1ebaad8c1985bd07 pcre2-10.46.tar.gz diff --git a/deps-packaging/pcre2/source b/deps-packaging/pcre2/source index 99e01f31b..133912b74 100644 --- a/deps-packaging/pcre2/source +++ b/deps-packaging/pcre2/source @@ -1 +1 @@ -https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.45/ +https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.46/ diff --git a/deps-packaging/php/cfbuild-php.spec b/deps-packaging/php/cfbuild-php.spec index 920ca8793..bb691ef2e 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 diff --git a/deps-packaging/pkg-build-rpm b/deps-packaging/pkg-build-rpm index 4f71b4196..6dba9a512 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'" \ diff --git a/packaging/cfengine-nova-hub/requirements.txt b/packaging/cfengine-nova-hub/requirements.txt index 9310747ce..0f620017c 100644 --- a/packaging/cfengine-nova-hub/requirements.txt +++ b/packaging/cfengine-nova-hub/requirements.txt @@ -1 +1 @@ -cfbs==5.0.2 +cfbs==5.1.1