* 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, 42 insertions, 26 deletions

diff --git a/Cryptlib/Cryptlib.diff b/Cryptlib/Cryptlib.diff
index a2f49d67..5a56470d 100644
--- a/Cryptlib/Cryptlib.diff
+++ b/Cryptlib/Cryptlib.diff
@@ -1,8 +1,20 @@
+diff --git a/Cryptlib/Include/openssl/e_os2.h b/Cryptlib/Include/openssl/e_os2.h
+index 99ea347..f11cffe 100644
+--- a/Cryptlib/Include/openssl/e_os2.h
++++ b/Cryptlib/Include/openssl/e_os2.h
+@@ -234,6 +234,7 @@ extern "C" {
+ 
+ /* Standard integer types */
+ # if defined(OPENSSL_SYS_UEFI)
++#include <efi.h>
+ typedef INT8 int8_t;
+ typedef UINT8 uint8_t;
+ typedef INT16 int16_t;
 diff --git a/Cryptlib/SysCall/BaseMemAllocation.c b/Cryptlib/SysCall/BaseMemAllocation.c
-index 68bc25a..1abe78e 100644
+index f390e0d..65e9938 100644
 --- a/Cryptlib/SysCall/BaseMemAllocation.c
 +++ b/Cryptlib/SysCall/BaseMemAllocation.c
-@@ -32,7 +32,7 @@ void *realloc (void *ptr, size_t size)
+@@ -33,7 +33,7 @@ void *realloc (void *ptr, size_t size)
    // BUG: hardcode OldSize == size! We have no any knowledge about

    // memory size of original pointer ptr.

    //

@@ -11,8 +23,33 @@ index 68bc25a..1abe78e 100644
  }

  

  /* De-allocates or frees a memory block */

+diff --git a/Cryptlib/SysCall/CrtWrapper.c b/Cryptlib/SysCall/CrtWrapper.c
+index 20c9656..7878953 100644
+--- a/Cryptlib/SysCall/CrtWrapper.c
++++ b/Cryptlib/SysCall/CrtWrapper.c
+@@ -371,20 +371,6 @@ size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)
+   return 0;

+ }

+ 

+-//

+-//  -- Dummy OpenSSL Support Routines --

+-//

+-

+-int BIO_printf (void *bio, const char *format, ...)

+-{

+-  return 0;

+-}

+-

+-int BIO_snprintf(char *buf, size_t n, const char *format, ...)

+-{

+-  return 0;

+-}

+-

+ #ifdef __GNUC__

+ 

+ typedef

 diff --git a/Cryptlib/SysCall/TimerWrapper.c b/Cryptlib/SysCall/TimerWrapper.c
-index 805e6b4..bb7bcba 100644
+index 581b8fb..04fe4ef 100644
 --- a/Cryptlib/SysCall/TimerWrapper.c
 +++ b/Cryptlib/SysCall/TimerWrapper.c
 @@ -13,9 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@@ -20,12 +57,12 @@ index 805e6b4..bb7bcba 100644
  **/

  

 -#include <Uefi.h>

- #include <OpenSslSupport.h>

+ #include <CrtLibSupport.h>

 -#include <Library/UefiRuntimeServicesTableLib.h>

  

  //

  // -- Time Management Routines --

-@@ -78,7 +76,7 @@ time_t time (time_t *timer)
+@@ -79,7 +77,7 @@ time_t time (time_t *timer)
    //

    // Get the current time and date information

    //

@@ -34,24 +71,3 @@ index 805e6b4..bb7bcba 100644
  

    //

    // Years Handling

-diff --git a/Cryptlib/SysCall/CrtWrapper.c b/Cryptlib/SysCall/CrtWrapper.c
-index fb446b6..5a8322d 100644
---- a/Cryptlib/SysCall/CrtWrapper.c
-+++ b/Cryptlib/SysCall/CrtWrapper.c
-@@ -293,16 +293,6 @@ size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)
- //  -- Dummy OpenSSL Support Routines --

- //

- 

--int BIO_printf (void *bio, const char *format, ...)

--{

--  return 0;

--}

--

--int BIO_snprintf(char *buf, size_t n, const char *format, ...)

--{

--  return 0;

--}

--

- void *UI_OpenSSL(void)

- {

-   return NULL;