diff --git a/0001-Add-openSUSE-cpe-links.patch b/0001-Add-openSUSE-cpe-links.patch deleted file mode 100644 index 1909de4..0000000 --- a/0001-Add-openSUSE-cpe-links.patch +++ /dev/null @@ -1,220 +0,0 @@ -From 48685f390b865f6edd7df8dba955c03dff6045e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= -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 @@ - Fedora 35 - oval:org.open-scap.cpe.fedora:def:35 - -+ -+ openSUSE Leap 15.1 -+ oval:org.open-scap.cpe.opensuse:def:151 -+ -+ -+ openSUSE Leap 15.2 -+ oval:org.open-scap.cpe.opensuse:def:152 -+ -+ -+ openSUSE Leap 15.3 -+ oval:org.open-scap.cpe.opensuse:def:153 -+ -+ -+ openSUSE Leap 15.4 -+ oval:org.open-scap.cpe.opensuse:def:154 -+ -+ -+ openSUSE Leap 15.5 -+ oval:org.open-scap.cpe.opensuse:def:155 -+ -+ -+ openSUSE Leap 15.6 -+ oval:org.open-scap.cpe.opensuse:def:156 -+ -+ -+ openSUSE Tumbleweed -+ oval:org.open-scap.cpe.opensuse:def:9999 -+ - -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 @@ - - - -+ -+ -+ openSUSE Leap 15.1 -+ -+ openSUSE Leap 15.1 -+ -+ -+ The operating system installed on the system is openSUSE Leap 15.1 -+ -+ -+ -+ -+ -+ -+ -+ openSUSE Leap 15.2 -+ -+ openSUSE Leap 15.2 -+ -+ -+ The operating system installed on the system is openSUSE Leap 15.2 -+ -+ -+ -+ -+ -+ -+ -+ openSUSE Leap 15.3 -+ -+ openSUSE Leap 15.3 -+ -+ -+ The operating system installed on the system is openSUSE Leap 15.3 -+ -+ -+ -+ -+ -+ -+ -+ openSUSE Leap 15.4 -+ -+ openSUSE Leap 15.4 -+ -+ -+ The operating system installed on the system is openSUSE Leap 15.4 -+ -+ -+ -+ -+ -+ -+ -+ openSUSE Leap 15.5 -+ -+ openSUSE Leap 15.5 -+ -+ -+ The operating system installed on the system is openSUSE Leap 15.5 -+ -+ -+ -+ -+ -+ -+ -+ openSUSE Leap 15.6 -+ -+ openSUSE Leap 15.6 -+ -+ -+ The operating system installed on the system is openSUSE Leap 15.6 -+ -+ -+ -+ -+ -+ -+ -+ openSUSE Tumbleweed -+ -+ openSUSE Tumbleweed -+ -+ -+ The operating system installed on the system is openSUSE Tumbleweed -+ -+ -+ -+ -+ - - - Wind River Linux -@@ -1087,6 +1178,41 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -@@ -1415,6 +1541,28 @@ - - ^15.0$ - -+ -+ ^15.1$ -+ -+ -+ ^15.2$ -+ -+ -+ ^15.3$ -+ -+ -+ ^15.4$ -+ -+ -+ ^15.5$ -+ -+ -+ ^15.6$ -+ -+ -+ -+ ^\d{8}$ -+ - -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 @@ - openSUSE Tumbleweed - oval:org.open-scap.cpe.opensuse:def:9999 - -+ -+ SUSE Linux Enterprise Server 12 -+ oval:org.open-scap.cpe.sles:def:12 -+ -+ -+ SUSE Linux Enterprise Desktop 12 -+ oval:org.open-scap.cpe.sled:def:12 -+ -+ -+ SUSE Linux Enterprise Server 15 -+ oval:org.open-scap.cpe.sles:def:15 -+ -+ -+ SUSE Linux Enterprise Desktop 15 -+ oval:org.open-scap.cpe.sled:def:15 -+ - -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 @@ - - - -+ -+ -+ SUSE Linux Enterprise Server 15 -+ -+ SUSE Linux Enterprise Server 15 -+ -+ -+ The operating system installed on the system is SUSE Linux Enterprise Server 15 -+ -+ -+ -+ -+ -+ -+ -+ SUSE Linux Enterprise Desktop 15 -+ -+ SUSE Linux Enterprise Desktop 15 -+ -+ -+ The operating system installed on the system is SUSE Linux Enterprise Desktop 15 -+ -+ -+ -+ -+ - - - Wind River Linux -@@ -1110,6 +1136,11 @@ - - - -+ -+ -+ -+ - - -@@ -1125,6 +1156,11 @@ - - - -+ -+ -+ -+ - - -@@ -1490,6 +1526,9 @@ - - ^12($|[^\d]) - -+ -+ ^15($|[^\d]) -+ - - ^10($|[^\d]) - -@@ -1499,6 +1538,9 @@ - - ^12($|[^\d]) - -+ -+ ^15($|[^\d]) -+ - - ^openSUSE-release - --- -2.40.0 - diff --git a/openscap-1.3.10.tar.gz b/openscap-1.3.10.tar.gz deleted file mode 100644 index adf0ae3..0000000 --- a/openscap-1.3.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a51a09810d6d188e82afb31e454d06989d59d05f39e2aec99a661b01cd660aa -size 14047461 diff --git a/openscap-1.4.1.tar.gz b/openscap-1.4.1.tar.gz new file mode 100644 index 0000000..837194d --- /dev/null +++ b/openscap-1.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ba92a9bd1244b0fcaafe880416cac0ea067eca9a6b583dddbdcaee59637034a +size 13139720 diff --git a/openscap.changes b/openscap.changes index 8ceeb8d..ea0e691 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Wed Jan 8 16:49:37 UTC 2025 - Alexander Bergmann + +- 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 diff --git a/openscap.spec b/openscap.spec index 05cff40..b1c0247 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,7 +1,7 @@ # # spec file for package openscap # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 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 25 +%define sover 33 %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.3.10 +Version: 1.4.1 Release: 0 Summary: A Set of Libraries for Integration with SCAP License: LGPL-2.1-or-later @@ -38,8 +38,6 @@ 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 @@ -311,6 +309,7 @@ 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