diff -Naur openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml openscap-1.3.3.alma/cpe/openscap-cpe-oval.xml --- openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml 2020-04-30 11:50:09.000000000 +0300 +++ openscap-1.3.3.alma/cpe/openscap-cpe-oval.xml 2021-03-22 13:12:12.069413537 +0300 @@ -133,6 +133,19 @@ <criterion comment="Oracle Linux 8 is installed" test_ref="oval:org.open-scap.cpe.ol:tst:8"/> </criteria> </definition> + <definition class="inventory" id="oval:org.open-scap.cpe.almalinux:def:8" version="1"> + <metadata> + <title>AlmaLinux 8</title> + <affected family="unix"> + <platform>AlmaLinux 8</platform> + </affected> + <reference ref_id="cpe:/o:almalinux:almalinux:8" source="CPE"/> + <description>The operating system installed on the system is AlmaLinux 8</description> + </metadata> + <criteria> + <criterion comment="AlmaLinux 8 is installed" test_ref="oval:org.open-scap.cpe.almalinux:tst:8"/> + </criteria> + </definition> <definition class="inventory" id="oval:org.open-scap.cpe.rhel:def:1005" version="1"> <metadata> <title>Community Enterprise Operating System 5</title> @@ -828,6 +841,11 @@ <object object_ref="oval:org.open-scap.cpe.oraclelinux-release:obj:1"/> <state state_ref="oval:org.open-scap.cpe.ol:ste:8"/> </rpminfo_test> + <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.almalinux:tst:8" version="1" check="at least one" comment="almalinux-release is version 8" + xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux"> + <object object_ref="oval:org.open-scap.cpe.almalinux-release:obj:1"/> + <state state_ref="oval:org.open-scap.cpe.almalinux:ste:8"/> + </rpminfo_test> <rpmverifyfile_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.rhel:tst:1005" version="1" check="at least one" comment="centos-release is version 5" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux"> <object object_ref="oval:org.open-scap.cpe.redhat-release:obj:3"/> @@ -1165,6 +1183,9 @@ <rpminfo_object id="oval:org.open-scap.cpe.oraclelinux-release:obj:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux"> <name>oraclelinux-release</name> </rpminfo_object> + <rpminfo_object id="oval:org.open-scap.cpe.almalinux-release:obj:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux"> + <name>almalinux-release</name> + </rpminfo_object> <registry_object id="oval:org.open-scap.cpe.windows:obj:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" > <hive>HKEY_LOCAL_MACHINE</hive> <key>SOFTWARE\Microsoft\Windows NT\CurrentVersion</key> @@ -1233,6 +1254,10 @@ <name operation="pattern match">^oraclelinux-release</name> <version operation="pattern match">^8</version> </rpminfo_state> + <rpminfo_state id="oval:org.open-scap.cpe.almalinux:ste:8" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux"> + <name operation="pattern match">^almalinux-release</name> + <version operation="pattern match">^8</version> + </rpminfo_state> <rpminfo_state id="oval:org.open-scap.cpe.fedora:ste:16" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux"> <version operation="pattern match">^16$</version> </rpminfo_state> diff -Naur openscap-1.3.5/cpe/openscap-cpe-dict.xml openscap-1.3.5.alma/cpe/openscap-cpe-dict.xml --- openscap-1.3.5/cpe/openscap-cpe-dict.xml 2021-04-23 13:39:58.000000000 +0300 +++ openscap-1.3.5.alma/cpe/openscap-cpe-dict.xml 2021-10-10 10:02:27.000000000 +0300 @@ -37,6 +37,10 @@ <title xml:lang="en-us">Community Enterprise Operating System 8</title> <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.centos:def:8</check> </cpe-item> + <cpe-item name="cpe:/o:almalinux:almalinux:8"> + <title xml:lang="en-us">AlmaLinux 8</title> + <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.almalinux:def:8</check> + </cpe-item> <cpe-item name="cpe:/o:fedoraproject:fedora:32"> <title xml:lang="en-us">Fedora 32</title> <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.fedora:def:32</check>