diff -Nru fwupd-1.2.10/debian/changelog fwupd-1.2.10/debian/changelog --- fwupd-1.2.10/debian/changelog 2019-11-13 19:46:47.000000000 +0000 +++ fwupd-1.2.10/debian/changelog 2020-01-13 19:17:07.000000000 +0000 @@ -1,3 +1,15 @@ +fwupd (1.2.10-1ubuntu4) eoan; urgency=medium + + [ Robert Ancell ] + * d/p/0001-trivial-libfwupd-skip-tests-if-machine-id-is-empty-t.patch: + - Only check the vendor ID if the device has one set (LP: #1856896) + + [ dann frazier ] + * d/p/0001-efi-use-a-wildcard-section-copy-for-final-EFI-genera.patch + - This avoids a crash on exec of fwupdaa64.efi (LP: #1858590) + + -- dann frazier Mon, 13 Jan 2020 12:17:07 -0700 + fwupd (1.2.10-1ubuntu3) eoan; urgency=medium * d/p/0001-Allows-confined-snaps-to-activate-fwupd-via-D-Bus.patch diff -Nru fwupd-1.2.10/debian/control fwupd-1.2.10/debian/control --- fwupd-1.2.10/debian/control 2019-11-13 19:46:47.000000000 +0000 +++ fwupd-1.2.10/debian/control 2020-01-13 19:17:07.000000000 +0000 @@ -1,6 +1,7 @@ Source: fwupd Priority: optional -Maintainer: Debian EFI +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian EFI Uploaders: Steve McIntyre <93sam@debian.org>, Daniel Jared Dominguez , Matthias Klumpp , diff -Nru fwupd-1.2.10/debian/control.in fwupd-1.2.10/debian/control.in --- fwupd-1.2.10/debian/control.in 2019-07-15 19:12:57.000000000 +0000 +++ fwupd-1.2.10/debian/control.in 2020-01-13 19:17:07.000000000 +0000 @@ -1,6 +1,7 @@ Source: fwupd Priority: optional -Maintainer: Debian EFI +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian EFI Uploaders: Steve McIntyre <93sam@debian.org>, Daniel Jared Dominguez , Matthias Klumpp , diff -Nru fwupd-1.2.10/debian/patches/0001-efi-use-a-wildcard-section-copy-for-final-EFI-genera.patch fwupd-1.2.10/debian/patches/0001-efi-use-a-wildcard-section-copy-for-final-EFI-genera.patch --- fwupd-1.2.10/debian/patches/0001-efi-use-a-wildcard-section-copy-for-final-EFI-genera.patch 1970-01-01 00:00:00.000000000 +0000 +++ fwupd-1.2.10/debian/patches/0001-efi-use-a-wildcard-section-copy-for-final-EFI-genera.patch 2020-01-13 19:15:55.000000000 +0000 @@ -0,0 +1,31 @@ +From 8b044c6cb3d007803bd67ca5e6527ed89d5ecb62 Mon Sep 17 00:00:00 2001 +From: YiFei Zhu +Date: Wed, 13 Nov 2019 18:52:15 -0600 +Subject: [PATCH] efi: use a wildcard section copy for final EFI generation + +The GNU gold linker uses the section name `.rela.dyn` instead of +`.rela` for containing the relocation information. If this section +is not copied the EFI executable can crash. + +Fixes #1530 +[ backported by dann frazier ] + +Origin: https://github.com/fwupd/fwupd/commit/8b044c6cb3d007803bd67ca5e6527ed89d5ecb62 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1858590 +Last-Updated: 2020-01-06 + +Index: fwupd-1.2.10/plugins/uefi/efi/meson.build +=================================================================== +--- fwupd-1.2.10.orig/plugins/uefi/efi/meson.build ++++ fwupd-1.2.10/plugins/uefi/efi/meson.build +@@ -144,9 +144,7 @@ app = custom_target(efi_name, + '-j', '.data', + '-j', '.dynamic', + '-j', '.dynsym', +- '-j', '.rel', +- '-j', '.rela', +- '-j', '.reloc'] ++ '-j', '.rel*'] + + efi_format + + ['@INPUT@', '@OUTPUT@'], + install : true, diff -Nru fwupd-1.2.10/debian/patches/0001-Only-check-the-vendor-ID-if-the-device-has-one-set.patch fwupd-1.2.10/debian/patches/0001-Only-check-the-vendor-ID-if-the-device-has-one-set.patch --- fwupd-1.2.10/debian/patches/0001-Only-check-the-vendor-ID-if-the-device-has-one-set.patch 1970-01-01 00:00:00.000000000 +0000 +++ fwupd-1.2.10/debian/patches/0001-Only-check-the-vendor-ID-if-the-device-has-one-set.patch 2020-01-13 19:15:51.000000000 +0000 @@ -0,0 +1,28 @@ +From 004a0624d05211e8436060bb7af6b0c6f2d805a3 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 9 Dec 2019 10:30:19 +0000 +Subject: [PATCH] Only check the vendor ID if the device has one set + +This means we don't get a weird error if the metadata sets a vendor-id, but the +device does not. +--- + src/fu-engine.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/fu-engine.c b/src/fu-engine.c +index d07843c3..814d15a6 100644 +--- a/src/fu-engine.c ++++ b/src/fu-engine.c +@@ -1058,7 +1058,8 @@ fu_engine_check_requirement_firmware (FuEngine *self, XbNode *req, + } + + /* vendor ID */ +- if (g_strcmp0 (xb_node_get_text (req), "vendor-id") == 0) { ++ if (g_strcmp0 (xb_node_get_text (req), "vendor-id") == 0 && ++ fu_device_get_vendor_id (device) != NULL) { + const gchar *version = fu_device_get_vendor_id (device); + if (!fu_engine_require_vercmp (req, version, &error_local)) { + if (g_strcmp0 (xb_node_get_attr (req, "compare"), "ge") == 0) { +-- +2.20.1 + diff -Nru fwupd-1.2.10/debian/patches/series fwupd-1.2.10/debian/patches/series --- fwupd-1.2.10/debian/patches/series 2019-11-13 19:46:47.000000000 +0000 +++ fwupd-1.2.10/debian/patches/series 2020-01-13 19:16:11.000000000 +0000 @@ -1,3 +1,5 @@ 0001-Relax-the-certificate-time-checks-in-the-self-tests-.patch 0001-trivial-libfwupd-skip-tests-if-machine-id-is-empty-t.patch 0001-Allows-confined-snaps-to-activate-fwupd-via-D-Bus.patch +0001-Only-check-the-vendor-ID-if-the-device-has-one-set.patch +0001-efi-use-a-wildcard-section-copy-for-final-EFI-genera.patch