Merge gnu-efi 3.0v-5 (main) from Debian unstable (main)

I've built and installed gnu-efi locally. Rebuilding shim with this version of gnu-efi fails with:

In file included from Cryptlib/Include/string.h:15:0,
                 from netboot.c:38:
Cryptlib/Include/OpenSslSupport.h:39:0: error: "va_arg" redefined [-Werror]
 #define va_arg VA_ARG
 ^
In file included from /usr/include/efi/efilib.h:27:0,
                 from netboot.c:37:

This is probably a bug in the shim code; nevertheless this merge shouldn't happen before we have this resolved and have verified that shim is buildable (and works) with the new gnu-efi.

unsubscribing the sponsors, it seems there are changes needed before that's ready for upload

Yes, it seems to be a bug in the Shim. You should not define va_arg, as gnu-efi defines that (and it's a standard library thing, so it really should be in here ). It did not use to be defined all the time in gnu-efi, but this had to be changed because the resulting code was broken (it compiled fine, but did not work).

So, simply removing the va_arg definition from shim should make it work with newer gnu-efi.

Newer versions have a GNU_EFI_USE_EXTERNAL_STDARG to use the compiler's stdarg.h, but that's really relevant here, as we're building without it.

shim 0.8 is compatible with gnu-efi 3.0v-5. Packages have been published to https://launchpad.net/~canonical-foundations/+archive/ubuntu/shim for testing.

This bug was fixed in the package gnu-efi - 3.0v-5ubuntu1

---------------
gnu-efi (3.0v-5ubuntu1) wily; urgency=medium

  * Merge from Debian unstable (LP: #1396381), remaining changes:
    - debian/patches/gcc46-compatibility: don't break with old compilers
      and -DGNU_EFI_USE_MS_ABI.
  * Dropped changes, included in Debian:
    - pass architecture arguments when building the x86_64 code on i386

gnu-efi (3.0v-5) unstable; urgency=medium

  * inc/efistdarg.h: Use gcc builtins instead of stubs
    - The last upload of gnu-efi caused things to compile, but severely
      broke them.

gnu-efi (3.0v-4) unstable; urgency=medium

  * Take over maintenance
  * Add git information and git-buildpackage configuration
  * Use gbp pq for maintaining the patch queue
  * inc/efistdarg.h: Stub out va_copy (Closes: #753682)

gnu-efi (3.0v-3) unstable; urgency=low

  * Stepping down from maintainers, no interest anymore since syslinux uses
    its own copy of gnu-efi that is bundled and sort-of impossible to patch
    out.

gnu-efi (3.0v-2) unstable; urgency=low

  * Temporarily build without stdarg.h in efistdarg.h (Closes: #747158).

gnu-efi (3.0v-1) unstable; urgency=low

  * Merging upstream version 3.0v.
  * Updating year in copyright file.
  * Updating make calls in rules for new upstream release.

 -- Steve Langasek <email address hidden> Tue, 12 May 2015 17:45:11 +0000