From b1e9dda1894e8803f3c9137ecaa70e09163e9253 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 28 2020 06:40:24 +0000
Subject: import shim-15-12


---

diff --git a/.shim.metadata b/.shim.metadata
index 419f702..b655807 100644
--- a/.shim.metadata
+++ b/.shim.metadata
@@ -1,3 +1,3 @@
-fddb9c22fd56e9c6975159ad72415c9a4cb7cebd SOURCES/shimaa64.efi
+750bd7932437b1fb6610c233f69db1b70d67fab1 SOURCES/shimaa64.efi
 c3c4d0ccdc07c03c20f133f9f65f6f12accea87a SOURCES/shimia32.efi
 6436ae30f3f189f70f9043d91ede90058fbeb00a SOURCES/shimx64.efi
diff --git a/SOURCES/shim.rpmmacros b/SOURCES/shim.rpmmacros
index c83519c..2e05163 100644
--- a/SOURCES/shim.rpmmacros
+++ b/SOURCES/shim.rpmmacros
@@ -13,7 +13,7 @@
 %global shimefix64 %{expand:%{SOURCE22}}
 #%%global shimefiarm %%{expand:%%{SOURCE23}
 
-%global shimveraa64 15-4.el8
+%global shimveraa64 15-6.el8
 %global shimveria32 15-2.el8
 %global shimverx64 15-2.el8
 #%%global shimverarm 15-1.el8
diff --git a/SPECS/shim.spec b/SPECS/shim.spec
index 8afb18f..e0b899d 100644
--- a/SPECS/shim.spec
+++ b/SPECS/shim.spec
@@ -5,7 +5,7 @@
 
 Name:		shim
 Version:	15
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		https://github.com/rhboot/shim/
@@ -106,6 +106,12 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
 %endif
 
 %changelog
+* Thu Jun 11 2020 Javier Martinez Canillas <javierm@redhat.com> - 15-12
+- Fix firmware update bug in aarch64 caused by shim ignoring arguments
+  Resolves: rhbz#1830871
+- Fix a shim crash when attempting to netboot
+  Resolves: rhbz#1795654
+
 * Fri Jun 07 2019 Javier Martinez Canillas <javierm@redhat.com> - 15-11
 - Update the shim-unsigned-aarch64 version number
   Related: rhbz#1715879