From 5fdc0d9a5b89fb9013a1cdfc0c0e6698f6ab7509 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Tue, 3 Jun 2025 17:36:12 -0500 Subject: [PATCH] Rebase to 0.1.77 Resolves: RHEL-94804 --- .gitignore | 1 + scap-security-guide.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a268203..4c9f192 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /scap-security-guide-0.1.73.tar.bz2 /scap-security-guide-0.1.74.tar.bz2 /scap-security-guide-0.1.76.tar.bz2 +/scap-security-guide-0.1.77.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 5c3a087..1c6a135 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,8 +4,8 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.76 -Release: 2%{?dist} +Version: 0.1.77 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -61,10 +61,10 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul %define cmake_defines_common -DSSG_SEPARATE_SCAP_FILES_ENABLED=OFF -DSSG_BASH_SCRIPTS_ENABLED=OFF -DSSG_BUILD_SCAP_12_DS=OFF %define cmake_defines_specific %{nil} %if 0%{?rhel} && ! %{defined eln} -%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON +%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON -DSSG_SCE_ENABLED:BOOL=ON %endif %if 0%{?centos} -%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON +%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON -DSSG_SCE_ENABLED:BOOL=ON %endif mkdir -p build @@ -98,6 +98,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Tue Jun 03 2025 Matthew Burket - 0.1.77-1 +- Rebase scap-security-guide to the latest upstream version 0.1.77 (RHEL-94804) + * Thu Feb 27 2025 Vojtech Polasek - 0.1.76-2 - rebuilt diff --git a/sources b/sources index 6b6e0c4..513cdd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.76.tar.bz2) = 27cb260eb0b2fbfd11afe2affb91624e4e2ff332e7ffe43a0c0ec2e08b5e2aa707f00e77c97fa1cbdace5549ef25cf42b34756777a568809da7d1222bd05950c +SHA512 (scap-security-guide-0.1.77.tar.bz2) = cc3bda1c7e3e40f58407b59d2c7222da7b1d3979f5411a2c12e5f12b73cfff4a71d04b3a51dcc84ca797486aca77ed6091977cb3f067ef3f63dc3d855b059b11