Fix a minor rebuild issue; note that this means it won't match the

result that's in shim-15-8.

Signed-off-by: Peter Jones <pjones@redhat.com>

0001-CFLAGS-add-Werror-address-of-packed-member.patch

@@ -0,0 +1,25 @@
+From 79f8e33de536909810578371dbc8a3043517b216 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 21 Jan 2020 14:37:59 -0500
+Subject: [PATCH] CFLAGS: add -Wno-error=address-of-packed-member
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ Make.defaults | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Make.defaults b/Make.defaults
+index e11ab5a7f2c..065b17445b5 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -41,6 +41,7 @@ EFI_LDS		= $(TOPDIR)/elf_$(ARCH)_efi.lds
+ 
+ CFLAGS		= -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \
+ 		  -fshort-wchar -Wall -Wsign-compare -Werror -fno-builtin \
++		  -Wno-error=address-of-packed-member -Wno-error=pointer-sign \
+ 		  -Werror=sign-compare -ffreestanding -std=gnu89 \
+ 		  -I$(shell $(CC) -print-file-name=include) \
+ 		  "-DDEFAULT_LOADER=L\"$(DEFAULT_LOADER)\"" \
+-- 
+2.24.1
+

0002-Fix-a-typo.patch

@@ -0,0 +1,26 @@
+From 67756daa55f48f1166b3526dca1309e32c99ad89 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 12 Nov 2019 14:34:51 -0500
+Subject: [PATCH] Fix a typo
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ lib/console.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/console.c b/lib/console.c
+index 3fee403e2a8..39f29faadc4 100644
+--- a/lib/console.c
++++ b/lib/console.c
+@@ -360,7 +360,7 @@ static struct {
+ 	{  EFI_SECURITY_VIOLATION,     L"Security Violation"},
+ 
+ 	// warnings
+-	{  EFI_WARN_UNKOWN_GLYPH,      L"Warning Unknown Glyph"},
++	{  EFI_WARN_UNKNOWN_GLYPH,     L"Warning Unknown Glyph"},
+ 	{  EFI_WARN_DELETE_FAILURE,    L"Warning Delete Failure"},
+ 	{  EFI_WARN_WRITE_FAILURE,     L"Warning Write Failure"},
+ 	{  EFI_WARN_BUFFER_TOO_SMALL,  L"Warning Buffer Too Small"},
+-- 
+2.23.0
+

shim-unsigned-x64.spec

@@ -1,5 +1,5 @@
 %global pesign_vre 0.106-1
-%global gnuefi_vre 1:3.0.5-6
+%global gnuefi_vre 1:3.0.8-1
 %global openssl_vre 1.0.2j
 
 %global debug_package %{nil}
@@ -17,8 +17,8 @@
 %global shimaltdir %{shimversiondir}/%{efialtarch}
 
 Name:		shim-unsigned-%{efiarch}
-Version:	13
-Release:	0.2%{?dist}
+Version:	15
+Release:	2%{?dist}
 Summary:	First-stage UEFI bootloader
 ExclusiveArch:	x86_64
 License:	BSD
@@ -37,6 +37,9 @@ Source2:	dbx.esl
 
 Source100:	shim-find-debuginfo.sh
 
+Patch0001:	0001-CFLAGS-add-Werror-address-of-packed-member.patch
+Patch0002:	0002-Fix-a-typo.patch
+
 BuildRequires:  gcc
 BuildRequires:	elfutils-libelf-devel
 BuildRequires:	git openssl-devel openssl
@@ -95,7 +98,7 @@ BuildArch:	noarch
 %debug_desc
 
 %prep
-%autosetup -S git -n shim-%{version}
+%autosetup -S git_am -n shim-%{version}
 git config --unset user.email
 git config --unset user.name
 mkdir build-%{efiarch}
@@ -171,6 +174,24 @@ cd ..
 %files debugsource -f build-%{efiarch}/debugsource.list
 
 %changelog
+* Tue Jan 21 2020 Peter Jones <pjones@redhat.com> - 15-2
+- Fix a minor rebuild issue; note that this means it won't match the
+  result that's in shim-15-8.
+
+* Thu Apr 05 2018 Peter Jones <pjones@redhat.com> - 15-1
+- Update to shim 15
+- better checking for bad linker output
+- flicker-free console if there's no error output
+- improved http boot support
+- better protocol re-installation
+- dhcp proxy support
+- tpm measurement even when verification is disabled
+- REQUIRE_TPM build flag
+- more reproducable builds
+- measurement of everything verified through shim_verify()
+- coverity and scan-build checker make targets
+- misc cleanups
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 13-0.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (shim-13.tar.bz2) = 99b11701f12866611a8e7418dab24342f723b72d7feba4a7567a23c9b6abb415d90f82ec59cf543ebf72c29fa2b14f12a7739cc43035e01b9da4983d03c6bec6
+SHA512 (shim-15.tar.bz2) = f7dfac774d644111431ca56da76b5575b891b0abad970b318edaede11a0d83c869728bc39cb6af3689bdb203c6826545caf8ddd3d14228831027e334963cf957