From 14fa71aac15ceeea9b694ef7fa49e2f787035dea Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Mon, 10 Jul 2023 13:04:19 +0200
Subject: [PATCH] re-import sources as agreed with the maintainer

---
 .gitignore                | 62 +++++++++++++++++++++++++++++++++------
 gnuefi-lib-dir-path.patch | 29 ++++++++++++++++++
 sources                   |  6 ++--
 3 files changed, 85 insertions(+), 12 deletions(-)
 create mode 100644 gnuefi-lib-dir-path.patch

diff --git a/.gitignore b/.gitignore
index d927e78..39ba958 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,62 @@
-SOURCES/DBXUpdate-20100307-x64.cab
-SOURCES/DBXUpdate-20140413-x64.cab
-SOURCES/DBXUpdate-20160809-x64.cab
-SOURCES/DBXUpdate-20200729-aa64.cab
-SOURCES/DBXUpdate-20200729-ia32.cab
-SOURCES/DBXUpdate-20200729-x64.cab
-SOURCES/fwupd-1.7.8.tar.xz
-SOURCES/fwupd-efi-1.3.tar.xz
-SOURCES/libjcat-0.1.9.tar.xz
+/fwupd-0.1.0.tar.xz
+/fwupd-0.1.1.tar.xz
+/fwupd-0.1.2.tar.xz
+/fwupd-0.1.3.tar.xz
+/fwupd-0.1.4.tar.xz
+/fwupd-0.1.5.tar.xz
+/fwupd-0.1.6.tar.xz
+/fwupd-0.5.0.tar.xz
+/fwupd-0.5.1.tar.xz
+/fwupd-0.5.2.tar.xz
+/fwupd-0.5.3.tar.xz
+/fwupd-0.5.4.tar.xz
+/fwupd-0.6.0.tar.xz
+/fwupd-0.6.1.tar.xz
+/fwupd-0.6.2.tar.xz
+/fwupd-0.6.3.tar.xz
+/fwupd-0.7.0.tar.xz
+/fwupd-0.7.1.tar.xz
+/fwupd-0.7.2.tar.xz
+/fwupd-0.7.3.tar.xz
+/fwupd-0.7.4.tar.xz
+/fwupd-0.7.5.tar.xz
+/fwupd-0.8.0.tar.xz
+/fwupd-0.8.1.tar.xz
+/fwupd-0.8.2.tar.xz
+/fwupd-0.9.2.tar.xz
+/fwupd-0.9.3.tar.xz
+/fwupd-0.9.4.tar.xz
+/fwupd-0.9.5.tar.xz
+/fwupd-0.9.6.tar.xz
+/fwupd-0.9.7.tar.xz
+/fwupd-1.0.0.tar.xz
+/fwupd-1.0.1.tar.xz
+/fwupd-1.0.2.tar.xz
+/fwupd-1.0.3.tar.xz
+/fwupd-1.0.4.tar.xz
+/fwupd-1.0.5.tar.xz
+/fwupd-1.0.6.tar.xz
+/fwupd-1.1.0.tar.xz
+/fwupd-1.1.1.tar.xz
+/fwupd-1.1.3.tar.xz
+/fwupd-1.1.4.tar.xz
+/fwupd-1.4.1.tar.xz
+/libjcat-0.1.2.tar.xz
+/fwupd-1.4.2.tar.xz
+/fwupd-1.5.4.tar.xz
 /DBXUpdate-20100307-x64.cab
 /DBXUpdate-20140413-x64.cab
 /DBXUpdate-20160809-x64.cab
 /DBXUpdate-20200729-aa64.cab
 /DBXUpdate-20200729-ia32.cab
 /DBXUpdate-20200729-x64.cab
+/fwupd-1.5.5.tar.xz
+/libjcat-0.1.5.tar.xz
+/fwupd-1.5.9.tar.xz
+/fwupd-1.7.1.tar.xz
+/libjcat-0.1.8.tar.xz
+/fwupd-efi-1.1.tar.xz
+/fwupd-1.7.4.tar.xz
 /fwupd-1.7.8.tar.xz
 /fwupd-efi-1.3.tar.xz
 /libjcat-0.1.9.tar.xz
