From 9e487516540fafeeb0adf154461c7422d66f9491eb3d98f2f85d954b0f76ff51 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 9 Oct 2015 14:57:21 +0000 Subject: [PATCH] - openscap-new-inventory.patch: find out the CPE ids of SUSE Linux Enterprise and openSUSE versions. OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=140 --- openscap-new-inventory.patch | 372 +++++++++++++++++++++++++++++++++++ openscap.changes | 6 + openscap.spec | 2 + 3 files changed, 380 insertions(+) create mode 100644 openscap-new-inventory.patch diff --git a/openscap-new-inventory.patch b/openscap-new-inventory.patch new file mode 100644 index 0000000..1f9b0c6 --- /dev/null +++ b/openscap-new-inventory.patch @@ -0,0 +1,372 @@ +Index: openscap-1.2.6/cpe/openscap-cpe-dict.xml +=================================================================== +--- openscap-1.2.6.orig/cpe/openscap-cpe-dict.xml ++++ openscap-1.2.6/cpe/openscap-cpe-dict.xml +@@ -77,7 +77,50 @@ + Fedora 24 + oval:org.open-scap.cpe.fedora:def:24 + +- ++ ++ SUSE Linux Enterprise all versions ++ oval:org.open-scap.cpe.sle:def:1 ++ ++ ++ SUSE Linux Enterprise Server 10 ++ oval:org.open-scap.cpe.sles:def:10 ++ ++ ++ SUSE Linux Enterprise Desktop 10 ++ oval:org.open-scap.cpe.sled:def:10 ++ ++ ++ SUSE Linux Enterprise Server 11 ++ oval:org.open-scap.cpe.sles:def:11 ++ ++ ++ SUSE Linux Enterprise Desktop 11 ++ oval:org.open-scap.cpe.sled:def:11 ++ ++ ++ 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 ++ ++ ++ openSUSE 11.4 ++ oval:org.open-scap.cpe.opensuse:def:114 ++ ++ ++ openSUSE 13.1 ++ oval:org.open-scap.cpe.opensuse:def:131 ++ ++ ++ openSUSE 13.2 ++ oval:org.open-scap.cpe.opensuse:def:132 ++ ++ ++ openSUSE All Versions ++ oval:org.open-scap.cpe.opensuse:def:1 ++ + + + Red Hat Enterprise Linux Optional Productivity Applications +Index: openscap-1.2.6/cpe/openscap-cpe-oval.xml +=================================================================== +--- openscap-1.2.6.orig/cpe/openscap-cpe-oval.xml ++++ openscap-1.2.6/cpe/openscap-cpe-oval.xml +@@ -278,6 +278,175 @@ + + + ++ ++ ++ ++ SUSE Linux Enterprise All Platforms ++ ++ SUSE Linux Enterprise All Platforms ++ ++ ++ The operating system installed on the system is SUSE Linux Enterprise ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ SUSE Linux Enterprise Server 10 ++ ++ SUSE Linux Enterprise Server 10 ++ ++ ++ The operating system installed on the system is SUSE Linux Enterprise Server 10 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ SUSE Linux Enterprise Desktop 10 ++ ++ SUSE Linux Enterprise Desktop 10 ++ ++ ++ The operating system installed on the system is SUSE Linux Enterprise Desktop 10 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ SUSE Linux Enterprise Server 11 ++ ++ SUSE Linux Enterprise Server 11 ++ ++ ++ The operating system installed on the system is SUSE Linux Enterprise Server 11 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ SUSE Linux Enterprise Desktop 11 ++ ++ SUSE Linux Enterprise Desktop 11 ++ ++ ++ The operating system installed on the system is SUSE Linux Enterprise Desktop 11 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ SUSE Linux Enterprise Server 12 ++ ++ SUSE Linux Enterprise Server 12 ++ ++ ++ The operating system installed on the system is SUSE Linux Enterprise Server 12 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ SUSE Linux Enterprise Desktop 12 ++ ++ SUSE Linux Enterprise Desktop 12 ++ ++ ++ The operating system installed on the system is SUSE Linux Enterprise Desktop 12 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ openSUSE All Versions ++ ++ openSUSE ++ ++ ++ The operating system installed on the system is openSUSE ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ openSUSE 11.4 ++ ++ openSUSE 11.4 ++ ++ ++ The operating system installed on the system is openSUSE 11.4 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ openSUSE 13.1 ++ ++ openSUSE 13.1 ++ ++ ++ The operating system installed on the system is openSUSE 13.1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ openSUSE 13.2 ++ ++ openSUSE 13.2 ++ ++ ++ The operating system installed on the system is openSUSE 13.2 ++ ++ ++ ++ ++ ++ ++ + + + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -400,6 +640,15 @@ + /etc/redhat-release + + ++ ++ sles-release ++ ++ ++ sled-release ++ ++ ++ openSUSE-release ++ + + + +@@ -470,5 +719,41 @@ + + ^24$ + ++ ++ ^sles-release ++ ++ ++ ^sled-release ++ ++ ++ ^10($|[^\d]) ++ ++ ++ ^11($|[^\d]) ++ ++ ++ ^12($|[^\d]) ++ ++ ++ ^10($|[^\d]) ++ ++ ++ ^11($|[^\d]) ++ ++ ++ ^12($|[^\d]) ++ ++ ++ ^openSUSE-release ++ ++ ++ ^11.4$ ++ ++ ++ ^13.1$ ++ ++ ++ ^13.2$ ++ + + diff --git a/openscap.changes b/openscap.changes index 1916763..30d9f7c 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 9 09:35:46 UTC 2015 - meissner@suse.com + +- openscap-new-inventory.patch: find out the CPE ids of + SUSE Linux Enterprise and openSUSE versions. + ------------------------------------------------------------------- Mon Oct 5 11:45:28 UTC 2015 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 5953e42..cbb4dbc 100644 --- a/openscap.spec +++ b/openscap.spec @@ -32,6 +32,7 @@ Source2: sysconfig.oscap-scan Source3: scap-yast2sec-xccdf.xml Source4: scap-yast2sec-oval.xml Patch0: fix-missing-include.dif +Patch1: openscap-new-inventory.patch Url: http://www.open-scap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel @@ -148,6 +149,7 @@ commonly used and require additional dependencies. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build