[shim/f19] Update for shim-0.3

[Peter Jones]

commit 87983bd45dc6ec47b59d7d451bf31705f5e0cd14
Author: Peter Jones <pjones at redhat.com>
Date:   Thu May 30 08:40:17 2013 -0400

    Update for shim-0.3

 .gitignore                              |    5 ++---
 0001-Fix-grub-path.patch                |   21 +++++++++++----------
 0002-Remove-extraneous-debug-code.patch |   25 -------------------------
 shim.spec                               |    9 +++++----
 sources                                 |    2 +-
 5 files changed, 19 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2b63911..b930343 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/shim-0.1.tar.bz2
-/shim-0.2.tar.bz2
-/mokutil-0.1.0.tar.bz2
+/mokutil-*.tar.bz2
+/shim-*.tar.bz2
diff --git a/0001-Fix-grub-path.patch b/0001-Fix-grub-path.patch
index 3890365..01aac82 100644
--- a/0001-Fix-grub-path.patch
+++ b/0001-Fix-grub-path.patch
@@ -1,25 +1,26 @@
-From aedb12117d5de52b3b2a49008e5e052f4369bda9 Mon Sep 17 00:00:00 2001
-From: Matthew Garrett <mjg59 at srcf.ucam.org>
-Date: Mon, 26 Nov 2012 19:31:05 -0500
+From 8f20d5f78a67675ac8920e0ba67581563b921465 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Tue, 14 May 2013 13:12:43 -0400
 Subject: [PATCH] Fix grub path
 
+Signed-off-by: Peter Jones <shim-owner at fedoraproject.org>
 ---
  shim.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/shim.c b/shim.c
-index 4d490b9..88c8209 100644
+index f2b8f1d..d28e0cd 100644
 --- a/shim.c
 +++ b/shim.c
-@@ -42,7 +42,7 @@
- #include "netboot.h"
+@@ -43,7 +43,7 @@
  #include "shim_cert.h"
+ #include "ucs2.h"
  
--#define SECOND_STAGE L"\\grub.efi"
-+#define SECOND_STAGE L"\\grubx64.efi"
+-#define DEFAULT_LOADER L"\\grub.efi"
++#define DEFAULT_LOADER L"\\grubx64.efi"
+ #define FALLBACK L"\\fallback.efi"
  #define MOK_MANAGER L"\\MokManager.efi"
  
- static EFI_SYSTEM_TABLE *systab;
 -- 
-1.8.0
+1.8.2.1
 
diff --git a/shim.spec b/shim.spec
index b260afc..8fd4479 100644
--- a/shim.spec
+++ b/shim.spec
@@ -1,6 +1,6 @@
 Name:           shim
-Version:        0.2
-Release:        3%{?dist}.pj0
+Version:        0.3
+Release:        1%{?dist}
 Summary:        First-stage UEFI bootloader
 
 License:        BSD
@@ -26,7 +26,8 @@ Patch0:		0001-Fix-grub-path.patch
 Patch2:		mokutil-correct-moklistrt-size.patch
 
 BuildRequires: gnu-efi git openssl-devel openssl
-BuildRequires: pesign >= 0.99-9
+BuildRequires: pesign >= 0.104-1
+BuildRequires: gnu-efi >= 3.0s
 
 # 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
@@ -89,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 install -D -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/shim/
 install -m 0644 shim.efi $RPM_BUILD_ROOT%{_datadir}/shim/shim.efi
 install -m 0644 shim.sig $RPM_BUILD_ROOT%{_datadir}/shim/shim.sig
-install -m 0644 fallback.efi $RPM_BUILD_ROOT%{_datadir}/shim/fallback.efi
+%pesign -s -i fallback.efi -o $RPM_BUILD_ROOT%{_datadir}/shim/fallback.efi
 install -D -d -m 0755 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
 %pesign -s -i MokManager.efi -o $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/MokManager.efi
 cd mokutil-%{mokutilver}
diff --git a/sources b/sources
index 19cdbdb..b272ff0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b13a2fa37897e1508e871a5bf0a87369  shim-0.2.tar.bz2
 485218c423aef15de46d55d6de48c98b  mokutil-0.1.0.tar.bz2
+f31a82c04df23aef0ef99b658fb61306  shim-0.3.tar.bz2