diff --git a/.gitignore b/.gitignore index 3c06325..e16c468 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/openscap-1.3.7.tar.gz +SOURCES/openscap-1.3.11.tar.gz diff --git a/.openscap.metadata b/.openscap.metadata index 00c5f43..b6fe539 100644 --- a/.openscap.metadata +++ b/.openscap.metadata @@ -1 +1 @@ -238acbe6e18162b54cbdd0083c52511c00faa268 SOURCES/openscap-1.3.7.tar.gz +2a44242053bd95c20c05fa572d203705e46a107b SOURCES/openscap-1.3.11.tar.gz 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 d2f7fba..2dfd901 100644 --- a/SPECS/openscap.spec +++ b/SPECS/openscap.spec @@ -1,15 +1,14 @@ Name: openscap -Version: 1.3.7 -Release: 1%{?dist}.alma +Version: 1.3.11 +Release: 1%{?dist}.alma.1 Epoch: 1 Summary: Set of open source libraries enabling integration of the SCAP line of standards License: LGPLv2+ URL: http://www.open-scap.org/ Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz -# Add AlmaLinux definitions -Patch1000: openscap-1.3.5-almalinux.patch - +# AlmaLinux Patch +Patch100: openscap-1.3.5-almalinux.patch BuildRequires: make BuildRequires: cmake >= 2.6 BuildRequires: gcc @@ -127,6 +126,7 @@ for developing applications that use %{name}-engine-sce. -DENABLE_PERL=OFF \ -DENABLE_OSCAP_UTIL_DOCKER=OFF \ -DENABLE_OSCAP_REMEDIATE_SERVICE=OFF \ + -DOPENSCAP_PROBE_LINUX_DPKGINFO=OFF \ -DOPENSCAP_PROBE_UNIX_GCONF=OFF \ -DOPENSCAP_ENABLE_SHA1=OFF \ -DOPENSCAP_ENABLE_MD5=OFF \ @@ -195,15 +195,39 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %{_bindir}/scap-as-rpm %{_mandir}/man8/autotailor.8.gz %{_bindir}/autotailor +%{_mandir}/man8/oscap-im.8.gz +%{_bindir}/oscap-im %files engine-sce %{_libdir}/libopenscap_sce.so.* %{_bindir}/oscap-run-sce-script %changelog -* Wed Mar 29 2023 Eduard Abdullin - 1:1.3.7-1.alma +* Tue Mar 11 2025 Eduard Abdullin - 1:1.3.11-1.alma.1 - Add AlmaLinux definitions +* Mon Feb 10 2025 Jan Černý - 1:1.3.11-1 +- Upgrade to the latest upstream release (RHEL-76355) +- Introduce "oscap-im", a tool for building hardened bootable container images +- Fix RPM probes in bootable container images build environment (RHEL-55251) + +* Wed Aug 07 2024 Milan Lysonek - 1:1.3.10-3 +- Switch gating to tmt plan (RHEL-43241) + +* Mon Apr 08 2024 Jan Černý - 1:1.3.10-2 +- Explicitely disable dpkginfo probe + +* Tue Apr 02 2024 Jan Černý - 1:1.3.10-1 +- Rebase to the latest upstream version (RHEL-29172) +- Fix OVAL results file name (RHEL-7050) +- Add ability to define a limit of collected items (RHEL-4141) +- Add ability to refine rules in autotailor (RHEL-1477) +- Improve the formatting of Blueprint remediations (RHEL-1476) + +* Fri Jul 14 2023 Evgenii Kolesnikov - 1.3.8-1 +- Upgrade to the latest upstream release (rhbz#2217442) +- Fix systemd* probes unit enumeration (rhbz#2219532) + * Fri Jan 27 2023 Jan Černý - 1:1.3.7-1 - Upgrade to the latest upstream release (rhbz#2159286) - Fix error when processing OVAL filters (rhbz#2126883)