From e545210db482b5f4e39ab3c75b13f306e4b58bca0ff929a423795fea1b9db4c3 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 9 Nov 2020 12:48:33 +0000
Subject: [PATCH 1/3] Accepting request 847158 from
 home:msmeissn:branches:security

- add dbus-1-devel buildrequires to enable systemd tests (bsc#1178301)

OBS-URL: https://build.opensuse.org/request/show/847158
OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=253
---
 openscap.changes | 5 +++++
 openscap.spec    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/openscap.changes b/openscap.changes
index 8b9c1a9..4116061 100644
--- a/openscap.changes
+++ b/openscap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Oct 31 08:33:48 UTC 2020 - Marcus Meissner <meissner@suse.com>
+
+- add dbus-1-devel buildrequires to enable systemd tests (bsc#1178301)
+
 -------------------------------------------------------------------
 Fri Oct  2 08:03:23 UTC 2020 - Robert Frohl <rfrohl@suse.com>
 
diff --git a/openscap.spec b/openscap.spec
index b77b128..47924bc 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -57,6 +57,7 @@ BuildRequires:  libgcrypt-devel
 BuildRequires:  libxml2-devel
 # Use package name cause of "have choice for perl(XML::Parser): brp-check-suse perl-XML-Parser"
 BuildRequires:  cmake
+BuildRequires:  dbus-1-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libblkid-devel
 BuildRequires:  libcap-devel

From e731fe86122f5dfb3644e77c6973b211dd8aaaa7ddddd0fe9c2f52db19eca994 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 9 Nov 2020 13:10:02 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/security/openscap?expand=0&rev=254

---
 openscap-leap-cpe-15.12.patch | 86 +++++++++++++++++++++++++++++++++++
 openscap.spec                 |  2 +
 2 files changed, 88 insertions(+)
 create mode 100644 openscap-leap-cpe-15.12.patch

diff --git a/openscap-leap-cpe-15.12.patch b/openscap-leap-cpe-15.12.patch
new file mode 100644
index 0000000..98cb56f
--- /dev/null
+++ b/openscap-leap-cpe-15.12.patch
@@ -0,0 +1,86 @@
+Index: openscap-1.3.4/cpe/openscap-cpe-dict.xml
+===================================================================
+--- openscap-1.3.4.orig/cpe/openscap-cpe-dict.xml
++++ openscap-1.3.4/cpe/openscap-cpe-dict.xml
+@@ -205,6 +205,14 @@
+             <title xml:lang="en-us">openSUSE Leap 15.0</title>
+             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:150</check>
+       </cpe-item>
++      <cpe-item name="cpe:/o:opensuse:leap:15.1">
++            <title xml:lang="en-us">openSUSE Leap 15.1</title>
++            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:151</check>
++      </cpe-item>
++      <cpe-item name="cpe:/o:opensuse:leap:15.2">
++            <title xml:lang="en-us">openSUSE Leap 15.2</title>
++            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:152</check>
++      </cpe-item>
+       <cpe-item name="cpe:/o:opensuse:opensuse">
+             <title xml:lang="en-us">openSUSE All Versions</title>
+             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:1</check>
+Index: openscap-1.3.4/cpe/openscap-cpe-oval.xml
+===================================================================
+--- openscap-1.3.4.orig/cpe/openscap-cpe-oval.xml
++++ openscap-1.3.4/cpe/openscap-cpe-oval.xml
+@@ -678,6 +678,32 @@
+                         <criterion comment="openSUSE Leap 15.0 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:150"/>
+                   </criteria>
+             </definition>
++            <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:151" version="1">
++                  <metadata>
++                        <title>openSUSE Leap 15.1</title>
++                        <affected family="unix">
++                            <platform>openSUSE Leap 15.1</platform>
++                        </affected>
++                        <reference ref_id="cpe:/o:opensuse:leap:15.1" source="CPE"/>
++                        <description>The operating system installed on the system is openSUSE Leap 15.1</description>
++                  </metadata>
++                  <criteria>
++                        <criterion comment="openSUSE Leap 15.1 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:151"/>
++                  </criteria>
++            </definition>
++            <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:152" version="1">
++                  <metadata>
++                        <title>openSUSE Leap 15.2</title>
++                        <affected family="unix">
++                            <platform>openSUSE Leap 15.2</platform>
++                        </affected>
++                        <reference ref_id="cpe:/o:opensuse:leap:15.2" source="CPE"/>
++                        <description>The operating system installed on the system is openSUSE Leap 15.2</description>
++                  </metadata>
++                  <criteria>
++                        <criterion comment="openSUSE Leap 15.2 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:152"/>
++                  </criteria>
++            </definition>
+             <definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1" version="1" >
+                   <metadata>
+                         <title>Wind River Linux</title>
+@@ -1067,6 +1093,16 @@
+                   <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>
++            <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:151" version="2" check="at least one" comment="openSUSE-release is version 15.1"
++                  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:151"/>
++            </rpminfo_test>
++            <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:152" version="2" check="at least one" comment="openSUSE-release is version 15.2"
++                  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:152"/>
++            </rpminfo_test>
+             <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">
+@@ -1379,6 +1415,12 @@
+             <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>
++            <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:151" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
++                  <version operation="pattern match">^15.1$</version>
++            </rpminfo_state>
++            <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:152" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
++                  <version operation="pattern match">^15.2$</version>
++            </rpminfo_state>
+             <textfilecontent54_state
+                             id="oval:org.open-scap.cpe.wrlinux-release:ste:8"
+                             comment="Check the /etc/wrlinux-release file for VERSION 8 specification."
diff --git a/openscap.spec b/openscap.spec
index 47924bc..1018e1d 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -39,6 +39,7 @@ Source4:        scap-yast2sec-oval.xml
 Source5:        oscap-scan.service
 Source6:        oscap-scan.sh
 Patch0:         openscap-new-suse.patch
+Patch1:         openscap-leap-cpe-15.12.patch
 URL:            https://www.open-scap.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  asciidoc
@@ -173,6 +174,7 @@ This package contains the Script Checking Engine Library (SCE) for OpenSCAP.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if 0%{?with_bindings}

From 75b3d9bbe9a2863d7909f888e3c38e3f4a5ece8b85c684f9ddafd40fc63be74d Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 9 Nov 2020 13:10:22 +0000
Subject: [PATCH 3/3] - openscap-leap-cpe-15.12.patch: add CPE dict entries for
 openSUSE   Leap 15.1 and 15.2

OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=255
---
 openscap.changes | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openscap.changes b/openscap.changes
index 4116061..4a91902 100644
--- a/openscap.changes
+++ b/openscap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov  9 13:10:09 UTC 2020 - Marcus Meissner <meissner@suse.com>
+
+- openscap-leap-cpe-15.12.patch: add CPE dict entries for openSUSE
+  Leap 15.1 and 15.2
+
 -------------------------------------------------------------------
 Sat Oct 31 08:33:48 UTC 2020 - Marcus Meissner <meissner@suse.com>