* Refreshed patches.

- Remaining patches:
    + second-stage-path
    + sbsigntool-not-pesign

debian/changelog

@@ -1,14 +1,14 @@
 shim (0.9+1465500757.14a5905-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release.
-
-  [ Matthias Klose ]
-  * Fix build with GCC 5, forcing -std=gnu89 to not rely on stdint.h
-    required by efibind.h, and not found with -nostdinc. (LP: #1429978)
-
-  [ Mathieu Trudel-Lapierre ]
-  * More GCC 5 fixes: stdarg.h and other include tweaks, cherry-pick from
-    d51739a4.
+    - Better handle LoadOptions.
+    - Measure state and second stage in TPM.
+    - Mirror MokSBState in runtime as MokSBStateRT.
+    - Various bug fixes and other improvements.
+  * Refreshed patches.
+    - Remaining patches:
+      + second-stage-path
+      + sbsigntool-not-pesign 
 
  -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Tue, 26 Jul 2016 12:02:21 -0400
 

debian/patches/sbsigntool-not-pesign

@@ -13,8 +13,8 @@ Index: b/Makefile
 ===================================================================
 --- a/Makefile
 +++ b/Makefile
-@@ -144,8 +144,8 @@ FORMAT		?= --target efi-app-$(ARCH)
- 		-j .debug_line -j .debug_str -j .debug_ranges \
+@@ -158,8 +158,8 @@ endif
+ 		-j .note.gnu.build-id \
  		$(FORMAT) $^ $@.debug
  
 -%.efi.signed: %.efi certdb/secmod.db

debian/patches/second-stage-path

@@ -13,7 +13,7 @@ Index: b/Makefile
 ===================================================================
 --- a/Makefile
 +++ b/Makefile
-@@ -18,7 +18,7 @@ EFI_LIBS	= -lefi -lgnuefi --start-group
+@@ -25,7 +25,7 @@ EFI_LIBS	= -lefi -lgnuefi --start-group
  EFI_CRT_OBJS 	= $(EFI_PATH)/crt0-efi-$(ARCH).o
  EFI_LDS		= elf_$(ARCH)_efi.lds
  
@@ -21,4 +21,4 @@ Index: b/Makefile
 +DEFAULT_LOADER	:= \\\\grubx64.efi
  CFLAGS		= -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \
  		  -fshort-wchar -Wall -Wsign-compare -Werror -fno-builtin \
- 		  -Werror=sign-compare \
+ 		  -Werror=sign-compare -ffreestanding -std=gnu89 \

debian/patches/series

@@ -1,5 +1,2 @@
-prototypes
 second-stage-path
 sbsigntool-not-pesign
-gcc-5.diff
-gcc5-includes-stdarg.patch