diff --git a/openscap-1.4.1-PR2154-filehash58.patch b/openscap-1.4.1-PR2154-filehash58.patch deleted file mode 100644 index 7d83033..0000000 --- a/openscap-1.4.1-PR2154-filehash58.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 106ffad93e3145747b9d6ea2a4872ed1bdc5f595 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= -Date: Tue, 20 Aug 2024 08:18:15 +0200 -Subject: [PATCH] Fix a cast - -The size_t is implementation-dependent data type, it shouldn't be -cast to unsigned int. -Fixes failing test probes/filehash58/test_probes_filehash58.sh -on s390x architecture. ---- - src/OVAL/probes/crapi/digest.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/OVAL/probes/crapi/digest.c b/src/OVAL/probes/crapi/digest.c -index 96f638d4a..2fc1c6998 100644 ---- a/src/OVAL/probes/crapi/digest.c -+++ b/src/OVAL/probes/crapi/digest.c -@@ -252,7 +252,9 @@ static int crapi_digest_update(struct crapi_digest_ctx *ctx, void *bptr, size_t - static int crapi_digest_fini(struct crapi_digest_ctx *ctx, crapi_alg_t alg) - { - #if defined(HAVE_NSS3) -- HASH_End (ctx->ctx, ctx->dst, (unsigned int *)ctx->size, *ctx->size); -+ unsigned int result_len; -+ HASH_End(ctx->ctx, ctx->dst, &result_len, *ctx->size); -+ *ctx->size = result_len; - HASH_Destroy (ctx->ctx); - #elif defined(HAVE_GCRYPT) - void *buffer; --- -2.46.0 - diff --git a/openscap.spec b/openscap.spec index 4f994c4..7c3cbae 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,13 +1,12 @@ Name: openscap -Version: 1.4.0 -Release: 2%{?dist}.alma.1 +Version: 1.4.1 +Release: 1%{?dist}.alma.1 Epoch: 1 Summary: Set of open source libraries enabling integration of the SCAP line of standards License: LGPL-2.1-or-later URL: http://www.open-scap.org/ VCS: https://github.com/OpenSCAP/openscap Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch1: openscap-1.4.1-PR2154-filehash58.patch %global common_description %{expand: OpenSCAP is a set of open source libraries providing an easier path @@ -161,9 +160,17 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog -* Tue Sep 03 2024 Eduard Abdullin - 1:1.4.0-2.alma.1 +* Thu Jan 16 2025 Eduard Abdullin - 1:1.4.1-1.alma.1 - Add AlmaLinux definitions +* Wed Jan 08 2025 Jan Černý - 1:1.4.1-1 +- Upgrade to the latest upstream release +- Introduce the 'oscap-im' tool + +* Tue Oct 29 2024 Troy Dawson - 1:1.4.0-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + * Tue Aug 20 2024 Jan Černý - 1:1.4.0-2 - Fix filehash58 probe on s390x architecture diff --git a/sources b/sources index 7e83b41..c659c51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openscap-1.4.0.tar.gz) = 93229826010b2034cb03f34f40c875fc667820b5f7c6332778a908aceeb2a15b5151abd0491c167ed83baff0c4bec3aa1425e40702eda8113a6d1885cb356a03 +SHA512 (openscap-1.4.1.tar.gz) = 07ebff512200e81bfaac5975e300bf9c72ac8a621e593245eb78d176e2208c36c18b2c6e70ab37dc49996b6903ce88e908187c6978168fc2ee8fa9cad689c877