rpm/openscap
SHA256
1
0
Fork 0
forked from pool/openscap
Code Pull Requests Activity

Accepting request 1172088 from security

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1172088
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openscap?expand=0&rev=87
This commit is contained in:
Ana Guerrero 2024-05-06 15:53:23 +00:00 committed by Git OBS Bridge
commit b25bde19dc
3 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
0001-Add-openSUSE-cpe-links.patch
View File

@ -8,11 +8,11 @@ Subject: [PATCH 1/5] Add openSUSE cpe links
cpe/openscap-cpe-oval.xml | 127 ++++++++++++++++++++++++++++++++++++++
2 files changed, 151 insertions(+)
diff --git a/cpe/openscap-cpe-dict.xml b/cpe/openscap-cpe-dict.xml
index 02d5361..cf52bee 100644
--- a/cpe/openscap-cpe-dict.xml
+++ b/cpe/openscap-cpe-dict.xml
@@ -53,4 +53,28 @@
Index: openscap-1.3.10/cpe/openscap-cpe-dict.xml
===================================================================
--- openscap-1.3.10.orig/cpe/openscap-cpe-dict.xml
+++ openscap-1.3.10/cpe/openscap-cpe-dict.xml
@@ -53,4 +53,32 @@
<title xml:lang="en-us">Fedora 35</title>
<check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.fedora:def:35</check>
</cpe-item>
@ -36,16 +36,20 @@ index 02d5361..cf52bee 100644
+ <title xml:lang="en-us">openSUSE Leap 15.5</title>
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:155</check>
+ </cpe-item>
+ <cpe-item name="cpe:/o:opensuse:leap:15.6">
+ <title xml:lang="en-us">openSUSE Leap 15.6</title>
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:156</check>
+ </cpe-item>
+ <cpe-item name="cpe:/o:opensuse:tumbleweed">
+ <title xml:lang="en-us">openSUSE Tumbleweed</title>
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:9999</check>
+ </cpe-item>
</cpe-list>
diff --git a/cpe/openscap-cpe-oval.xml b/cpe/openscap-cpe-oval.xml
index 6409940..a402c7f 100644
--- a/cpe/openscap-cpe-oval.xml
+++ b/cpe/openscap-cpe-oval.xml
@@ -690,6 +690,84 @@
Index: openscap-1.3.10/cpe/openscap-cpe-oval.xml
===================================================================
--- openscap-1.3.10.orig/cpe/openscap-cpe-oval.xml
+++ openscap-1.3.10/cpe/openscap-cpe-oval.xml
@@ -690,6 +690,97 @@
<criterion comment="openSUSE Leap 15.0 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:150"/>
</criteria>
</definition>
@ -114,6 +118,19 @@ index 6409940..a402c7f 100644
+ <criterion comment="openSUSE Leap 15.5 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:155"/>
+ </criteria>
+ </definition>
+ <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:156" version="1">
+ <metadata>
+ <title>openSUSE Leap 15.6</title>
+ <affected family="unix">
+ <platform>openSUSE Leap 15.6</platform>
+ </affected>
+ <reference ref_id="cpe:/o:opensuse:leap:15.6" source="CPE"/>
+ <description>The operating system installed on the system is openSUSE Leap 15.6</description>
+ </metadata>
+ <criteria>
+ <criterion comment="openSUSE Leap 15.6 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:156"/>
+ </criteria>
+ </definition>
+ <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:9999" version="1">
+ <metadata>
+ <title>openSUSE Tumbleweed</title>
@ -130,7 +147,7 @@ index 6409940..a402c7f 100644
<definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1" version="1" >
<metadata>
<title>Wind River Linux</title>
@@ -1087,6 +1165,36 @@
@@ -1087,6 +1178,41 @@
<object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
<state state_ref="oval:org.open-scap.cpe.opensuse:ste:150"/>
</rpminfo_test>
@ -159,6 +176,11 @@ index 6409940..a402c7f 100644
+ <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
+ <state state_ref="oval:org.open-scap.cpe.opensuse:ste:155"/>
+ </rpminfo_test>
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:156" version="2" check="at least one" comment="openSUSE-release is version 15.6"
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+ <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
+ <state state_ref="oval:org.open-scap.cpe.opensuse:ste:156"/>
+ </rpminfo_test>
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:9999" version="2" check="at least one" comment="openSUSE-release is openSUSE Tumbleweed"
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+ <object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
@ -167,7 +189,7 @@ index 6409940..a402c7f 100644
<family_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.wrlinux: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">
@@ -1415,6 +1523,25 @@
@@ -1415,6 +1541,28 @@
<rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:150" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
<version operation="pattern match">^15.0$</version>
</rpminfo_state>
@ -186,6 +208,9 @@ index 6409940..a402c7f 100644
+ <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:155" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+ <version operation="pattern match">^15.5$</version>
+ </rpminfo_state>
+ <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:156" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+ <version operation="pattern match">^15.6$</version>
+ </rpminfo_state>
+ <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:9999" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+ <!-- matching for timestamp -->
+ <version operation="pattern match">^\d{8}$</version>
@ -193,6 +218,3 @@ index 6409940..a402c7f 100644
<textfilecontent54_state
id="oval:org.open-scap.cpe.wrlinux-release:ste:8"
comment="Check the /etc/wrlinux-release file for VERSION 8 specification."
--
2.40.0

