Compare commits
No commits in common. "factory" and "factory" have entirely different histories.
220
0001-Add-openSUSE-cpe-links.patch
Normal file
220
0001-Add-openSUSE-cpe-links.patch
Normal file
@ -0,0 +1,220 @@
|
||||
From 48685f390b865f6edd7df8dba955c03dff6045e8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
|
||||
Date: Tue, 28 Mar 2023 12:02:43 +0200
|
||||
Subject: [PATCH 1/5] Add openSUSE cpe links
|
||||
|
||||
---
|
||||
cpe/openscap-cpe-dict.xml | 24 +++++++
|
||||
cpe/openscap-cpe-oval.xml | 127 ++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 151 insertions(+)
|
||||
|
||||
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>
|
||||
+ <cpe-item name="cpe:/o:opensuse:leap:15.1">
|
||||
+ <title xml:lang="en-us">openSUSE Leap 15.1</title>
|
||||
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:151</check>
|
||||
+ </cpe-item>
|
||||
+ <cpe-item name="cpe:/o:opensuse:leap:15.2">
|
||||
+ <title xml:lang="en-us">openSUSE Leap 15.2</title>
|
||||
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:152</check>
|
||||
+ </cpe-item>
|
||||
+ <cpe-item name="cpe:/o:opensuse:leap:15.3">
|
||||
+ <title xml:lang="en-us">openSUSE Leap 15.3</title>
|
||||
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:153</check>
|
||||
+ </cpe-item>
|
||||
+ <cpe-item name="cpe:/o:opensuse:leap:15.4">
|
||||
+ <title xml:lang="en-us">openSUSE Leap 15.4</title>
|
||||
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:154</check>
|
||||
+ </cpe-item>
|
||||
+ <cpe-item name="cpe:/o:opensuse:leap:15.5">
|
||||
+ <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>
|
||||
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>
|
||||
+ <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:151" version="1">
|
||||
+ <metadata>
|
||||
+ <title>openSUSE Leap 15.1</title>
|
||||
+ <affected family="unix">
|
||||
+ <platform>openSUSE Leap 15.1</platform>
|
||||
+ </affected>
|
||||
+ <reference ref_id="cpe:/o:opensuse:leap:15.1" source="CPE"/>
|
||||
+ <description>The operating system installed on the system is openSUSE Leap 15.1</description>
|
||||
+ </metadata>
|
||||
+ <criteria>
|
||||
+ <criterion comment="openSUSE Leap 15.1 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:151"/>
|
||||
+ </criteria>
|
||||
+ </definition>
|
||||
+ <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:152" version="1">
|
||||
+ <metadata>
|
||||
+ <title>openSUSE Leap 15.2</title>
|
||||
+ <affected family="unix">
|
||||
+ <platform>openSUSE Leap 15.2</platform>
|
||||
+ </affected>
|
||||
+ <reference ref_id="cpe:/o:opensuse:leap:15.2" source="CPE"/>
|
||||
+ <description>The operating system installed on the system is openSUSE Leap 15.2</description>
|
||||
+ </metadata>
|
||||
+ <criteria>
|
||||
+ <criterion comment="openSUSE Leap 15.2 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:152"/>
|
||||
+ </criteria>
|
||||
+ </definition>
|
||||
+ <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:153" version="1">
|
||||
+ <metadata>
|
||||
+ <title>openSUSE Leap 15.3</title>
|
||||
+ <affected family="unix">
|
||||
+ <platform>openSUSE Leap 15.3</platform>
|
||||
+ </affected>
|
||||
+ <reference ref_id="cpe:/o:opensuse:leap:15.3" source="CPE"/>
|
||||
+ <description>The operating system installed on the system is openSUSE Leap 15.3</description>
|
||||
+ </metadata>
|
||||
+ <criteria>
|
||||
+ <criterion comment="openSUSE Leap 15.3 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:153"/>
|
||||
+ </criteria>
|
||||
+ </definition>
|
||||
+ <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:154" version="1">
|
||||
+ <metadata>
|
||||
+ <title>openSUSE Leap 15.4</title>
|
||||
+ <affected family="unix">
|
||||
+ <platform>openSUSE Leap 15.4</platform>
|
||||
+ </affected>
|
||||
+ <reference ref_id="cpe:/o:opensuse:leap:15.4" source="CPE"/>
|
||||
+ <description>The operating system installed on the system is openSUSE Leap 15.4</description>
|
||||
+ </metadata>
|
||||
+ <criteria>
|
||||
+ <criterion comment="openSUSE Leap 15.4 is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:154"/>
|
||||
+ </criteria>
|
||||
+ </definition>
|
||||
+ <definition class="inventory" id="oval:org.open-scap.cpe.opensuse:def:155" version="1">
|
||||
+ <metadata>
|
||||
+ <title>openSUSE Leap 15.5</title>
|
||||
+ <affected family="unix">
|
||||
+ <platform>openSUSE Leap 15.5</platform>
|
||||
+ </affected>
|
||||
+ <reference ref_id="cpe:/o:opensuse:leap:15.5" source="CPE"/>
|
||||
+ <description>The operating system installed on the system is openSUSE Leap 15.5</description>
|
||||
+ </metadata>
|
||||
+ <criteria>
|
||||
+ <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>
|
||||
+ <affected family="unix">
|
||||
+ <platform>openSUSE Tumbleweed</platform>
|
||||
+ </affected>
|
||||
+ <reference ref_id="cpe:/o:opensuse:tumbleweed" source="CPE"/>
|
||||
+ <description>The operating system installed on the system is openSUSE Tumbleweed</description>
|
||||
+ </metadata>
|
||||
+ <criteria>
|
||||
+ <criterion comment="openSUSE Tumbleweed is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:9999"/>
|
||||
+ </criteria>
|
||||
+ </definition>
|
||||
<definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1" version="1" >
|
||||
<metadata>
|
||||
<title>Wind River Linux</title>
|
||||
@@ -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>
|
||||
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:151" version="2" check="at least one" comment="openSUSE-release is version 15.1"
|
||||
+ 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:151"/>
|
||||
+ </rpminfo_test>
|
||||
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:152" version="2" check="at least one" comment="openSUSE-release is version 15.2"
|
||||
+ 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:152"/>
|
||||
+ </rpminfo_test>
|
||||
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:153" version="2" check="at least one" comment="openSUSE-release is version 15.3"
|
||||
+ 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:153"/>
|
||||
+ </rpminfo_test>
|
||||
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:154" version="2" check="at least one" comment="openSUSE-release is version 15.4"
|
||||
+ 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:154"/>
|
||||
+ </rpminfo_test>
|
||||
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:155" version="2" check="at least one" comment="openSUSE-release is version 15.5"
|
||||
+ 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: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"/>
|
||||
+ <state state_ref="oval:org.open-scap.cpe.opensuse:ste:9999"/>
|
||||
+ </rpminfo_test>
|
||||
<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 +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>
|
||||
+ <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:151" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
+ <version operation="pattern match">^15.1$</version>
|
||||
+ </rpminfo_state>
|
||||
+ <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:152" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
+ <version operation="pattern match">^15.2$</version>
|
||||
+ </rpminfo_state>
|
||||
+ <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:153" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
+ <version operation="pattern match">^15.3$</version>
|
||||
+ </rpminfo_state>
|
||||
+ <rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:154" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
+ <version operation="pattern match">^15.4$</version>
|
||||
+ </rpminfo_state>
|
||||
+ <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>
|
||||
+ </rpminfo_state>
|
||||
<textfilecontent54_state
|
||||
id="oval:org.open-scap.cpe.wrlinux-release:ste:8"
|
||||
comment="Check the /etc/wrlinux-release file for VERSION 8 specification."
|
119
0002-Add-SUSE-cpe-links.patch
Normal file
119
0002-Add-SUSE-cpe-links.patch
Normal file
@ -0,0 +1,119 @@
|
||||
From 8ef63951ad8e87a65cb252601a03bd958631f94c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
|
||||
Date: Tue, 28 Mar 2023 12:04:28 +0200
|
||||
Subject: [PATCH 2/5] Add SUSE cpe links
|
||||
|
||||
---
|
||||
cpe/openscap-cpe-dict.xml | 16 +++++++++++++++
|
||||
cpe/openscap-cpe-oval.xml | 42 +++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 58 insertions(+)
|
||||
|
||||
diff --git a/cpe/openscap-cpe-dict.xml b/cpe/openscap-cpe-dict.xml
|
||||
index cf52bee..85917a8 100644
|
||||
--- a/cpe/openscap-cpe-dict.xml
|
||||
+++ b/cpe/openscap-cpe-dict.xml
|
||||
@@ -77,4 +77,20 @@
|
||||
<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-item name="cpe:/o:suse:sles:12">
|
||||
+ <title xml:lang="en-us">SUSE Linux Enterprise Server 12</title>
|
||||
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.sles:def:12</check>
|
||||
+ </cpe-item>
|
||||
+ <cpe-item name="cpe:/o:suse:sled:12">
|
||||
+ <title xml:lang="en-us">SUSE Linux Enterprise Desktop 12</title>
|
||||
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.sled:def:12</check>
|
||||
+ </cpe-item>
|
||||
+ <cpe-item name="cpe:/o:suse:sles:15">
|
||||
+ <title xml:lang="en-us">SUSE Linux Enterprise Server 15</title>
|
||||
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.sles:def:15</check>
|
||||
+ </cpe-item>
|
||||
+ <cpe-item name="cpe:/o:suse:sled:15">
|
||||
+ <title xml:lang="en-us">SUSE Linux Enterprise Desktop 15</title>
|
||||
+ <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.sled:def:15</check>
|
||||
+ </cpe-item>
|
||||
</cpe-list>
|
||||
diff --git a/cpe/openscap-cpe-oval.xml b/cpe/openscap-cpe-oval.xml
|
||||
index a402c7f..531297b 100644
|
||||
--- a/cpe/openscap-cpe-oval.xml
|
||||
+++ b/cpe/openscap-cpe-oval.xml
|
||||
@@ -768,6 +768,32 @@
|
||||
<criterion comment="openSUSE Tumbleweed is installed" test_ref="oval:org.open-scap.cpe.opensuse:tst:9999"/>
|
||||
</criteria>
|
||||
</definition>
|
||||
+ <definition class="inventory" id="oval:org.open-scap.cpe.sles:def:15" version="1">
|
||||
+ <metadata>
|
||||
+ <title>SUSE Linux Enterprise Server 15</title>
|
||||
+ <affected family="unix">
|
||||
+ <platform>SUSE Linux Enterprise Server 15</platform>
|
||||
+ </affected>
|
||||
+ <reference ref_id="cpe:/o:suse:sles:15" source="CPE"/>
|
||||
+ <description>The operating system installed on the system is SUSE Linux Enterprise Server 15</description>
|
||||
+ </metadata>
|
||||
+ <criteria>
|
||||
+ <criterion comment="SLES 15 is installed" test_ref="oval:org.open-scap.cpe.sles:tst:15"/>
|
||||
+ </criteria>
|
||||
+ </definition>
|
||||
+ <definition class="inventory" id="oval:org.open-scap.cpe.sled:def:15" version="1">
|
||||
+ <metadata>
|
||||
+ <title>SUSE Linux Enterprise Desktop 15</title>
|
||||
+ <affected family="unix">
|
||||
+ <platform>SUSE Linux Enterprise Desktop 15</platform>
|
||||
+ </affected>
|
||||
+ <reference ref_id="cpe:/o:suse:sled:15" source="CPE"/>
|
||||
+ <description>The operating system installed on the system is SUSE Linux Enterprise Desktop 15</description>
|
||||
+ </metadata>
|
||||
+ <criteria>
|
||||
+ <criterion comment="SLED 15 is installed" test_ref="oval:org.open-scap.cpe.sled:tst:15"/>
|
||||
+ </criteria>
|
||||
+ </definition>
|
||||
<definition class="inventory" id="oval:org.open-scap.cpe.wrlinux:def:1" version="1" >
|
||||
<metadata>
|
||||
<title>Wind River Linux</title>
|
||||
@@ -1110,6 +1136,11 @@
|
||||
<object object_ref="oval:org.open-scap.cpe.sles-release:obj:1"/>
|
||||
<state state_ref="oval:org.open-scap.cpe.sles:ste:12"/>
|
||||
</rpminfo_test>
|
||||
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sles:tst:15" version="1" check="at least one" comment="sles-release is version 15"
|
||||
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
+ <object object_ref="oval:org.open-scap.cpe.sles-release:obj:1"/>
|
||||
+ <state state_ref="oval:org.open-scap.cpe.sles:ste:15"/>
|
||||
+ </rpminfo_test>
|
||||
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sled:tst:10" version="1" check="at least one" comment="sled-release is version 10"
|
||||
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
<object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
|
||||
@@ -1125,6 +1156,11 @@
|
||||
<object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
|
||||
<state state_ref="oval:org.open-scap.cpe.sled:ste:12"/>
|
||||
</rpminfo_test>
|
||||
+ <rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.sled:tst:15" version="1" check="at least one" comment="sled-release is version 15"
|
||||
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
+ <object object_ref="oval:org.open-scap.cpe.sled-release:obj:1"/>
|
||||
+ <state state_ref="oval:org.open-scap.cpe.sled:ste:15"/>
|
||||
+ </rpminfo_test>
|
||||
<rpminfo_test check_existence="at_least_one_exists" id="oval:org.open-scap.cpe.opensuse:tst:1" version="1" check="at least one" comment="openSUSE-release is version 11.4"
|
||||
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
<object object_ref="oval:org.open-scap.cpe.openSUSE-release:obj:1"/>
|
||||
@@ -1490,6 +1526,9 @@
|
||||
<rpminfo_state id="oval:org.open-scap.cpe.sles:ste:12" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
<version operation="pattern match">^12($|[^\d])</version>
|
||||
</rpminfo_state>
|
||||
+ <rpminfo_state id="oval:org.open-scap.cpe.sles:ste:15" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
+ <version operation="pattern match">^15($|[^\d])</version>
|
||||
+ </rpminfo_state>
|
||||
<rpminfo_state id="oval:org.open-scap.cpe.sled:ste:10" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
<version operation="pattern match">^10($|[^\d])</version>
|
||||
</rpminfo_state>
|
||||
@@ -1499,6 +1538,9 @@
|
||||
<rpminfo_state id="oval:org.open-scap.cpe.sled:ste:12" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
<version operation="pattern match">^12($|[^\d])</version>
|
||||
</rpminfo_state>
|
||||
+ <rpminfo_state id="oval:org.open-scap.cpe.sled:ste:15" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
+ <version operation="pattern match">^15($|[^\d])</version>
|
||||
+ </rpminfo_state>
|
||||
<rpminfo_state id="oval:org.open-scap.cpe.opensuse:ste:2" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
|
||||
<name operation="pattern match">^openSUSE-release</name>
|
||||
</rpminfo_state>
|
||||
--
|
||||
2.40.0
|
||||
|
BIN
openscap-1.3.10.tar.gz
(Stored with Git LFS)
Normal file
BIN
openscap-1.3.10.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6ba92a9bd1244b0fcaafe880416cac0ea067eca9a6b583dddbdcaee59637034a
|
||||
size 13139720
|
@ -1,49 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 8 16:49:37 UTC 2025 - Alexander Bergmann <abergmann@suse.com>
|
||||
|
||||
- update to 1.4.1:
|
||||
* New features
|
||||
- Introduce "oscap-im" - script that can be used in Containerfiles to build
|
||||
- hardened bootable container images to run as Image Mode Operating System
|
||||
Maintenance, bug fix
|
||||
- Add support for containers with no entrypoint/cmd in "oscap-docker"
|
||||
- Stop printing useless component reference information in "oscap info"
|
||||
- Fix missing declaration of PATH_MAX on Solaris
|
||||
- Fix RPM database path in RPM probes (RHEL-55251, #2151)
|
||||
- Fix issues reported by OpenScanHub after 1.4.0 release
|
||||
- Fix failing test probes/filehash58/test_probes_filehash58.sh on s390x
|
||||
- architecture
|
||||
- Ensure xlink namespace exists (RHEL-34104)
|
||||
- Minor fixes in test suite and CI
|
||||
- update to 1.4.0:
|
||||
* New features
|
||||
- Introduce ability to generate Kickstarts for unattended OS installation using the oscap xccdf generate fix --fix-type kickstart command
|
||||
- Add ability to process multi-profile JSON tailorings by the autotailor tool
|
||||
* Removed features
|
||||
- Removed cve, cvss, cvrf modules
|
||||
- Removed ds submodules sds-compose, sds-add, sds-split, rds-create, rds-split
|
||||
- Removed --template, --oval-template and --sce-template options from the xccdf generate submodule
|
||||
- Remove the --skip-valid option (replaced by --skip-validation)
|
||||
* Maintenance, bug fix
|
||||
- Advertise path to SSG in remediation scripts
|
||||
- Remove the option to build with PCRE
|
||||
- Process CPE AL platforms if CPE dictionary isn't part of data stream
|
||||
- Disable GConf probe by default (and remove dependencies from docs)
|
||||
- Disable MD5 and SHA-1 by default
|
||||
- Remove CPE dictionary
|
||||
- Fix compiler warnings
|
||||
- Update User Manual
|
||||
- Remove SUSE/openSUSE CPE dictionary patches.
|
||||
* drop 0001-Add-openSUSE-cpe-links.patch
|
||||
* drop 0002-Add-SUSE-cpe-links.patch
|
||||
- Set .so version to 33.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 16 11:49:29 UTC 2024 - Marcus Meissner <meissner@suse.com>
|
||||
|
||||
- disable sendmail buildrequires (seems unused)
|
||||
- only use distribution-release to make work everywhere
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 4 09:44:02 UTC 2024 - Marcus Meissner <meissner@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package openscap
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,14 +16,14 @@
|
||||
#
|
||||
|
||||
|
||||
%define sover 33
|
||||
%define sover 25
|
||||
%define with_bindings 0
|
||||
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||
%if ! %{defined _fillupdir}
|
||||
%define _fillupdir %{_localstatedir}/adm/fillup-templates
|
||||
%endif
|
||||
Name: openscap
|
||||
Version: 1.4.1
|
||||
Version: 1.3.10
|
||||
Release: 0
|
||||
Summary: A Set of Libraries for Integration with SCAP
|
||||
License: LGPL-2.1-or-later
|
||||
@ -38,6 +38,8 @@ Source3: scap-yast2sec-xccdf.xml
|
||||
Source4: scap-yast2sec-oval.xml
|
||||
Source5: oscap-scan.service
|
||||
Source6: oscap-scan.sh
|
||||
Patch1: 0001-Add-openSUSE-cpe-links.patch
|
||||
Patch2: 0002-Add-SUSE-cpe-links.patch
|
||||
Patch3: 0003-Use-openSUSE-SUSE-cpe-links.patch
|
||||
%if 0%{?suse_version} != 1599
|
||||
Patch4: 0004-oscap-remediate-is-located-in-bindir.patch
|
||||
@ -73,6 +75,7 @@ BuildRequires: procps
|
||||
BuildRequires: procps-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: rpm-devel
|
||||
BuildRequires: sendmail
|
||||
BuildRequires: swig
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: unixODBC-devel
|
||||
@ -85,7 +88,12 @@ BuildRequires: pkgconfig(systemd)
|
||||
# remove extra packages from version 1.2.9 and older
|
||||
Obsoletes: openscap-engine-sce < %{version}
|
||||
Obsoletes: openscap-extra-probes < %{version}
|
||||
# Next few lines are needed for unit tests, they expect /etc/os-release to exist
|
||||
%if !0%{?is_opensuse} && 0%{?sle_version} < 130000
|
||||
BuildRequires: sles-release
|
||||
%else
|
||||
BuildRequires: distribution-release
|
||||
%endif
|
||||
|
||||
%description
|
||||
OpenSCAP is a set of open source libraries providing an easier path for
|
||||
@ -309,7 +317,6 @@ mv %{buildroot}/%{_prefix}/libexec/oscap-remediate %{buildroot}/%{_bindir}
|
||||
%{_unitdir}/oscap-scan.service
|
||||
%{_bindir}/autotailor
|
||||
%{_bindir}/oscap
|
||||
%{_bindir}/oscap-im
|
||||
%{_bindir}/oscap-vm
|
||||
%{_bindir}/oscap-scan
|
||||
%{_bindir}/oscap-ssh
|
||||
|
Loading…
Reference in New Issue
Block a user