[shim/f19] Update to 0.8

[Peter Jones]

commit b819c2be5b47a47e2e78a2d6774bf51c3d0b540d
Author: Peter Jones <pjones at redhat.com>
Date:   Mon Oct 13 17:40:34 2014 -0400

    Update to 0.8
    
      Related: rhbz#1148230
      Related: rhbz#1148231
      Related: rhbz#1148232
    
    Signed-off-by: Peter Jones <pjones at redhat.com>

 shim.spec |   51 ++++++++++++---------------------------------------
 sources   |    3 +--
 2 files changed, 13 insertions(+), 41 deletions(-)
---
diff --git a/shim.spec b/shim.spec
index c0f58f4..4bcf178 100644
--- a/shim.spec
+++ b/shim.spec
@@ -1,5 +1,5 @@
 Name:           shim
-Version:        0.4
+Version:        0.8
 Release:        1%{?dist}
 Summary:        First-stage UEFI bootloader
 
@@ -8,10 +8,6 @@ URL:            http://www.codon.org.uk/~mjg59/shim/
 Source0:        http://www.codon.org.uk/~mjg59/shim/shim-%{version}.tar.bz2
 Source1:	fedora-ca.cer
 
-# incorporate mokutil for packaging simplicity
-%global mokutilver 0.1.0
-Source2:	http://www.codon.org.uk/~mjg59/mokutil/mokutil-%{mokutilver}.tar.bz2
-
 # currently here's what's in our dbx:
 # grub2-efi-2.00-11.fc18.x86_64:
 # grubx64.efi 6ac839881e73504047c06a1aac0c4763408ecb3642783c8acf77a2d393ea5cd7
@@ -22,35 +18,20 @@ Source2:	http://www.codon.org.uk/~mjg59/mokutil/mokutil-%{mokutilver}.tar.bz2
 # woops.
 Source3:	dbx.esl
 
-# this we'll always need, unless we phase in a rename of our grub binary.
-Patch0:		0001-Fix-grub-path.patch
-
-# this we won't need in the next version of mokutil
-Patch1:		mokutil-correct-moklistrt-size.patch
-
-# this needs to be worked on upstream
-Patch2:		0001-Don-t-use-shim_cert-for-verifying-MoK-fedora-will-do.patch
-
-# this will go away once a new gnu-efi actually works again
-Patch3:		0001-EFI_PXE_BASE_CODE_DHCPV6_PACKET-is-in-gnu-efi-3.0t.patch
-
-# this will go away with shim 0.5
-Patch4:		0001-Fix-some-pointer-casting-issues.patch
-
 BuildRequires: gnu-efi git openssl-devel openssl
 BuildRequires: pesign >= 0.106-1
-BuildRequires: gnu-efi = 3.0q
+BuildRequires: gnu-efi = 3.0w
 
 # Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI is not
 # compatible with SysV (there's no red zone under UEFI) and there isn't a
 # POSIX-style C library.
 # BuildRequires: OpenSSL
-Provides: bundled(openssl) = 0.9.8w
+Provides: bundled(openssl) = 0.9.8zb
 
 # Shim is only required on platforms implementing the UEFI secure boot
 # protocol. The only one of those we currently wish to support is 64-bit x86.
 # Adding further platforms will require adding appropriate relocation code.
-ExclusiveArch: x86_64
+ExclusiveArch: x86_64 aarch64
 
 # Figure out the right file path to use
 %if 0%{?rhel}
@@ -71,12 +52,6 @@ Summary: First-stage UEFI bootloader (unsigned data)
 Initial UEFI bootloader that handles chaining to a trusted full bootloader
 under secure boot environments.
 
-%package -n mokutil
-Summary: Utilities for managing Secure Boot/MoK keys.
-
-%description -n mokutil
-Utilities for managing the "Machine's Own Keys" list.
-
 %prep
 %setup -q -n shim-%{version}
 %setup -q -a 2 -D -T
@@ -86,6 +61,8 @@ git config user.name "Fedora Ninjas"
 git add .
 git commit -a -q -m "%{version} baseline."
 git am %{patches} </dev/null
+git config --unset user.email
+git config --unset user.name
 
 %build
 MAKEFLAGS=""
@@ -93,10 +70,6 @@ if [ -f "%{SOURCE1}" ]; then
 	MAKEFLAGS="VENDOR_CERT_FILE=%{SOURCE1} VENDOR_DBX_FILE=%{SOURCE3}"
 fi
 make ${MAKEFLAGS} shim.efi MokManager.efi fallback.efi
-cd mokutil-%{mokutilver}
-%configure
-make %{?_smp_mflags}
-cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -106,8 +79,6 @@ install -m 0644 shim.efi $RPM_BUILD_ROOT%{_datadir}/shim/shim.efi
 install -m 0644 shim.hash $RPM_BUILD_ROOT%{_datadir}/shim/shim.hash
 install -m 0644 fallback.efi $RPM_BUILD_ROOT%{_datadir}/shim/fallback.efi
 install -m 0644 MokManager.efi $RPM_BUILD_ROOT%{_datadir}/shim/MokManager.efi
-cd mokutil-%{mokutilver}
-make PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} install
 # now install our .debug files...
 cd ..
 install -D -d -m 0755 $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/shim/
@@ -120,11 +91,13 @@ install -m 0644 MokManager.efi.debug $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/s
 %dir %{_datadir}/shim
 %{_datadir}/shim/*
 
-%files -n mokutil
-/usr/bin/mokutil
-/usr/share/man/man1/mokutil.1.gz
-
 %changelog
+* Mon Oct 13 2014 Peter Jones <pjones at redhat.com> - 0.8-1
+- Update to 0.8
+  Related: rhbz#1148230
+  Related: rhbz#1148231
+  Related: rhbz#1148232
+
 * Tue Jun 11 2013 Peter Jones <pjones at redhat.com> - 0.4-1
 - Update to 0.4
 
diff --git a/sources b/sources
index 3e2751b..1f66b7a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-485218c423aef15de46d55d6de48c98b  mokutil-0.1.0.tar.bz2
-8e7c5fe72ca0d911de9c1103a68eb455  shim-0.4.tar.bz2
+af9b5f559d1f9e370ad119c244d0f563  shim-0.8.tar.bz2