diff --git a/openscap-opensuse-cpe.patch b/openscap-opensuse-cpe.patch new file mode 100644 index 0000000..caece96 --- /dev/null +++ b/openscap-opensuse-cpe.patch @@ -0,0 +1,109 @@ +Index: openscap-1.3.5/cpe/openscap-cpe-dict.xml +=================================================================== +--- openscap-1.3.5.orig/cpe/openscap-cpe-dict.xml ++++ openscap-1.3.5/cpe/openscap-cpe-dict.xml +@@ -53,4 +53,16 @@ + Fedora 35 + oval:org.open-scap.cpe.fedora:def:35 + ++ ++ openSUSE Leap 15.1 ++ oval:org.open-scap.cpe.opensuse:def:151 ++ ++ ++ openSUSE Leap 15.2 ++ oval:org.open-scap.cpe.opensuse:def:152 ++ ++ ++ openSUSE Leap 15.3 ++ oval:org.open-scap.cpe.opensuse:def:153 ++ + +Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml +=================================================================== +--- openscap-1.3.5.orig/cpe/openscap-cpe-oval.xml ++++ openscap-1.3.5/cpe/openscap-cpe-oval.xml +@@ -690,6 +690,45 @@ + + + ++ ++ ++ openSUSE Leap 15.1 ++ ++ openSUSE Leap 15.1 ++ ++ ++ The operating system installed on the system is openSUSE Leap 15.1 ++ ++ ++ ++ ++ ++ ++ ++ openSUSE Leap 15.2 ++ ++ openSUSE Leap 15.2 ++ ++ ++ The operating system installed on the system is openSUSE Leap 15.2 ++ ++ ++ ++ ++ ++ ++ ++ openSUSE Leap 15.3 ++ ++ openSUSE Leap 15.3 ++ ++ ++ The operating system installed on the system is openSUSE Leap 15.3 ++ ++ ++ ++ ++ + + + Wind River Linux +@@ -1087,6 +1126,21 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +@@ -1415,6 +1469,15 @@ + + ^15.0$ + ++ ++ ^15.1$ ++ ++ ++ ^15.2$ ++ ++ ++ ^15.3$ ++ + openSUSE Leap 15.3 + oval:org.open-scap.cpe.opensuse:def:153 + ++ ++ SUSE Linux Enterprise Server 12 ++ oval:org.open-scap.cpe.sles:def:12 ++ ++ ++ SUSE Linux Enterprise Desktop 12 ++ oval:org.open-scap.cpe.sled:def:12 ++ ++ ++ SUSE Linux Enterprise Server 15 ++ oval:org.open-scap.cpe.sles:def:15 ++ ++ ++ SUSE Linux Enterprise Desktop 15 ++ oval:org.open-scap.cpe.sled:def:15 ++ + +Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml +=================================================================== +--- openscap-1.3.5.orig/cpe/openscap-cpe-oval.xml ++++ openscap-1.3.5/cpe/openscap-cpe-oval.xml +@@ -729,6 +729,32 @@ + + + ++ ++ ++ SUSE Linux Enterprise Server 15 ++ ++ SUSE Linux Enterprise Server 15 ++ ++ ++ The operating system installed on the system is SUSE Linux Enterprise Server 15 ++ ++ ++ ++ ++ ++ ++ ++ SUSE Linux Enterprise Desktop 15 ++ ++ SUSE Linux Enterprise Desktop 15 ++ ++ ++ The operating system installed on the system is SUSE Linux Enterprise Desktop 15 ++ ++ ++ ++ ++ + + + Wind River Linux +@@ -1071,6 +1097,11 @@ + + + ++ ++ ++ ++ + + +@@ -1086,6 +1117,11 @@ + + + ++ ++ ++ ++ + + +@@ -1436,6 +1472,9 @@ + + ^12($|[^\d]) + ++ ++ ^15($|[^\d]) ++ + + ^10($|[^\d]) + +@@ -1445,6 +1484,9 @@ + + ^12($|[^\d]) + ++ ++ ^15($|[^\d]) ++ + + ^openSUSE-release + diff --git a/openscap.changes b/openscap.changes index e624bd6..15b8e4f 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 2 15:11:14 UTC 2021 - Robert Frohl + +- add old patches - slightly renamed; cpe are needed (boo#1186735) + * openscap-opensuse-cpe.patch + * openscap-suse-cpe.patch + ------------------------------------------------------------------- Fri Apr 23 11:08:00 UTC 2021 - Robert Frohl diff --git a/openscap.spec b/openscap.spec index 2808d70..7243e32 100644 --- a/openscap.spec +++ b/openscap.spec @@ -38,6 +38,8 @@ Source3: scap-yast2sec-xccdf.xml Source4: scap-yast2sec-oval.xml Source5: oscap-scan.service Source6: oscap-scan.sh +Patch1: openscap-opensuse-cpe.patch +Patch2: openscap-suse-cpe.patch URL: https://www.open-scap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: asciidoc @@ -173,6 +175,8 @@ This package contains the Script Checking Engine Library (SCE) for OpenSCAP. %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build %if 0%{?with_bindings}