Merge git into history

7 files changed, 85 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 90acab33..6a2a1989 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,21 @@
-shim (0.9+1465500757.14a5905-0ubuntu1) UNRELEASED; urgency=medium
+shim (0.9+1465500757.14a5905-0ubuntu1) yakkety; 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.
-
- -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Tue, 26 Jul 2016 12:02:21 -0400
+    - Better handle LoadOptions. (LP: #1581299)
+    - Measure state and second stage in TPM.
+    - Mirror MokSBState in runtime as MokSBStateRT.
+    - Fix failure to build with GCC 5. (LP: #1429978)
+    - Various bug fixes and other improvements.
+  * Refreshed patches.
+    - Remaining patches:
+      + second-stage-path
+      + sbsigntool-not-pesign 
+  * debian/patches/unused-variable: remove unused variable size.
+  * debian/patches/binutils-version-matching: revert d9a4c912 to correctly
+    match objcopy's version on Ubuntu.
+  * debian/copyright: update copyright for patches.
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Tue, 26 Jul 2016 16:48:32 -0400
 
 shim (0.8-0ubuntu2) wily; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index d9f12756..b25a56db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,24 @@ Upstream-Name: shim
 Upstream-Contact: Matthew Garrett <mjg@redhat.com>
 Source: https://github.com/mjg59/shim.git
 
+Files: debian/patches/*
+Copyright: 2016 Canonical Ltd.
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
 Files: *
 Copyright: 2012 Red Hat, Inc
 	2009-2012 Intel Corporation
diff --git a/debian/patches/binutils-version-matching b/debian/patches/binutils-version-matching
new file mode 100644
index 00000000..0e3bba8b
--- /dev/null
+++ b/debian/patches/binutils-version-matching
@@ -0,0 +1,26 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: Revert d9a4c912 to fix matching binutils version on Ubuntu.
+
+That commit breaks on Ubuntu as we don't just have "version xyz", but rather
+just the version number at the end of the version string, which looks like
+this:
+
+  "GNU objcopy (GNU Binutils for Ubuntu) 2.26"
+
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@ LD		= $(CROSS_COMPILE)ld
+ OBJCOPY		= $(CROSS_COMPILE)objcopy
+ 
+ ARCH		= $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
+-OBJCOPY_GTE224  = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^.version //g' | cut -f1-2 -d.` \>= 2.24)
++OBJCOPY_GTE224  = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^.* //g' | cut -f1-2 -d.` \>= 2.24)
+ 
+ SUBDIRS		= Cryptlib lib
+ 
diff --git a/debian/patches/sbsigntool-not-pesign b/debian/patches/sbsigntool-not-pesign
index c91a6475..9629cb12 100644
--- a/debian/patches/sbsigntool-not-pesign
+++ b/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
diff --git a/debian/patches/second-stage-path b/debian/patches/second-stage-path
index fef139c9..da53af8e 100644
--- a/debian/patches/second-stage-path
+++ b/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 \
diff --git a/debian/patches/series b/debian/patches/series
index a5f3392d..8613be11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 second-stage-path
 sbsigntool-not-pesign
+unused-variable
+binutils-version-matching
diff --git a/debian/patches/unused-variable b/debian/patches/unused-variable
new file mode 100644
index 00000000..b6435ce6
--- /dev/null
+++ b/debian/patches/unused-variable
@@ -0,0 +1,19 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: Remove unused variable; pointed out by Werror=unused-variable
+
+---
+ shim.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+Index: b/shim.c
+===================================================================
+--- a/shim.c
++++ b/shim.c
+@@ -1118,7 +1118,6 @@ static EFI_STATUS handle_image (void *da
+ 	EFI_STATUS efi_status;
+ 	char *buffer;
+ 	int i;
+-	unsigned int size;
+ 	EFI_IMAGE_SECTION_HEADER *Section;
+ 	char *base, *end;
+ 	PE_COFF_LOADER_IMAGE_CONTEXT context;