diff --git a/0001-Add-AlmaLinux-to-CPE-dictionary.patch b/0001-Add-AlmaLinux-to-CPE-dictionary.patch new file mode 100644 index 0000000..0057cc4 --- /dev/null +++ b/0001-Add-AlmaLinux-to-CPE-dictionary.patch @@ -0,0 +1,137 @@ +From 8052b221a046c479c2cbb44c297191eb0d701e89 Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +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 @@ + + +- +- Linux +- oval:org.open-scap.cpe.linux:def:1 ++ ++ AlmaLinux 8 ++ oval:org.open-scap.cpe.almalinux:def:8 ++ ++ ++ AlmaLinux 9 ++ oval:org.open-scap.cpe.almalinux:def:9 ++ ++ ++ AlmaLinux 10 ++ oval:org.open-scap.cpe.almalinux:def:10 + + +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 @@ + 2012-11-22T15:00:00+01:00 + + +- ++ + +- Red Hat Enterprise Linux ++ AlmaLinux 8 + +- Linux ++ AlmaLinux 8 + +- +- The operating system installed is Linux ++ ++ The operating system installed on the system is AlmaLinux 8 + + +- ++ ++ ++ ++ ++ ++ AlmaLinux 9 ++ ++ AlmaLinux 9 ++ ++ ++ The operating system installed on the system is AlmaLinux 9 ++ ++ ++ ++ ++ ++ ++ ++ AlmaLinux 10 ++ ++ AlmaLinux 10 ++ ++ ++ The operating system installed on the system is AlmaLinux 10 ++ ++ ++ + + + + +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +- ++ ++ almalinux-release ++ + + +- +- unix +- ++ ++ ^almalinux-release ++ ^8 ++ ++ ++ ^almalinux-release ++ ^9 ++ ++ ++ ^almalinux.*-release ++ ^10 ++ + + +-- +2.43.5 + diff --git a/openscap.spec b/openscap.spec index f6fdc27..db31550 100644 --- a/openscap.spec +++ b/openscap.spec @@ -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 - 1:1.4.1-1.alma.1 +- Add AlmaLinux definitions + * Wed Jan 08 2025 Jan Černý - 1:1.4.1-1 - Upgrade to the latest upstream release - Introduce the 'oscap-im' tool