diff --git a/SOURCES/openscap-1.3.5-almalinux.patch b/SOURCES/openscap-1.3.5-almalinux.patch index 93bd510..ce026ec 100644 --- a/SOURCES/openscap-1.3.5-almalinux.patch +++ b/SOURCES/openscap-1.3.5-almalinux.patch @@ -1,7 +1,7 @@ -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 @@ +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 @@ @@ -17,11 +17,24 @@ diff -Naur openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml openscap-1.3.3.alma/cpe + + + ++ ++ ++ ++ AlmaLinux 9 ++ ++ AlmaLinux 9 ++ ++ ++ The operating system installed on the system is AlmaLinux 9 ++ ++ ++ ++ + Community Enterprise Operating System 5 -@@ -828,6 +841,11 @@ +@@ -868,6 +894,16 @@ @@ -29,11 +42,16 @@ diff -Naur openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml openscap-1.3.3.alma/cpe + xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux"> + + ++ ++ ++ ++ + -@@ -1165,6 +1183,9 @@ +@@ -1223,6 +1259,9 @@ oraclelinux-release @@ -43,27 +61,35 @@ diff -Naur openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml openscap-1.3.3.alma/cpe HKEY_LOCAL_MACHINE SOFTWARE\Microsoft\Windows NT\CurrentVersion -@@ -1233,6 +1254,10 @@ +@@ -1307,6 +1346,14 @@ ^oraclelinux-release ^8 + + ^almalinux-release + ^8 ++ ++ ++ ^almalinux-release ++ ^9 + ^16$ -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 @@ +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 @@ Community Enterprise Operating System 8 oval:org.open-scap.cpe.centos:def:8 + + AlmaLinux 8 + oval:org.open-scap.cpe.almalinux:def:8 ++ ++ ++ AlmaLinux 9 ++ oval:org.open-scap.cpe.almalinux:def:9 + Fedora 32 diff --git a/SPECS/openscap.spec b/SPECS/openscap.spec index 5425833..40fb523 100644 --- a/SPECS/openscap.spec +++ b/SPECS/openscap.spec @@ -1,6 +1,6 @@ Name: openscap Version: 1.3.8 -Release: 1%{?dist}.alma +Release: 1%{?dist}.alma.2 Epoch: 1 Summary: Set of open source libraries enabling integration of the SCAP line of standards License: LGPLv2+ @@ -202,6 +202,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %{_bindir}/oscap-run-sce-script %changelog +* Thu Sep 28 2023 Eduard Abdullin - 1.3.8-1.alma.2 +- Fix AlmaLinux patch + * Tue Sep 12 2023 Eduard Abdullin - 1.3.8-1.alma - Add AlmaLinux definitions