From 81422c2ec5d627d52fe33a59dae02d7772454daab202ffed84a2a65778752483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Thu, 3 Oct 2024 18:46:06 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main suse-build-key revision
 06d6ca9b5be898ccbe90c93cbdb89531

---
 gpg-pubkey-39db7c82-5f68629b.asc | 19 -------------------
 gpg-pubkey-39db7c82-66c5d91a.asc | 18 ++++++++++++++++++
 suse-build-key.changes           | 12 ++++++++++++
 suse-build-key.spec              |  6 +++---
 4 files changed, 33 insertions(+), 22 deletions(-)
 delete mode 100644 gpg-pubkey-39db7c82-5f68629b.asc
 create mode 100644 gpg-pubkey-39db7c82-66c5d91a.asc

diff --git a/gpg-pubkey-39db7c82-5f68629b.asc b/gpg-pubkey-39db7c82-5f68629b.asc
deleted file mode 100644
index ee13f10..0000000
--- a/gpg-pubkey-39db7c82-5f68629b.asc
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-mQENBFEKlmsBCADbpZZbbSC5Zi+HxCR/ynYsVxU5JNNiSSZabN5GMgc9Z0hxeXxp
-YWvFoE/4n0+IXIsp83iKvxf06Eu8je/DXp0lMqDZu7WiT3XXAlkOPSNV4akHTDoY
-91SJaZCpgUJ7K1QXOPABNbREsAMN1a7rxBowjNjBUyiTJ2YuvQRLtGdK1kExsVma
-hieh/QxpoDyYd5w/aky3z23erCoEd+OPfAqEHd5tQIa6LOosa63BSCEl3milJ7J9
-vDmoGPAoS6ui7S2R5X4/+PLN8Mm2kOBrFjhmL93LX0mrGCMxsNsKgP6zabYKQEb8
-L028SXvl7EGoA+Vw5Vd3wIGbM73PfbgNrXjfABEBAAG0KFN1U0UgUGFja2FnZSBT
-aWduaW5nIEtleSA8YnVpbGRAc3VzZS5kZT6JATwEEwECACYCGwMGCwkIBwMCBBUC
-CAMEFgIDAQIeAQIXgAUCX2himwUJFeKaMAAKCRBwr56BOdt8glQcCACXQAkHKf0y
-7EPlayuX/EHc8sro4IAJDZqQFiPaJh8F+5HWD36+iw3D/HlOlzbd2y9oVqtbVDZV
-amOJ0KV+l2oxPbMVg32plYGXLlXh1Gwp7/lLWieceXVzf3AbleejgXfafUyiCuvj
-VaQyPNcGlEXIjiwi3qulw0+2rYAiUAf6KEq4wM9a/KLTLMhvxi2NigC+MiIbZtmt
-HlpFhMkp+Bdpdcqtz6cAucE3dSpVQcvkfNLOkZgrtkZfzkNBPaWnyZLtWdSrQah2
-vdIQX+RvMYVAQP4x+aL44ALlhnyeUST0wIX4AH82ifSnpvz/rEb1kpERj3XhwW+N
-NPBstHtGpA+l
-=cJ/8
------END PGP PUBLIC KEY BLOCK-----
diff --git a/gpg-pubkey-39db7c82-66c5d91a.asc b/gpg-pubkey-39db7c82-66c5d91a.asc
new file mode 100644
index 0000000..7581c5a
--- /dev/null
+++ b/gpg-pubkey-39db7c82-66c5d91a.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFEKlmsBCADbpZZbbSC5Zi+HxCR/ynYsVxU5JNNiSSZabN5GMgc9Z0hxeXxp
+YWvFoE/4n0+IXIsp83iKvxf06Eu8je/DXp0lMqDZu7WiT3XXAlkOPSNV4akHTDoY
+91SJaZCpgUJ7K1QXOPABNbREsAMN1a7rxBowjNjBUyiTJ2YuvQRLtGdK1kExsVma
+hieh/QxpoDyYd5w/aky3z23erCoEd+OPfAqEHd5tQIa6LOosa63BSCEl3milJ7J9
+vDmoGPAoS6ui7S2R5X4/+PLN8Mm2kOBrFjhmL93LX0mrGCMxsNsKgP6zabYKQEb8
+L028SXvl7EGoA+Vw5Vd3wIGbM73PfbgNrXjfABEBAAG0KFN1U0UgUGFja2FnZSBT
+aWduaW5nIEtleSA8YnVpbGRAc3VzZS5kZT6JAVMEEwEIAD0CGwMGCwkIBwMCBBUC
+CAMEFgIDAQIeAQIXgBYhBP6rUCU52EbbLAlhynCvnoE523yCBQJmxdkaBQkdeMEv
+AAoJEHCvnoE523yCsyEH/1NZhXtgIa4kFCZdWhPhXPvqz7IkIm62yXpS3Iseivbm
+rxzQNXNlQVLnaOOKZX4nEUyh1lr+w18PGlb1yIdMjQqt04hwFgCU+q99cTfrAHG5
+jzirSq9I2iBjn+zARCjLzJsD+dH7JGfEMm0lxtPyMRoNJ6bq8eEkjEtKxDOg0iTE
+vQ4eboRlR0a8hH06tauPfeWx6Ri6hIobN3TNdCY/RQe4WeyYL8vEog3c7uYYag/V
+iMFfj8QzRHgkkcCE9W3TTfr1K/h8AGZTW0uJH4YQhl2HqUsspKmicZIbK/W9M87l
+HUyO8EgreF1MuKsg1GWxV2OikZAJKMcNs6EhzLWUWHs=
+=5hye
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/suse-build-key.changes b/suse-build-key.changes
index dc80c91..02176bb 100644
--- a/suse-build-key.changes
+++ b/suse-build-key.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Aug 21 15:36:57 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- extended 2048 bit SUSE SLE 12, 15 GA-SP5 key until 2028. (bsc#1229339)
+  - gpg-pubkey-39db7c82-5f68629b.asc
+  + gpg-pubkey-39db7c82-66c5d91a.asc
+
+-------------------------------------------------------------------
+Tue Jul 30 14:33:40 UTC 2024 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
+
+- ensure key2rpmname is called using bash.
+
 -------------------------------------------------------------------
 Fri Jul 19 08:47:17 UTC 2024 - Marcus Meissner <meissner@suse.com>
 
diff --git a/suse-build-key.spec b/suse-build-key.spec
index 78f33ae..8280f04 100644
--- a/suse-build-key.spec
+++ b/suse-build-key.spec
@@ -17,6 +17,7 @@
 # needspubkeyforbuild
 
 
+
 %bcond_with     build_key_include_prjkey
 
 Name:           suse-build-key
@@ -31,7 +32,7 @@ Release:        0
 Source1000:     key2rpmname
 # pub  2048R/39DB7C82 2013-01-31 SuSE Package Signing Key <build@suse.de>
 # The main package signing key.
-Source0:        gpg-pubkey-39db7c82-5f68629b.asc
+Source0:        gpg-pubkey-39db7c82-66c5d91a.asc
 #pub   rsa4096/0xF74F09BC3FA1D6CE 2023-01-19 [SC] [expires: 2027-01-18]
 #      Key fingerprint = 7F00 9157 B127 B994 D5CF  BE76 F74F 09BC 3FA1 D6CE
 #uid                             SUSE Package Signing Key <build@suse.de>
@@ -123,7 +124,7 @@ mkdir -p $RPM_BUILD_ROOT%{keydir}
 
 %if %{with build_key_include_prjkey}
 if [ -e "%_sourcedir/_pubkey" ]; then
-    name="$(sh %{SOURCE1000} %_sourcedir/_pubkey).asc"
+    name="$(bash %{SOURCE1000} %_sourcedir/_pubkey).asc"
     if [ ! -e "%_sourcedir/$name" ]; then
         install -D -m 644 %_sourcedir/_pubkey %{buildroot}%keydir/"$name"
     fi
@@ -138,7 +139,6 @@ for i in %sources; do
     esac
 done
 
-
 %if 0%{?suse_version} &&  0%{?suse_version} < 1120
 install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/usr/lib/rpm/gnupg
 %endif