11
openscap.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat May 4 09:44:02 UTC 2024 - Marcus Meissner <meissner@suse.com>
- 0001-Add-openSUSE-cpe-links.patch: added Leap 15.6
-------------------------------------------------------------------
Wed Mar 20 18:37:30 UTC 2024 - Dan Čermák <dcermak@suse.com>
- Rename oscap-docker to oscap-containers and provide oscap-podman as well
(Relates to jsc#SLE-12852)
-------------------------------------------------------------------
Wed Mar 20 08:56:12 UTC 2024 - Robert Frohl <rfrohl@suse.com>

19
openscap.spec
View File

@ -115,12 +115,15 @@ Requires: libopenscap%{sover} = %{version}
This package contains the development files (mainly C header files) for the
OpenSCAP C library.
%package docker
Summary: Docker plugin for OpenSCAP
%package containers
Summary: OpenSCAP plugin for scanning containers
Group: System/Libraries
Provides: openscap-docker = %{version}-%{release}
Obsoletes: openscap-docker < %{version}-%{release}
%description docker
This package contains the Docker support for OpenSCAP.
%description containers
This package contains plugins for scanning containers using OpenSCAP either via
podman or docker.
%if 0%{?with_bindings}
%package -n python-openscap
@ -291,9 +294,12 @@ mv %{buildroot}/%{_prefix}/libexec/oscap-remediate %{buildroot}/%{_bindir}
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*
%files docker
%files containers
%{python3_sitelib}/oscap_docker_python
%{_bindir}/oscap-docker
%{_bindir}/oscap-podman
%{_mandir}/man8/oscap-podman.8*
%{_mandir}/man8/oscap-docker.8*
%if 0%{?with_bindings}
%files -n python-openscap
@ -316,10 +322,11 @@ mv %{buildroot}/%{_prefix}/libexec/oscap-remediate %{buildroot}/%{_bindir}
%{_bindir}/oscap-ssh
%{_bindir}/oscap-chroot
%{_bindir}/scap-as-rpm
%{_bindir}/oscap-podman
%{_bindir}/oscap-run-sce-script
%{_sbindir}/rcoscap-scan
%{_datadir}/bash-completion/completions/*
%exclude %{_mandir}/man8/oscap-podman.8*
%exclude %{_mandir}/man8/oscap-docker.8*
%{_bindir}/oscap-remediate-offline
%{_prefix}/lib/systemd/system/oscap-remediate.service
%if 0%{?suse_version} != 1599