Control: tags 925672 + pending Dear maintainer,
I've prepared an NMU for efivar (versioned as 37-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer or cancel the NMU. Regards, David Polverari.
diff -Nru efivar-37/debian/changelog efivar-37/debian/changelog --- efivar-37/debian/changelog 2019-03-01 12:55:07.000000000 -0500 +++ efivar-37/debian/changelog 2020-06-09 17:31:58.000000000 -0500 @@ -1,3 +1,12 @@ +efivar (37-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: added upstream patches fix-gcc9-werror-format-guid.patch + and fix-gcc9-werrors.patch to fix FTBFS with GCC 9. Thanks to Matthias + Klose <d...@ubuntu.com>. (Closes: #925672) + + -- David da Silva Polverari <david.polver...@gmail.com> Tue, 09 Jun 2020 17:31:58 -0500 + efivar (37-2) unstable; urgency=medium * Cherry-pick fix from upstream: diff -Nru efivar-37/debian/patches/fix-gcc9-werror-format-guid.patch efivar-37/debian/patches/fix-gcc9-werror-format-guid.patch --- efivar-37/debian/patches/fix-gcc9-werror-format-guid.patch 1969-12-31 19:00:00.000000000 -0500 +++ efivar-37/debian/patches/fix-gcc9-werror-format-guid.patch 2020-06-09 17:25:29.000000000 -0500 @@ -0,0 +1,28 @@ +Subject: dp.h: make format_guid() handle misaligned guid pointers safely. +Author: Peter Jones <pjo...@redhat.com> +Bug: https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 +Bug-Debian: https://bugs.debian.org/925672 +Origin: upstream, https://github.com/rhboot/efivar/commit/b98ba8921010d03f46704a476c69861515deb1ca +Last-Update: 2019-01-07 +diff --git a/src/dp.h b/src/dp.h +index aa4e390..20cb608 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -70,8 +70,15 @@ + #define format_guid(buf, size, off, dp_type, guid) ({ \ + int _rc; \ + char *_guidstr = NULL; \ +- \ +- _rc = efi_guid_to_str(guid, &_guidstr); \ ++ efi_guid_t _guid; \ ++ const efi_guid_t * const _guid_p = \ ++ likely(__alignof__(guid) == sizeof(guid)) \ ++ ? guid \ ++ : &_guid; \ ++ \ ++ if (unlikely(__alignof__(guid) == sizeof(guid))) \ ++ memmove(&_guid, guid, sizeof(_guid)); \ ++ _rc = efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ + dp_type); \ diff -Nru efivar-37/debian/patches/fix-gcc9-werrors.patch efivar-37/debian/patches/fix-gcc9-werrors.patch --- efivar-37/debian/patches/fix-gcc9-werrors.patch 1969-12-31 19:00:00.000000000 -0500 +++ efivar-37/debian/patches/fix-gcc9-werrors.patch 2020-06-09 17:24:41.000000000 -0500 @@ -0,0 +1,145 @@ +Subject: Fix all the places -Werror=address-of-packed-member catches. +Author: Peter Jones <pjo...@redhat.com> +Bug: https://github.com/rhboot/efivar/issues/123 +Bug-Debian: https://bugs.debian.org/925672 +Origin: upstream, https://github.com/rhboot/efivar/commit/c3c553db85ff10890209d0fe48fb4856ad68e4e0 +Last-Update: 2019-02-21 +--- a/src/dp-message.c ++++ b/src/dp-message.c +@@ -620,11 +620,13 @@ + ) / sizeof(efi_ip_addr_t); + format(buf, size, off, "Dns", "Dns("); + for (int i=0; i < end; i++) { +- const efi_ip_addr_t *addr = &dp->dns.addrs[i]; ++ efi_ip_addr_t addr; ++ ++ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr)); + if (i != 0) + format(buf, size, off, "Dns", ","); + format_ip_addr(buf, size, off, "Dns", +- dp->dns.is_ipv6, addr); ++ dp->dns.is_ipv6, &addr); + } + format(buf, size, off, "Dns", ")"); + break; +--- a/src/dp.h ++++ b/src/dp.h +@@ -71,13 +71,9 @@ + int _rc; \ + char *_guidstr = NULL; \ + efi_guid_t _guid; \ +- const efi_guid_t * const _guid_p = \ +- likely(__alignof__(guid) == sizeof(guid)) \ +- ? guid \ +- : &_guid; \ +- \ +- if (unlikely(__alignof__(guid) == sizeof(guid))) \ +- memmove(&_guid, guid, sizeof(_guid)); \ ++ const efi_guid_t * const _guid_p = &_guid; \ ++ \ ++ memmove(&_guid, guid, sizeof(_guid)); \ + _rc = efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ +@@ -86,7 +82,7 @@ + _guidstr = onstack(_guidstr, \ + strlen(_guidstr)+1); \ + _rc = format(buf, size, off, dp_type, "%s", \ +- _guidstr); \ ++ _guidstr); \ + } \ + _rc; \ + }) +--- a/src/guid.c ++++ b/src/guid.c +@@ -31,7 +31,7 @@ + extern const efi_guid_t efi_guid_zero; + + int NONNULL(1, 2) PUBLIC +-efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b) ++efi_guid_cmp(const void * const a, const void * const b) + { + return memcmp(a, b, sizeof (efi_guid_t)); + } +--- a/src/include/efivar/efivar.h ++++ b/src/include/efivar/efivar.h +@@ -128,7 +128,7 @@ + + extern int efi_guid_is_zero(const efi_guid_t *guid); + extern int efi_guid_is_empty(const efi_guid_t *guid); +-extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b); ++extern int efi_guid_cmp(const void * const a, const void * const b); + + /* import / export functions */ + typedef struct efi_variable efi_variable_t; +--- a/src/ucs2.h ++++ b/src/ucs2.h +@@ -23,16 +23,21 @@ + (((val) & ((mask) << (shift))) >> (shift)) + + static inline size_t UNUSED +-ucs2len(const uint16_t * const s, ssize_t limit) ++ucs2len(const void *vs, ssize_t limit) + { + ssize_t i; +- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++) ++ const uint16_t *s = vs; ++ const uint8_t *s8 = vs; ++ ++ for (i = 0; ++ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; ++ i++, s8 += 2, s++) + ; + return i; + } + + static inline size_t UNUSED +-ucs2size(const uint16_t * const s, ssize_t limit) ++ucs2size(const void *s, ssize_t limit) + { + size_t rc = ucs2len(s, limit); + rc *= sizeof (uint16_t); +@@ -69,10 +74,11 @@ + } + + static inline unsigned char * UNUSED +-ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) ++ucs2_to_utf8(const void * const voidchars, ssize_t limit) + { + ssize_t i, j; + unsigned char *ret; ++ const uint16_t * const chars = voidchars; + + if (limit < 0) + limit = ucs2len(chars, -1); +@@ -124,10 +130,12 @@ + } + + static inline ssize_t UNUSED NONNULL(4) +-utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) ++utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8) + { + ssize_t req; + ssize_t i, j; ++ uint16_t *ucs2 = ucs2void; ++ uint16_t val16; + + if (!ucs2 && size > 0) { + errno = EINVAL; +@@ -162,10 +170,13 @@ + val = utf8[i] & 0x7f; + i += 1; + } +- ucs2[j] = val; ++ val16 = val; ++ ucs2[j] = val16; ++ } ++ if (terminate) { ++ val16 = 0; ++ ucs2[j++] = val16; + } +- if (terminate) +- ucs2[j++] = (uint16_t)0; + return j; + }; + diff -Nru efivar-37/debian/patches/series efivar-37/debian/patches/series --- efivar-37/debian/patches/series 2019-03-01 12:55:07.000000000 -0500 +++ efivar-37/debian/patches/series 2020-06-08 00:11:20.000000000 -0500 @@ -1 +1,3 @@ remove-arrows.patch +fix-gcc9-werror-format-guid.patch +fix-gcc9-werrors.patch
