From 40749d1a9caf2e6cbaac15e6cd3ef00200da39779f6c5bae008f59ec1ed35016 Mon Sep 17 00:00:00 2001
From: Wolfgang Frisch <wolfgang.frisch@suse.com>
Date: Mon, 6 May 2024 07:39:11 +0000
Subject: [PATCH] Accepting request 1171991 from
 home:msmeissn:branches:security

- 0001-Add-openSUSE-cpe-links.patch: added Leap 15.6

OBS-URL: https://build.opensuse.org/request/show/1171991
OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=293
---
 0001-Add-openSUSE-cpe-links.patch | 52 ++++++++++++++++++++++---------
 openscap.changes                  |  5 +++
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/0001-Add-openSUSE-cpe-links.patch b/0001-Add-openSUSE-cpe-links.patch
index 8c3e311..1909de4 100644
--- a/0001-Add-openSUSE-cpe-links.patch
+++ b/0001-Add-openSUSE-cpe-links.patch
@@ -8,11 +8,11 @@ Subject: [PATCH 1/5] Add openSUSE cpe links
  cpe/openscap-cpe-oval.xml | 127 ++++++++++++++++++++++++++++++++++++++
  2 files changed, 151 insertions(+)
 
-diff --git a/cpe/openscap-cpe-dict.xml b/cpe/openscap-cpe-dict.xml
-index 02d5361..cf52bee 100644
---- a/cpe/openscap-cpe-dict.xml
-+++ b/cpe/openscap-cpe-dict.xml
-@@ -53,4 +53,28 @@
+Index: openscap-1.3.10/cpe/openscap-cpe-dict.xml
+===================================================================
+--- openscap-1.3.10.orig/cpe/openscap-cpe-dict.xml
++++ openscap-1.3.10/cpe/openscap-cpe-dict.xml
+@@ -53,4 +53,32 @@
              <title xml:lang="en-us">Fedora 35</title>
              <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.fedora:def:35</check>
        </cpe-item>
@@ -36,16 +36,20 @@ index 02d5361..cf52bee 100644
 +            <title xml:lang="en-us">openSUSE Leap 15.5</title>
 +            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:155</check>
 +      </cpe-item>
++      <cpe-item name="cpe:/o:opensuse:leap:15.6">
++            <title xml:lang="en-us">openSUSE Leap 15.6</title>
++            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:156</check>
++      </cpe-item>
 +      <cpe-item name="cpe:/o:opensuse:tumbleweed">
 +            <title xml:lang="en-us">openSUSE Tumbleweed</title>
 +            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:9999</check>
 +      </cpe-item>
  </cpe-list>
-diff --git a/cpe/openscap-cpe-oval.xml b/cpe/openscap-cpe-oval.xml
-index 6409940..a402c7f 100644
---- a/cpe/openscap-cpe-oval.xml
-+++ b/cpe/openscap-cpe-oval.xml
-@@ -690,6 +690,84 @@
+Index: openscap-1.3.10/cpe/openscap-cpe-oval.xml
+===================================================================
+--- openscap-1.3.10.orig/cpe/openscap-cpe-oval.xml
++++ openscap-1.3.10/cpe/openscap-cpe-oval.xml
+@@ -690,6 +690,97 @@
                          <criterion comment="openSUSE Leap 15.0 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:150"/>
                    </criteria>
              </definition>
@@ -114,6 +118,19 @@ index 6409940..a402c7f 100644
 +                        <criterion comment="openSUSE Leap 15.5 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:155"/>
 +                  </criteria>
 +            </definition>
++            <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:156" version="1">
++                  <metadata>
++                        <title>openSUSE Leap 15.6</title>
++                        <affected family="unix">
++                            <platform>openSUSE Leap 15.6</platform>
++                        </affected>
++                        <reference ref_id="cpe:/o:opensuse:leap:15.6" source="CPE"/>
++                        <description>The operating system installed on the system is openSUSE Leap 15.6</description>
++                  </metadata>
++                  <criteria>
++                        <criterion comment="openSUSE Leap 15.6 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:156"/>
++                  </criteria>
++            </definition>
 +            <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:9999" version="1">
 +                  <metadata>
 +                        <title>openSUSE Tumbleweed</title>
@@ -130,7 +147,7 @@ index 6409940..a402c7f 100644
              <definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1" version="1" >
                    <metadata>
                          <title>Wind River Linux</title>
-@@ -1087,6 +1165,36 @@
+@@ -1087,6 +1178,41 @@
                    <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
                    <state state_ref="oval:org.open-scap.cpe.opensuse:ste:150"/>
              </rpminfo_test>
@@ -159,6 +176,11 @@ index 6409940..a402c7f 100644
 +                  <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
 +                  <state state_ref="oval:org.open-scap.cpe.opensuse:ste:155"/>
 +            </rpminfo_test>
++            <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:156" version="2" check="at least one" comment="openSUSE-release is version 15.6"
++                  xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
++                  <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
++                  <state state_ref="oval:org.open-scap.cpe.opensuse:ste:156"/>
++            </rpminfo_test>
 +            <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:9999" version="2" check="at least one" comment="openSUSE-release is openSUSE Tumbleweed"
 +                  xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
 +                  <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
@@ -167,7 +189,7 @@ index 6409940..a402c7f 100644
              <family_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.wrlinux:tst:1" version="1" check="only one"
                    comment="Installed operating system is part of the Unix family."
                    xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
-@@ -1415,6 +1523,25 @@
+@@ -1415,6 +1541,28 @@
              <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:150" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                    <version operation="pattern match">^15.0$</version>
              </rpminfo_state>
@@ -186,6 +208,9 @@ index 6409940..a402c7f 100644
 +            <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:155" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
 +                  <version operation="pattern match">^15.5$</version>
 +            </rpminfo_state>
++            <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:156" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
++                  <version operation="pattern match">^15.6$</version>
++            </rpminfo_state>
 +            <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:9999" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
 +              <!-- matching for timestamp -->
 +              <version operation="pattern match">^\d{8}$</version>
@@ -193,6 +218,3 @@ index 6409940..a402c7f 100644
              <textfilecontent54_state
                              id="oval:org.open-scap.cpe.wrlinux-release:ste:8"
                              comment="Check the /etc/wrlinux-release file for VERSION 8 specification."
--- 
-2.40.0
-
diff --git a/openscap.changes b/openscap.changes
index 0c1c856..558a96f 100644
--- a/openscap.changes
+++ b/openscap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May  4 09:44:02 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- 0001-Add-openSUSE-cpe-links.patch: added Leap 15.6
+
 -------------------------------------------------------------------
 Wed Mar 20 18:37:30 UTC 2024 - Dan Čermák <dcermak@suse.com>