Skip to content

Updated dependencies (3.24.x) #1665

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
merged 11 commits into from
Apr 17, 2025
Merged

Updated dependencies (3.24.x) #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c7adbb0
Updated dependency 'libcurl' from version 8.12.1 to 8.13.0
github-actions[bot] Apr 8, 2025
83e320b
Updated dependency 'libcurl-hub' from version 8.12.1 to 8.13.0
github-actions[bot] Apr 8, 2025
1ee9660
Updated dependency 'libexpat' from version 2.7.0 to 2.7.1
github-actions[bot] Apr 8, 2025
15aa915
Updated dependency 'libxml2' from version 2.13.6 to 2.14.1
github-actions[bot] Apr 8, 2025
6b01c45
Updated dependency 'openssl' from version 3.4.1 to 3.5.0
github-actions[bot] Apr 8, 2025
4f15487
Removed 32-bit Windows client as it is no longer supported
craigcomstock Apr 15, 2025
aec5c82
Adjusted mingw libxml2 build to exclude libiconv
craigcomstock Apr 15, 2025
8e67e8f
Adjusted dll filename for mingw libxml2 dependency build
craigcomstock Apr 15, 2025
3d46dba
Removed two patches for hpux which are no longer needed
craigcomstock Apr 17, 2025
c6f388a
Removed unused openssl patches: 0001 and 0002
craigcomstock Apr 17, 2025
cd0bc82
Adjusted openssl spec file for rhel/centos-6 platform
craigcomstock Apr 17, 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
1 change: 0 additions & 1 deletion build-scripts/labels.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ PACKAGES_arm_64_linux_ubuntu_22
PACKAGES_x86_64_linux_ubuntu_24
PACKAGES_arm_64_linux_ubuntu_24

PACKAGES_i386_mingw
PACKAGES_x86_64_mingw

PACKAGES_ia64_hpux_11.23
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define curl_version 8.12.1
%define curl_version 8.13.0

Summary: CFEngine Build Automation -- libcurl
Name: cfbuild-libcurl-hub
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libcurl-hub/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7b40ea64947e0b440716a4d7f0b7aa56230a5341c8377d7b609649d4aea8dbcf curl-8.12.1.tar.gz
c261a4db579b289a7501565497658bbd52d3138fdbaccf1490fa918129ab45bc curl-8.13.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/libcurl/cfbuild-libcurl.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define curl_version 8.12.1
%define curl_version 8.13.0

Summary: CFEngine Build Automation -- libcurl
Name: cfbuild-libcurl
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libcurl/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7b40ea64947e0b440716a4d7f0b7aa56230a5341c8377d7b609649d4aea8dbcf curl-8.12.1.tar.gz
c261a4db579b289a7501565497658bbd52d3138fdbaccf1490fa918129ab45bc curl-8.13.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/libexpat/cfbuild-libexpat.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define expat_version 2.7.0
%define expat_version 2.7.1

Summary: CFEngine Build Automation -- libexpat
Name: cfbuild-libexpat
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libexpat/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
25df13dd2819e85fb27a1ce0431772b7047d72af81ae78dc26b4c6e0805f48d1 expat-2.7.0.tar.xz
354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30 expat-2.7.1.tar.xz
2 changes: 1 addition & 1 deletion deps-packaging/libexpat/source
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/libexpat/libexpat/releases/download/R_2_7_0/
https://github.com/libexpat/libexpat/releases/download/R_2_7_1/
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/cfbuild-libxml2.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define libxml_version 2.13.6
%define libxml_version 2.14.1

Summary: CFEngine Build Automation -- libxml2
Name: cfbuild-libxml2
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96 libxml2-2.13.6.tar.xz
310df85878b65fa717e5e28e0d9e8f6205fd29d883929303a70a4f2fc4f6f1f2 libxml2-2.14.1.tar.xz
3 changes: 2 additions & 1 deletion deps-packaging/libxml2/mingw/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ build: build-stamp
build-stamp:
dh_testdir

