From 40918825fa74a0d51a6b5957ed47f6f60ef104da Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Feb 27 2014 18:37:39 +0000
Subject: import shim-signed-0.7-5.2.el7.src.rpm


---

diff --git a/.shim-signed.metadata b/.shim-signed.metadata
index d6bdf58..19549bb 100644
--- a/.shim-signed.metadata
+++ b/.shim-signed.metadata
@@ -1,2 +1,3 @@
-a44fe59367a951161a126ca69ed762d2ad4ebf2a SOURCES/redhatsecureboot003.cer
-e8c5e9f13efc3f87c2a5fa5c045603dc2fabb269 SOURCES/redhatsecurebootca2.cer
+4a07b56e28741884b86da6ac91f8f9929541a1e4 SOURCES/secureboot.cer
+cf9230e69000076727e5b784ec871d22716dc5da SOURCES/securebootca.cer
+3fb967f4f5604474e74fa9e7b55ffbc21072b5c2 SOURCES/shim.efi
diff --git a/SPECS/shim-signed.spec b/SPECS/shim-signed.spec
index 38f39b9..cdba02d 100644
--- a/SPECS/shim-signed.spec
+++ b/SPECS/shim-signed.spec
@@ -1,15 +1,16 @@
 Name:           shim-signed
 Version:        0.7
-Release:        5%{?dist}
+Release:        5.2%{?dist}
 Summary:        First-stage UEFI bootloader
 Provides:	shim = %{version}-%{release}
-%define unsigned_release 4%{?dist}
+%define unsigned_release 5%{?dist}
 
 License:        BSD
 URL:            http://www.codon.org.uk/~mjg59/shim/
+Source0:	shim.efi
 Source1:	BOOT.CSV
-Source2:	redhatsecureboot003.cer
-Source3:	redhatsecurebootca2.cer
+Source2:	secureboot.cer
+Source3:	securebootca.cer
 
 BuildRequires: shim-unsigned = %{version}-%{unsigned_release}
 BuildRequires: pesign >= 0.106-5%{dist}
@@ -62,20 +63,27 @@ mkdir shim-signed-%{version}
 %define vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
 
 cd shim-signed-%{version}
-pesign -i %{_datadir}/shim/shim.efi -h -P > shim.hash
+pesign -i %{SOURCE0} -h -P > shim.hash
 if ! cmp shim.hash %{_datadir}/shim/shim.hash ; then
 	echo Invalid signature\! > /dev/stderr
 	exit 1
 fi
-%pesign -s -i %{_datadir}/shim/shim.efi -o shim.efi -a %{SOURCE3} -c %{SOURCE2} -n redhatsecureboot003
-%pesign -s -i %{_datadir}/shim/MokManager.efi -o MokManager.efi -a %{SOURCE3} -c %{SOURCE2} -n redhatsecureboot003
-%pesign -s -i %{_datadir}/shim/fallback.efi -o fallback.efi -a %{SOURCE3} -c %{SOURCE2} -n redhatsecureboot003
+pesign -i %{SOURCE0} -o clean.efi -r -u 0
+%pesign -s -i clean.efi -a %{SOURCE3} -c %{SOURCE2} -n redhatsecureboot301 -o tmp.efi
+pesign -i tmp.efi -e shim-redhat.sig
+rm tmp.efi
+pesign -i %{SOURCE0} -o shim.efi -m shim-redhat.sig -u 1
+pesign -i %{SOURCE0} -o tmp.efi -r -u 0
+pesign -i tmp.efi -o shim-redhat.efi -m shim-redhat.sig
+%pesign -s -i %{_datadir}/shim/MokManager.efi -o MokManager.efi -a %{SOURCE3} -c %{SOURCE2} -n redhatsecureboot301
+%pesign -s -i %{_datadir}/shim/fallback.efi -o fallback.efi -a %{SOURCE3} -c %{SOURCE2} -n redhatsecureboot301
 
 %install
 rm -rf $RPM_BUILD_ROOT
 cd shim-signed-%{version}
 install -D -d -m 0755 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
 install -m 0644 shim.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
+install -m 0644 shim-redhat.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim-redhat.efi
 install -m 0644 MokManager.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/MokManager.efi
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV
 
@@ -85,12 +93,21 @@ install -m 0644 fallback.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fallback.efi
 
 %files -n shim
 /boot/efi/EFI/%{efidir}/shim.efi
+/boot/efi/EFI/%{efidir}/shim-redhat.efi
 /boot/efi/EFI/%{efidir}/MokManager.efi
 /boot/efi/EFI/%{efidir}/BOOT.CSV
 /boot/efi/EFI/BOOT/BOOTX64.EFI
 /boot/efi/EFI/BOOT/fallback.efi
 
 %changelog
+* Thu Feb 27 2014 Peter Jones <pjones@redhat.com> - 0.7-5.2
+- Get the right signatures on shim-redhat.efi
+  Related: rhbz#1064449
+
+* Thu Feb 27 2014 Peter Jones <pjones@redhat.com> - 0.7-5.1
+- Update for signed shim for RHEL 7
+  Resolves: rhbz#1064449
+
 * Thu Nov 21 2013 Peter Jones <pjones@redhat.com> - 0.7-5
 - Fix shim-unsigned deps.
   Related: rhbz#1032583