rpm/openscap
SHA256
1
0
Fork 0
forked from pool/openscap
Code Pull Requests Activity

Accepting request 1003839 from security

Browse Source 
- added Leap 15.4 and 15.5 dictionary entries. (bsc#1203408)

OBS-URL: https://build.opensuse.org/request/show/1003839
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openscap?expand=0&rev=78
This commit is contained in:
Dominique Leuenberger 2022-09-15 20:59:50 +00:00 committed by Git OBS Bridge
commit 8295895d8c
2 changed files with 65 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
openscap-opensuse-cpe.patch
View File

@ -1,8 +1,8 @@
Index: openscap-1.3.5/cpe/openscap-cpe-dict.xml
Index: openscap-1.3.6/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,20 @@
--- openscap-1.3.6.orig/cpe/openscap-cpe-dict.xml
+++ openscap-1.3.6/cpe/openscap-cpe-dict.xml
@@ -53,4 +53,28 @@
<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>
@ -18,16 +18,24 @@ Index: openscap-1.3.5/cpe/openscap-cpe-dict.xml
+ <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:opensuse:leap:15.4">
+ <title xml:lang="en-us">openSUSE Leap 15.4</title>
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:154</check>
+ </cpe-item>
+ <cpe-item name="cpe:/o:opensuse:leap:15.5">
+ <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: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>
Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
Index: openscap-1.3.6/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,58 @@
--- openscap-1.3.6.orig/cpe/openscap-cpe-oval.xml
+++ openscap-1.3.6/cpe/openscap-cpe-oval.xml
@@ -690,6 +690,84 @@
<criterion comment="openSUSE Leap 15.0 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:150"/>
</criteria>
</definition>
@ -70,6 +78,32 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
+ <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.opensuse:def:154" version="1">
+ <metadata>
+ <title>openSUSE Leap 15.4</title>
+ <affected family="unix">
+ <platform>openSUSE Leap 15.4</platform>
+ </affected>
+ <reference ref_id="cpe:/o:opensuse:leap:15.4" source="CPE"/>
+ <description>The operating system installed on the system is openSUSE Leap 15.4</description>
+ </metadata>
+ <criteria>
+ <criterion comment="openSUSE Leap 15.4 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:154"/>
+ </criteria>
+ </definition>
+ <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:155" version="1">
+ <metadata>
+ <title>openSUSE Leap 15.5</title>
+ <affected family="unix">
+ <platform>openSUSE Leap 15.5</platform>
+ </affected>
+ <reference ref_id="cpe:/o:opensuse:leap:15.5" source="CPE"/>
+ <description>The operating system installed on the system is openSUSE Leap 15.5</description>
+ </metadata>
+ <criteria>
+ <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:9999" version="1">
+ <metadata>
+ <title>openSUSE Tumbleweed</title>
@ -86,7 +120,7 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
<definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1" version="1" >
<metadata>
<title>Wind River Linux</title>
@@ -1087,6 +1139,26 @@
@@ -1087,6 +1165,36 @@
<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>
@ -105,6 +139,16 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
+ <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>
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:154" version="2" check="at least one" comment="openSUSE-release is version 15.4"
+ 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:154"/>
+ </rpminfo_test>
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:155" version="2" check="at least one" comment="openSUSE-release is version 15.5"
+ 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:155"/>
+ </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"/>
@ -113,7 +157,7 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
<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 +1487,19 @@
@@ -1415,6 +1523,25 @@
<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>
@ -126,6 +170,12 @@ Index: openscap-1.3.5/cpe/openscap-cpe-oval.xml
+ <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>
+ <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:154" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+ <version operation="pattern match">^15.4$</version>
+ </rpminfo_state>
+ <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:9999" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+ <!-- matching for timestamp -->
+ <version operation="pattern match">^\d{8}$</version>

5
openscap.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 15 08:29:25 UTC 2022 - Marcus Meissner <meissner@suse.com>
- added Leap 15.4 and 15.5 dictionary entries. (bsc#1203408)
-------------------------------------------------------------------
Sat Feb 19 13:46:06 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>