9 changed files with 1379 additions and 586 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,137 +1,10 @@
-/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.0.7.tar.xz
-/fwupd-1.0.8.tar.xz
-/fwupd-1.1.0.tar.xz
-/fwupd-1.1.1.tar.xz
-/fwupd-1.1.2.tar.xz
-/fwupd-1.1.3.tar.xz
-/fwupd-1.2.0.tar.xz
-/fwupd-1.2.1.tar.xz
-/fwupd-1.2.2.tar.xz
-/fwupd-1.2.3.tar.xz
-/fwupd-1.2.4.tar.xz
-/fwupd-1.2.5.tar.xz
-/fwupd-1.2.6.tar.xz
-/fwupd-1.2.7.tar.xz
-/fwupd-1.2.8.tar.xz
-/fwupd-1.2.9.tar.xz
-/fwupd-1.2.10.tar.xz
-/fwupd-1.3.2.tar.xz
-/fwupd-1.3.3.tar.xz
-/fwupd-1.3.4.tar.xz
-/fwupd-1.3.5.tar.xz
-/fwupd-1.3.6.tar.xz
-/fwupd-1.3.7.tar.xz
-/fwupd-1.3.8.tar.xz
-/fwupd-1.3.9.tar.xz
-/fwupd-1.4.0.tar.xz
-/fwupd-1.4.1.tar.xz
-/fwupd-1.4.2.tar.xz
-/fwupd-1.4.3.tar.xz
-/fwupd-1.4.4.tar.xz
-/fwupd-1.4.5.tar.xz
-/fwupd-1.4.6.tar.xz
-/fwupd-1.5.0.tar.xz
-/fwupd-1.5.1.tar.xz
-/fwupd-1.5.2.tar.xz
-/fwupd-1.5.3.tar.xz
-/fwupd-1.5.4.tar.xz
-/fwupd-1.5.5.tar.xz
-/fwupd-1.5.6.tar.xz
-/fwupd-1.5.7.tar.xz
-/fwupd-1.5.8.tar.xz
-/fwupd-1.5.9.tar.xz
-/fwupd-1.6.0.tar.xz
-/fwupd-1.6.1.tar.xz
-/fwupd-1.6.2.tar.xz
-/fwupd-1.6.3.tar.xz
-/fwupd-1.6.4.tar.xz
-/fwupd-1.7.0.tar.xz
-/fwupd-1.7.1.tar.xz
-/fwupd-1.7.2.tar.xz
-/fwupd-1.7.3.tar.xz
-/fwupd-1.7.4.tar.xz
-/fwupd-1.7.5.tar.xz
-/fwupd-1.7.6.tar.xz
-/fwupd-1.7.7.tar.xz
-/fwupd-1.8.0.tar.xz
-/fwupd-1.8.1.tar.xz
-/fwupd-1.8.2.tar.xz
-/fwupd-1.8.3.tar.xz
-/fwupd-1.8.4.tar.xz
-/fwupd-1.8.5.tar.xz
-/fwupd-1.8.6.tar.xz
-/fwupd-1.8.7.tar.xz
-/fwupd-1.8.8.tar.xz
-/fwupd-1.8.9.tar.xz
-/fwupd-1.8.10.tar.xz
-/fwupd-1.8.11.tar.xz
-/fwupd-1.8.12.tar.xz
-/fwupd-1.8.13.tar.xz
-/fwupd-1.8.14.tar.xz
-/fwupd-1.8.15.tar.xz
-/fwupd-1.9.1.tar.xz
-/fwupd-1.9.2.tar.xz
-/fwupd-1.9.3.tar.xz
-/fwupd-1.9.4.tar.xz
-/fwupd-1.9.5.tar.xz
-/fwupd-1.9.6.tar.xz
-/fwupd-1.9.7.tar.xz
-/fwupd-1.9.8.tar.xz
-/fwupd-1.9.9.tar.xz
-/fwupd-1.9.10.tar.xz
-/fwupd-1.9.11.tar.xz
-/fwupd-1.9.12.tar.xz
-/fwupd-1.9.13.tar.xz
-/fwupd-1.9.19.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
-/DBXUpdate-20210429-x64.cab
-/DBXUpdate-20220812-aa64.cab
-/DBXUpdate-20220812-ia32.cab
-/DBXUpdate-20220812-x64.cab
-/DBXUpdate-20230509-aa64.cab
-/DBXUpdate-20230509-ia32.cab
-/DBXUpdate-20230509-x64.cab
-/fwupd-1.9.26.tar.xz
+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/almalinuxsecurebootca0.cer
+SOURCES/fwupd-1.7.8.tar.xz
+SOURCES/fwupd-efi-1.3.tar.xz
+SOURCES/libjcat-0.1.9.tar.xz
--- a/SOURCES/0001-Use-usr-libexec-platform-python-for-RHEL.patch
+++ b/SOURCES/0001-Use-usr-libexec-platform-python-for-RHEL.patch
@ -0,0 +1,29 @@
+From 1fc24adecbb62b3cd77ef965c5daf1b72f6c7aa8 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Tue, 22 Aug 2023 10:05:27 +0100
+Subject: [PATCH] Use /usr/libexec/platform-python for RHEL
+
+---
+ meson.build | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index bb406d616..ac90c8ee6 100644
+--- a/meson.build
+++ b/meson.build
+@@ -261,11 +261,7 @@ if libgcab.type_name() == 'pkgconfig' and cc.has_function('gcab_file_set_bytes',
+ endif
+ 
+ bashcomp = dependency('bash-completion', required: false)
+-if host_machine.system() != 'freebsd'
+-  python3 = find_program('python3')
+-else
+-  python3 = find_program('python3.8', 'python3', 'python3.9')
+-endif
+python3 = find_program('/usr/libexec/platform-python')
+ 
+ if get_option('gnutls')
+   gnutls = dependency('gnutls', version : '>= 3.6.0')
+-- 
+2.41.0
+
--- a/SOURCES/0001-redfish-Set-the-permissions-of-redfish.conf-at-insta.patch
+++ b/SOURCES/0001-redfish-Set-the-permissions-of-redfish.conf-at-insta.patch
@ -0,0 +1,28 @@
+From 442f7f9200fbf6ec509dd0ee40eae2e37b2fb73e Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Tue, 20 Sep 2022 08:06:12 +0100
+Subject: [PATCH 1/3] redfish: Set the permissions of redfish.conf at install
+ time
+
+Although typically we set the password using fu_plugin_set_secure_config_value()
+or something like Ansible or Puppet -- the user could just edit the file with
+vim and we still want the permissions set correctly.
+---
+ plugins/redfish/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
+index 34ba4b7f6..7b19574de 100644
+--- a/plugins/redfish/meson.build
+++ b/plugins/redfish/meson.build
+@@ -48,6 +48,7 @@ shared_module('fu_plugin_redfish',
+ 
+ install_data(['redfish.conf'],
+   install_dir:  join_paths(sysconfdir, 'fwupd'),
+  install_mode: 'rw-r-----',
+ )
+ 
+ if get_option('tests')
+-- 
+2.39.1
+
--- a/SOURCES/0002-redfish-Only-create-users-using-IPMI-when-we-know-it.patch
+++ b/SOURCES/0002-redfish-Only-create-users-using-IPMI-when-we-know-it.patch
@ -0,0 +1,47 @@
+From 4f39b747a6d860e32a3000451dd2635366c81776 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Tue, 20 Sep 2022 09:13:52 +0100
+Subject: [PATCH 2/3] redfish: Only create users using IPMI when we know it's
+ going to work
+
+Make the IPMI auto-account feature allow-listed on specific vendors as some IPMI
+implementations are not specification compliant and do entirely the wrong thing.
+---
+ plugins/redfish/fu-plugin-redfish.c | 8 ++++++++
+ plugins/redfish/redfish.quirk       | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/redfish/fu-plugin-redfish.c b/plugins/redfish/fu-plugin-redfish.c
+index deb0fe742..3972d4b4b 100644
+--- a/plugins/redfish/fu-plugin-redfish.c
+++ b/plugins/redfish/fu-plugin-redfish.c
+@@ -422,6 +422,14 @@ fu_plugin_redfish_startup(FuPlugin *plugin, GError **error)
+ #ifdef HAVE_LINUX_IPMI_H
+ 	/* we got neither a type 42 entry or config value, lets try IPMI */
+ 	if (fu_redfish_backend_get_username(data->backend) == NULL) {
+		if (!fu_context_has_hwid_flag(fu_plugin_get_context(plugin), "ipmi-create-user")) {
+			g_set_error_literal(error,
+					    FWUPD_ERROR,
+					    FWUPD_ERROR_NOT_SUPPORTED,
+					    "no username and password specified, "
+					    "and no vendor quirk for 'ipmi-create-user'");
+			return FALSE;
+		}
+ 		if (!fu_plugin_get_config_value_boolean(plugin, "IpmiDisableCreateUser")) {
+ 			g_debug("attempting to create user using IPMI");
+ 			if (!fu_redfish_plugin_ipmi_create_user(plugin, error))
+diff --git a/plugins/redfish/redfish.quirk b/plugins/redfish/redfish.quirk
+index b12439926..5e9722fda 100644
+--- a/plugins/redfish/redfish.quirk
+++ b/plugins/redfish/redfish.quirk
+@@ -1,6 +1,6 @@
+ # Lenovo ThinkSystem
+ [42f00735-c9ab-5374-bd63-a5deee5881e0]
+-Flags = wildcard-targets,reset-required
+Flags = wildcard-targets,reset-required,ipmi-create-user
+ 
+ [REDFISH\VENDOR_Lenovo&ID_BMC-Backup]
+ ParentGuid = REDFISH\VENDOR_Lenovo&ID_BMC-Primary
+-- 
+2.39.1
+
--- a/SOURCES/0003-Never-save-the-Redfish-passwords-to-a-file-readable-.patch
+++ b/SOURCES/0003-Never-save-the-Redfish-passwords-to-a-file-readable-.patch
@ -0,0 +1,141 @@
+From 41575afd93ca0e68bced78ca43a4488f124906a1 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Wed, 21 Sep 2022 14:56:10 +0100
+Subject: [PATCH 3/3] Never save the Redfish passwords to a file readable by
+ users
+
+When the redfish plugin automatically creates an OPERATOR user account on the
+BMC we save the autogenerated password to /etc/fwupd/redfish.conf, ensuring it
+is chmod'ed to 0660 before writing the file with g_key_file_save_to_file().
+
+Under the covers, g_key_file_save_to_file() calls g_file_set_contents() with
+the keyfile string data.
+I was under the impression that G_FILE_CREATE_REPLACE_DESTINATION was being
+used to copy permissions, but alas not.
+
+GLib instead calls g_file_set_contents_full() with the mode hardcoded to 0666,
+which undoes the previous chmod().
+
+Use g_file_set_contents_full() with the correct mode for newer GLib versions,
+and provide a fallback with the same semantics for older versions.
+---
+ contrib/fwupd.spec.in         |  3 ++
+ libfwupdplugin/fu-plugin.c    | 65 +++++++++++++++++++++++++++++------
+ libfwupdplugin/fu-self-test.c | 57 ++++++++++++++++++++++++++++++
+ 3 files changed, 114 insertions(+), 11 deletions(-)
+
+diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in
+index a50e30a9c..0854fcf4f 100644
+--- a/contrib/fwupd.spec.in
+++ b/contrib/fwupd.spec.in
+@@ -313,6 +313,9 @@ for fn in /etc/fwupd/remotes.d/*.conf; do
+     fi
+ done
+ 
+# ensure this is private
+chmod 0660 /etc/fwupd/redfish.conf
+
+ %preun
+ %systemd_preun fwupd.service
+ 
+diff --git a/libfwupdplugin/fu-plugin.c b/libfwupdplugin/fu-plugin.c
+index 18042a028..04951de85 100644
+--- a/libfwupdplugin/fu-plugin.c
+++ b/libfwupdplugin/fu-plugin.c
+@@ -9,6 +9,7 @@
+ #include "config.h"
+ 
+ #include <errno.h>
+#include <fcntl.h>
+ #include <fwupd.h>
+ #include <glib/gstdio.h>
+ #include <gmodule.h>
+@@ -2256,6 +2257,46 @@ fu_plugin_set_config_value(FuPlugin *self, const gchar *key, const gchar *value,
+ 	return g_key_file_save_to_file(keyfile, conf_path, error);
+ }
+ 
+#if !GLIB_CHECK_VERSION(2, 66, 0)
+
+#define G_FILE_SET_CONTENTS_CONSISTENT 0
+typedef guint GFileSetContentsFlags;
+static gboolean
+g_file_set_contents_full(const gchar *filename,
+			 const gchar *contents,
+			 gssize length,
+			 GFileSetContentsFlags flags,
+			 int mode,
+			 GError **error)
+{
+	gint fd;
+	gssize wrote;
+
+	if (length < 0)
+		length = strlen(contents);
+	fd = g_open(filename, O_CREAT, mode);
+	if (fd <= 0) {
+		g_set_error(error,
+			    G_IO_ERROR,
+			    G_IO_ERROR_FAILED,
+			    "could not open %s file",
+			    filename);
+		return FALSE;
+	}
+	wrote = write(fd, contents, length);
+	if (wrote != length) {
+		g_set_error(error,
+			    G_IO_ERROR,
+			    G_IO_ERROR_FAILED,
+			    "did not write %s file",
+			    filename);
+		g_close(fd, NULL);
+		return FALSE;
+	}
+	return g_close(fd, error);
+}
+#endif
+
+ /**
+  * fu_plugin_set_secure_config_value:
+  * @self: a #FuPlugin
+@@ -2277,7 +2318,8 @@ fu_plugin_set_secure_config_value(FuPlugin *self,
+ 				  GError **error)
+ {
+ 	g_autofree gchar *conf_path = fu_plugin_get_config_filename(self);
+-	gint ret;
+	g_autofree gchar *data = NULL;
+	g_autoptr(GKeyFile) keyfile = g_key_file_new();
+ 
+ 	g_return_val_if_fail(FU_IS_PLUGIN(self), FALSE);
+ 	g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
+@@ -2286,17 +2328,18 @@ fu_plugin_set_secure_config_value(FuPlugin *self,
+ 		g_set_error(error, FWUPD_ERROR, FWUPD_ERROR_NOT_FOUND, "%s is missing", conf_path);
+ 		return FALSE;
+ 	}
+-	ret = g_chmod(conf_path, 0660);
+-	if (ret == -1) {
+-		g_set_error(error,
+-			    FWUPD_ERROR,
+-			    FWUPD_ERROR_INTERNAL,
+-			    "failed to set permissions on %s",
+-			    conf_path);
+	if (!g_key_file_load_from_file(keyfile, conf_path, G_KEY_FILE_KEEP_COMMENTS, error))
+ 		return FALSE;
+-	}
+-
+-	return fu_plugin_set_config_value(self, key, value, error);
+	g_key_file_set_string(keyfile, fu_plugin_get_name(self), key, value);
+	data = g_key_file_to_data(keyfile, NULL, error);
+	if (data == NULL)
+		return FALSE;
+	return g_file_set_contents_full(conf_path,
+					data,
+					-1,
+					G_FILE_SET_CONTENTS_CONSISTENT,
+					0660,
+					error);
+ }
+ 
+ /**
+-- 
+2.39.1
+
--- a/SPECS/fwupd.spec
+++ b/SPECS/fwupd.spec
--- a/fwupd.spec
+++ b/fwupd.spec
@ -1,429 +0,0 @@
-%global glib2_version 2.45.8
-%global libxmlb_version 0.1.3
-%global libgusb_version 0.3.5
-%global libcurl_version 7.62.0
-%global libjcat_version 0.1.0
-%global systemd_version 231
-%global json_glib_version 1.1.1
-
-# although we ship a few tiny python files these are utilities that 99.99%
-# of users do not need -- use this to avoid dragging python onto CoreOS
-%global __requires_exclude ^%{python3}$
-
-# PPC64 is too slow to complete the tests under 3 minutes...
-%ifnarch ppc64le
-%global enable_tests 1
-%endif
-
-%global enable_dummy 1
-
-# fwupd.efi is only available on these arches
-%ifarch x86_64 aarch64 riscv64
-%global have_uefi 1
-%endif
-
-# gpio.h is only available on these arches
-%ifarch x86_64 aarch64
-%global have_gpio 1
-%endif
-
-# flashrom is only available on these arches
-%ifarch i686 x86_64 armv7hl aarch64 ppc64le riscv64
-%global have_flashrom 1
-%endif
-
-%ifarch i686 x86_64
-%global have_msr 1
-%endif
-
-# Until we actually have seen it outside x86
-%ifarch i686 x86_64
-%global have_thunderbolt 1
-%endif
-
-# only available recently
-%if 0%{?fedora} >= 30
-%global have_modem_manager 1
-%endif
-
-Summary:   Firmware update daemon
-Name:      fwupd
-Version:   1.9.26
-Release:   %autorelease
-License:   LGPL-2.1-or-later
-URL:       https://github.com/fwupd/fwupd
-Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-
-Source10:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab
-Source11:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab
-Source12:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20160809-x64.cab
-Source13:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-aa64.cab
-Source14:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-ia32.cab
-Source15:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-x64.cab
-Source16:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20210429-x64.cab
-Source17:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20220812-aa64.cab
-Source18:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20220812-ia32.cab
-Source19:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20220812-x64.cab
-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
-
-BuildRequires: gettext
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: libxmlb-devel >= %{libxmlb_version}
-BuildRequires: libgudev1-devel
-BuildRequires: libgusb-devel >= %{libgusb_version}
-BuildRequires: libcurl-devel >= %{libcurl_version}
-BuildRequires: libjcat-devel >= %{libjcat_version}
-BuildRequires: polkit-devel >= 0.103
-BuildRequires: python3-packaging
-BuildRequires: python3-jinja2
-BuildRequires: sqlite-devel
-BuildRequires: systemd >= %{systemd_version}
-BuildRequires: systemd-devel
-BuildRequires: libarchive-devel
-BuildRequires: gobject-introspection-devel
-%ifarch %{valgrind_arches}
-BuildRequires: valgrind
-BuildRequires: valgrind-devel
-%endif
-BuildRequires: gi-docgen
-BuildRequires: gnutls-devel
-BuildRequires: gnutls-utils
-BuildRequires: meson
-BuildRequires: json-glib-devel >= %{json_glib_version}
-BuildRequires: vala
-%if 0%{?fedora} >= 41
-BuildRequires: bash-completion-devel
-%else
-BuildRequires: bash-completion
-%endif
-BuildRequires: git-core
-%if 0%{?have_flashrom}
-BuildRequires: flashrom-devel >= 1.2-2
-%endif
-BuildRequires: libdrm-devel
-
-%if 0%{?have_modem_manager}
-BuildRequires: ModemManager-glib-devel >= 1.10.0
-BuildRequires: libqmi-devel >= 1.22.0
-BuildRequires: libmbim-devel
-%endif
-
-%if 0%{?have_uefi}
-BuildRequires: python3 python3-cairo python3-gobject
-BuildRequires: pango-devel
-BuildRequires: cairo-devel cairo-gobject-devel
-BuildRequires: freetype
-BuildRequires: fontconfig
-BuildRequires: google-noto-sans-cjk-ttc-fonts
-BuildRequires: tpm2-tss-devel >= 2.2.3
-%endif
-
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-
-Requires: glib2%{?_isa} >= %{glib2_version}
-Requires: libxmlb%{?_isa} >= %{libxmlb_version}
-Requires: libgusb%{?_isa} >= %{libgusb_version}
-Requires: shared-mime-info
-
-Obsoletes: dbxtool < 9
-Provides: dbxtool
-
-# optional, but a really good idea
-Recommends: udisks2
-Recommends: jq
-
-%if 0%{?have_modem_manager}
-Recommends: %{name}-plugin-modem-manager
-%endif
-%if 0%{?have_flashrom}
-Recommends: %{name}-plugin-flashrom
-%endif
-%if 0%{?have_uefi}
-Recommends: %{name}-efi
-Recommends: %{name}-plugin-uefi-capsule-data
-%endif
-
-%description
-fwupd is a daemon to allow session software to update device firmware.
-
-%package devel
-Summary: Development package for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: libebitdo-devel < 0.7.5-3
-Obsoletes: libdfu-devel < 1.0.0
-
-%description devel
-Files for development with %{name}.
-
-%package tests
-Summary: Data files for installed tests
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description tests
-Data files for installed tests.
-
-%if 0%{?have_modem_manager}
-%package plugin-modem-manager
-Summary: fwupd plugin using ModemManger
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description plugin-modem-manager
-This provides the optional package which is only required on hardware that
-might have mobile broadband hardware. It is probably not required on servers.
-%endif
-
-%if 0%{?have_flashrom}
-%package plugin-flashrom
-Summary: fwupd plugin using flashrom
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description plugin-flashrom
-This provides the optional package which is only required on hardware that
-can be flashed using flashrom. It is probably not required on servers.
-%endif
-
-%if 0%{?have_uefi}
-%package plugin-uefi-capsule-data
-Summary: Localized data for the UEFI UX capsule
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description plugin-uefi-capsule-data
-This provides the pregenerated BMP artwork for the UX capsule, which allows the
-"Installing firmware update…" localized text to be shown during a UEFI firmware
-update operation. This subpackage is probably not required on embedded hardware
-or server machines.
-%endif
-
-%prep
-%autosetup -p1
-
-%build
-
-%meson \
-    -Ddocs=enabled \
-%if 0%{?enable_tests}
-    -Dtests=true \
-%else
-    -Dtests=false \
-%endif
-%if 0%{?have_flashrom}
-    -Dplugin_flashrom=enabled \
-%else
-    -Dplugin_flashrom=disabled \
-%endif
-%if 0%{?have_msr}
-    -Dplugin_msr=enabled \
-%else
-    -Dplugin_msr=disabled \
-%endif
-%if 0%{?have_gpio}
-    -Dplugin_gpio=enabled \
-%else
-    -Dplugin_gpio=disabled \
-%endif
-%if 0%{?have_uefi}
-    -Dplugin_uefi_capsule=enabled \
-    -Dplugin_uefi_pk=enabled \
-    -Dplugin_tpm=enabled \
-    -Defi_binary=false \
-%else
-    -Dplugin_uefi_capsule=disabled \
-    -Dplugin_uefi_pk=disabled \
-    -Dplugin_tpm=disabled \
-%endif
-%if 0%{?have_modem_manager}
-    -Dplugin_modem_manager=enabled \
-%else
-    -Dplugin_modem_manager=disabled \
-%endif
-    -Dbluez=disabled \
-    -Dcbor=disabled \
-    -Dlaunchd=disabled \
-    -Dlvfs=disabled \
-    -Dman=true \
-    -Dpassim=disabled \
-    -Dplugin_android_boot=disabled \
-    -Dplugin_cfu=disabled \
-    -Dplugin_igsc=disabled \
-    -Dplugin_intel_me=disabled \
-    -Dplugin_logitech_bulkcontroller=disabled \
-    -Dplugin_logitech_scribe=disabled \
-    -Dplugin_mtd=disabled \
-    -Dplugin_powerd=disabled \
-    -Dplugin_uf2=disabled \
-    -Dsupported_build=enabled \
-    -Dsystemd_unit_user=""
-
-%meson_build
-
-%if 0%{?enable_tests}
-%check
-%meson_test
-%endif
-
-%install
-%meson_install
-
-# on RHEL the LVFS is disabled by default
-mkdir -p %{buildroot}/%{_datadir}/dbxtool
-install \
-  %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
-  %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} \
-  %{buildroot}/%{_datadir}/fwupd/remotes.d/vendor/firmware/
-
-mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
-
-# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1757948
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/fwupd
-
-%find_lang %{name}
-
-%post
-%systemd_post fwupd.service fwupd-refresh.timer
-
-# change vendor-installed remotes to use the default keyring type
-for fn in /etc/fwupd/remotes.d/*.conf; do
-    if grep -q "Keyring=gpg" "$fn"; then
-        sed -i 's/Keyring=gpg/#Keyring=pkcs/g' "$fn";
-    fi
-done
-
-%preun
-%systemd_preun fwupd.service fwupd-refresh.timer
-
-%postun
-%systemd_postun_with_restart fwupd.service fwupd-refresh.timer
-
-%triggerun -- fedora-release-common < 39-0.28
-# For upgrades from versions before fwupd-refresh.timer was enabled by default
-systemctl --no-reload preset fwupd-refresh.timer &>/dev/null || :
-
-%files -f %{name}.lang
-%doc README.md
-%license COPYING
-%config(noreplace)%{_sysconfdir}/fwupd/fwupd.conf
-%dir %{_libexecdir}/fwupd
-%{_libexecdir}/fwupd/fwupd
-%ifarch x86_64
-%{_libexecdir}/fwupd/fwupd-detect-cet
-%endif
-%{_libexecdir}/fwupd/fwupdoffline
-%{_bindir}/dbxtool
-%{_bindir}/fwupdmgr
-%{_bindir}/fwupdtool
-%dir %{_sysconfdir}/fwupd
-%dir %{_sysconfdir}/fwupd/bios-settings.d
-%{_sysconfdir}/fwupd/bios-settings.d/README.md
-%dir %{_sysconfdir}/fwupd/remotes.d
-%config(noreplace)%{_sysconfdir}/fwupd/remotes.d/lvfs.conf
-%config(noreplace)%{_sysconfdir}/fwupd/remotes.d/lvfs-testing.conf
-%config(noreplace)%{_sysconfdir}/fwupd/remotes.d/vendor-directory.conf
-%config(noreplace)%{_sysconfdir}/pki/fwupd
-%{_sysconfdir}/pki/fwupd-metadata
-%if 0%{?have_msr}
-/usr/lib/modules-load.d/fwupd-msr.conf
-%endif
-%{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf
-%{_datadir}/bash-completion/completions/fwupdmgr
-%{_datadir}/bash-completion/completions/fwupdtool
-%{_datadir}/fish/vendor_completions.d/fwupdmgr.fish
-%dir %{_datadir}/fwupd
-%dir %{_datadir}/fwupd/metainfo
-%{_datadir}/fwupd/metainfo/org.freedesktop.fwupd*.metainfo.xml
-%dir %{_datadir}/fwupd/remotes.d
-%dir %{_datadir}/fwupd/remotes.d/vendor
-%dir %{_datadir}/fwupd/remotes.d/vendor/firmware
-%{_datadir}/fwupd/remotes.d/vendor/firmware/README.md
-%{_datadir}/fwupd/remotes.d/vendor/firmware/*.cab
-%{_datadir}/dbus-1/interfaces/org.freedesktop.fwupd.xml
-%{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
-%{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
-%{_datadir}/dbus-1/system-services/org.freedesktop.fwupd.service
-%{_mandir}/man1/fwupdtool.1*
-%{_mandir}/man1/dbxtool.*
-%{_mandir}/man1/fwupdmgr.1*
-%{_mandir}/man5/*
-%{_mandir}/man8/*
-%{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml
-%{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg
-%{_datadir}/fwupd/firmware_packager.py
-%{_datadir}/fwupd/simple_client.py
-%{_datadir}/fwupd/add_capsule_header.py
-%{_datadir}/fwupd/install_dell_bios_exe.py
-%{_unitdir}/fwupd-offline-update.service
-%{_unitdir}/fwupd.service
-%{_unitdir}/fwupd-refresh.service
-%{_unitdir}/fwupd-refresh.timer
-%{_unitdir}/system-update.target.wants/
-%dir %{_localstatedir}/lib/fwupd
-%dir %{_localstatedir}/cache/fwupd
-%dir %{_datadir}/fwupd/quirks.d
-%{_datadir}/fwupd/quirks.d/builtin.quirk.gz
-%{_datadir}/doc/fwupd/*.html
-%if 0%{?have_uefi}
-%config(noreplace)%{_sysconfdir}/grub.d/35_fwupd
-%endif
-%{_libdir}/libfwupd.so.2*
-%{_libdir}/girepository-1.0/Fwupd-2.0.typelib
-/usr/lib/udev/rules.d/*.rules
-/usr/lib/systemd/system-shutdown/fwupd.shutdown
-%dir %{_libdir}/fwupd-%{version}
-%{_libdir}/fwupd-%{version}/libfwupd*.so
-%ghost %{_localstatedir}/lib/fwupd/gnupg
-
-%if 0%{?have_modem_manager}
-%files plugin-modem-manager
-%{_libdir}/fwupd-%{version}/libfu_plugin_modem_manager.so
-%endif
-%if 0%{?have_flashrom}
-%files plugin-flashrom
-%{_libdir}/fwupd-%{version}/libfu_plugin_flashrom.so
-%endif
-%if 0%{?have_uefi}
-%files plugin-uefi-capsule-data
-%{_datadir}/fwupd/uefi-capsule-ux.tar.xz
-%endif
-
-%files devel
-%{_datadir}/gir-1.0/Fwupd-2.0.gir
-%{_datadir}/doc/fwupd/libfwupdplugin
-%{_datadir}/doc/fwupd/libfwupd
-%{_datadir}/doc/libfwupdplugin
-%{_datadir}/doc/libfwupd
-%{_datadir}/vala/vapi
-%{_includedir}/fwupd-1
-%{_libdir}/libfwupd*.so
-%{_libdir}/pkgconfig/fwupd.pc
-
-%files tests
-%if 0%{?enable_tests}
-%{_datadir}/fwupd/host-emulate.d/*.json.gz
-%dir %{_datadir}/installed-tests/fwupd
-%{_datadir}/installed-tests/fwupd/tests/*
-%{_datadir}/installed-tests/fwupd/fwupd-tests.xml
-%{_datadir}/installed-tests/fwupd/*.test
-%{_datadir}/installed-tests/fwupd/*.cab
-%{_datadir}/installed-tests/fwupd/fakedevice124.jcat
-%{_datadir}/installed-tests/fwupd/fakedevice124.bin
-%{_datadir}/installed-tests/fwupd/fakedevice124.metainfo.xml
-%{_datadir}/installed-tests/fwupd/*.sh
-%{_datadir}/installed-tests/fwupd/*.zip
-%if 0%{?have_uefi}
-%{_datadir}/installed-tests/fwupd/efi
-%endif
-%{_datadir}/installed-tests/fwupd/chassis_type
-%{_datadir}/installed-tests/fwupd/sys_vendor
-# libgusb >= 0.4.5
-%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
-%{_datadir}/fwupd/device-tests/*.json
-%endif
-%{_libexecdir}/installed-tests/fwupd/*
-%{_datadir}/fwupd/remotes.d/fwupd-tests.conf
-%endif
-
-%changelog
-%autochangelog
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.hardware-fwupd.tier0.functional}
--- a/14
+++ b/14
@ -1,14 +0,0 @@
-SHA512 (fwupd-1.9.26.tar.xz) = 04684f0be26c1daec9966e62c7db103cce923bb361657c66111e085e9a388e812250ac18774ef83eac672852489acc2ab21b9d7c94a28a8e5564e8bb7d67c0ba
-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 (DBXUpdate-20210429-x64.cab) = 7bc5e7780d105da89da367fbde7c33427bed6c37752b0ae6933793dfe96121c87e49629f14c3b762fc138b10e5c5b6db821dbdc56039ab761e3dca977fc7f817
-SHA512 (DBXUpdate-20220812-aa64.cab) = 422ebd0b9d15a26ad12b98798229615a1f5e272a95993934de0cd9d4e4e75589b41eae6366b52b4e25e8766bd7cf74f95d220b719649b1f3864603e46c18c193
-SHA512 (DBXUpdate-20220812-ia32.cab) = 09094cc747f865e21fc815199d6ad5b6d3b1c9e19621497e3fe7cdfc4b96e144e721673bdff9ea6204dd465e8a8e2da1cc2b4a4badfd1f4f82c54eace11acb42
-SHA512 (DBXUpdate-20220812-x64.cab) = 03dde66a31241ccaa562c57bd9b6b824f2a6b5a1d10affe32ee5a0452056609c981f8f7633bfc65fd0c7da79455b071dd9e02b6af7c880fb1c4a6ffdf577bcdc
-SHA512 (DBXUpdate-20230509-aa64.cab) = 259f2373d6ab4cd031fe8b993825ba4cf922306afb3da1617d7b4e9d4ac918018b463135f58ace884a2ceec01789f3b2b31aaf63e63501503e4efbcf46ce567b
-SHA512 (DBXUpdate-20230509-ia32.cab) = e9983039fa5283bf8357c75874842d06ac76a36e90c76406ab864a2b76f557f9649e84be3eb20ab473486cd60a08847ece0ef4015145357969067561338a7977
-SHA512 (DBXUpdate-20230509-x64.cab) = b2893b431adc3b155335a07e035979a2bf08b7c06975bde7c5561f5e5c1d8ed55f337e7a4782e6ad5c4c50c286cf474a1be356991784c88c23315c467fca30bb