From 1f148f657e9fb1f8c3a0c0a3308a13f91df21f2c Mon Sep 17 00:00:00 2001
From: Matthew Burket <mburket@redhat.com>
Date: Fri, 7 Mar 2025 14:45:51 -0600
Subject: [PATCH 1/4] Remove expat as BuildRequires as it is no longer required

Resolves: RHEL-94804
---
 scap-security-guide.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index f558852..5c3a087 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -14,7 +14,6 @@ Patch0: disable_ospp.patch
 BuildArch:	noarch
 
 BuildRequires:	libxslt
-BuildRequires:	expat
 BuildRequires:	openscap-scanner >= 1.2.5
 BuildRequires:	cmake >= 2.8
 # To get python3 inside the buildroot require its path explicitly in BuildRequires

From 5fdc0d9a5b89fb9013a1cdfc0c0e6698f6ab7509 Mon Sep 17 00:00:00 2001
From: Matthew Burket <mburket@redhat.com>
Date: Tue, 3 Jun 2025 17:36:12 -0500
Subject: [PATCH 2/4] Rebase to 0.1.77

Resolves: RHEL-94804
---
 .gitignore               |  1 +
 scap-security-guide.spec | 11 +++++++----
 sources                  |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a268203..4c9f192 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@
 /scap-security-guide-0.1.73.tar.bz2
 /scap-security-guide-0.1.74.tar.bz2
 /scap-security-guide-0.1.76.tar.bz2
+/scap-security-guide-0.1.77.tar.bz2
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 5c3a087..1c6a135 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -4,8 +4,8 @@
 %global _vpath_builddir build
 
 Name:		scap-security-guide
-Version:	0.1.76
-Release:	2%{?dist}
+Version:	0.1.77
+Release:	1%{?dist}
 Summary:	Security guidance and baselines in SCAP formats
 License:	BSD-3-Clause
 URL:		https://github.com/ComplianceAsCode/content/
@@ -61,10 +61,10 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul
 %define cmake_defines_common -DSSG_SEPARATE_SCAP_FILES_ENABLED=OFF -DSSG_BASH_SCRIPTS_ENABLED=OFF -DSSG_BUILD_SCAP_12_DS=OFF
 %define cmake_defines_specific %{nil}
 %if 0%{?rhel} && ! %{defined eln}
-%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON
+%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON -DSSG_SCE_ENABLED:BOOL=ON
 %endif
 %if 0%{?centos}
-%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON
+%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON -DSSG_SCE_ENABLED:BOOL=ON
 %endif
 
 mkdir -p build
@@ -98,6 +98,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
 %endif
 
 %changelog
+* Tue Jun 03 2025 Matthew Burket <mburket@redhat.com> - 0.1.77-1
+- Rebase scap-security-guide to the latest upstream version 0.1.77 (RHEL-94804)
+
 * Thu Feb 27 2025 Vojtech Polasek <vpolasek@redhat.com> - 0.1.76-2
 - rebuilt
 
diff --git a/sources b/sources
index 6b6e0c4..513cdd0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scap-security-guide-0.1.76.tar.bz2) = 27cb260eb0b2fbfd11afe2affb91624e4e2ff332e7ffe43a0c0ec2e08b5e2aa707f00e77c97fa1cbdace5549ef25cf42b34756777a568809da7d1222bd05950c
+SHA512 (scap-security-guide-0.1.77.tar.bz2) = cc3bda1c7e3e40f58407b59d2c7222da7b1d3979f5411a2c12e5f12b73cfff4a71d04b3a51dcc84ca797486aca77ed6091977cb3f067ef3f63dc3d855b059b11

From f4c9a9703ae7f99f6c083693643e3509cb1f5bb6 Mon Sep 17 00:00:00 2001
From: Vojtech Polasek <vpolasek@redhat.com>
Date: Fri, 27 Jun 2025 17:49:18 +0200
Subject: [PATCH 3/4] apply fixes to rules related to grub2 bootloader and UEFI

