diff --git a/2283.patch b/2283.patch deleted file mode 100644 index 4fdea38..0000000 --- a/2283.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6767362e139bf1e8981e1f1138e38cad359e4182 Mon Sep 17 00:00:00 2001 -From: Matthew Burket -Date: Fri, 5 Dec 2025 09:12:43 -0600 -Subject: [PATCH] Always check the current lists before inserting on blueprints - -Fixes OpenSCAP#2282 ---- - src/XCCDF_POLICY/xccdf_policy_remediate.c | 2 +- - .../unittests/test_remediation_blueprint.xccdf.xml | 10 ++++++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/XCCDF_POLICY/xccdf_policy_remediate.c b/src/XCCDF_POLICY/xccdf_policy_remediate.c -index 0f6c21c4ee..5e4a0b1116 100644 ---- a/src/XCCDF_POLICY/xccdf_policy_remediate.c -+++ b/src/XCCDF_POLICY/xccdf_policy_remediate.c -@@ -742,7 +742,7 @@ static inline int _parse_blueprint_fix(const char *fix_text, struct blueprint_cu - memcpy(val, &fix_text[ovector[2]], ovector[3] - ovector[2]); - val[ovector[3] - ovector[2]] = '\0'; - -- if (!oscap_list_contains(customizations->kernel_append, val, (oscap_cmp_func) oscap_streq)) { -+ if (!oscap_list_contains(tab[i].list, val, (oscap_cmp_func) oscap_streq)) { - oscap_list_prepend(tab[i].list, val); - } else { - free(val); -diff --git a/tests/API/XCCDF/unittests/test_remediation_blueprint.xccdf.xml b/tests/API/XCCDF/unittests/test_remediation_blueprint.xccdf.xml -index 2fc909795b..de3b8468a8 100644 ---- a/tests/API/XCCDF/unittests/test_remediation_blueprint.xccdf.xml -+++ b/tests/API/XCCDF/unittests/test_remediation_blueprint.xccdf.xml -@@ -104,6 +104,16 @@ enabled = ["sshd"] - - [customizations.services] - masked = ["evil"] -+ -+ -+ -+ -+ -+ -+ Enable sshd -+ -+[customizations.services] -+enabled = ["sshd"] - - - diff --git a/openscap.spec b/openscap.spec index d9f9863..4b7623e 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,5 +1,5 @@ Name: openscap -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist}.alma.1 Epoch: 1 Summary: Set of open source libraries enabling integration of the SCAP line of standards @@ -7,7 +7,6 @@ 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 -Patch0: 2283.patch # AlmaLinux Patch Patch1000: 0001-Add-AlmaLinux-to-CPE-dictionary.patch @@ -161,9 +160,14 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog -* Fri Dec 12 2025 Eduard Abdullin - 1:1.4.3-1.alma.1 +* Wed Apr 22 2026 Eduard Abdullin - 1:1.4.4-1.alma.1 - Add AlmaLinux definitions +* Thu Apr 09 2026 Matthew Burket - 1:1.4.4-1 +- Upgrade to the latest upstream release (RHEL-161763) +- Fix Bash completion (RHEL-145121) +- Add ability to list rules and variables in a profile by the "oscap info" command (RHEL-143569) + * Mon Dec 08 2025 Matthew Burket - 1:1.4.3-1 - Upgrade to the latest upstream release (RHEL-133978) - Add the ability to show rule details in output (RHEL-104651) diff --git a/sources b/sources index 9006201..dc4231e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openscap-1.4.3.tar.gz) = 76ee761804f781f72adea07d9a07f0100cde9bb2a08f1637887b4e6f42438d9bbcfd73b17dc233b67cee3db86f9ccb1654f87c23c374bf3f834139413e121d6f +SHA512 (openscap-1.4.4.tar.gz) = c69736bee997e50a04aff8e4f22da880f342190e1289c5df0fb73b7af34833d3bd9f4e5055b227a18d571167671f821701a09f8c9a3e4568c7da68cc4be51133