Accepting request 901558 from home:rfrohl:branches:security
added missing CPEs again OBS-URL: https://build.opensuse.org/request/show/901558 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=261
This commit is contained in:
parent
afb06b7aac
commit
862ac7d75f
109
openscap-opensuse-cpe.patch
Normal file
109
openscap-opensuse-cpe.patch
Normal file
@ -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 @@
|
||||||
|
<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>
|
||||||
|
+ <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:leap:15.3">
|
||||||
|
+ <title xml:lang="en-us">openSUSE Leap 15.3</title>
|
||||||
|
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:153</check>
|
||||||
|
+ </cpe-item>
|
||||||
|
</cpe-list>
|
||||||
|
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 @@
|
||||||
|
<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.opensuse:def:153" version="1">
|
||||||
|
+ <metadata>
|
||||||
|
+ <title>openSUSE Leap 15.3</title>
|
||||||
|
+ <affected family="unix">
|
||||||
|
+ <platform>openSUSE Leap 15.3</platform>
|
||||||
|
+ </affected>
|
||||||
|
+ <reference ref_id="cpe:/o:opensuse:leap:15.3" source="CPE"/>
|
||||||
|
+ <description>The operating system installed on the system is openSUSE Leap 15.3</description>
|
||||||
|
+ </metadata>
|
||||||
|
+ <criteria>
|
||||||
|
+ <criterion comment="openSUSE Leap 15.3 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:153"/>
|
||||||
|
+ </criteria>
|
||||||
|
+ </definition>
|
||||||
|
<definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1" version="1" >
|
||||||
|
<metadata>
|
||||||
|
<title>Wind River Linux</title>
|
||||||
|
@@ -1087,6 +1126,21 @@
|
||||||
|
<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>
|
||||||
|
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:153" version="2" check="at least one" comment="openSUSE-release is version 15.3"
|
||||||
|
+ 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:153"/>
|
||||||
|
+ </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">
|
||||||
|
@@ -1415,6 +1469,15 @@
|
||||||
|
<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>
|
||||||
|
+ <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:153" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
+ <version operation="pattern match">^15.3$</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."
|
106
openscap-suse-cpe.patch
Normal file
106
openscap-suse-cpe.patch
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
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
|
||||||
|
@@ -65,4 +65,20 @@
|
||||||
|
<title xml:lang="en-us">openSUSE Leap 15.3</title>
|
||||||
|
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:153</check>
|
||||||
|
</cpe-item>
|
||||||
|
+ <cpe-item name="cpe:/o:suse:sles:12">
|
||||||
|
+ <title xml:lang="en-us">SUSE Linux Enterprise Server 12</title>
|
||||||
|
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.sles:def:12</check>
|
||||||
|
+ </cpe-item>
|
||||||
|
+ <cpe-item name="cpe:/o:suse:sled:12">
|
||||||
|
+ <title xml:lang="en-us">SUSE Linux Enterprise Desktop 12</title>
|
||||||
|
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.sled:def:12</check>
|
||||||
|
+ </cpe-item>
|
||||||
|
+ <cpe-item name="cpe:/o:suse:sles:15">
|
||||||
|
+ <title xml:lang="en-us">SUSE Linux Enterprise Server 15</title>
|
||||||
|
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.sles:def:15</check>
|
||||||
|
+ </cpe-item>
|
||||||
|
+ <cpe-item name="cpe:/o:suse:sled:15">
|
||||||
|
+ <title xml:lang="en-us">SUSE Linux Enterprise Desktop 15</title>
|
||||||
|
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.sled:def:15</check>
|
||||||
|
+ </cpe-item>
|
||||||
|
</cpe-list>
|
||||||
|
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 @@
|
||||||
|
<criterion comment="openSUSE Leap 15.3 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:153"/>
|
||||||
|
</criteria>
|
||||||
|
</definition>
|
||||||
|
+ <definition class="inventory" id="oval:org.open-scap.cpe.sles:def:15" version="1">
|
||||||
|
+ <metadata>
|
||||||
|
+ <title>SUSE Linux Enterprise Server 15</title>
|
||||||
|
+ <affected family="unix">
|
||||||
|
+ <platform>SUSE Linux Enterprise Server 15</platform>
|
||||||
|
+ </affected>
|
||||||
|
+ <reference ref_id="cpe:/o:suse:sles:15" source="CPE"/>
|
||||||
|
+ <description>The operating system installed on the system is SUSE Linux Enterprise Server 15</description>
|
||||||
|
+ </metadata>
|
||||||
|
+ <criteria>
|
||||||
|
+ <criterion comment="SLES 15 is installed" test_ref="oval:org.open-scap.cpe.sles:tst:15"/>
|
||||||
|
+ </criteria>
|
||||||
|
+ </definition>
|
||||||
|
+ <definition class="inventory" id="oval:org.open-scap.cpe.sled:def:15" version="1">
|
||||||
|
+ <metadata>
|
||||||
|
+ <title>SUSE Linux Enterprise Desktop 15</title>
|
||||||
|
+ <affected family="unix">
|
||||||
|
+ <platform>SUSE Linux Enterprise Desktop 15</platform>
|
||||||
|
+ </affected>
|
||||||
|
+ <reference ref_id="cpe:/o:suse:sled:15" source="CPE"/>
|
||||||
|
+ <description>The operating system installed on the system is SUSE Linux Enterprise Desktop 15</description>
|
||||||
|
+ </metadata>
|
||||||
|
+ <criteria>
|
||||||
|
+ <criterion comment="SLED 15 is installed" test_ref="oval:org.open-scap.cpe.sled:tst:15"/>
|
||||||
|
+ </criteria>
|
||||||
|
+ </definition>
|
||||||
|
<definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1" version="1" >
|
||||||
|
<metadata>
|
||||||
|
<title>Wind River Linux</title>
|
||||||
|
@@ -1071,6 +1097,11 @@
|
||||||
|
<object object_ref="oval:org.open-scap.cpe.sles-release:obj:1"/>
|
||||||
|
<state state_ref="oval:org.open-scap.cpe.sles:ste:12"/>
|
||||||
|
</rpminfo_test>
|
||||||
|
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sles:tst:15" version="1" check="at least one" comment="sles-release is version 15"
|
||||||
|
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
+ <object object_ref="oval:org.open-scap.cpe.sles-release:obj:1"/>
|
||||||
|
+ <state state_ref="oval:org.open-scap.cpe.sles:ste:15"/>
|
||||||
|
+ </rpminfo_test>
|
||||||
|
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sled:tst:10" version="1" check="at least one" comment="sled-release is version 10"
|
||||||
|
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
<object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
|
||||||
|
@@ -1086,6 +1117,11 @@
|
||||||
|
<object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
|
||||||
|
<state state_ref="oval:org.open-scap.cpe.sled:ste:12"/>
|
||||||
|
</rpminfo_test>
|
||||||
|
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sled:tst:15" version="1" check="at least one" comment="sled-release is version 15"
|
||||||
|
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
+ <object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
|
||||||
|
+ <state state_ref="oval:org.open-scap.cpe.sled:ste:15"/>
|
||||||
|
+ </rpminfo_test>
|
||||||
|
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:1" version="1" check="at least one" comment="openSUSE-release is version 11.4"
|
||||||
|
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
<object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
|
||||||
|
@@ -1436,6 +1472,9 @@
|
||||||
|
<rpminfo_state id="oval:org.open-scap.cpe.sles:ste:12" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
<version operation="pattern match">^12($|[^\d])</version>
|
||||||
|
</rpminfo_state>
|
||||||
|
+ <rpminfo_state id="oval:org.open-scap.cpe.sles:ste:15" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
+ <version operation="pattern match">^15($|[^\d])</version>
|
||||||
|
+ </rpminfo_state>
|
||||||
|
<rpminfo_state id="oval:org.open-scap.cpe.sled:ste:10" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
<version operation="pattern match">^10($|[^\d])</version>
|
||||||
|
</rpminfo_state>
|
||||||
|
@@ -1445,6 +1484,9 @@
|
||||||
|
<rpminfo_state id="oval:org.open-scap.cpe.sled:ste:12" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
<version operation="pattern match">^12($|[^\d])</version>
|
||||||
|
</rpminfo_state>
|
||||||
|
+ <rpminfo_state id="oval:org.open-scap.cpe.sled:ste:15" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
+ <version operation="pattern match">^15($|[^\d])</version>
|
||||||
|
+ </rpminfo_state>
|
||||||
|
<rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:2" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||||
|
<name operation="pattern match">^openSUSE-release</name>
|
||||||
|
</rpminfo_state>
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 2 15:11:14 UTC 2021 - Robert Frohl <rfrohl@suse.com>
|
||||||
|
|
||||||
|
- 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 <rfrohl@suse.com>
|
Fri Apr 23 11:08:00 UTC 2021 - Robert Frohl <rfrohl@suse.com>
|
||||||
|
|
||||||
|
@ -38,6 +38,8 @@ Source3: scap-yast2sec-xccdf.xml
|
|||||||
Source4: scap-yast2sec-oval.xml
|
Source4: scap-yast2sec-oval.xml
|
||||||
Source5: oscap-scan.service
|
Source5: oscap-scan.service
|
||||||
Source6: oscap-scan.sh
|
Source6: oscap-scan.sh
|
||||||
|
Patch1: openscap-opensuse-cpe.patch
|
||||||
|
Patch2: openscap-suse-cpe.patch
|
||||||
URL: https://www.open-scap.org/
|
URL: https://www.open-scap.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: asciidoc
|
BuildRequires: asciidoc
|
||||||
@ -173,6 +175,8 @@ This package contains the Script Checking Engine Library (SCE) for OpenSCAP.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if 0%{?with_bindings}
|
%if 0%{?with_bindings}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user