* New upstream release.debian/15+1533136590.3beb971-1

  - debian/patches/second-stage-path: dropped; the default loader path now
    includes an arch suffix.
  - debian/patches/sbsigntool-no-pesign: dropped; no longer needed.
* Drop remaining patches that were not being applied.
* Sync packaging from Ubuntu:
  - debian/copyright: Update upstream source location.
  - debian/control: add a Build-Depends on libelf-dev.
  - Enable arm64 build.
  - debian/patches/fixup_git.patch: don't run git in clean; we're not
    really in a git tree.
  - debian/rules, debian/shim.install: use the upstream install target as
    intended, and move files to the target directory using dh_install.
  - define RELEASE and COMMIT_ID for the snapshot.
  - Set ENABLE_HTTPBOOT to enable the HTTP Boot feature.
  - Update dh_auto_build/dh_auto_clean/dh_auto_install for new upstream
    options: set MAKELEVEL.
  - Define an EFI_ARCH variable, and use that for paths to shim. This
    makes it possible to build a shim for other architectures than amd64.
  - Set EFIDIR=$distro for dh_auto_install; that will let files be installed
    in the "right" final directories, and makes boot.csv for us.
  - Set ENABLE_SHIM_CERT, to keep using ephemeral self-signed certs built
    at compile-time for MokManager and fallback.
  - Set ENABLE_SBSIGN, to use sbsign instead of pesign for signing fallback
    and MokManager.

1 files changed, 16 insertions, 17 deletions

diff --git a/lib/configtable.c b/lib/configtable.c
index edf2ed74..df047f0e 100644
--- a/lib/configtable.c
+++ b/lib/configtable.c
@@ -8,8 +8,7 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include <guid.h>
-#include <configtable.h>
+#include "shim.h"
 
 void *
 configtable_get_table(EFI_GUID *guid)
@@ -46,26 +45,26 @@ configtable_find_image(const EFI_DEVICE_PATH *DevicePath)
 	int i;
 	for (i = 0; i < entries; i++) {
 #ifdef DEBUG_CONFIG
-		Print(L"InfoSize = %d  Action = %d\n", e->InfoSize, e->Action);
+		console_print(L"InfoSize = %d  Action = %d\n", e->InfoSize, e->Action);
 
 		/* print what we have for debugging */
 		UINT8 *d = (UINT8 *)e; // + sizeof(UINT32)*2;
-		Print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+		console_print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
 		      d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); 
 		d += 16;
-		Print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+		console_print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
 		      d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); 
 		d += 16;
-		Print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+		console_print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
 		      d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); 
 		d += 16;
-		Print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+		console_print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
 		      d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); 
 		d += 16;
-		Print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+		console_print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
 		      d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); 
 		d += 16;
-		Print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+		console_print(L"Data: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
 		      d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); 
 #endif
 		CHAR16 *name = (CHAR16 *)(e->Data);
@@ -77,33 +76,33 @@ configtable_find_image(const EFI_DEVICE_PATH *DevicePath)
 		if (name[0] == '\0' || (e->Data[1] == 0 && e->Data[3] == 0)) {
 			skip = StrSize(name);
 #ifdef DEBUG_CONFIG
-			Print(L"FOUND NAME %s (%d)\n", name, skip);
+			console_print(L"FOUND NAME %s (%d)\n", name, skip);
 #endif
 		}
 		EFI_DEVICE_PATH *dp = (EFI_DEVICE_PATH *)(e->Data + skip), *dpn = dp;
 		if (dp->Type == 0 || dp->Type > 6 || dp->SubType == 0
 		    || ((unsigned)((dp->Length[1] << 8) + dp->Length[0]) > e->InfoSize)) {
 			/* Parse error, table corrupt, bail */
-			Print(L"Image Execution Information table corrupt\n");
+			console_print(L"Image Execution Information table corrupt\n");
 			break;
 		}
 
 		UINTN Size;
 		DevicePathInstance(&dpn, &Size);
 #ifdef DEBUG_CONFIG
-		Print(L"Path: %s\n", DevicePathToStr(dp));
-		Print(L"Device Path Size %d\n", Size);
+		console_print(L"Path: %s\n", DevicePathToStr(dp));
+		console_print(L"Device Path Size %d\n", Size);
 #endif
 		if (Size > e->InfoSize) {
 			/* parse error; the platform obviously has a 
 			 * corrupted image table; bail */
-			Print(L"Image Execution Information table corrupt\n");
+			console_print(L"Image Execution Information table corrupt\n");
 			break;
 		}
 		
 		if (CompareMem(dp, (void *)DevicePath, Size) == 0) {
 #ifdef DEBUG_CONFIG
-			Print(L"***FOUND\n");
+			console_print(L"***FOUND\n");
 			console_get_keystroke();
 #endif
 			return e;
@@ -112,7 +111,7 @@ configtable_find_image(const EFI_DEVICE_PATH *DevicePath)
 	}
 
 #ifdef DEBUG_CONFIG
-	Print(L"***NOT FOUND\n");
+	console_print(L"***NOT FOUND\n");
 	console_get_keystroke();
 #endif
 
@@ -135,7 +134,7 @@ configtable_image_is_forbidden(const EFI_DEVICE_PATH *DevicePath)
 		  || e->Action == EFI_IMAGE_EXECUTION_AUTH_SIG_FAILED)) {
 		/* this means the images signing key is in dbx */
 #ifdef DEBUG_CONFIG
-		Print(L"SIGNATURE IS IN DBX, FORBIDDING EXECUTION\n");
+		console_print(L"SIGNATURE IS IN DBX, FORBIDDING EXECUTION\n");
 #endif
 		return 1;
 	}