From a91f6315949d07970e9c5e4e3b02c71f3d3c5433 Mon Sep 17 00:00:00 2001
From: Armando Acosta <armando.acosta@oracle.com>
Date: Fri, 23 Aug 2024 11:05:00 -0600
Subject: [PATCH 1/3] Update installed_OS_is_rhel9

To prevent false positive RHEL9 in OL9
because OL9 has redhat-release package present

Signed-off-by: Armando Acosta <armando.acosta@oracle.com>
---
 shared/checks/oval/installed_OS_is_rhel9.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shared/checks/oval/installed_OS_is_rhel9.xml b/shared/checks/oval/installed_OS_is_rhel9.xml
index 25507019a42..4ca1534acc4 100644
--- a/shared/checks/oval/installed_OS_is_rhel9.xml
+++ b/shared/checks/oval/installed_OS_is_rhel9.xml
@@ -15,7 +15,11 @@
       <criterion comment="Installed operating system is part of the unix family"
       test_ref="test_rhel9_unix_family" />
       <criteria operator="OR">
-        <criterion comment="RHEL 9 is installed" test_ref="test_rhel9" />
+        <criteria operator="AND" comment="RHEL 9 is installed">
+          <criterion comment="RHEL 9 is installed" test_ref="test_rhel9" />
+          <!-- This prevent false positive RHEL9 in OL9 because OL9 has redhat-release package present -->
+          <extend_definition comment="Installed OS is not OL9" definition_ref="installed_OS_is_ol9" negate="true"/>
+        </criteria>
         <criteria operator="AND" comment="Red Hat Enterprise Virtualization Host is installed">
           <criterion comment="Red Hat Virtualization Host (RHVH)" test_ref="test_rhvh4_version" />
           <criterion comment="Red Hat Enterprise Virtualization Host is based on RHEL 9" test_ref="test_rhevh_rhel9_version" />

From 593fda8b6be6e2361deb62d7cd9725b7616b2f82 Mon Sep 17 00:00:00 2001
From: Armando Acosta <armando.acosta@oracle.com>
Date: Fri, 23 Aug 2024 12:14:50 -0600
Subject: [PATCH 2/3] Update installed_OS_is_rhel8

To prevent false positive RHEL8 in OL8
because OL8 has redhat-release package present

Signed-off-by: Armando Acosta <armando.acosta@oracle.com>
---
 shared/checks/oval/installed_OS_is_rhel8.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shared/checks/oval/installed_OS_is_rhel8.xml b/shared/checks/oval/installed_OS_is_rhel8.xml
index feab963b941..d4333d716e6 100644
--- a/shared/checks/oval/installed_OS_is_rhel8.xml
+++ b/shared/checks/oval/installed_OS_is_rhel8.xml
@@ -15,7 +15,11 @@
       <criterion comment="Installed operating system is part of the unix family"
       test_ref="test_rhel8_unix_family" />
       <criteria operator="OR">
-        <criterion comment="RHEL 8 is installed" test_ref="test_rhel8" />
+        <criteria operator="AND" comment="RHEL 8 is installed">
+          <criterion comment="RHEL 8 is installed" test_ref="test_rhel8" />
+          <!-- This prevent false positive RHEL8 in OL8 because OL8 has redhat-release package present-->
+          <extend_definition comment="Installed OS is not OL8" definition_ref="installed_OS_is_ol8" negate="true"/>
+        </criteria>
         <criteria operator="AND" comment="Red Hat Enterprise Virtualization Host is installed">
           <criterion comment="Red Hat Virtualization Host (RHVH)" test_ref="test_rhvh4_version" />
           <criterion comment="Red Hat Enterprise Virtualization Host is based on RHEL 8" test_ref="test_rhevh_rhel8_version" />

From 2c060752cd5a5769538bd6882ac524997819d60f Mon Sep 17 00:00:00 2001
From: Armando Acosta <armando.acosta@oracle.com>
Date: Tue, 3 Sep 2024 11:49:48 -0600
Subject: [PATCH 3/3] Update ssg/build_derivatives to avoid duplication

Signed-off-by: Armando Acosta <armando.acosta@oracle.com>
---
 ssg/build_derivatives.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ssg/build_derivatives.py b/ssg/build_derivatives.py
index 79fc3eb3089..e090b710637 100644
--- a/ssg/build_derivatives.py
+++ b/ssg/build_derivatives.py
@@ -76,7 +76,8 @@ def add_element_to(oval_root, tag_name, component_element):
     if xml_el is None:
         xml_el = ElementTree.Element("{%s}%s" % (oval_namespace, tag_name))
         oval_root.append(xml_el)
-    xml_el.append(component_element)
+    if xml_el.find("%s[@id='%s']" % (component_element.tag, component_element.get("id"))) is None:
+        xml_el.append(component_element)
 
 
 def add_oval_components_to_oval_xml(oval_root, tag_name, component_dict):