rpms/openscap
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add AlmaLinux definitions

Browse Source
This commit is contained in:
Eduard Abdullin 2025-05-14 15:17:25 +00:00 committed by root
parent b6272ebc89
commit 8a4717ff30
2 changed files with 144 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
0001-Add-AlmaLinux-to-CPE-dictionary.patch Normal file
View File

@ -0,0 +1,137 @@
From 8052b221a046c479c2cbb44c297191eb0d701e89 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Thu, 26 Sep 2024 11:42:20 +0000
Subject: [PATCH] Add AlmaLinux to CPE dictionary
---
cpe/openscap-cpe-dict.xml | 14 +++++--
cpe/openscap-cpe-oval.xml | 78 +++++++++++++++++++++++++++++++--------
2 files changed, 73 insertions(+), 19 deletions(-)
diff --git a/cpe/openscap-cpe-dict.xml b/cpe/openscap-cpe-dict.xml
index 6c93b79..93a90c8 100644
--- a/cpe/openscap-cpe-dict.xml
+++ b/cpe/openscap-cpe-dict.xml
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<cpe-list xmlns="http://cpe.mitre.org/dictionary/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <cpe-item name="cpe:/o:linux:linux_kernel:-">
- <title xml:lang="en-us">Linux</title>
- <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.linux:def:1</check>
+ <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:almalinux:almalinux:10">
+ <title xml:lang="en-us">AlmaLinux 10</title>
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.almalinux:def:10</check>
</cpe-item>
</cpe-list>
diff --git a/cpe/openscap-cpe-oval.xml b/cpe/openscap-cpe-oval.xml
index 99bed4a..3935c38 100644
--- a/cpe/openscap-cpe-oval.xml
+++ b/cpe/openscap-cpe-oval.xml
@@ -12,34 +12,80 @@
<oval:timestamp>2012-11-22T15:00:00+01:00</oval:timestamp>
</generator>
<definitions>
- <definition class="inventory" id="oval:org.open-scap.cpe.linux:def:1" version="1">
+ <definition class="inventory" id="oval:org.open-scap.cpe.almalinux:def:8" version="1">
<metadata>
- <title>Red Hat Enterprise Linux</title>
+ <title>AlmaLinux 8</title>
<affected family="unix">
- <platform>Linux</platform>
+ <platform>AlmaLinux 8</platform>
</affected>
- <reference ref_id="cpe:/o:linux:linux_kernel:-" source="CPE"/>
- <description>The operating system installed is Linux</description>
+ <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="Linux is installed" test_ref="oval:org.open-scap.cpe.linux:tst:1"/>
+ <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.almalinux:def:10" version="1">
+ <metadata>
+ <title>AlmaLinux 10</title>
+ <affected family="unix">
+ <platform>AlmaLinux 10</platform>
+ </affected>
+ <reference ref_id="cpe:/o:almalinux:almalinux:10" source="CPE"/>
+ <description>The operating system installed on the system is AlmaLinux 10</description>
+ </metadata>
+ <criteria>
+ <criterion comment="AlmaLinux 10 is installed" test_ref="oval:org.open-scap.cpe.almalinux:tst:10"/>
</criteria>
</definition>
</definitions>
<tests>
- <family_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.linux: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">
- <object object_ref="oval:org.open-scap.cpe.unix:obj:1" />
- <state state_ref="oval:org.open-scap.cpe.unix:ste:1" />
- </family_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>
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.almalinux:tst:10" version="1" check="at least one" comment="almalinux-release is version 10"
+ 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:10"/>
+ </rpminfo_test>
</tests>
<objects>
- <family_object id="oval:org.open-scap.cpe.unix:obj:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent"/>
+ <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>
</objects>
<states>
- <family_state id="oval:org.open-scap.cpe.unix:ste:1" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
- <family>unix</family>
- </family_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.almalinux:ste:10" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+ <name operation="pattern match">^almalinux.*-release</name>
+ <version operation="pattern match">^10</version>
+ </rpminfo_state>
</states>
</oval_definitions>
--
2.43.5

8
openscap.spec
View File

@ -1,6 +1,6 @@
Name: openscap
Version: 1.4.1
Release: 1%{?dist}
Release: 1%{?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
@ -8,6 +8,9 @@ URL: http://www.open-scap.org/
VCS: https://github.com/OpenSCAP/openscap
Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
# AlmaLinux Patch
Patch1000: 0001-Add-AlmaLinux-to-CPE-dictionary.patch
%global common_description %{expand:
OpenSCAP is a set of open source libraries providing an easier path
for integration of the SCAP line of standards. SCAP is a line of standards
@ -157,6 +160,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
* Wed May 14 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.4.1-1.alma.1
- Add AlmaLinux definitions
* Wed Jan 08 2025 Jan Černý <jcerny@redhat.com> - 1:1.4.1-1
- Upgrade to the latest upstream release
- Introduce the 'oscap-im' tool