diff --git a/.gitignore b/.gitignore index fa40fa8..cdfe353 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -scap-security-guide-0.1.77.tar.bz2 +scap-security-guide-0.1.78.tar.bz2 diff --git a/disable_ospp.patch b/disable_ospp.patch index 2499154..5faad3b 100644 --- a/disable_ospp.patch +++ b/disable_ospp.patch @@ -1,22 +1,11 @@ -From 56f17c7c5c9544633ac88a54c264ab232268a40d Mon Sep 17 00:00:00 2001 -From: Vojtech Polasek -Date: Tue, 25 Feb 2025 17:18:53 +0100 -Subject: prevent ospp profile from being built on rhel10 product - ---- - products/rhel10/profiles/ospp.profile | 1 + - 1 file changed, 1 insertion(+) - diff --git a/products/rhel10/profiles/ospp.profile b/products/rhel10/profiles/ospp.profile -index 0642cbab2e..bf87808035 100644 +index 23e2baf806..d3b46bc354 100644 --- a/products/rhel10/profiles/ospp.profile +++ b/products/rhel10/profiles/ospp.profile -@@ -1,4 +1,5 @@ +@@ -1,5 +1,6 @@ + --- documentation_complete: true +hidden: true metadata: version: 4.3 --- -2.48.1 - diff --git a/scap-security-guide.spec b/scap-security-guide.spec index aabf622..c0a3a91 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,18 +4,13 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.77 -Release: 2%{?dist} +Version: 0.1.78 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2 Patch0: disable_ospp.patch -# fix applicability of grub2_admin_username and grub2_password rules on uefi systems -Patch1: scap-security-guide_0_1_78_fix_uefi_applicability.patch -Patch2: scap-security-guide_0_1_78_fix_uefi_applicability_jinja.patch -# fix wrong grub-mkconfig (should be grub2-mkconfig) command in rule descriptions -Patch3: scap-security-guide_0_1_78_fix_wrong_grubmkconfig.patch BuildArch: noarch @@ -104,6 +99,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Mon Sep 15 2025 Vojtech Polasek - 0.1.78-1 +- rebase scap-security-guide to the latest version 0.1.78 (RHEL-120076) + * Fri Jun 27 2025 Vojtech Polasek - 0.1.77-2 - fix incorrect applicability of Grub2 UEFI specific rules - replace grub-mkconfig with grub2-mkconfig in rule descriptions diff --git a/scap-security-guide_0_1_78_fix_uefi_applicability.patch b/scap-security-guide_0_1_78_fix_uefi_applicability.patch deleted file mode 100644 index 67dd18e..0000000 --- a/scap-security-guide_0_1_78_fix_uefi_applicability.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 35a873bf3da694876a1390eb4ea324cfb3d64327 Mon Sep 17 00:00:00 2001 -From: Gabriel Becker -Date: Wed, 18 Jun 2025 14:04:34 +0200 -Subject: [PATCH] Remove uefi/non-uefi from grub2 rules in case they do not - need. - -Products that have the same grub2 path for both UEFI/non-UEFI do not -need to set the platform and the products have now consolidated the use -of the grub2 rules to only select the ones that come from the non-UEFI -set of rules. ---- - linux_os/guide/system/bootloader-grub2/non-uefi/group.yml | 2 ++ - linux_os/guide/system/bootloader-grub2/uefi/group.yml | 2 ++ - 2 files changed, 4 insertions(+) - -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 b093bdad864..2a79674b363 100644 ---- a/linux_os/guide/system/bootloader-grub2/non-uefi/group.yml -+++ b/linux_os/guide/system/bootloader-grub2/non-uefi/group.yml -@@ -5,4 +5,6 @@ title: 'Non-UEFI GRUB2 bootloader configuration' - description: |- - Non-UEFI GRUB2 bootloader configuration - -+{{%- if grub2_boot_path != grub2_uefi_boot_path -%}} - platform: non-uefi -+{{%- endif -%}} -diff --git a/linux_os/guide/system/bootloader-grub2/uefi/group.yml b/linux_os/guide/system/bootloader-grub2/uefi/group.yml -index e08747fe8c9..08f2e4ad9d0 100644 ---- a/linux_os/guide/system/bootloader-grub2/uefi/group.yml -+++ b/linux_os/guide/system/bootloader-grub2/uefi/group.yml -@@ -5,7 +5,9 @@ title: 'UEFI GRUB2 bootloader configuration' - description: |- - UEFI GRUB2 bootloader configuration - -+{{%- if grub2_boot_path != grub2_uefi_boot_path -%}} - platform: uefi -+{{%- endif -%}} - - warnings: - - functionality: |- 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 deleted file mode 100644 index ddfe407..0000000 --- a/scap-security-guide_0_1_78_fix_uefi_applicability_jinja.patch +++ /dev/null @@ -1,42 +0,0 @@ -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: |- diff --git a/scap-security-guide_0_1_78_fix_wrong_grubmkconfig.patch b/scap-security-guide_0_1_78_fix_wrong_grubmkconfig.patch deleted file mode 100644 index 70471c9..0000000 --- a/scap-security-guide_0_1_78_fix_wrong_grubmkconfig.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 0e0667783e9901f898af637c00464217654fcf9e Mon Sep 17 00:00:00 2001 -From: vojtapolasek -Date: Fri, 27 Jun 2025 13:53:28 +0200 -Subject: [PATCH] replace instances of grub-mkconfig with correct - grub2-mkconfig - ---- - .../bootloader-grub2/non-uefi/grub2_admin_username/rule.yml | 4 ++-- - .../system/bootloader-grub2/non-uefi/grub2_password/rule.yml | 4 ++-- - .../bootloader-grub2/uefi/grub2_uefi_admin_username/rule.yml | 4 ++-- - .../system/bootloader-grub2/uefi/grub2_uefi_password/rule.yml | 4 ++-- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_admin_username/rule.yml b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_admin_username/rule.yml -index 20c824cd0b6..53baf2b128a 100644 ---- a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_admin_username/rule.yml -+++ b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_admin_username/rule.yml -@@ -23,7 +23,7 @@ description: |- - update the - grub.cfg file by running: - {{%- if "rhel" in product %}} --
grub-mkconfig -o /boot/grub2/grub.cfg
-+
grub2-mkconfig -o /boot/grub2/grub.cfg
- {{%- else %}} -
{{{ grub_command("update") }}}
- {{%- endif %}} -@@ -85,7 +85,7 @@ fixtext: |- - Once the superuser account has been added, update the grub.cfg file by running: - - {{%- if "rhel" in product %}} --
grub-mkconfig -o /boot/grub2/grub.cfg
-+
grub2-mkconfig -o /boot/grub2/grub.cfg
- {{%- else %}} -
{{{ grub_command("update") }}}
- {{%- endif %}} -diff --git a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/rule.yml b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/rule.yml -index cf660bff13e..326cfda1a84 100644 ---- a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/rule.yml -+++ b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/rule.yml -@@ -28,7 +28,7 @@ description: |- - update the - grub.cfg file by running: - {{%- if "rhel" in product %}} --
grub-mkconfig -o /boot/grub2/grub.cfg
-+
grub2-mkconfig -o /boot/grub2/grub.cfg
- {{%- else %}} -
{{{ grub_command("update") }}}
- {{%- endif %}} -@@ -111,7 +111,7 @@ fixtext: |- - Once the superuser account has been added, update the grub.cfg file by running: - - {{%- if "rhel" in product %}} --
grub-mkconfig -o /boot/grub2/grub.cfg
-+
grub2-mkconfig -o /boot/grub2/grub.cfg
- {{%- else %}} -
{{{ grub_command("update") }}}
- {{%- endif %}} -diff --git a/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_admin_username/rule.yml b/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_admin_username/rule.yml -index ad52e7797e1..451537e032f 100644 ---- a/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_admin_username/rule.yml -+++ b/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_admin_username/rule.yml -@@ -23,7 +23,7 @@ description: |- - update the - grub.cfg file by running: - {{%- if "rhel" in product %}} --
grub-mkconfig -o /boot/grub2/grub.cfg
-+
grub2-mkconfig -o /boot/grub2/grub.cfg
- {{%- else %}} -
{{{ grub_command("update") }}}
- {{%- endif %}} -@@ -89,7 +89,7 @@ fixtext: |- - Once the superuser account has been added, update the grub.cfg file by running: - - {{%- if "rhel" in product %}} --
grub-mkconfig -o /boot/grub2/grub.cfg
-+
grub2-mkconfig -o /boot/grub2/grub.cfg
- {{%- else %}} -
{{{ grub_command("update") }}}
- {{%- endif %}} -diff --git a/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_password/rule.yml b/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_password/rule.yml -index 357c2e8defa..0d75ba87338 100644 ---- a/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_password/rule.yml -+++ b/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_password/rule.yml -@@ -28,7 +28,7 @@ description: |- - update the - grub.cfg file by running: - {{%- if "rhel" in product %}} --
grub-mkconfig -o /boot/grub2/grub.cfg
-+
grub2-mkconfig -o /boot/grub2/grub.cfg
- {{%- else %}} -
{{{ grub_command("update") }}}
- {{%- endif %}} -@@ -109,7 +109,7 @@ fixtext: |- - Then, update the grub.cfg file by running: - - {{%- if "rhel" in product %}} --
grub-mkconfig -o /boot/grub2/grub.cfg
-+
grub2-mkconfig -o /boot/grub2/grub.cfg
- {{%- else %}} -
{{{ grub_command("update") }}}
- {{%- endif %}} diff --git a/sources b/sources index 513cdd0..ebcceed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.77.tar.bz2) = cc3bda1c7e3e40f58407b59d2c7222da7b1d3979f5411a2c12e5f12b73cfff4a71d04b3a51dcc84ca797486aca77ed6091977cb3f067ef3f63dc3d855b059b11 +SHA512 (scap-security-guide-0.1.78.tar.bz2) = b84c549fe42799a6daffecf5720c5208f9946974f74193b9f6beb3fba04c35d9f073953c94b83c5ddf36855d59be1c66dafb011dde4427ab040dd1ec5048c063