diff --git a/gnuefi-lib-dir-path.patch b/gnuefi-lib-dir-path.patch
new file mode 100644
index 0000000..a01c310
--- /dev/null
+++ b/gnuefi-lib-dir-path.patch
@@ -0,0 +1,29 @@
+From 1e8912c79a70ec219ac8ca1af3ab20e42b735481 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Tue, 13 Apr 2021 18:01:50 +0200
+Subject: [PATCH] uefi-capsule: Don't set gnu-efi lib dir path when using
+ custom crt0
+
+The libefi.a and libgnuefi.a libraries are located in /usr/lib64 in RHEL8,
+not in /usr/lib/gnuefi/$gnu_efi_arch/ as is the case in Fedora. This leads
+to the linker not finding these libraries.
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+---
+ plugins/uefi-capsule/efi/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plugins/uefi-capsule/efi/meson.build b/plugins/uefi-capsule/efi/meson.build
+index 99654184a20..543474c0311 100644
+--- plugins/uefi-capsule/efi/meson.build
++++ plugins/uefi-capsule/efi/meson.build
+@@ -80,7 +80,6 @@ if host_cpu == 'aarch64' or host_cpu == 'arm'
+     if cmd.returncode() != 0
+       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt_source)))
+       # The gnuefi libraries are still needed
+-      efi_libdir = efi_crtdir
+       efi_crtdir = join_paths(meson.current_build_dir(), 'crt0')
+     endif
+   endif
+-- 
+2.30.2
diff --git a/sources b/sources
index 43adcfa..d3686af 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,9 @@
+SHA512 (fwupd-1.7.8.tar.xz) = c90c86b1b336e47083b0b6f558ba321cceb1717f2e663fd569d17c81cc8bee52599909c5aa9b163a9936ca2948b53c83edc7e460a107c52969e7618244713f48
+SHA512 (fwupd-efi-1.3.tar.xz) = 582bc0298f773b3017fab317a392b6fe95a9d1698bfe17e56370515f4563c8d45c12f28ae52d304866e4b077043bb0c9d5c1abf4b75ded5f70b6d8ccad495ea5
+SHA512 (libjcat-0.1.9.tar.xz) = 7fe29c82033eeb24965311496e948c0a78a09db5af6655c62da1ce6c39d817647aac0e9299dddf7ce13515c0e32a6c00d2a4b35ad045e7ac79d27034b96f4ec6
 SHA512 (DBXUpdate-20100307-x64.cab) = f8ad56cf015f4cdc5c305856ff1f7a8589c25a2a671708c61883f427f38eb9b6a7abd3f2c8d79ef9d5076222255e42585917f8705a2a4b13f860bad4e02ec409
 SHA512 (DBXUpdate-20140413-x64.cab) = 75771876a2309fa8ca083c2e76520173d434229b7cacf1e7636bd9b1bc4f871d745c348b9792bfb65fd9f40ef54c25bb427b1431151e817e7050b7829456731a
 SHA512 (DBXUpdate-20160809-x64.cab) = c27c564999ae84515540f1a598cd0fd9ef3a80cdfaaf439f1c4cb04eaee0e73074548b6d76c21ca3af1ba9c4c0625907e821582998eb5617e33ecd412e6c8a13
 SHA512 (DBXUpdate-20200729-aa64.cab) = 7a0cea13ed9b645fd9f1d5e3410a451d83643a75f5dc603272b0771b093f2c012f9a19419160403631c250cf64127ad2ce1c8fa2079b04064af73fe85b9add33
 SHA512 (DBXUpdate-20200729-ia32.cab) = 578ec9cccf2001b8bfa54b66809a1662269677050e74bd3225536fbd2be56a8162c48669bd16ea553723580195df1693a28dc01fc1cf62ff06e36a2c5568f74f
 SHA512 (DBXUpdate-20200729-x64.cab) = b8b195167d286a3f16aaa7c89149a0d5b4c8f53080e3265758b912f250fa655533c603359b7d1c989ebad6953ce443809b3317ec1d00f750326945ee0537e43b
-SHA512 (fwupd-1.7.8.tar.xz) = c90c86b1b336e47083b0b6f558ba321cceb1717f2e663fd569d17c81cc8bee52599909c5aa9b163a9936ca2948b53c83edc7e460a107c52969e7618244713f48
-SHA512 (fwupd-efi-1.3.tar.xz) = 582bc0298f773b3017fab317a392b6fe95a9d1698bfe17e56370515f4563c8d45c12f28ae52d304866e4b077043bb0c9d5c1abf4b75ded5f70b6d8ccad495ea5
-SHA512 (libjcat-0.1.9.tar.xz) = 7fe29c82033eeb24965311496e948c0a78a09db5af6655c62da1ce6c39d817647aac0e9299dddf7ce13515c0e32a6c00d2a4b35ad045e7ac79d27034b96f4ec6