From 3bb7cc18a58f057735a1fc3d887aec7e32630e74b0fe1c7bafb1ff46dd5d7d7c Mon Sep 17 00:00:00 2001
From: Joey Lee <jlee@suse.com>
Date: Tue, 26 Jul 2022 04:16:19 +0000
Subject: [PATCH 1/2] Accepting request 991171 from
 home:joeyli:branches:devel:openSUSE:Factory

Revoked the change in shim.spec for use common SBAT values (boo#1193282) (bsc#1198458)

OBS-URL: https://build.opensuse.org/request/show/991171
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=189
---
 shim.changes | 10 ++++++++++
 shim.spec    | 18 +++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/shim.changes b/shim.changes
index 7709e0c..a8ed766 100644
--- a/shim.changes
+++ b/shim.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jul 25 12:44:24 UTC 2022 - Joey Lee <jlee@suse.com>
+
+- Revoked the change in shim.spec for "use common SBAT values (boo#1193282)"
+  - we need to build openSUSE Tumbleweed's shim on Leap 15.4 because Factory
+    is unstable for building out a stable shim binary for signing. (bsc#1198458)
+  - But the rpm-config-suse package in Leap 15.4 is direct copied from SLE 15.4
+    because closing-the-leap-gap. So sbat_distro_* variables are SLE version,
+    not for openSUSE. (bsc#1198458)
+
 -------------------------------------------------------------------
 Tue Jun 28 04:03:45 UTC 2022 - Joey Lee <jlee@suse.com>
 
diff --git a/shim.spec b/shim.spec
index 1567522..9d33f3d 100644
--- a/shim.spec
+++ b/shim.spec
@@ -35,13 +35,6 @@
 %endif
 %endif
 
-%if %{defined sbat_distro}
-# SBAT metadata
-%define sbat_generation 1
-%else
-%{error please define sbat_distro, sbat_distro_summary and sbat_distro_url}
-%endif
-
 Name:           shim
 Version:        15.6
 Release:        0
@@ -134,10 +127,17 @@ The source code of UEFI shim loader
 %patch100 -p1
 
 %build
-%if 0%{?sbat_generation}
 # generate the vendor SBAT metadata
-echo "shim.%{sbat_distro},%{sbat_generation},%{sbat_distro_summary},%{name},%{version},%{sbat_distro_url}" > data/sbat.vendor.csv
+%if 0%{?is_opensuse} == 1 || 0%{?sle_version} == 0
+distro_id="opensuse"
+distro_name="The openSUSE project"
+%else
+distro_id="sle"
+distro_name="SUSE Linux Enterprise"
 %endif
+distro_sbat=1
+sbat="shim.${distro_id},${distro_sbat},${distro_name},%{name},%{version},mail:security-team@suse.de"
+echo "${sbat}" > data/sbat.vendor.csv
 
 # first, build MokManager and fallback as they don't depend on a
 # specific certificate

From 63fb624566b8b0aae786afb0a913f696e2e9823a99f2adca8efab7d3b57e3ce2 Mon Sep 17 00:00:00 2001
From: Joey Lee <jlee@suse.com>
Date: Fri, 29 Jul 2022 02:47:14 +0000
Subject: [PATCH 2/2] Accepting request 991618 from
 home:joeyli:branches:devel:openSUSE:Factory

Change the URL in SBAT section to mail:security@suse.de. (bsc#1193282)

OBS-URL: https://build.opensuse.org/request/show/991618
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=190
---
 shim.changes | 5 +++++
 shim.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/shim.changes b/shim.changes
index a8ed766..6f4d7dd 100644
--- a/shim.changes
+++ b/shim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 29 02:36:36 UTC 2022 - Joey Lee <jlee@suse.com>
+
+- Change the URL in SBAT section to mail:security@suse.de. (bsc#1193282)
+
 -------------------------------------------------------------------
 Mon Jul 25 12:44:24 UTC 2022 - Joey Lee <jlee@suse.com>
 
diff --git a/shim.spec b/shim.spec
index 9d33f3d..1f99a89 100644
--- a/shim.spec
+++ b/shim.spec
@@ -136,7 +136,7 @@ distro_id="sle"
 distro_name="SUSE Linux Enterprise"
 %endif
 distro_sbat=1
-sbat="shim.${distro_id},${distro_sbat},${distro_name},%{name},%{version},mail:security-team@suse.de"
+sbat="shim.${distro_id},${distro_sbat},${distro_name},%{name},%{version},mail:security@suse.de"
 echo "${sbat}" > data/sbat.vendor.csv
 
 # first, build MokManager and fallback as they don't depend on a