From b5dcc6c2668fdd1471741e6d044cca714a99589911a6a547acac3604cdbe7dca Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 16 Nov 2023 19:31:09 +0000
Subject: [PATCH] Accepting request 1126851 from home:dimstar:Factory

- Re-add fwupd-bsc1130056-change-shim-path.patch: patch was dropped
  in error (boo#1217138).

OBS-URL: https://build.opensuse.org/request/show/1126851
OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=152
---
 fwupd-bsc1130056-change-shim-path.patch | 14 ++++++++++++++
 fwupd.changes                           |  6 ++++++
 fwupd.spec                              |  2 ++
 3 files changed, 22 insertions(+)
 create mode 100644 fwupd-bsc1130056-change-shim-path.patch

diff --git a/fwupd-bsc1130056-change-shim-path.patch b/fwupd-bsc1130056-change-shim-path.patch
new file mode 100644
index 0000000..7b25f9f
--- /dev/null
+++ b/fwupd-bsc1130056-change-shim-path.patch
@@ -0,0 +1,14 @@
+diff --git a/plugins/uefi-capsule/fu-uefi-bootmgr.c b/plugins/uefi-capsule/fu-uefi-bootmgr.c
+index 9d9e30f..daa9b2c 100644
+--- a/plugins/uefi-capsule/fu-uefi-bootmgr.c
++++ b/plugins/uefi-capsule/fu-uefi-bootmgr.c
+@@ -408,7 +408,8 @@ fu_uefi_bootmgr_bootnext(FuVolume *esp,
+ 	/* test if we should use shim */
+ 	secure_boot = fu_efivar_secure_boot_enabled(NULL);
+ 	if (secure_boot) {
+-		shim_app = fu_uefi_get_esp_app_path("shim", error);
++		shim_app = g_strdup_printf ("%s/shim.efi",
++					    fu_uefi_get_esp_path_for_os());
+ 		if (shim_app == NULL)
+ 			return FALSE;
+ 
diff --git a/fwupd.changes b/fwupd.changes
index 72485a6..dfc4b1e 100644
--- a/fwupd.changes
+++ b/fwupd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 16 10:51:27 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Re-add fwupd-bsc1130056-change-shim-path.patch: patch was dropped
+  in error (boo#1217138).
+
 -------------------------------------------------------------------
 Wed Nov 15 08:06:09 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/fwupd.spec b/fwupd.spec
index 8f2967e..ce56216 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -48,6 +48,8 @@ Group:          System/Management
 URL:            https://fwupd.org/
 Source:         %{name}-%{version}.tar.xz
 
+# PATCH-FIX-OPENSUSE fwupd-bsc1130056-shim-path.patch bsc#1130056
+Patch1:         fwupd-bsc1130056-change-shim-path.patch
 # PATCH-FIX-OPENSUSE fwupd-jscSLE-11766-close-efidir-leap-gap.patch jsc#SLE-11766 qkzhu@suse.com -- Set SLE and openSUSE esp os dir at runtime
 Patch2:         fwupd-jscSLE-11766-close-efidir-leap-gap.patch
 # PATCH-FEATURE-OPENSUSE harden_fwupd-offline-update.service.patch -- Harden services