Skip to content

Commit

Permalink
Merge pull request OpenSCAP#1026 from openSUSE/maint-1.2
Browse files Browse the repository at this point in the history 
openSUSE CPE update
  • Loading branch information
@mpreisler
mpreisler authored Jun 7, 2018
2 parents 3b133b4 + 86782ba commit 6de3139
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 8 deletions.
16 changes: 16 additions & 0 deletions cpe/openscap-cpe-dict.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,26 @@
<title xml:lang="en-us">openSUSE 42.1</title>
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:421</check>
</cpe-item>
<cpe-item name="cpe:/o:opensuse:leap:42.1">
<title xml:lang="en-us">openSUSE Leap 42.1</title>
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:421</check>
</cpe-item>
<cpe-item name="cpe:/o:novell:leap:42.2">
<title xml:lang="en-us">openSUSE 42.2</title>
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:422</check>
</cpe-item>
<cpe-item name="cpe:/o:opensuse:leap:42.2">
<title xml:lang="en-us">openSUSE Leap 42.2</title>
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:422</check>
</cpe-item>
<cpe-item name="cpe:/o:opensuse:leap:42.3">
<title xml:lang="en-us">openSUSE Leap 42.3</title>
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:423</check>
</cpe-item>
<cpe-item name="cpe:/o:opensuse:leap:15.0">
<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: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>
Expand Down
60 changes: 52 additions & 8 deletions cpe/openscap-cpe-oval.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,28 +519,56 @@
</definition>
<definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:421" version="1">
<metadata>
<title>openSUSE 42.1</title>
<title>openSUSE Leap 42.1</title>
<affected family="unix">
<platform>openSUSE 42.1</platform>
<platform>openSUSE Leap 42.1</platform>
</affected>
<reference ref_id="cpe:/o:novell:leap:42.1" source="CPE"/>
<description>The operating system installed on the system is openSUSE 42.1</description>
<reference ref_id="cpe:/o:opensuse:leap:42.1" source="CPE"/>
<description>The operating system installed on the system is openSUSE Leap 42.1</description>
</metadata>
<criteria>
<criterion comment="openSUSE 42.1 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:421"/>
<criterion comment="openSUSE Leap 42.1 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:421"/>
</criteria>
</definition>
<definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:422" version="1">
<metadata>
<title>openSUSE 42.2</title>
<title>openSUSE Leap 42.2</title>
<affected family="unix">
<platform>openSUSE 42.2</platform>
<platform>openSUSE Leap 42.2</platform>
</affected>
<reference ref_id="cpe:/o:novell:leap:42.2" source="CPE"/>
<description>The operating system installed on the system is openSUSE 42.2</description>
<reference ref_id="cpe:/o:opensuse:leap:42.2" source="CPE"/>
<description>The operating system installed on the system is openSUSE Leap 42.2</description>
</metadata>
<criteria>
<criterion comment="openSUSE 42.2 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:422"/>
<criterion comment="openSUSE Leap 42.2 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:422"/>
</criteria>
</definition>
<definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:423" version="1">
<metadata>
<title>openSUSE Leap 42.3</title>
<affected family="unix">
<platform>openSUSE Leap 42.3</platform>
</affected>
<reference ref_id="cpe:/o:opensuse:leap:42.3" source="CPE"/>
<description>The operating system installed on the system is openSUSE Leap 42.3</description>
</metadata>
<criteria>
<criterion comment="openSUSE Leap 42.3 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:423"/>
</criteria>
</definition>
<definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:150" version="1">
<metadata>
<title>openSUSE Leap 15.0</title>
<affected family="unix">
<platform>openSUSE Leap 15.0</platform>
</affected>
<reference ref_id="cpe:/o:opensuse:leap:15.0" source="CPE"/>
<description>The operating system installed on the system is openSUSE Leap 15.0</description>
</metadata>
<criteria>
<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.wrlinux:def:1" version="1" >
Expand Down Expand Up @@ -778,6 +806,16 @@
<object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
<state state_ref="oval:org.open-scap.cpe.opensuse:ste:422"/>
</rpminfo_test>
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:423" version="2" check="at least one" comment="openSUSE-release is version 42.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:423"/>
</rpminfo_test>
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:150" version="2" check="at least one" comment="openSUSE-release is version 15.0"
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:150"/>
</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">
Expand Down Expand Up @@ -1003,6 +1041,12 @@
<rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:422" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
<version operation="pattern match">^42.2$</version>
</rpminfo_state>
<rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:423" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
<version operation="pattern match">^42.3$</version>
</rpminfo_state>
<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>
<textfilecontent54_state
id="oval:org.open-scap.cpe.wrlinux-release:ste:8"
comment="Check the /etc/wrlinux-release file for VERSION 8 specification."
Expand Down

0 comments on commit 6de3139

Please sign in to comment.