From d369b28d167e9a9b714d175e929e5ae9f6cc8a32 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 24 Apr 2018 15:52:27 -0400
Subject: [PATCH] Update to shim 15.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 shim.spec | 34 ++++++++++++++++++++++++----------
 sources   |  7 +++----
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/shim.spec b/shim.spec
index e589d72..44d8f53 100644
--- a/shim.spec
+++ b/shim.spec
@@ -7,8 +7,8 @@
 %global dist %{expand:%%{_dist}}
 
 Name:		shim
-Version:	13
-Release:	5%{dist}
+Version:	15
+Release:	0.1%{?dist}
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		http://github.com/rhboot/shim/
@@ -27,11 +27,11 @@ Source2:	BOOTIA32.CSV
 Source10:	shimaa64.efi
 Source11:	shimia32.efi
 Source12:	shimx64.efi
-Source13:	shimx64-signed.efi
+#Source13:	shimx64-signed.efi
 
-%global shimverx64 13-3.fc27
-%global shimveria32 13-3.fc27
-%global shimveraa64 13-3.fc29
+%global shimverx64 15-1.fc28
+%global shimveria32 15-1.fc28
+%global shimveraa64 15-1.fc28
 
 %ifarch x86_64
 BuildRequires: shim-unsigned-x64 = %{shimverx64}
@@ -187,10 +187,10 @@ install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/
 install -m 0700 %{SOURCE2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV
 install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mmx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/MokManager.efi
 install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fbx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fallback.efi
-#%%install -m 0700 %%{SOURCE12} $RPM_BUILD_ROOT/boot/efi/EFI/%%{efidir}/shim.efi
-install -m 0700 %{SOURCE13} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
-install -m 0700 %{SOURCE13} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shimx64.efi
-install -m 0700 %{SOURCE13} $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOTX64.EFI
+install -m 0700 %{SOURCE12} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
+#install -m 0700 %%{SOURCE13} $RPM_BUILD_ROOT/boot/efi/EFI/%%{efidir}/shim.efi
+#install -m 0700 %%{SOURCE13} $RPM_BUILD_ROOT/boot/efi/EFI/%%{efidir}/shimx64.efi
+#install -m 0700 %%{SOURCE13} $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOTX64.EFI
 %endif
 %ifarch aarch64
 %do_install -a aa64 -A AA64 -b %{SOURCE1}
@@ -226,6 +226,20 @@ install -m 0700 %{SOURCE10} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
 %endif
 
 %changelog
+* Tue Apr 24 2018 Peter Jones <pjones@redhat.com> - 15-1
+- Update to shim 15.
+- more reproduceable build
+- 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
+- more reproducable builds
+- measurement of everything verified through shim_verify()
+- coverity and scan-build checker make targets
+- misc cleanups
+
 * Tue Mar 06 2018 Peter Jones <pjones@redhat.com> - 13-5
 - Back off to the thing we had in 13-0.8 until I get new signatures.
 
diff --git a/sources b/sources
index e896a27..5849284 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-SHA512 (shimx64-signed.efi) = 4aad924e65356ff97d52a9c5ebf72cec9be51670db312f6a57ec80d1a254c855d3f90475dcf35deba565c09f498bba1156e0a66c17c31588721656a8f368d59b
-SHA512 (shimaa64.efi) = 779893923f9707bb20476bf9dfd9a613e72efad4f6cd7fd569f1a46cf5565b210d62b5c78e8ef5b8eb40ba673561fd74dd3195d82f72492348a3e31f859bf3b5
-SHA512 (shimia32.efi) = 19573da07e0a4531b4bfa829e3ab61ad9f8015284f75f4425721d5fb6df79c602344261939fb053147df4db6c37fad751e5ac32e3250b3ef653b42ec09c468ac
-SHA512 (shimx64.efi) = 95888ea0208de7baa8607866cc6a8dd7301bd1b8432322bace02d4f5e391a39b8ead03bdb5fabde1a8171bc08d4ca3904db8da53e6a6a152aae6475457a79a07
+SHA512 (shimia32.efi) = e249199f91a97ea13554a1f0aa6eb4df228b3d604487dabb83e53172b79765015e3eb593c488a8edd24ec618fe4943313708405383cc28ae436ec48202d6300b
+SHA512 (shimx64.efi) = 52e08b6e1686b19fea9e8f8d8ca51d22bba252467ceaf6db6ead8dd2dca4a0b0b02e547e50ddf1cdee225b8785f8514f6baa846bdf1ea0bf994e772daf70f2c3
+SHA512 (shimaa64.efi) = 39aec528ac1999a980a2989089e12d5765a0a28f4452d22a7e325c3fb11ab48417a76d4eb2246963e72ab3166e2905ebf04637ee7977dc083253c7129fa0d672