From 6947825882cf60f4d4e167ee73225e4e5ed1dd93 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 11 Jul 2025 11:08:56 +0100
Subject: [PATCH] Rebase to latest upstream version

Resolves: #RHEL-82423
---
 .gitignore | 2 ++
 fwupd.spec | 5 +++--
 sources    | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2dab72f..62f51c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,3 +137,5 @@
 /fwupd-1.9.26.tar.xz
 /fwupd-1.9.29.tar.xz
 /DBXUpdate-20241101-x64.cab
+/fwupd-1.9.31.tar.xz
+/DBXUpdate-20250507-legacy-x64.cab
diff --git a/fwupd.spec b/fwupd.spec
index fb7e8de..c9f1831 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -48,7 +48,7 @@
 
 Summary:   Firmware update daemon
 Name:      fwupd
-Version:   1.9.29
+Version:   1.9.31
 Release:   %autorelease
 License:   LGPL-2.1-or-later
 URL:       https://github.com/fwupd/fwupd
@@ -68,6 +68,7 @@ Source20:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20230509-aa64.cab
 Source21:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20230509-ia32.cab
 Source22:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20230509-x64.cab
 Source23:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20241101-x64.cab
+Source24:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20250507-legacy-x64.cab
 
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -275,7 +276,7 @@ mkdir -p %{buildroot}/%{_datadir}/dbxtool
 install \
   %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
   %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} \
-  %{SOURCE22} %{SOURCE23} \
+  %{SOURCE22} %{SOURCE23} %{SOURCE24} \
   %{buildroot}/%{_datadir}/fwupd/remotes.d/vendor/firmware/
 
 mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
diff --git a/sources b/sources
index 191213e..1b4f34e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (fwupd-1.9.29.tar.xz) = 27a6b687f4956b9b137cb29a23ab735f2e0b8c2260e2db08c5ba08660d1819a8cd2f8f67772c559a95ba6f7e8aeecd080b7666ee26fa740afa76ce93ec2d8eef
+SHA512 (fwupd-1.9.31.tar.xz) = ce9cd5129d0bcbedade6ba11f661fd3350445557d3116f479a8628376e9e8d6a933e6d2632ac3576d47ad9dbf0eafd54480d2765be86f776e8f04f689287ec80
 SHA512 (DBXUpdate-20100307-x64.cab) = f8ad56cf015f4cdc5c305856ff1f7a8589c25a2a671708c61883f427f38eb9b6a7abd3f2c8d79ef9d5076222255e42585917f8705a2a4b13f860bad4e02ec409
 SHA512 (DBXUpdate-20140413-x64.cab) = 75771876a2309fa8ca083c2e76520173d434229b7cacf1e7636bd9b1bc4f871d745c348b9792bfb65fd9f40ef54c25bb427b1431151e817e7050b7829456731a
 SHA512 (DBXUpdate-20160809-x64.cab) = c27c564999ae84515540f1a598cd0fd9ef3a80cdfaaf439f1c4cb04eaee0e73074548b6d76c21ca3af1ba9c4c0625907e821582998eb5617e33ecd412e6c8a13
@@ -13,3 +13,4 @@ SHA512 (DBXUpdate-20230509-aa64.cab) = 259f2373d6ab4cd031fe8b993825ba4cf922306af
 SHA512 (DBXUpdate-20230509-ia32.cab) = e9983039fa5283bf8357c75874842d06ac76a36e90c76406ab864a2b76f557f9649e84be3eb20ab473486cd60a08847ece0ef4015145357969067561338a7977
 SHA512 (DBXUpdate-20230509-x64.cab) = b2893b431adc3b155335a07e035979a2bf08b7c06975bde7c5561f5e5c1d8ed55f337e7a4782e6ad5c4c50c286cf474a1be356991784c88c23315c467fca30bb
 SHA512 (DBXUpdate-20241101-x64.cab) = 0a2883908e15c405c2b8b3adf84b3c322f3ddcb9cae8658bbe4ef99a2b575865654339a3b901db7bb2088b7a669a335be04c50134e7e2168871fc397e1a096b6
+SHA512 (DBXUpdate-20250507-legacy-x64.cab) = 12e2a24582be6b6653d68b6c99f8c667165883c79bada6d8f3b01b4867b4574343b75e88b014b37a4479a9bed9ae9542c59cbd084fdb44facf0f8b2efda9fec6