From 76c42e3c66e1367e7c560cb9e27da5e9b99d5aba Mon Sep 17 00:00:00 2001 From: ebasov Date: Fri, 10 Jan 2025 10:07:30 +0300 Subject: [PATCH 1/3] Added oscap-docker --- SPECS/openscap.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/SPECS/openscap.spec b/SPECS/openscap.spec index 0eaa3c2..382515b 100644 --- a/SPECS/openscap.spec +++ b/SPECS/openscap.spec @@ -1,6 +1,6 @@ Name: openscap Version: 1.3.10 -Release: 2%{?dist} +Release: 2%{?dist}.inferit.1 Epoch: 1 Summary: Set of open source libraries enabling integration of the SCAP line of standards License: LGPLv2+ @@ -87,6 +87,7 @@ Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: rpmdevtools rpm-build Requires: %{name}-scanner%{?_isa} = %{epoch}:%{version}-%{release} Requires: bash +Requires: python-docker >= 5.0.2 %description utils The %{name}-utils package contains command-line tools build on top @@ -121,7 +122,7 @@ for developing applications that use %{name}-engine-sce. %cmake \ -DENABLE_DOCS=ON \ -DENABLE_PERL=OFF \ - -DENABLE_OSCAP_UTIL_DOCKER=OFF \ + -DENABLE_OSCAP_UTIL_DOCKER=ON \ -DENABLE_OSCAP_REMEDIATE_SERVICE=OFF \ -DOPENSCAP_PROBE_LINUX_DPKGINFO=OFF \ -DOPENSCAP_PROBE_UNIX_GCONF=OFF \ @@ -146,6 +147,8 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %ldconfig_scriptlets +%define _dirlib /usr/lib/ + %files %doc AUTHORS NEWS README.md %license COPYING @@ -159,6 +162,7 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %{_datadir}/openscap/xsl/* %{_datadir}/openscap/cpe/* + %files python3 %{python3_sitearch}/* @@ -184,6 +188,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %doc docs/oscap-scan.cron %{_mandir}/man8/oscap-ssh.8.gz %{_bindir}/oscap-ssh +%{_mandir}/man8/oscap-docker.8.gz +%{_dirlib}/python3.9 +%{_bindir}/oscap-docker %{_mandir}/man8/oscap-podman.8.gz %{_bindir}/oscap-podman %{_mandir}/man8/oscap-vm.8.gz @@ -198,6 +205,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %{_bindir}/oscap-run-sce-script %changelog +* Fri Jan 10 2025 Eduard Basov - 1:1.3.10-2.inferit.1 +- Enabling an additional component in the build ( oscap-docker) + * Mon Apr 08 2024 Jan Černý - 1:1.3.10-2 - Explicitely disable dpkginfo probe @@ -212,9 +222,6 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm - Upgrade to the latest upstream release (rhbz#2217442) - Fix systemd* probes unit enumeration (rhbz#2219532) -* Wed Mar 15 2023 MSVSphere Packaging Team - 1:1.3.7-1 -- Rebuilt for MSVSphere 9.1. - * 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) From f9853dae5145f177500a2d08163e1858b1276030 Mon Sep 17 00:00:00 2001 From: ebasov Date: Fri, 10 Jan 2025 10:12:10 +0300 Subject: [PATCH 2/3] Added miss changelog --- SPECS/openscap.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SPECS/openscap.spec b/SPECS/openscap.spec index 382515b..23f6908 100644 --- a/SPECS/openscap.spec +++ b/SPECS/openscap.spec @@ -222,6 +222,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm - Upgrade to the latest upstream release (rhbz#2217442) - Fix systemd* probes unit enumeration (rhbz#2219532) +* Wed Mar 15 2023 MSVSphere Packaging Team - 1:1.3.7-1 +- Rebuilt for MSVSphere 9.1. + * 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) From 9e35d8a8e22d35bc994a17a170ae62f593bc786e Mon Sep 17 00:00:00 2001 From: ebasov Date: Fri, 10 Jan 2025 10:25:23 +0300 Subject: [PATCH 3/3] version adjustment --- SPECS/openscap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/openscap.spec b/SPECS/openscap.spec index 23f6908..01a6f44 100644 --- a/SPECS/openscap.spec +++ b/SPECS/openscap.spec @@ -1,6 +1,6 @@ Name: openscap Version: 1.3.10 -Release: 2%{?dist}.inferit.1 +Release: 2%{?dist}.inferit Epoch: 1 Summary: Set of open source libraries enabling integration of the SCAP line of standards License: LGPLv2+ @@ -205,7 +205,7 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %{_bindir}/oscap-run-sce-script %changelog -* Fri Jan 10 2025 Eduard Basov - 1:1.3.10-2.inferit.1 +* Fri Jan 10 2025 Eduard Basov - 1:1.3.10-2.inferit - Enabling an additional component in the build ( oscap-docker) * Mon Apr 08 2024 Jan Černý - 1:1.3.10-2