diff --git a/scap-security-guide-0.1.74.tar.bz2 b/scap-security-guide-0.1.77.tar.bz2 similarity index 50% rename from scap-security-guide-0.1.74.tar.bz2 rename to scap-security-guide-0.1.77.tar.bz2 index 9cdb84445c3d4ac56666bc2ed9d8f99d864e8c67..a1c6f81dca0e921652f296244b9d1852e6a517d0 100644 Binary files a/scap-security-guide-0.1.74.tar.bz2 and b/scap-security-guide-0.1.77.tar.bz2 differ diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 25880c8341e7f47df8b1a4a830c3bd4af1ec47c9..335e009f10ed832b5ae3391072624ab2422bfe13 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -1,13 +1,15 @@ -%define anolis_release 1 +%define anolis_release 1 %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.74 +Version: 0.1.77 Release: %{anolis_release}%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD URL: https://github.com/ComplianceAsCode/content/ Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2 +Source: https://github.com/ComplianceAsCode/content/releases/download/v0.1.77/scap-security-guide-0.1.77.tar.bz2 +Patch1: scap-security-guide_0_1_78_fix_uefi_applicability_jinja.patch BuildArch: noarch @@ -19,6 +21,7 @@ BuildRequires: python3-devel BuildRequires: python3-jinja2 BuildRequires: python3-PyYAML BuildRequires: python3-setuptools +BuildRequires: python3 Requires: xml-common, openscap-scanner >= 1.2.5 %description @@ -67,6 +70,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %doc %{_docdir}/%{name}/guides/*.html %changelog +* Thu Aug 21 2025 wenyuzifang - 0.1.77-1 +- Updated to version 0.1.77 to fix xxxxxxxxxx +- Ensure correct YAML parsing and platform key handling for reliable compliance checks + * Wed Feb 19 2025 Chang Gao - 0.1.74-1 - Update to 0.1.74 - Remove patch which already exist in upstream diff --git a/scap-security-guide_0_1_78_fix_uefi_applicability_jinja.patch b/scap-security-guide_0_1_78_fix_uefi_applicability_jinja.patch new file mode 100644 index 0000000000000000000000000000000000000000..ddfe4078dfbb71c765786325283875b0aee139f7 --- /dev/null +++ b/scap-security-guide_0_1_78_fix_uefi_applicability_jinja.patch @@ -0,0 +1,42 @@ +From 884ccb32e27aca7e3a4b0af841ddd5ecba81ae67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= +Date: Thu, 19 Jun 2025 14:40:17 +0200 +Subject: [PATCH] Remove excess dashes in Jinja 2 expression + +These dashes consume all surrounding namespaces. As a result, +the platform key isn't taken as a key but becomes part of the +description value. +--- + linux_os/guide/system/bootloader-grub2/non-uefi/group.yml | 4 ++-- + linux_os/guide/system/bootloader-grub2/uefi/group.yml | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/linux_os/guide/system/bootloader-grub2/non-uefi/group.yml b/linux_os/guide/system/bootloader-grub2/non-uefi/group.yml +index 2a79674b363..67c0612649c 100644 +--- a/linux_os/guide/system/bootloader-grub2/non-uefi/group.yml ++++ b/linux_os/guide/system/bootloader-grub2/non-uefi/group.yml +@@ -5,6 +5,6 @@ title: 'Non-UEFI GRUB2 bootloader configuration' + description: |- + Non-UEFI GRUB2 bootloader configuration + +-{{%- if grub2_boot_path != grub2_uefi_boot_path -%}} ++{{% if grub2_boot_path != grub2_uefi_boot_path -%}} + platform: non-uefi +-{{%- endif -%}} ++{{%- endif %}} +diff --git a/linux_os/guide/system/bootloader-grub2/uefi/group.yml b/linux_os/guide/system/bootloader-grub2/uefi/group.yml +index 08f2e4ad9d0..b9516b94403 100644 +--- a/linux_os/guide/system/bootloader-grub2/uefi/group.yml ++++ b/linux_os/guide/system/bootloader-grub2/uefi/group.yml +@@ -5,9 +5,9 @@ title: 'UEFI GRUB2 bootloader configuration' + description: |- + UEFI GRUB2 bootloader configuration + +-{{%- if grub2_boot_path != grub2_uefi_boot_path -%}} ++{{% if grub2_boot_path != grub2_uefi_boot_path -%}} + platform: uefi +-{{%- endif -%}} ++{{%- endif %}} + + warnings: + - functionality: |-