From 5236c572dc1bd50a0ba7f2a29b5776905f27bf5a Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Tue, 16 Jun 2026 05:42:59 -0400
Subject: [PATCH] import UBI openscap-1.3.14-1.el9_8

---
 .gitignore          |  2 +-
 .openscap.metadata  |  2 +-
 SOURCES/2284.patch  | 45 ---------------------------------------------
 SPECS/openscap.spec |  6 ++++--
 4 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 SOURCES/2284.patch

diff --git a/.gitignore b/.gitignore
index 4a65e17..aa2f524 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/openscap-1.3.13.tar.gz
+SOURCES/openscap-1.3.14.tar.gz
diff --git a/.openscap.metadata b/.openscap.metadata
index 4f862e4..0642581 100644
--- a/.openscap.metadata
+++ b/.openscap.metadata
@@ -1 +1 @@
-3fad4a88243c254a23faacef8a246ba761d49697 SOURCES/openscap-1.3.13.tar.gz
+7bbfedd3dbf393d934e8a484c9fb446007ad61d7 SOURCES/openscap-1.3.14.tar.gz
diff --git a/SOURCES/2284.patch b/SOURCES/2284.patch
deleted file mode 100644
index e62ef6f..0000000
--- a/SOURCES/2284.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3a9fbd448ac18e50dfdf5a60af043cda7cdd63d0 Mon Sep 17 00:00:00 2001
-From: Matthew Burket <mburket@redhat.com>
-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 842ef2df9d..c7c02f0135 100644
---- a/src/XCCDF_POLICY/xccdf_policy_remediate.c
-+++ b/src/XCCDF_POLICY/xccdf_policy_remediate.c
-@@ -724,7 +724,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"]
-     <fix system="urn:redhat:osbuild:blueprint">
- [customizations.services]
- masked = ["evil"]
-+</fix>
-+    <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5">
-+      <check-content-ref href="test_remediation_simple.oval.xml" name="oval:moc.elpmaxe.www:def:1"/>
-+    </check>
-+  </Rule>
-+ <Rule selected="true" id="xccdf_moc.elpmaxe.www_rule_11">
-+    <title>Enable sshd</title>
-+    <fix system="urn:redhat:osbuild:blueprint">
-+[customizations.services]
-+enabled = ["sshd"]
- </fix>
-     <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5">
-       <check-content-ref href="test_remediation_simple.oval.xml" name="oval:moc.elpmaxe.www:def:1"/>
diff --git a/SPECS/openscap.spec b/SPECS/openscap.spec
index 49f574d..ebfe83b 100644
--- a/SPECS/openscap.spec
+++ b/SPECS/openscap.spec
@@ -1,12 +1,11 @@
 Name:           openscap
-Version:        1.3.13
+Version:        1.3.14
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 License:        LGPLv2+
 URL:            http://www.open-scap.org/
 Source0:        https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
-Patch0:         2284.patch
 BuildRequires:  make
 BuildRequires:  cmake >= 2.6
 BuildRequires:  gcc
@@ -201,6 +200,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
 %{_bindir}/oscap-run-sce-script
 
 %changelog
+* Mon Apr 13 2026 Matthew Burket <mburket@redhat.com> - 1:1.3.14-1
+- Upgrade to the latest upstream release (RHEL-167949)
+
 * Mon Dec 08 2025 Matthew Burket <mburket@redhat.com> - 1:1.3.13-1
 - Upgrade to the latest upstream release (RHEL-133976)
 - Fix Filepath and Pattern Fields inversion (RHEL-104073)