From 8412e759afbb0302f776b1a15a3ee80f44a688e5 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Fri, 9 Aug 2024 11:02:22 -0500 Subject: [PATCH] Update to scap-security-guide 0.1.74 --- .gitignore | 1 + 01-Add-RHEL10.patch | 13 ------------- scap-security-guide.spec | 9 ++++++--- sources | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 01-Add-RHEL10.patch diff --git a/.gitignore b/.gitignore index 3105ff4..329f996 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /scap-security-guide-0.1.71.tar.bz2 /scap-security-guide-0.1.72.tar.bz2 /scap-security-guide-0.1.73.tar.bz2 +/scap-security-guide-0.1.74.tar.bz2 diff --git a/01-Add-RHEL10.patch b/01-Add-RHEL10.patch deleted file mode 100644 index 60c4073..0000000 --- a/01-Add-RHEL10.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 35ecb89f66..eaedb3d093 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -100,7 +100,7 @@ option(SSG_PRODUCT_OPENSUSE "If enabled, the openSUSE SCAP content will be built - option(SSG_PRODUCT_RHEL7 "If enabled, the RHEL7 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) - option(SSG_PRODUCT_RHEL8 "If enabled, the RHEL8 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) - option(SSG_PRODUCT_RHEL9 "If enabled, the RHEL9 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) --option(SSG_PRODUCT_RHEL10 "If enabled, the RHEL10 SCAP content will be built" FALSE) -+option(SSG_PRODUCT_RHEL10 "If enabled, the RHEL10 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) - option(SSG_PRODUCT_RHV4 "If enabled, the RHV4 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) - option(SSG_PRODUCT_SLE12 "If enabled, the SLE12 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) - option(SSG_PRODUCT_SLE15 "If enabled, the SLE15 SCAP content will be built" ${SSG_PRODUCT_DEFAULT}) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 7c43790..eb911dd 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,13 +4,12 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.73 -Release: 2%{?dist} +Version: 0.1.74 +Release: 1%{?dist} 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 -Patch0: 01-Add-RHEL10.patch BuildArch: noarch BuildRequires: libxslt @@ -99,6 +98,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* 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 + * Mon Jun 24 2024 Troy Dawson - 0.1.73-2 - Bump release for June 2024 mass rebuild diff --git a/sources b/sources index ce6f37a..0ced6da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.73.tar.bz2) = 8750aeb61378d7729e00e4bcfb17d1463d97192801ef6707593ec639dfef2abba6669b9d1b8f71958f7d24f6c66f308f1587d731dd4e63878f91266232883ad7 +SHA512 (scap-security-guide-0.1.74.tar.bz2) = 773cc7fb72e8d24fe9b12bf58815e051db21ee474cd0c3aebd07c2026712a89e6174c00840b1fd56195c900a541ff9e656240ee6b5a1cf3f3fe9b119cbedc30f