From 95fc71e511d942eaeb8181284b0e9d66dda690d2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 2 Feb 2022 22:18:45 +0000 Subject: [PATCH] import scap-security-guide-0.1.60-1.el8 --- .gitignore | 2 +- .scap-security-guide.metadata | 2 +- .../disable-not-in-good-shape-profiles.patch | 24 +++++++------------ SPECS/scap-security-guide.spec | 5 +++- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 73a97f1..903d18b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/scap-security-guide-0.1.52-2.el7_9-rhel6.tar.bz2 -SOURCES/scap-security-guide-0.1.59.tar.bz2 +SOURCES/scap-security-guide-0.1.60.tar.bz2 diff --git a/.scap-security-guide.metadata b/.scap-security-guide.metadata index cee5549..bf424e0 100644 --- a/.scap-security-guide.metadata +++ b/.scap-security-guide.metadata @@ -1,2 +1,2 @@ b22b45d29ad5a97020516230a6ef3140a91d050a SOURCES/scap-security-guide-0.1.52-2.el7_9-rhel6.tar.bz2 -8499b16fb8a559943775ff407eb21bfe02ade345 SOURCES/scap-security-guide-0.1.59.tar.bz2 +6768818c9bd6f9f35596f2fe23c50ffe52b974c3 SOURCES/scap-security-guide-0.1.60.tar.bz2 diff --git a/SOURCES/disable-not-in-good-shape-profiles.patch b/SOURCES/disable-not-in-good-shape-profiles.patch index c5b8d9a..655c558 100644 --- a/SOURCES/disable-not-in-good-shape-profiles.patch +++ b/SOURCES/disable-not-in-good-shape-profiles.patch @@ -1,23 +1,15 @@ -diff --git a/rhel8/CMakeLists.txt b/rhel8/CMakeLists.txt -index d61689c97..5e444a101 100644 +diff --git a/products/rhel8/CMakeLists.txt b/products/rhel8/CMakeLists.txt +index 5258591c7f..cc4b9c5720 100644 --- a/products/rhel8/CMakeLists.txt +++ b/products/rhel8/CMakeLists.txt -@@ -14,15 +14,9 @@ ssg_build_html_table_by_ref(${PRODUCT} "cis") - ssg_build_html_table_by_ref(${PRODUCT} "pcidss") - ssg_build_html_table_by_ref(${PRODUCT} "anssi") +@@ -11,7 +11,6 @@ ssg_build_product(${PRODUCT}) + ssg_build_html_ref_tables("${PRODUCT}" "table-${PRODUCT}-{ref_id}refs" "anssi;cis;cui;nist;pcidss") --ssg_build_html_nistrefs_table(${PRODUCT} "standard") - ssg_build_html_nistrefs_table(${PRODUCT} "ospp") - ssg_build_html_nistrefs_table(${PRODUCT} "stig") + ssg_build_html_profile_table("table-${PRODUCT}-nistrefs-ospp" "${PRODUCT}" "ospp" "nist") +-ssg_build_html_profile_table("table-${PRODUCT}-nistrefs-standard" "${PRODUCT}" "standard" "nist") + ssg_build_html_profile_table("table-${PRODUCT}-nistrefs-stig" "${PRODUCT}" "stig" "nist") --ssg_build_html_anssirefs_table(${PRODUCT} "bp28_minimal") --ssg_build_html_anssirefs_table(${PRODUCT} "bp28_intermediary") --ssg_build_html_anssirefs_table(${PRODUCT} "bp28_enhanced") --ssg_build_html_anssirefs_table(${PRODUCT} "bp28_high") -- - ssg_build_html_cce_table(${PRODUCT}) - - ssg_build_html_srgmap_tables(${PRODUCT} "stig" ${DISA_SRG_TYPE}) + ssg_build_html_profile_table("table-${PRODUCT}-anssirefs-bp28_minimal" "${PRODUCT}" "anssi_bp28_minimal" "anssi") diff --git a/products/rhel8/profiles/cjis.profile b/rhel8/profiles/cjis.profile index 035d2705b..c6475f33e 100644 --- a/products/rhel8/profiles/cjis.profile diff --git a/SPECS/scap-security-guide.spec b/SPECS/scap-security-guide.spec index b8c9d97..64a1933 100644 --- a/SPECS/scap-security-guide.spec +++ b/SPECS/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.59 +Version: 0.1.60 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause @@ -122,6 +122,9 @@ cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name %endif %changelog +* Thu Jan 27 2022 Watson Sato - 0.1.60-1 +- Rebase to a new upstream release (RHBZ#2014485) + * Wed Dec 01 2021 Watson Sato - 0.1.59-1 - Rebase to a new upstream release (RHBZ#2014485)