gentoo resync : 02.02.2022

3 files changed, 61 insertions, 1 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index c00479a974ff..d907028a91f7 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,8 +1,9 @@
+AUX fwupd-1.7.4-efivar38.patch 1690 BLAKE2B c8b168d382b65e7d2cdde3d285076c841efe3f0aa09a68fd5e2ce1cf237533f2970ba11edf8a7056b784b0d5412d3629e1443f3c829299be65caaf2ffdd8ad22 SHA512 400112843d28f1bd3ef9bb6fb785fbfae9d00073e0aa1f9559115bfd4d64706f3f9eb2894934624ce3427b613a6f6025d04d130fe08c6126a8011192008520ca
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a30ac011b3656a3dee312295250e370a09b4ea2fbf35992f0124a7aa78b6e17200dc57c768d75d9ce3a94f6f18 SHA512 9cf47d13e31eaf11e2ffddfd26a0fb23a18049bcd7a54a1cb4e96003db8134cf01bbe83e507b90d429df78e478cb3c97bdd3d2c0e194f02994ef4c5a15347521
 DIST fwupd-1.7.3.tar.gz 3964542 BLAKE2B ab098023663c6b33e02270e169d1f29f5e2d8531e6b7924ae98b2bc2cb36bd86958c301f99bbc6754f5b30737ae1ee9ec64eec67a8661960837497527e2e5995 SHA512 6192574b0b4cb839c724bca91c9ed3d6ee934140038873a8e596d852b272b38b31e690f94e83eb9e21c45eb71515ff50720511c721a58b28f8f434a2ccd58bc8
 DIST fwupd-1.7.4.tar.gz 4002584 BLAKE2B 6d01ee3993cc2a55164fd6ae468c00430fdc63b737abbad3dd279ef061625de4e2540d76b7069757753a9e94c1afc3635b565a25758c9d616e0d467212fd4751 SHA512 fa7195e2873a55fe544636c639597b4b2bac0855b10df4fac075ce377b87ae2aa2ccd86fb173379d39ebff542acca33e97234fd6c946e12b212dcf88b5f378a1
 EBUILD fwupd-1.7.2-r2.ebuild 4613 BLAKE2B 25a272eeeaefa4189652e3c36e2650e7e63411e1425d9638b881eb4212c9d2ff127a1490d75474cd16da39e4c28a6678c3dd15a82544e276de7fc6c490e82f91 SHA512 fb4d755c895bc592bf9332c1832a7be592eab965d370c82be19a05420b8ecb099e60c75f895680570144f1d6293e21aade92fbb681fe78e2471aee68e903c9af
 EBUILD fwupd-1.7.3-r1.ebuild 4637 BLAKE2B 2ada3d1f2cf76f72a4c839547292a4b5349eaf5fee86eb5d343d1f5be27393499db2e2ab87dc9a7a28826877f97ea49ee12c2e04b975ecc1ed634045bff55aa2 SHA512 8694296c35966537ea731aa8ad0e2431d302a995bb9961eb254910f237391a58f077ba01c9ad9078eb9761362a2588582576043d36738b6cc92058c3aeb22c0e
-EBUILD fwupd-1.7.4.ebuild 4668 BLAKE2B 759f1f4a8a54fdd329783e5c68b91b5ae6956bd37d5ec1563ecf12d219b2c93602c4320651967bc586a44b4cd2d4137bba1c6c7c6f53886aff34482b828753d4 SHA512 2f54c8d0b30c6afb75f2783df48fa34e8421a859e9c25ac2d25bf75293872273f688ff76466df5c490dcd09264faedb07ef70b2cc50457c542f25d528c467db6
+EBUILD fwupd-1.7.4.ebuild 4731 BLAKE2B aa42598f5b037073e756fbe4ae2f5b4ecefafc61cba0b9de909b6d441c95059b7625b1e2d747f2106dc0ade727c018d59850f10decd27a3cb8242c009846a4f2 SHA512 3426bca2ac992913b94e3c4683e5e9554f62c13c5874d522a9311eaa9f230120929ac591c4043b2ef70dd678cc2c38792c30aba547bd8c10fc794743684c64cb
 MISC metadata.xml 1432 BLAKE2B 02b0b170e7d8ecd293457ed8e1f9fffe2aecb4bb4e1be91869b638445d98c9e5824baf0ef497fe19aced0c1b80d747e7c41643a159edbaf7bca6f845bb5baa18 SHA512 aa650a07d777ba5a3816f6f3fd6ff6fadea149b29a7c1633acec56149de99c072493965724d33d8a76ac0221bb665ee6bf2ddc35f61967798cedbe02f79bcfbb
diff --git a/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch b/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch
new file mode 100644
index 000000000000..968a0e7222d3
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.7.4-efivar38.patch
@@ -0,0 +1,55 @@
+From e74d38bfd3097471fe60dbe843a68c16516a78da Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 17 Jan 2022 14:50:47 +0000
+Subject: [PATCH] Fix compiling with new versions of efivar
+
+Fixes https://github.com/fwupd/fwupd/issues/4181
+---
+ meson.build                           | 5 +++++
+ plugins/uefi-capsule/fu-uefi-common.h | 3 +++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 833bdbf56..691cc8a58 100644
+--- a/meson.build
++++ b/meson.build
+@@ -412,6 +412,11 @@ endif
+ if build_standalone and get_option('plugin_uefi_capsule')
+   efiboot = dependency('efiboot')
+ 
++  efivar = dependency('efivar')
++  if cc.has_header_symbol('efivar/efivar-types.h', 'efi_time_t', dependencies : efivar)
++    conf.set('HAVE_EFI_TIME_T', '1')
++  endif
++
+   efi_app_location = join_paths(libexecdir, 'fwupd', 'efi')
+   conf.set_quoted('EFI_APP_LOCATION', efi_app_location)
+ 
+diff --git a/plugins/uefi-capsule/fu-uefi-common.h b/plugins/uefi-capsule/fu-uefi-common.h
+index a21806d6b..1d616c9e0 100644
+--- a/plugins/uefi-capsule/fu-uefi-common.h
++++ b/plugins/uefi-capsule/fu-uefi-common.h
+@@ -9,6 +9,7 @@
+ 
+ #include <fwupdplugin.h>
+ 
++#include <efivar/efivar.h>
+ #include <glib.h>
+ 
+ #define EFI_CAPSULE_HEADER_FLAGS_PERSIST_ACROSS_RESET  0x00010000
+@@ -17,6 +18,7 @@
+ 
+ #define EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED 0x0000000000000004ULL
+ 
++#ifndef HAVE_EFI_TIME_T
+ typedef struct __attribute__((__packed__)) {
+ 	guint16 year;
+ 	guint8 month;
+@@ -30,6 +32,7 @@ typedef struct __attribute__((__packed__)) {
+ 	guint8 daylight;
+ 	guint8 pad2;
+ } efi_time_t;
++#endif
+ 
+ typedef struct __attribute__((__packed__)) {
+ 	fwupd_guid_t guid;
diff --git a/sys-apps/fwupd/fwupd-1.7.4.ebuild b/sys-apps/fwupd/fwupd-1.7.4.ebuild
index 282861f294ad..aaed0839779c 100644
--- a/sys-apps/fwupd/fwupd-1.7.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.4.ebuild
@@ -86,6 +86,10 @@ DEPEND="
 	x11-libs/pango[introspection]
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.4-efivar38.patch" #831327
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 	if use nvme ; then