diff --git a/.gitignore b/.gitignore index 23746bd..57e24d2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ SOURCES/scap-security-guide-0.1.66.tar.bz2 /scap-security-guide-0.1.73-1.el7_9-rhel7.tar.bz2 /scap-security-guide-0.1.75.tar.bz2 /scap-security-guide-0.1.76.tar.bz2 +/scap-security-guide-0.1.77.tar.bz2 diff --git a/fix_scap_delta_tailoring.patch b/fix_scap_delta_tailoring.patch index a146bbc..d97c898 100644 --- a/fix_scap_delta_tailoring.patch +++ b/fix_scap_delta_tailoring.patch @@ -9,19 +9,19 @@ Subject: create_delta_scap_tailoring: pass path to build_config.yml explicitly 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/SSGCommon.cmake b/cmake/SSGCommon.cmake -index 337067c215..170ae3d39f 100644 +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 +- 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 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 82cf027..6b10710 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ # global _default_patch_fuzz 2 # Normally shouldn't be needed as patches should apply cleanly Name: scap-security-guide -Version: 0.1.76 +Version: 0.1.77 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause @@ -126,6 +126,10 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %endif %changelog +* Tue Jun 03 2025 Matthew Burket - 0.1.77-1 +- Rebase scap-security-guide to the latest upstream version 0.1.76 (RHEL-94802) +- STIG: do not remediate rule disabling user namespaces (RHEL-76750) + * Tue Feb 25 2025 Vojtech Polasek - 0.1.76-1 - rebase scap-security-guide to the latest upstream version 0.1.76 (RHEL-74241) diff --git a/sources b/sources index 4409a13..38451ae 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (scap-security-guide-0.1.52-2.el7_9-rhel6.tar.bz2) = c12b1210a7829578d2b32c22950a9f93913ae4981efb31304aea04d43791eb86c75bb5cdc4ceb35741bcb00306db44a5734a03bd0578f1d255917d590e840260 SHA512 (scap-security-guide-0.1.73-1.el7_9-rhel7.tar.bz2) = 36321a8ba03bcdb41e592a8dfdd8126e7717effeab5fa65b56db1125d2b62bf79ed0940b819f1ea1e080d1960553b1f28e317e019b725147b980e07b96700860 -SHA512 (scap-security-guide-0.1.76.tar.bz2) = 27cb260eb0b2fbfd11afe2affb91624e4e2ff332e7ffe43a0c0ec2e08b5e2aa707f00e77c97fa1cbdace5549ef25cf42b34756777a568809da7d1222bd05950c +SHA512 (scap-security-guide-0.1.77.tar.bz2) = cc3bda1c7e3e40f58407b59d2c7222da7b1d3979f5411a2c12e5f12b73cfff4a71d04b3a51dcc84ca797486aca77ed6091977cb3f067ef3f63dc3d855b059b11