Merge pull request #1369 from dehuo0/maint-1.2

Add WRLinux 1019 support

Author: jan-cerny

cpe/openscap-cpe-dict.xml

@@ -210,4 +210,8 @@
             <title xml:lang="en-us">Wind River Linux 8</title>
             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.wrlinux:def:8</check>
       </cpe-item>
+      <cpe-item name="cpe:/o:windriver:wrlinux:1019">
+            <title xml:lang="en-us">Wind River Linux 1019</title>
+            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.wrlinux:def:1019</check>
+      </cpe-item>
 </cpe-list>

cpe/openscap-cpe-oval.xml

@@ -638,6 +638,19 @@
                         <criterion comment="Wind River Linux version is 8." test_ref="oval:org.open-scap.cpe.wrlinux:tst:8" />
                   </criteria>
             </definition>
+            <definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1019" version="1" >
+                  <metadata>
+                        <title>Wind River Linux 1019</title>
+                        <affected family="unix">
+                            <platform>Wind River Linux 1019</platform>
+                        </affected>
+                        <reference ref_id="cpe:/o:windriver:wrlinux:1019" source="CPE"/>
+                        <description>The operating system installed on the system is Wind River Linux 1019</description>
+                  </metadata>
+                  <criteria>
+                        <criterion comment="Wind River Linux version is 1019." test_ref="oval:org.open-scap.cpe.wrlinux:tst:1019" />
+                  </criteria>
+            </definition>
       </definitions>
       <tests>
             <rpmverifyfile_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.rhel:tst:2" version="1" check="at least one" comment="/etc/redhat-release is provided by redhat-release package"
@@ -897,6 +910,17 @@
                   <object object_ref="oval:org.open-scap.cpe.wrlinux-release:obj:2"/>
                   <state state_ref="oval:org.open-scap.cpe.wrlinux-release:ste:8"/>
             </textfilecontent54_test>
+            <textfilecontent54_test
+                            id="oval:org.open-scap.cpe.wrlinux:tst:1019"
+                            check="all"
+                            check_existence="all_exist"
+                            comment="Check /etc/os-release for VERSION 1019 specification."
+                            version="1"
+                            xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent"
+                            >
+                  <object object_ref="oval:org.open-scap.cpe.wrlinux-release:obj:3"/>
+                  <state state_ref="oval:org.open-scap.cpe.wrlinux-release:ste:10"/>
+            </textfilecontent54_test>
             <rpminfo_test check="all" check_existence="only_one_exists" comment="redhat-release-virtualization-host RPM package is installed" id="oval:org.open-scap.cpe.rhevh:tst:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                   <object object_ref="oval:org.open-scap.cpe.rhevh:obj:1" />
             </rpminfo_test>
@@ -946,6 +970,17 @@
                 <pattern operation="pattern match">^VERSION=.([[:digit:]]*)</pattern>
                 <instance operation="greater than or equal" datatype="int">1</instance>
             </textfilecontent54_object>
+            <textfilecontent54_object
+                            id="oval:org.open-scap.cpe.wrlinux-release:obj:3"
+                            comment="Check VERSION specification in /etc/os-release."
+                            version="1"
+                            xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent"
+                            >
+                <path>/etc</path>
+                <filename>os-release</filename>
+                <pattern operation="pattern match">^VERSION=.(\d*.\d*)</pattern>
+                <instance operation="greater than or equal" datatype="int">1</instance>
+            </textfilecontent54_object>
             <rpminfo_object id="oval:org.open-scap.cpe.rhevh:obj:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                 <name>redhat-release-virtualization-host</name>
             </rpminfo_object>
@@ -1120,6 +1155,14 @@
                             >
                   <subexpression operation="pattern match">8</subexpression>
             </textfilecontent54_state>
+            <textfilecontent54_state
+                            id="oval:org.open-scap.cpe.wrlinux-release:ste:10"
+                            comment="Check the /etc/os-release file for VERSION 1019 specification."
+                            version="1"
+                            xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent"
+                            >
+                  <subexpression operation="pattern match">10.19</subexpression>
+            </textfilecontent54_state>
             <textfilecontent54_state id="oval:org.open-scap.cpe.rhevh:ste:2" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
                   <subexpression operation="pattern match">7</subexpression>
             </textfilecontent54_state>