diff --git a/.gitignore b/.gitignore index 329f996..a268203 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /scap-security-guide-0.1.72.tar.bz2 /scap-security-guide-0.1.73.tar.bz2 /scap-security-guide-0.1.74.tar.bz2 +/scap-security-guide-0.1.76.tar.bz2 diff --git a/disable_ospp.patch b/disable_ospp.patch new file mode 100644 index 0000000..2499154 --- /dev/null +++ b/disable_ospp.patch @@ -0,0 +1,22 @@ +From 56f17c7c5c9544633ac88a54c264ab232268a40d Mon Sep 17 00:00:00 2001 +From: Vojtech Polasek +Date: Tue, 25 Feb 2025 17:18:53 +0100 +Subject: prevent ospp profile from being built on rhel10 product + +--- + products/rhel10/profiles/ospp.profile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/products/rhel10/profiles/ospp.profile b/products/rhel10/profiles/ospp.profile +index 0642cbab2e..bf87808035 100644 +--- a/products/rhel10/profiles/ospp.profile ++++ b/products/rhel10/profiles/ospp.profile +@@ -1,4 +1,5 @@ + documentation_complete: true ++hidden: true + + metadata: + version: 4.3 +-- +2.48.1 + diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 0f035dd..c905504 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,16 +4,17 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.74 +Version: 0.1.76 Release: 1%{?dist}.alma.1 Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2 -BuildArch: noarch +Patch0: disable_ospp.patch -# AlmaLinux 10 support -Patch1000: scap-security-guide-%{version}-add-almalinux10-product.patch +# AlmaLinux Patch +Patch1000: scap-security-guide-0.1.74-add-almalinux10-product.patch +BuildArch: noarch BuildRequires: libxslt BuildRequires: expat @@ -104,9 +105,16 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog -* Fri Sep 27 2024 Andrew Lukoshko - 0.1.74-1.alma.1 +* Wed Feb 26 2025 Andrew Lukoshko - 0.1.76-1.alma.1 - Add AlmaLinux 10 support +* Tue Feb 25 2025 Vojtech Polasek - 0.1.76-1 +- rebase scap-security-guide to the latest upstream version 0.1.76 (RHEL-74239) + +* Tue Oct 29 2024 Troy Dawson - 0.1.74-2 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + * Fri Aug 09 2024 Matthew Burket - Update to latest upstream SCAP-Security-Guide-0.1.74 release: https://github.com/ComplianceAsCode/content/releases/tag/v0.1.74 diff --git a/sources b/sources index 0ced6da..6b6e0c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.74.tar.bz2) = 773cc7fb72e8d24fe9b12bf58815e051db21ee474cd0c3aebd07c2026712a89e6174c00840b1fd56195c900a541ff9e656240ee6b5a1cf3f3fe9b119cbedc30f +SHA512 (scap-security-guide-0.1.76.tar.bz2) = 27cb260eb0b2fbfd11afe2affb91624e4e2ff332e7ffe43a0c0ec2e08b5e2aa707f00e77c97fa1cbdace5549ef25cf42b34756777a568809da7d1222bd05950c