Skip to content

Updated dependencies (3.24.x) #1871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larsewi merged 5 commits into from
Sep 8, 2025
Merged

Updated dependencies (3.24.x) #1871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd12a3d
Updated dependency 'git' from version 2.50.1 to 2.51.0
github-actions[bot] Sep 1, 2025
f82d01b
Updated dependency 'pcre2' from version 10.45 to 10.46
github-actions[bot] Sep 1, 2025
a6e7b88
Updated dependency 'php' from version 8.3.24 to 8.3.25
github-actions[bot] Sep 1, 2025
2d4071c
Bump cfbs to 5.1.1 which fixes python issues on older platforms
craigcomstock Sep 3, 2025
f91a72c
Adjusted libcurl spec file to honor SYSTEM_SSL setting from compile-o…
craigcomstock Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build-scripts/compile-options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/git/cfbuild-git.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define git_version 2.50.1
%define git_version 2.51.0

Summary: CFEngine Build Automation -- git
Name: cfbuild-git
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/git/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
522d1635f8b62b484b0ce24993818aad3cab8e11ebb57e196bda38a3140ea915 git-2.50.1.tar.gz
3d531799d2cf2cac8e294ec6e3229e07bfca60dc6c783fe69e7712738bef7283 git-2.51.0.tar.gz
3 changes: 1 addition & 2 deletions deps-packaging/libcurl/cfbuild-libcurl.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/pcre2/cfbuild-pcre2.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define pcre2_version 10.45
%define pcre2_version 10.46

Summary: CFEngine Build Automation -- pcre2
Name: cfbuild-pcre2
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/pcre2/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0e138387df7835d7403b8351e2226c1377da804e0737db0e071b48f07c9d12ee pcre2-10.45.tar.gz
8d28d7f2c3b970c3a4bf3776bcbb5adfc923183ce74bc8df1ebaad8c1985bd07 pcre2-10.46.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/pcre2/source
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.45/
https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.46/
2 changes: 1 addition & 1 deletion deps-packaging/php/cfbuild-php.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define php_version 8.3.24
%define php_version 8.3.25

Summary: CFEngine Build Automation -- php
Name: cfbuild-php
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/php/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b827c512b59270c3dc7e19614314fc345022c423e6443c960746310792d0de82 php-8.3.24.tar.gz
86711e98eccffb637dc319f0cdcde9188c1710633910beb1a3cbb3ae5ecc2e05 php-8.3.25.tar.gz
1 change: 1 addition & 0 deletions deps-packaging/pkg-build-rpm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'" \
Expand Down
2 changes: 1 addition & 1 deletion packaging/cfengine-nova-hub/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cfbs==5.0.2
cfbs==5.1.1
Loading