Resolves: RHEL-94804
---
 scap-security-guide.spec                      |  12 ++-
 ...-guide_0_1_78_fix_uefi_applicability.patch |  40 +++++++
 ..._0_1_78_fix_uefi_applicability_jinja.patch |  42 ++++++++
 ...-guide_0_1_78_fix_wrong_grubmkconfig.patch | 101 ++++++++++++++++++
 4 files changed, 194 insertions(+), 1 deletion(-)
 create mode 100644 scap-security-guide_0_1_78_fix_uefi_applicability.patch
 create mode 100644 scap-security-guide_0_1_78_fix_uefi_applicability_jinja.patch
 create mode 100644 scap-security-guide_0_1_78_fix_wrong_grubmkconfig.patch

diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 1c6a135..aabf622 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -5,12 +5,18 @@
 
 Name:		scap-security-guide
 Version:	0.1.77
-Release:	1%{?dist}
+Release:	2%{?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
 
 BuildRequires:	libxslt
@@ -98,6 +104,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
 %endif
 
 %changelog
+* Fri Jun 27 2025 Vojtech Polasek <vpolasek@redhat.com> - 0.1.77-2
+- fix incorrect applicability of Grub2 UEFI specific rules
+- replace grub-mkconfig with grub2-mkconfig in rule descriptions
+
 * Tue Jun 03 2025 Matthew Burket <mburket@redhat.com> - 0.1.77-1
 - Rebase scap-security-guide to the latest upstream version 0.1.77 (RHEL-94804)
 
diff --git a/scap-security-guide_0_1_78_fix_uefi_applicability.patch b/scap-security-guide_0_1_78_fix_uefi_applicability.patch
new file mode 100644
index 0000000..67dd18e
--- /dev/null
+++ b/scap-security-guide_0_1_78_fix_uefi_applicability.patch
@@ -0,0 +1,40 @@
+From 35a873bf3da694876a1390eb4ea324cfb3d64327 Mon Sep 17 00:00:00 2001
+From: Gabriel Becker <ggasparb@redhat.com>
+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
new file mode 100644
index 0000000..ddfe407
--- /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?= <jcerny@redhat.com>
+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
new file mode 100644
index 0000000..70471c9
--- /dev/null
+++ b/scap-security-guide_0_1_78_fix_wrong_grubmkconfig.patch
@@ -0,0 +1,101 @@
+From 0e0667783e9901f898af637c00464217654fcf9e Mon Sep 17 00:00:00 2001
+From: vojtapolasek <krecoun@gmail.com>
+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
+     <tt>grub.cfg</tt> file by running:
+     {{%- if "rhel" in product %}}
+-    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
++    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
+     {{%- else %}}
+     <pre>{{{ grub_command("update") }}}</pre>
+     {{%- endif %}}
+@@ -85,7 +85,7 @@ fixtext: |-
+     Once the superuser account has been added, update the grub.cfg file by running:
+ 
+     {{%- if "rhel" in product %}}
+-    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
++    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
+     {{%- else %}}
+     <pre>{{{ grub_command("update") }}}</pre>
+     {{%- 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
+     <tt>grub.cfg</tt> file by running:
+     {{%- if "rhel" in product %}}
+-    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
++    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
+     {{%- else %}}
+     <pre>{{{ grub_command("update") }}}</pre>
+     {{%- endif %}}
+@@ -111,7 +111,7 @@ fixtext: |-
+     Once the superuser account has been added, update the grub.cfg file by running:
+ 
+     {{%- if "rhel" in product %}}
+-    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
++    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
+     {{%- else %}}
+     <pre>{{{ grub_command("update") }}}</pre>
+     {{%- 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
+     <tt>grub.cfg</tt> file by running:
+     {{%- if "rhel" in product %}}
+-    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
++    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
+     {{%- else %}}
+     <pre>{{{ grub_command("update") }}}</pre>
+     {{%- endif %}}
+@@ -89,7 +89,7 @@ fixtext: |-
+     Once the superuser account has been added, update the grub.cfg file by running:
+ 
+     {{%- if "rhel" in product %}}
+-    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
++    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
+     {{%- else %}}
+     <pre>{{{ grub_command("update") }}}</pre>
+     {{%- 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
+     <tt>grub.cfg</tt> file by running:
+     {{%- if "rhel" in product %}}
+-    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
++    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
+     {{%- else %}}
+     <pre>{{{ grub_command("update") }}}</pre>
+     {{%- endif %}}
+@@ -109,7 +109,7 @@ fixtext: |-
+     Then, update the grub.cfg file by running:
+ 
+     {{%- if "rhel" in product %}}
+-    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
++    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
+     {{%- else %}}
+     <pre>{{{ grub_command("update") }}}</pre>
+     {{%- endif %}}

From 8216939844aeb2828452aebd2cc2606c268b0c1f Mon Sep 17 00:00:00 2001
From: Vojtech Polasek <vpolasek@redhat.com>
Date: Mon, 15 Sep 2025 13:53:43 +0200
Subject: [PATCH 4/4] Rebase scap-security-guide to 0.1.78

Resolves: RHEL-120076
---
 .gitignore                                    |   1 +
 disable_ospp.patch                            |  17 +--
 scap-security-guide.spec                      |  12 +--
 ...-guide_0_1_78_fix_uefi_applicability.patch |  40 -------
 ..._0_1_78_fix_uefi_applicability_jinja.patch |  42 --------
 ...-guide_0_1_78_fix_wrong_grubmkconfig.patch | 101 ------------------
 sources                                       |   2 +-
 7 files changed, 10 insertions(+), 205 deletions(-)
 delete mode 100644 scap-security-guide_0_1_78_fix_uefi_applicability.patch
 delete mode 100644 scap-security-guide_0_1_78_fix_uefi_applicability_jinja.patch
 delete mode 100644 scap-security-guide_0_1_78_fix_wrong_grubmkconfig.patch

diff --git a/.gitignore b/.gitignore
index 4c9f192..e584d71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@
 /scap-security-guide-0.1.74.tar.bz2
 /scap-security-guide-0.1.76.tar.bz2
 /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 <vpolasek@redhat.com>
-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 <vpolasek@redhat.com> - 0.1.78-1
+- rebase scap-security-guide to the latest version 0.1.78 (RHEL-120076)
+
 * Fri Jun 27 2025 Vojtech Polasek <vpolasek@redhat.com> - 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 <ggasparb@redhat.com>
-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?= <jcerny@redhat.com>
-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 <krecoun@gmail.com>
-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
-     <tt>grub.cfg</tt> file by running:
-     {{%- if "rhel" in product %}}
--    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
-+    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
-     {{%- else %}}
-     <pre>{{{ grub_command("update") }}}</pre>
-     {{%- endif %}}
-@@ -85,7 +85,7 @@ fixtext: |-
-     Once the superuser account has been added, update the grub.cfg file by running:
- 
-     {{%- if "rhel" in product %}}
--    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
-+    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
-     {{%- else %}}
-     <pre>{{{ grub_command("update") }}}</pre>
-     {{%- 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
-     <tt>grub.cfg</tt> file by running:
-     {{%- if "rhel" in product %}}
--    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
-+    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
-     {{%- else %}}
-     <pre>{{{ grub_command("update") }}}</pre>
-     {{%- endif %}}
-@@ -111,7 +111,7 @@ fixtext: |-
-     Once the superuser account has been added, update the grub.cfg file by running:
- 
-     {{%- if "rhel" in product %}}
--    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
-+    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
-     {{%- else %}}
-     <pre>{{{ grub_command("update") }}}</pre>
-     {{%- 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
-     <tt>grub.cfg</tt> file by running:
-     {{%- if "rhel" in product %}}
--    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
-+    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
-     {{%- else %}}
-     <pre>{{{ grub_command("update") }}}</pre>
-     {{%- endif %}}
-@@ -89,7 +89,7 @@ fixtext: |-
-     Once the superuser account has been added, update the grub.cfg file by running:
- 
-     {{%- if "rhel" in product %}}
--    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
-+    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
-     {{%- else %}}
-     <pre>{{{ grub_command("update") }}}</pre>
-     {{%- 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
-     <tt>grub.cfg</tt> file by running:
-     {{%- if "rhel" in product %}}
--    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
-+    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
-     {{%- else %}}
-     <pre>{{{ grub_command("update") }}}</pre>
-     {{%- endif %}}
-@@ -109,7 +109,7 @@ fixtext: |-
-     Then, update the grub.cfg file by running:
- 
-     {{%- if "rhel" in product %}}
--    <pre>grub-mkconfig -o /boot/grub2/grub.cfg</pre>
-+    <pre>grub2-mkconfig -o /boot/grub2/grub.cfg</pre>
-     {{%- else %}}
-     <pre>{{{ grub_command("update") }}}</pre>
-     {{%- 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