From 768be3778fbecf014c4a9d23c0d6e08522ee7f74 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Tue, 28 Oct 2025 16:44:28 +0800 Subject: [PATCH 1/3] [BUG]update to scap-security-guide-0.1.78-1 to #ID3UU2 update to scap-security-guide-0.1.78-1 for bugfix Signed-off-by: Jacob Wang --- download | 2 +- fix_scap_delta_tailoring.patch | 63 ---------------------------------- scap-security-guide.spec | 42 +++++------------------ 3 files changed, 10 insertions(+), 97 deletions(-) delete mode 100644 fix_scap_delta_tailoring.patch diff --git a/download b/download index 7ce06f9..a1d6181 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ 219c992603514558e5f6f3d29adaa534 scap-security-guide-0.1.52-2.el7_9-rhel6.tar.bz2 8cf987028930d5baf17214fb65ad8b6b scap-security-guide-0.1.73-1.el7_9-rhel7.tar.bz2 -b5fb217e6146a5bd9ac6ebd9cdcf312a scap-security-guide-0.1.77.tar.bz2 +0d5ed575439409f7abed24f4dff32443 scap-security-guide-0.1.78.tar.bz2 diff --git a/fix_scap_delta_tailoring.patch b/fix_scap_delta_tailoring.patch deleted file mode 100644 index d97c898..0000000 --- a/fix_scap_delta_tailoring.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 452ee249e43dc3ce5d1f052ed528a084f5a3657f Mon Sep 17 00:00:00 2001 -From: Vojtech Polasek -Date: Tue, 25 Feb 2025 16:55:19 +0100 -Subject: create_delta_scap_tailoring: pass path to build_config.yml explicitly - when calling the script from cmake - ---- - cmake/SSGCommon.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/SSGCommon.cmake b/cmake/SSGCommon.cmake -index c5c2f0d55d..81ff323b82 100644 ---- a/cmake/SSGCommon.cmake -+++ b/cmake/SSGCommon.cmake -@@ -658,7 +658,7 @@ macro(ssg_build_disa_delta PRODUCT PROFILE) - add_custom_command( - OUTPUT "${CMAKE_BINARY_DIR}/${PRODUCT}/tailoring/${PRODUCT}_${PROFILE}_delta_tailoring.xml" - COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/${PRODUCT}/tailoring" -- COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${Python_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/utils/create_scap_delta_tailoring.py" --root "${CMAKE_SOURCE_DIR}" --product "${PRODUCT}" --manual "${DISA_SCAP_REF}" --profile "${PROFILE}" --reference "stigid" --output "${CMAKE_BINARY_DIR}/${PRODUCT}/tailoring/${PRODUCT}_${PROFILE}_delta_tailoring.xml" --quiet --build-root ${CMAKE_BINARY_DIR} --resolved-rules-dir -+ COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${Python_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/utils/create_scap_delta_tailoring.py" --root "${CMAKE_SOURCE_DIR}" --product "${PRODUCT}" --manual "${DISA_SCAP_REF}" --profile "${PROFILE}" --reference "stigid" --output "${CMAKE_BINARY_DIR}/${PRODUCT}/tailoring/${PRODUCT}_${PROFILE}_delta_tailoring.xml" --quiet --build-root ${CMAKE_BINARY_DIR} --resolved-rules-dir -c ${CMAKE_BINARY_DIR}/build_config.yml - DEPENDS "${PRODUCT}-content" - COMMENT "[${PRODUCT}-generate-ssg-delta] generating disa tailoring file" - ) --- -2.48.1 - - -From 6def0e0e54497f32b8be6b1511fe98e324bc057d Mon Sep 17 00:00:00 2001 -From: Vojtech Polasek -Date: Tue, 25 Feb 2025 17:08:54 +0100 -Subject: create_scap_delta_tailoring: remove hardcoded build directory - ---- - utils/create_scap_delta_tailoring.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/utils/create_scap_delta_tailoring.py b/utils/create_scap_delta_tailoring.py -index ee85a57bc0..04ca197c5f 100755 ---- a/utils/create_scap_delta_tailoring.py -+++ b/utils/create_scap_delta_tailoring.py -@@ -24,8 +24,8 @@ NS = {'scap': ssg.constants.datastream_namespace, - PROFILE = 'stig' - - --def get_profile(product, profile_name): -- ds_root = ET.parse(os.path.join(SSG_ROOT, 'build', 'ssg-{product}-ds.xml' -+def get_profile(product, profile_name, build_root): -+ ds_root = ET.parse(os.path.join(build_root, 'ssg-{product}-ds.xml' - .format(product=product))).getroot() - profiles = ds_root.findall( - './/{{{scap}}}component/{{{xccdf}}}Benchmark/{{{xccdf}}}Profile'.format( -@@ -177,7 +177,7 @@ def create_tailoring(args): - args.build_root) - needed_rules = filter_out_implemented_rules(known_rules, NS, benchmark_root) - needed_rule_names_set = set(rulename for ruleset in needed_rules.values() for rulename in ruleset) -- profile_root = get_profile(args.product, args.profile) -+ profile_root = get_profile(args.product, args.profile, args.build_root) - selections = profile_root.findall('xccdf-1.2:select', NS) - tailoring_profile = setup_tailoring_profile(args.profile_id, profile_root) - for selection in selections: --- -2.48.1 - diff --git a/scap-security-guide.spec b/scap-security-guide.spec index f7bc3c5..9e1be12 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # Base name of static rhel6 content tarball %global _static_rhel6_content %{name}-0.1.52-2.el7_9-rhel6 # Base name of static rhel7 content tarball @@ -6,8 +5,8 @@ # global _default_patch_fuzz 2 # Normally shouldn't be needed as patches should apply cleanly Name: scap-security-guide -Version: 0.1.77 -Release: 1%{anolis_release}%{?dist} +Version: 0.1.78 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause Group: Applications/System @@ -17,7 +16,6 @@ Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{versio Source1: %{_static_rhel6_content}.tar.bz2 # Include tarball with last released rhel7 content Source2: %{_static_rhel7_content}.tar.bz2 -Patch0: fix_scap_delta_tailoring.patch BuildArch: noarch @@ -54,14 +52,6 @@ The %{name}-doc package contains HTML formatted documents containing hardening guidances that have been generated from XCCDF benchmarks present in %{name} package. -%package extra -Summary: Extra files package -Group: System Environment/Base -Requires: %{name} = %{version}-%{release} - -%description extra -The %{name}-extra package contains various situation guidebooks - %if ( %{defined rhel} && (! %{defined centos}) ) %package rule-playbooks Summary: Ansible playbooks per each rule. @@ -74,18 +64,14 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul %prep %setup -q -b1 -b2 -%patch -P 0 -p1 -%define cmake_defines_common -DSSG_SEPARATE_SCAP_FILES_ENABLED=OFF -DSSG_BASH_SCRIPTS_ENABLED=OFF -DSSG_PRODUCT_FIREFOX:BOOLEAN=true -DSSG_PRODUCT_JRE:BOOLEAN=TRUE +%define cmake_defines_common -DSSG_SEPARATE_SCAP_FILES_ENABLED=OFF -DSSG_BASH_SCRIPTS_ENABLED=ON -DSSG_PRODUCT_FIREFOX:BOOLEAN=true -DSSG_PRODUCT_JRE:BOOLEAN=TRUE %define cmake_defines_specific %{nil} %if 0%{?rhel} %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON %endif %if 0%{?centos} %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON -%if 0%{?anolis} -%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_PRODUCT_ANOLIS%{anolis}:BOOLEAN=TRUE -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON -%endif %endif %build @@ -114,11 +100,6 @@ ln -s ssg-rhel8-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-rhel8-ds ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefox-ds-1.2.xml %files -%exclude %{_datadir}/%{name}/ansible/rhel* -%exclude %{_datadir}/%{name}/bash/rhel* -%exclude %{_datadir}/%{name}/kickstart/ssg-rhel* -%exclude %{_datadir}/%{name}/tailoring/rhel* -%exclude %{_datadir}/xml/scap/ssg/content/ssg-rhel* %{_datadir}/xml/scap/ssg/content %{_datadir}/%{name}/kickstart %{_datadir}/%{name}/ansible @@ -136,13 +117,6 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %doc %{_docdir}/%{name}/guides/*.html %doc %{_docdir}/%{name}/tables/*.html -%files extra -%{_datadir}/%{name}/ansible/rhel* -%{_datadir}/%{name}/bash/rhel* -%{_datadir}/%{name}/kickstart/ssg-rhel* -%{_datadir}/%{name}/tailoring/rhel* -%{_datadir}/xml/scap/ssg/content/ssg-rhel* - %if ( %{defined rhel} && (! %{defined centos}) ) %files rule-playbooks %defattr(-,root,root,-) @@ -150,12 +124,14 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %endif %changelog -* Tue Sep 16 2025 Chang Gao - 0.1.77-1.0.1 -- Add extra package -- Add product for Anolis8 (#9770)(Yuqing) +* Tue Sep 16 2025 Matthew Burket - 0.1.78-1 +- Rebase scap-security-guide to the latest upstream version 0.1.78 (RHEL-111011) +- Rule service_rngd_enabled is now evaluated on RHEL >= 8.4 in case kernel is not in FIPS mode (RHEL-95188) +- Use default order in rule configure_gnutls_tls_crypto_policy (RHEL-1821) +- Renable building of bash scripts (RHEL-105501) * Tue Jun 03 2025 Matthew Burket - 0.1.77-1 -- Rebase scap-security-guide to the latest upstream version 0.1.76 (RHEL-94802) +- Rebase scap-security-guide to the latest upstream version 0.1.77 (RHEL-94802) - STIG: do not remediate rule disabling user namespaces (RHEL-76750) * Tue Feb 25 2025 Vojtech Polasek - 0.1.76-1 -- Gitee From 741fadb563bcbf93dc6487d30e8656446a4448a4 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Thu, 10 Nov 2022 02:22:35 +0800 Subject: [PATCH 2/3] Add extra package --- scap-security-guide.spec | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 9e1be12..6e2b012 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # Base name of static rhel6 content tarball %global _static_rhel6_content %{name}-0.1.52-2.el7_9-rhel6 # Base name of static rhel7 content tarball @@ -6,7 +7,7 @@ Name: scap-security-guide Version: 0.1.78 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause Group: Applications/System @@ -52,6 +53,14 @@ The %{name}-doc package contains HTML formatted documents containing hardening guidances that have been generated from XCCDF benchmarks present in %{name} package. +%package extra +Summary: Extra files package +Group: System Environment/Base +Requires: %{name} = %{version}-%{release} + +%description extra +The %{name}-extra package contains various situation guidebooks + %if ( %{defined rhel} && (! %{defined centos}) ) %package rule-playbooks Summary: Ansible playbooks per each rule. @@ -100,6 +109,11 @@ ln -s ssg-rhel8-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-rhel8-ds ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefox-ds-1.2.xml %files +%exclude %{_datadir}/%{name}/ansible/rhel* +%exclude %{_datadir}/%{name}/bash/rhel* +%exclude %{_datadir}/%{name}/kickstart/ssg-rhel* +%exclude %{_datadir}/%{name}/tailoring/rhel* +%exclude %{_datadir}/xml/scap/ssg/content/ssg-rhel* %{_datadir}/xml/scap/ssg/content %{_datadir}/%{name}/kickstart %{_datadir}/%{name}/ansible @@ -117,6 +131,13 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %doc %{_docdir}/%{name}/guides/*.html %doc %{_docdir}/%{name}/tables/*.html +%files extra +%{_datadir}/%{name}/ansible/rhel* +%{_datadir}/%{name}/bash/rhel* +%{_datadir}/%{name}/kickstart/ssg-rhel* +%{_datadir}/%{name}/tailoring/rhel* +%{_datadir}/xml/scap/ssg/content/ssg-rhel* + %if ( %{defined rhel} && (! %{defined centos}) ) %files rule-playbooks %defattr(-,root,root,-) @@ -124,6 +145,9 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %endif %changelog +* Tue Oct 28 2025 Chang Gao - 0.1.78-1.0.1 +- Add extra package + * Tue Sep 16 2025 Matthew Burket - 0.1.78-1 - Rebase scap-security-guide to the latest upstream version 0.1.78 (RHEL-111011) - Rule service_rngd_enabled is now evaluated on RHEL >= 8.4 in case kernel is not in FIPS mode (RHEL-95188) -- Gitee From ffc2b82884ee3b7fa590425db28725514cf886a9 Mon Sep 17 00:00:00 2001 From: qhw01063182 Date: Thu, 23 Feb 2023 16:49:16 +0800 Subject: [PATCH 3/3] Add product for Anolis8 Signed-off-by: qhw01063182 --- scap-security-guide.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 6e2b012..5b78cd5 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -81,6 +81,9 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul %endif %if 0%{?centos} %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON +%if 0%{?anolis} +%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_PRODUCT_ANOLIS%{anolis}:BOOLEAN=TRUE -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON +%endif %endif %build @@ -147,6 +150,7 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %changelog * Tue Oct 28 2025 Chang Gao - 0.1.78-1.0.1 - Add extra package +- Add product for Anolis8 (#9770)(Yuqing) * Tue Sep 16 2025 Matthew Burket - 0.1.78-1 - Rebase scap-security-guide to the latest upstream version 0.1.78 (RHEL-111011) -- Gitee