diff --git a/ci/linux-install-jdk21.sh b/ci/linux-install-jdk21.sh index 4d189adb3..9a3bf298e 100755 --- a/ci/linux-install-jdk21.sh +++ b/ci/linux-install-jdk21.sh @@ -9,15 +9,15 @@ install_jdk() { baseurl=https://download.oracle.com/java/21/archive/ major_version=21 baseurl="https://download.oracle.com/java/${major_version}/archive/" - version=21.0.9 + version=21.0.10 if uname -m | grep aarch64; then tarball=jdk-${version}_linux-aarch64_bin.tar.gz # checksum from https://download.oracle.com/java/${major_version}/archive/jdk-${version}_linux-aarch64_bin.tar.gz.sha256 - sha=6e0eef0f229e121dd432358b60e2755bc0916b207bcef014839c78cf9e4367ac + sha=edaf800c6deb1e7daeb448ef9c6a047551fd681942cb9e37e2729ae1a3918d1d else tarball=jdk-${version}_linux-x64_bin.tar.gz # checksum from https://download.oracle.com/java/${major_version}/latest/jdk-${version}_linux-x64_bin.tar.gz.sha256 - sha=0854421306468559813f1e5068e036213f9710e1e239d823c0d63552a1259e25 + sha=773eff7191d996d3b6ce3a99c21ce69cf2d836fd07277106313732a098d4309a fi wget --quiet "$baseurl$tarball" echo "$sha $tarball" | sha256sum --check - diff --git a/deps-packaging/libexpat/cfbuild-libexpat.spec b/deps-packaging/libexpat/cfbuild-libexpat.spec index a1ada50ea..546d93b06 100644 --- a/deps-packaging/libexpat/cfbuild-libexpat.spec +++ b/deps-packaging/libexpat/cfbuild-libexpat.spec @@ -1,4 +1,4 @@ -%define expat_version 2.7.3 +%define expat_version 2.7.4 Summary: CFEngine Build Automation -- libexpat Name: cfbuild-libexpat diff --git a/deps-packaging/libexpat/distfiles b/deps-packaging/libexpat/distfiles index 8a85f1e49..57a9b1453 100644 --- a/deps-packaging/libexpat/distfiles +++ b/deps-packaging/libexpat/distfiles @@ -1 +1 @@ -71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f expat-2.7.3.tar.xz +9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0 expat-2.7.4.tar.xz diff --git a/deps-packaging/libexpat/source b/deps-packaging/libexpat/source index 937e26214..ca385f88e 100644 --- a/deps-packaging/libexpat/source +++ b/deps-packaging/libexpat/source @@ -1 +1 @@ -https://github.com/libexpat/libexpat/releases/download/R_2_7_3/ +https://github.com/libexpat/libexpat/releases/download/R_2_7_4/ diff --git a/deps-packaging/lmdb/cfbuild-lmdb.spec b/deps-packaging/lmdb/cfbuild-lmdb.spec index 6b8f20873..1fe9dc9e6 100644 --- a/deps-packaging/lmdb/cfbuild-lmdb.spec +++ b/deps-packaging/lmdb/cfbuild-lmdb.spec @@ -1,4 +1,4 @@ -%define lmdb_version 0.9.33 +%define lmdb_version 0.9.35 Summary: CFEngine Build Automation -- lmdb Name: cfbuild-lmdb diff --git a/deps-packaging/lmdb/distfiles b/deps-packaging/lmdb/distfiles index 80ead25f5..0ced69b1f 100644 --- a/deps-packaging/lmdb/distfiles +++ b/deps-packaging/lmdb/distfiles @@ -1 +1 @@ -476801f5239c88c7de61c3390502a5d13965ecedef80105b5fb0fcb8373d1e53 openldap-LMDB_0.9.33.tar.gz +0d090c6a7c85a4f31a2ab0d734554c21097f24752393a190b0e51996b08f48c4 openldap-LMDB_0.9.35.tar.gz diff --git a/deps-packaging/lmdb/source b/deps-packaging/lmdb/source index e3779388d..94726e992 100644 --- a/deps-packaging/lmdb/source +++ b/deps-packaging/lmdb/source @@ -1 +1 @@ -https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.33/ +https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.35/ diff --git a/deps-packaging/openldap/cfbuild-openldap-aix.spec b/deps-packaging/openldap/cfbuild-openldap-aix.spec index 296c32989..30d9c8018 100644 --- a/deps-packaging/openldap/cfbuild-openldap-aix.spec +++ b/deps-packaging/openldap/cfbuild-openldap-aix.spec @@ -1,4 +1,4 @@ -%define openldap_version 2.6.10 +%define openldap_version 2.6.12 Summary: CFEngine Build Automation -- openldap Name: cfbuild-openldap diff --git a/deps-packaging/openldap/cfbuild-openldap.spec b/deps-packaging/openldap/cfbuild-openldap.spec index 1ebb49cab..d75fa496d 100644 --- a/deps-packaging/openldap/cfbuild-openldap.spec +++ b/deps-packaging/openldap/cfbuild-openldap.spec @@ -1,4 +1,4 @@ -%define openldap_version 2.6.10 +%define openldap_version 2.6.12 Summary: CFEngine Build Automation -- openldap Name: cfbuild-openldap diff --git a/deps-packaging/openldap/distfiles b/deps-packaging/openldap/distfiles index 2405c564b..c34ddcef5 100644 --- a/deps-packaging/openldap/distfiles +++ b/deps-packaging/openldap/distfiles @@ -1 +1 @@ -c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516 openldap-2.6.10.tgz +1716ad779e85d743694c3e3b05277fb71b6a5eadca43c7a958aa62683b22208e openldap-2.6.12.tgz diff --git a/deps-packaging/openssl/0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch b/deps-packaging/openssl/0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch deleted file mode 100644 index 9433b3e0e..000000000 --- a/deps-packaging/openssl/0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d8d3a570fde3799c2933be25edd52be7448aeac7 Mon Sep 17 00:00:00 2001 -From: Vratislav Podzimek -Date: Tue, 14 May 2024 16:52:38 +0200 -Subject: [PATCH 2/4] Define _XOPEN_SOURCE_EXTENDED as 1 - -Otherwise build on AIX 7 hits this beauty: - -``` -16:38:25 /usr/include/standards.h:88:28: error: operator '==' has no left operand -16:38:25 #if (_XOPEN_SOURCE_EXTENDED==1) -16:38:25 ^~ -``` - -(cherry picked from commit c762f970d1c390908def261001a9d2873014bbef) ---- - apps/ocsp.c | 2 +- - crypto/conf/conf_lib.c | 2 ++ - crypto/conf/conf_sap.c | 2 ++ - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/apps/ocsp.c b/apps/ocsp.c -index 97454a4b81..299323390c 100644 ---- a/apps/ocsp.c -+++ b/apps/ocsp.c -@@ -11,7 +11,7 @@ - - #ifdef OPENSSL_SYS_VMS - /* So fd_set and friends get properly defined on OpenVMS */ --# define _XOPEN_SOURCE_EXTENDED -+# define _XOPEN_SOURCE_EXTENDED 1 - #endif - - #include -diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c -index 601f494302..0665644cde 100644 ---- a/crypto/conf/conf_lib.c -+++ b/crypto/conf/conf_lib.c -@@ -7,6 +7,8 @@ - * https://www.openssl.org/source/license.html - */ - -+#define _XOPEN_SOURCE_EXTENDED 1 /* To get a definition of strdup() */ -+ - #include "internal/e_os.h" - #include - #include -diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c -index 6b3defe0fc..d967a4cb5a 100644 ---- a/crypto/conf/conf_sap.c -+++ b/crypto/conf/conf_sap.c -@@ -7,6 +7,8 @@ - * https://www.openssl.org/source/license.html - */ - -+#define _XOPEN_SOURCE_EXTENDED 1 /* To get a definition of strdup() */ -+ - #include - #include - #include "internal/cryptlib.h" --- -2.45.0 - diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec index 70f700192..d2566b4fe 100644 --- a/deps-packaging/openssl/cfbuild-openssl.spec +++ b/deps-packaging/openssl/cfbuild-openssl.spec @@ -1,4 +1,4 @@ -%define openssl_version 3.6.0 +%define openssl_version 3.6.1 Summary: CFEngine Build Automation -- openssl Name: cfbuild-openssl @@ -6,7 +6,7 @@ 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 +Patch1: 0010-Update-sha512-x86_64-pl.patch License: MIT Group: Other Url: https://cfengine.com @@ -179,4 +179,3 @@ CFEngine Build Automation -- openssl -- development files %{prefix}/lib/pkgconfig %changelog - diff --git a/deps-packaging/openssl/distfiles b/deps-packaging/openssl/distfiles index b8dcfac59..51bfdf889 100644 --- a/deps-packaging/openssl/distfiles +++ b/deps-packaging/openssl/distfiles @@ -1 +1 @@ -b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9 openssl-3.6.0.tar.gz +b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e openssl-3.6.1.tar.gz diff --git a/deps-packaging/openssl/source b/deps-packaging/openssl/source index 686c04774..eab874077 100644 --- a/deps-packaging/openssl/source +++ b/deps-packaging/openssl/source @@ -1 +1 @@ -https://github.com/openssl/openssl/releases/download/openssl-3.6.0/ +https://github.com/openssl/openssl/releases/download/openssl-3.6.1/