From e936f2317fbe763c4cdd615ca411f2f62999d531 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Fri, 2 Aug 2024 15:02:55 +0300
Subject: [PATCH] - Add AlmaLinux definitions

---
 openscap-1.3.5-almalinux.patch | 96 ++++++++++++++++++++++++++++++++++
 openscap.spec                  |  8 ++-
 2 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 openscap-1.3.5-almalinux.patch

diff --git a/openscap-1.3.5-almalinux.patch b/openscap-1.3.5-almalinux.patch
new file mode 100644
index 0000000..ce026ec
--- /dev/null
+++ b/openscap-1.3.5-almalinux.patch
@@ -0,0 +1,96 @@
+diff -aruN openscap-1.3.6/cpe/openscap-cpe-oval.xml openscap-1.3.6.alma/cpe/openscap-cpe-oval.xml
+--- openscap-1.3.6/cpe/openscap-cpe-oval.xml	2021-04-12 08:34:00.000000000 +0300
++++ openscap-1.3.6.alma/cpe/openscap-cpe-oval.xml	2022-05-19 12:24:07.000000000 +0300
+@@ -133,6 +133,32 @@
+                         <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.almalinux:def:9" version="1">
++                  <metadata>
++                        <title>AlmaLinux 9</title>
++                        <affected family="unix">
++                              <platform>AlmaLinux 9</platform>
++                        </affected>
++                        <reference ref_id="cpe:/o:almalinux:almalinux:9" source="CPE"/>
++                        <description>The operating system installed on the system is AlmaLinux 9</description>
++                  </metadata>
++                  <criteria>
++                        <criterion comment="AlmaLinux 9 is installed" test_ref="oval:org.open-scap.cpe.almalinux:tst:9"/>
++                  </criteria>
++            </definition>
+             <definition class="inventory" id="oval:org.open-scap.cpe.rhel:def:1005" version="1">
+                   <metadata>
+                         <title>Community Enterprise Operating System 5</title>
+@@ -868,6 +894,16 @@
+                   <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>
++            <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.almalinux:tst:9" version="1" check="at least one" comment="almalinux-release is version 9"
++                  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:9"/>
++            </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"/>
+@@ -1223,6 +1259,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>
+@@ -1307,6 +1346,14 @@
+                   <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.almalinux:ste:9" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
++                  <name operation="pattern match">^almalinux-release</name>
++                  <version operation="pattern match">^9</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 -aruN openscap-1.3.6/cpe/openscap-cpe-dict.xml openscap-1.3.6.alma/cpe/openscap-cpe-dict.xml
+--- openscap-1.3.6/cpe/openscap-cpe-dict.xml	2021-04-12 08:34:00.000000000 +0300
++++ openscap-1.3.6.alma/cpe/openscap-cpe-dict.xml	2022-05-19 12:24:45.000000000 +0300
+@@ -37,6 +37,14 @@
+             <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:almalinux:almalinux:9">
++            <title xml:lang="en-us">AlmaLinux 9</title>
++            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.almalinux:def:9</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>
diff --git a/openscap.spec b/openscap.spec
index f7f1503..7ff0d37 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -1,6 +1,6 @@
 Name:           openscap
 Version:        1.3.10
-Release:        3%{?dist}
+Release:        3%{?dist}.alma.1
 Epoch:          1
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 License:        LGPL-2.1-or-later
@@ -54,6 +54,8 @@ Requires:       procps
 Requires:       xmlsec1
 Requires:       xmlsec1-openssl
 
+Patch1000:      openscap-1.3.5-almalinux.patch
+
 %description %{common_description}
 
 %package        devel
@@ -212,6 +214,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Fri Aug 02 2024 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.3.10-3.alma.1
+- Add AlmaLinux definitions
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.3.10-3
 - Bump release for June 2024 mass rebuild
 
@@ -831,4 +836,3 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 * Thu Jan 15 2009 Tomas Heinrich <theinric@redhat.com> 0.1.1-1
 - Initial rpm
-