./configure --host=$(DEB_HOST_GNU_TYPE) --prefix=$(PREFIX) --without-python
# ENT-12744 note: --without-iconv is needed on ubuntu-16 build host, we can use win-iconv-mingw-w64-dev on ubuntu-20+ when we get there.
./configure --host=$(DEB_HOST_GNU_TYPE) --prefix=$(PREFIX) --without-python --without-iconv
make

touch build-stamp
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/source
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://download.gnome.org/sources/libxml2/2.13/
https://download.gnome.org/sources/libxml2/2.14/
83 changes: 0 additions & 83 deletions deps-packaging/openssl/0001-Revert-rcu-Ensure-that-updates-to-the-ID-field-of-a-.patch
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions deps-packaging/openssl/0002-Don-t-use-__ATOMIC_ACQ_REL-on-older-compilers.patch
View file
Open in desktop

This file was deleted.

15 changes: 1 addition & 14 deletions deps-packaging/openssl/cfbuild-openssl.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
%define openssl_version 3.4.1
%define openssl_version 3.5.0

Summary: CFEngine Build Automation -- openssl
Name: cfbuild-openssl
Version: %{version}
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
License: MIT
Group: Other
Url: https://cfengine.com
Expand All @@ -20,17 +18,6 @@ AutoReqProv: no
mkdir -p %{_builddir}
%setup -q -n openssl-%{openssl_version}

%patch0 -p1
%patch1 -p1

if expr "`cat /etc/redhat-release`" : '.* [6]\.'
then
# These two patches are taken from master branch as of 2025-Mar-26 and
# should be removed with upgrade past 3.4.1
patch -p1 < %{_topdir}/SOURCES/0001-Revert-rcu-Ensure-that-updates-to-the-ID-field-of-a-.patch
patch -p1 < %{_topdir}/SOURCES/0002-Don-t-use-__ATOMIC_ACQ_REL-on-older-compilers.patch
fi

%build

if [ -z "$MAKE" ]
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/openssl/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3 openssl-3.4.1.tar.gz
344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0 openssl-3.5.0.tar.gz
5 changes: 0 additions & 5 deletions deps-packaging/openssl/hpux/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ export LD_LIBRARY_PATH=$PREFIX/lib

# Configure

# These two patches are taken from master branch as of 2025-Mar-26 and should
# be removed with upgrade past 3.4.1
${PATCH} -p1 < 0001-Revert-rcu-Ensure-that-updates-to-the-ID-field-of-a-.patch
${PATCH} -p1 < 0002-Don-t-use-__ATOMIC_ACQ_REL-on-older-compilers.patch

$PERL ./Configure hpux-ia64-gcc $(<config_flags_$ROLE.txt) \
$LDFLAGS --prefix=$PREFIX --libdir=lib

Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/openssl/source
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/openssl/openssl/releases/download/openssl-3.4.1/
https://github.com/openssl/openssl/releases/download/openssl-3.5.0/
2 changes: 1 addition & 1 deletion packaging/cfengine-nova/cfengine-nova.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<File Id='zlib1.dll' Name='zlib1.dll' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\zlib1.dll' />
</Component>
<Component Id='libxml2.dll' Guid='7ae36f48-d2ad-417c-a01f-809b7613eccc' Win64='$(var.isWin64)'>
<File Id='libxml2.dll' Name='libxml2-2.dll' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\libxml2-2.dll' />
<File Id='libxml2.dll' Name='libxml2-16.dll' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\libxml2-16.dll' />
</Component>
<Component Id='libcurl_4.dll' Guid='de435dd1-1fce-424a-b6a0-dc63192e2060' Win64='$(var.isWin64)'>
<File Id='libcurl_4.dll' Name='libcurl-4.dll' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\libcurl-4.dll' />
Expand Down
Loading