Accepting request 1301973 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1301973
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fwupd?expand=0&rev=102

8583.patch

@@ -1,125 +0,0 @@
-From a6338350485d78121fee4a69742b7de6275880cd Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Thu, 13 Mar 2025 16:38:52 +0100
-Subject: [PATCH] Fix build against pygobject 3.52
-
-With the introduction of pygobject 3.52, accessing GIRepository 2.0 is
-no longer permitted.
-
-Instead of complicating the test code with conditionalizing between
-GIRepository 2.0 and GIRepository 3.0 in override_gi_search_path,
-we can drop override_gi_search_path entirely and rely on GIRepository's
-own envvar GI_TYPELIB_PATH to help it find our freshly built typelib
-
-Fixes #8569
----
- contrib/test-venv.sh            |  3 ++-
- data/tests/fwupd_test.py        | 15 ---------------
- data/tests/meson.build          |  7 ++++---
- plugins/meson.build             |  7 ++++---
- plugins/pci-psp/pci_psp_test.py |  3 +--
- 5 files changed, 11 insertions(+), 24 deletions(-)
-
-diff --git a/contrib/test-venv.sh b/contrib/test-venv.sh
-index 1a061d3d7cf0..5e622b95b491 100755
---- a/contrib/test-venv.sh
-+++ b/contrib/test-venv.sh
-@@ -5,7 +5,8 @@ BUILD=${VENV}/build
- INSTALLED_TESTS=${VENV}/dist/share/installed-tests/fwupd
- export G_TEST_BUILDDIR=${INSTALLED_TESTS}
- export G_TEST_SRCDIR=${INSTALLED_TESTS}
--export LIBFWUPD_BUILD_DIR=${BUILD}/libfwupd
-+export GI_TYPELIB_PATH=${BUILD}/libfwupd
-+export LD_LIBRARY_PATH=${BUILD}/libfwupd
- export DAEMON_BUILDDIR=${BUILD}/src
- export PATH=${VENV}/bin:$PATH
- 
-diff --git a/data/tests/fwupd_test.py b/data/tests/fwupd_test.py
-index 4840fc52eeb5..e4b684fb428a 100755
---- a/data/tests/fwupd_test.py
-+++ b/data/tests/fwupd_test.py
-@@ -22,19 +22,6 @@
- from gi.repository import UMockdev
- 
- 
--def override_gi_search_path():
--    if "LIBFWUPD_BUILD_DIR" in os.environ:
--        gi.require_version("GIRepository", "2.0")
--        from gi.repository import GIRepository
--
--        GIRepository.Repository.prepend_search_path(
--            os.path.join(os.environ["LIBFWUPD_BUILD_DIR"])
--        )
--        GIRepository.Repository.prepend_library_path(
--            os.path.join(os.environ["LIBFWUPD_BUILD_DIR"])
--        )
--
--
- class FwupdTest(dbusmock.DBusTestCase):
-     DBUS_NAME = "org.freedesktop.fwupd"
-     DBUS_PATH = "/"
-@@ -60,8 +47,6 @@ def setUpClass(cls):
-         cls.start_system_bus()
-         cls.dbus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)
- 
--        override_gi_search_path()
--
-     def setUp(self):
-         self.testbed = UMockdev.Testbed.new()
-         self.polkitd, self.obj_polkit = self.spawn_server_template(
-diff --git a/data/tests/meson.build b/data/tests/meson.build
-index 517ce034b3cc..74073f54194b 100644
---- a/data/tests/meson.build
-+++ b/data/tests/meson.build
-@@ -140,10 +140,11 @@ if umockdev_integration_tests.allowed()
-   foreach ut: unit_tests
-       test(ut, python3, args: [fwupd_mockdev_tests, ut], is_parallel: false,
-           env: {
--            'DAEMON_BUILDDIR': join_paths(meson.project_build_root(), 'src'),
--            'LIBFWUPD_BUILD_DIR': join_paths(meson.project_build_root(), 'libfwupd'),
--            'STATE_DIRECTORY': join_paths(meson.project_build_root(), 'state'),
-             'CACHE_DIRECTORY': join_paths(meson.project_build_root(), 'cache'),
-+            'DAEMON_BUILDDIR': join_paths(meson.project_build_root(), 'src'),
-+            'GI_TYPELIB_PATH': join_paths(meson.project_build_root(), 'libfwupd'),
-+            'LD_LIBRARY_PATH': join_paths(meson.project_build_root(), 'libfwupd'),
-+            'STATE_DIRECTORY': join_paths(meson.project_build_root(), 'state')
-           },
-           )
-   endforeach
-diff --git a/plugins/meson.build b/plugins/meson.build
-index 22397c65b4f6..38bb648492e1 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -153,12 +153,13 @@ endforeach
- 
- if umockdev_integration_tests.allowed()
-   envs = environment()
-+  envs.set('CACHE_DIRECTORY', join_paths(meson.project_build_root(), 'cache'))
-   envs.set('DAEMON_BUILDDIR', join_paths(meson.project_build_root(), 'src'))
--  envs.set('LIBFWUPD_BUILD_DIR', join_paths(meson.project_build_root(), 'libfwupd'))
--  envs.set('PYTHONPATH', join_paths(meson.project_source_root(), 'data', 'tests'))
-   envs.set('FWUPD_DATADIR_QUIRKS', join_paths(meson.project_build_root()))
-+  envs.set('GI_TYPELIB_PATH', join_paths(meson.project_build_root(), 'libfwupd'))
-+  envs.set('LD_LIBRARY_PATH', join_paths(meson.project_build_root(), 'libfwupd'))
-+  envs.set('PYTHONPATH', join_paths(meson.project_source_root(), 'data', 'tests'))
-   envs.set('STATE_DIRECTORY', join_paths(meson.project_build_root(), 'state'))
--  envs.set('CACHE_DIRECTORY', join_paths(meson.project_build_root(), 'cache'))
- 
-   foreach suite: umockdev_tests
-     r = run_command(unittest_inspector, suite,
-diff --git a/plugins/pci-psp/pci_psp_test.py b/plugins/pci-psp/pci_psp_test.py
-index b3f4f3d924c8..059bf272c1ce 100755
---- a/plugins/pci-psp/pci_psp_test.py
-+++ b/plugins/pci-psp/pci_psp_test.py
-@@ -8,10 +8,9 @@
- import os
- import sys
- import unittest
--from fwupd_test import FwupdTest, override_gi_search_path
-+from fwupd_test import FwupdTest
- 
- try:
--    override_gi_search_path()
-     gi.require_version("Fwupd", "2.0")
-     from gi.repository import Fwupd  # pylint: disable=wrong-import-position
- except ValueError:

8588.patch

@@ -1,33 +0,0 @@
-From 5e095c944557cbebc47cbf42c3738358fa4e45d4 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 14 Mar 2025 19:13:42 +0000
-Subject: [PATCH] trivial: Fix compile when using Pango >= 1.56.2
-
-Fixes https://github.com/fwupd/fwupd/issues/8587
----
- plugins/uefi-capsule/make-images.py | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/uefi-capsule/make-images.py b/plugins/uefi-capsule/make-images.py
-index d4c2242de5f0..a8641d61282a 100755
---- a/plugins/uefi-capsule/make-images.py
-+++ b/plugins/uefi-capsule/make-images.py
-@@ -141,8 +141,16 @@ def main(args) -> int:
-                 items = Pango.itemize(pctx, label_translated, 0, length, attrs, None)
-                 if not items:
-                     continue
--                gs = Pango.GlyphString()
--                Pango.shape(label_translated, length, items[0].analysis, gs)
-+                try:
-+                    # urgh, https://gitlab.gnome.org/GNOME/pango/-/merge_requests/829
-+                    # -- if we depend on Pango >= 1.56.2 we can drop the fallback
-+                    #
-+                    # ...or if we depend on python3-gobject >= 3.51.0 we can use the nicer:
-+                    #    len(inspect.signature(Pango.shape).parameters)
-+                    gs = Pango.shape(label_translated, length, items[0].analysis)
-+                except TypeError:
-+                    gs = Pango.GlyphString()
-+                    Pango.shape(label_translated, length, items[0].analysis, gs)
-                 del img, cctx, pctx, layout
- 
-                 def find_size(fs, f, data):

_service

@@ -4,7 +4,7 @@
     <param name="url">https://github.com/fwupd/fwupd.git</param>
     <param name="scm">git</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
-    <param name="revision">2.0.6</param>
+    <param name="revision">2.0.14</param>
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>

fwupd-2.0.14.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:243f5d35dbc74e673425642ee4f91f646c0cc728b2d2c1ab2736adb1413ad473
+size 21242381

fwupd.changes

@@ -1,3 +1,267 @@
+-------------------------------------------------------------------
+Fri Aug 29 13:36:08 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 2.0.14:
+  + This release adds the following features:
+    - Add support for ignoring the network connectivity requirement
+    - Allow building on RHEL-9 and RHEL-10
+    - Allow plugins to know the firmware version during update
+    - Allow UEFI capsule devices to opt-out of Capsule-on-Disk
+    - Allow unsetting HwID plugin context flags
+    - Allow upgrading from a zero "empty" UEFI dbx
+  + This release fixes the following bugs:
+    - Add an automatic firehose counterpart to the QCDM modem device
+    - Disable signature time checks when verifying firmware
+    - Do not add a vendor ID of UNKNOWN when the signature has no vendor
+    - Do not discover ThunderBolt retimer devices when run in single-shot mode
+    - Do not use deprecated libflashrom API
+    - Enhance firmware metadata generation in firmware_packager
+    - Ensure Lexar NVMe drives use a proper version number
+    - Fix parsing and writing UF2 extension sections
+    - Fix Synaptics RMI initialization for new devices
+    - Fix updating DFOTA and MBIM modem devices
+    - Move some vendor name fixups to the quirk file
+    - Remove CapsuleOnDisk HwID match for Dell
+    - Return a sensible error when using build-cabinet wrong
+    - Set the firehose loader filename in a more permissive way
+    - Update the mapping for TPM vendor names
+    - Verify the checksum of the serialized data in tests
+    - Work around a libmbim bug when detaching
+  + This release adds support for the following hardware:
+    - Egis MoC devices
+    - Framework QMK devices
+    - ILITEK touch controllers
+    - SteelSeries Arctis Nova 3P
+
+
+-------------------------------------------------------------------
+Fri Jul 25 15:57:05 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- drop unneeded gpgme build dependency. GPG support is provided
+  with libjcat
+
+-------------------------------------------------------------------
+Tue Jul 22 10:47:51 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 2.0.13:
+  + This release adds the following features:
+    - Add a daemon config option to ignore efivars free space
+    - Add support for glob-aware version comparison requirements
+    - Allow targeting specific regions in FMAP when using flashrom
+    - Detect static variables and magic numbers during code review
+    - Remove the unused hailuck and rts54hid plugins
+  + This release fixes the following bugs:
+    - Align MTD erase up to the erasesize as necessary
+    - Allow parsing IGSC OptionROM when using fwupdtool
+    - Allow removing private flags from UEFI capsule devices in quirks
+    - Do not copy the vendor for Intel reference ME firmware
+    - Do not use an interactive console if stdout is redirected
+    - Fix the UEFI self-test when the capsule splash is disabled
+    - Get better device information when using PCI-backed MTD devices
+    - Get the Intel GPU SKU and SVN when using BMG hardware
+    - Make MBIM modem devices emulatable
+    - Make sure fwupdtool.exe is available in the Windows PATH
+    - Only show the 'Full Disk Encryption Detected' warning when required
+    - Set all QCDM modem devices to raw mode when updating
+    - Show all devices for fwupdtool get-devices --show-all --force
+    - Show correct dbx version if non-Microsoft entries are present
+    - Show KEK device attributes in fwupdmgr
+    - Use an alternate GUID when the Intel GPU is in recovery mode
+    - Use the kernel netlink hotplug socket when there is no Udev
+    - Various small changes to speed up startup by 60% and lower RSS by 40%
+  + This release adds support for the following hardware:
+    - HP USB-C 100W G6 Dock
+    - Logitech Bulk Controller pheripherals
+    - More MediaTek scaler devices
+
+-------------------------------------------------------------------
+Mon Jun 23 09:06:03 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Fix %{_modulesloaddir}/fwupd-i2c.conf packaging
+
+-------------------------------------------------------------------
+Fri Jun 20 06:25:18 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 2.0.12:
+  + This release adds the following features:
+    - Add a config option for enforcing immutable device enumeration
+    - Add device emulation support for Thunderbolt host controllers
+    - Do the efivarfs free space checks for dbx, db, KEK and PK devices
+    - Ensure the i2c_dev kernel driver is always loaded if a module
+    - Parse the SBOM data from fwupdx64.efi if provided
+    - Support loading multiple coSWID blobs from PE files
+  + This release fixes the following bugs:
+    - Added HP Elitedesk G6 mini to not get dbx-updates
+    - Add two more uefi dbx checksum->version entries
+    - Be more useful when building modem device Instance IDs
+    - Convert asus-hid and legion-hid2 to hidraw to avoid possible input blips
+    - Do not create radio for Logitech RDFU-capable devices
+    - Fix a modem-manager regression where a PCI device had no vendor ID
+    - Fix a regression when updating DFOTA modem devices
+    - Fix self tests when building with -Defi_os_dir
+    - Fix self tests when the builder does not support DistroVersion
+    - Fix updating Thunderbolt host controllers with some version formats
+    - Handle HECI unsupported status (0x0b) for Dell hardware
+    - Make tar a dependency of the uefi-capsule tests
+    - Mark the KEK and db updates as affecting FDE like BitLocker
+    - Properly detect the Redfish reboot request for Dell servers
+    - Send the proper artifact firmware filename to the Redfish BMC
+    - Set the correct RMM device version for some Dell dock devices
+    - Use inhibits so that the rts54hub device is marked as non-updatable
+    - Use the virtual size to avoid padding when cutting PE sections
+    - Wait for the Logitech Scribe device to replug after updating
+  + This release adds support for the following hardware:
+    - HP Portable USB-C Hub
+    - More Foxconn 5G modem products
+    - More Intel Arc Battlemage products
+
+
+-------------------------------------------------------------------
+Wed Jun  4 13:02:53 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 2.0.11:
+  + This release adds the following features:
+    - Add a new check-reboot-needed command for scripts to use
+    - Read the SELinux state in the report failure metadata
+  + This release fixes the following bugs:
+    - Add some notes in the README about security-relevant build flags
+    - Add support for the Dell dock ownership command
+    - Add the subsystem VIDPID when provided by ModemManager
+    - Allow changing the rts54hub block size from a quirk entry
+    - Allow Legion HID2 downgrades without --force, and clear config on upgrades
+    - Allow specifying multiple DEVICE-IDs for the get-updates command
+    - Cache the stream when parsing the processed cabinet to fix the report upload
+    - Do not allow DBX updates on the AiStone X5KK4NAG
+    - Do not use translated low-level error messages in the failure report
+    - Fall back to the activation date if the X.509 cert has no suitable subject
+    - Fix newer Synaptics VMM9 devices by adding a delay after disabling RC
+    - Ignore some sanity checks when parsing PK, KEK and db certificates
+    - Increase timeout requested by logitech RDFU devices
+    - Never include systemd.machine_id in the failure report
+    - Parse the correct VendorID from the ModemManager device ID
+    - Process all pending event sources when waiting for replug
+    - Use the UEFI PK report attributes for the other UEFI plugins
+  + This release adds support for the following hardware:
+    - Lenovo Thunderbolt 5 Smart Dock
+
+-------------------------------------------------------------------
+Mon May 26 08:07:42 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 2.0.10:
+  + This release adds the following features:
+    - Include the AGESA version as the summary of the AMD secure processor device
+    - Include the UEFI PK certificate key ID in the uploaded problem report
+    - Provide a way for the client to restrict the GUID list to an emulated device
+  + This release fixes the following bugs:
+    - Do not allow dbx updates on the HP Elitebook 845 Gen10
+    - Do not warn about BIOS bugs we can easily work around
+    - Fix a regression in fwupdmgr emulation-save when recording some devices
+    - Fix a regression preventing installation of KEKs
+    - Fix a small memory leak when getting security attributes
+    - Never write a UX capsule when using Capsule-On-Disk
+    - Use the 'OnBattery' property from upower to tell if plugged in
+  + This release adds support for the following hardware:
+    - Lenovo Legion Touchpad
+    - Logitech MX Mechanical
+    - Poly Studio V72 and V12
+
+-------------------------------------------------------------------
+Thu May  8 09:05:31 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 2.0.9:
+  + This release adds the following features:
+    - Add some documentation about updating the KEK and db
+    - Allow installing multiple db certificate updates at the same time
+    - Show what certificate signed the EFI authenticated variable
+    - Use readline to look up inputs from user, and make it optional
+  + This release fixes the following bugs:
+    - Add several devices with broken firmware to the UEFI dbx blocklist
+    - Constructing the authenticated URI properly when using FirmwareBaseURI
+    - Do not enumerate non-updatable OptionROM devices
+    - Do not export Redfish backup partitions as devices
+    - Fix a crash when installing some Wacom firmware types
+    - Fix a crash when parsing uevents that are not KEY=VALUE
+    - Fix parsing the DFU descriptor when not using libusb
+    - Fix PK and KEK enumeration failure on some systems
+    - Fix SMBIOS parsing for ROM size >= 16MiB
+    - Include a resolution for more of the HSI failures
+    - Include more output when using fwupdtool get-devices --json
+    - Never allow updating updatable-hidden devices with fwupdtool
+    - Properly handle redfish location redirect when installing firmware
+    - Recognize a very old dbx hash to allow upgrades
+    - Require a reboot after updating Intel CVS devices
+    - Rework the MEI code so that a device can use more than one interface
+    - Rewrite the ModemManger plugin to be simpler and more supportable
+    - Simplify parsing USB descriptors
+  + This release adds support for the following hardware:
+    - Intel Arc Battlemage GPUs
+- Add explicit pkgconfig(libusb-1.0) B?uildREquires: pulled in by
+  gusb already, but having it explicit allows to add specific
+  version constrains.
+- Add pkgconfig(readline) BuildRequires: new dependency.
+
+-------------------------------------------------------------------
+Fri Apr 11 07:33:28 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 2.0.8:
+  + This release adds the following features:
+    - Add the updated UEFI db as a new HSI attribute
+    - Add two new plugins that can update the UEFI Signature Database and KEK
+  + This release fixes the following bugs:
+    - Add /sys/firmware/efi/efivars to ReadWritePaths
+    - Avoid any DPAUX IO if the BnR DPCD does not match
+    - Be more careful falling back to older emulation versions
+    - Detect the Firehose protocol features if not automatically sent
+    - Do not match SMC Redfish method on non-Supermicro hardware
+    - Do not show prompts or messages in --json mode
+    - Fix a critical warning when enumerating DTH135K0C
+    - Make the EFI LOADOPT either a path or ShimHive when setting metadata
+    - Match lowercase directory names when checking for ESP
+    - Only allow UEFI capsule updates on UEFI-capable architectures
+    - Set the version format when using fwupdtool install offline
+    - Support segment value 0 in the ccgx-dmc image parser
+
+-------------------------------------------------------------------
+Tue Mar 25 16:35:12 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 2.0.7:
+  + This release adds the following features:
+    - Allow calling 'fwupdtool security' with a fwupd version parameter
+    - A new plugin to update B&R DisplayPort receivers
+    - A new plugin to update Intel CVS cameras
+    - A new plugin to verify UEFI memory protection attributes
+    - A new quirk to signify that no additional ESP space is required
+    - Build additional Redfish instance IDs for Dell server hardware
+    - Implement the HPE proprietary Redfish firmware push method
+    - Support cabinet archives greater in size than 2GB
+    - Support for showing the SBOM release URL
+    - Support for UEFI capsule installation in the bootloader
+  + This release fixes the following bugs:
+    - Always close USB file descriptors after starting the daemon
+    - Do not add a Redfish release date if set to 00:00:00Z
+    - Fix a critical warning when rescanning a device with no GUIDs
+    - Fix a small memory leak when emumerating Logitech Rallysystem devices
+    - Fix a tiny Redfish memory leak when writing firmware
+    - Fix building against pygobject 3.52
+    - Fix Logitech BulkController setup for new device firmware versions
+    - Fix scaler-only Wacom USB update deployment
+    - Fix updating the RMM component in the dell-kestrel dock
+    - Fix writing new EFI variables to workaround a kernel regression
+    - Make PCI NAME and SSVID_SSPID based modem-manager IDs visible
+    - Parse firmware before putting the device into bootloader mode
+    - Prepend the capsule header when using Capsule-on-Disk
+    - Put a memory limit on decoding LZMA streams when parsing firmware
+    - Retry claiming the fastboot interface for up to 2500ms
+    - Trigger dpaux rescan on drm changes correctly
+    - Use the metadata version format to set the version_lowest when required
+  + This release adds support for the following hardware:
+    - Another HP wireless dongle
+    - Lenovo ThinkPad Thunderbolt 4 Smart Dock Gen2
+    - Lenovo USB-C Dual Display Travel Dock
+    - More EDL 5G modem devices
+- Drop 8583.patch and 8588.patch: fixed upsrtream.
+- Align meson call with current upstream supported parameters. 
+
 -------------------------------------------------------------------
 Mon Mar 17 15:11:43 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
 

fwupd.obsinfo

@@ -1,4 +1,4 @@
 name: fwupd
-version: 2.0.6
-mtime: 1739538606
-commit: 476e1bf881daa548ad6bba60d713fe5666a9d53e
+version: 2.0.14
+mtime: 1756467794
+commit: 51611d0bbeb3da0df4516475f18ddca710f92c4b

fwupd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package fwupd
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 
-%ifarch %{ix86} x86_64 %{arm} aarch64 riscv64
+%ifarch %{ix86} x86_64 aarch64 riscv64
 %bcond_without efi_fw_update
 %else
 %bcond_with efi_fw_update
@@ -30,6 +30,10 @@
 %bcond_with dell_support
 %endif
 
+%ifarch %{ix86} x86_64 aarch64
+%bcond uefi_dbx 1
+%endif
+
 %if 0%{?suse_version} > 1500
 %bcond_without fish_support
 %else
@@ -40,7 +44,7 @@
 %define docs 0
 
 Name:           fwupd
-Version:        2.0.6
+Version:        2.0.14
 Release:        0
 Summary:        Device firmware updater daemon
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -48,10 +52,6 @@ Group:          System/Management
 URL:            https://fwupd.org/
 Source:         %{name}-%{version}.tar.xz
 
-# PATCH-FIX-UPSTREAM
-Patch0:         https://patch-diff.githubusercontent.com/raw/fwupd/fwupd/pull/8583.patch
-# PATCH-FIx-UPSTREAM
-Patch1:         https://patch-diff.githubusercontent.com/raw/fwupd/fwupd/pull/8588.patch
 # PATCH-FIX-OPENSUSE fwupd-bsc1130056-shim-path.patch bsc#1130056
 Patch99:        fwupd-bsc1130056-change-shim-path.patch
 
@@ -65,7 +65,6 @@ BuildRequires:  gcab
 BuildRequires:  gnutls
 BuildRequires:  gobject-introspection
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  gpgme-devel
 BuildRequires:  help2man
 BuildRequires:  intltool
 BuildRequires:  libelf-devel
@@ -110,12 +109,14 @@ BuildRequires:  pkgconfig(libelf)
 BuildRequires:  pkgconfig(libgcab-1.0) >= 1.0
 BuildRequires:  pkgconfig(libprotobuf-c)
 BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libusb-1.0) >= 0.1.27
 BuildRequires:  pkgconfig(mbim-glib)
 BuildRequires:  pkgconfig(mm-glib)
 BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.103
 BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  pkgconfig(qmi-glib)
+BuildRequires:  pkgconfig(readline)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(tss2-esys) >= 2.0
 BuildRequires:  pkgconfig(udev)
@@ -229,32 +230,10 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE"
 # Dell support requires direct SMBIOS access,
 # Synaptics requires Dell support, i.e. x86 only
 %meson \
-  -Dlaunchd=disabled \
-  -Dplugin_amdgpu=enabled \
   -Dpassim=disabled \
 %if %{with efi_fw_update}
-  -Dplugin_uefi_capsule=enabled \
-  -Dplugin_uefi_pk=enabled \
   -Defi_binary=false \
-%else
-  -Dplugin_uefi_capsule=disabled \
-  -Dplugin_uefi_pk=disabled \
 %endif
-%if %{with msr_support}
-  -Dplugin_msr=enabled \
-%else
-  -Dplugin_msr=disabled \
-%endif
-%if %{with dell_support}
-  -Dplugin_synaptics_mst=enabled \
-%else
-  -Dplugin_synaptics_mst=disabled \
-%endif
-%ifnarch %{ix86} x86_64
-  -Dplugin_synaptics_rmi=disabled \
-%endif
-  -Dplugin_nvme=enabled \
-  -Dplugin_redfish=enabled \
   -Ddocs=enabled \
   -Dsupported_build=enabled \
   -Dtests=false \
@@ -317,7 +296,9 @@ rm -fr %{buildroot}%{_datadir}/fish
 %{_libexecdir}/fwupd
 %{_bindir}/fwupdmgr
 %{_bindir}/fwupdtool
+%if %{with uefi_dbx}
 %{_bindir}/dbxtool
+%endif
 %{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf
 %{_datadir}/dbus-1/interfaces/org.freedesktop.fwupd.xml
 %{_datadir}/dbus-1/system-services/org.freedesktop.fwupd.service
@@ -347,6 +328,7 @@ rm -fr %{buildroot}%{_datadir}/fish
 %endif
 %endif
 %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
+%{_modulesloaddir}/fwupd-i2c.conf
 %if %{with msr_support}
 %dir %{_modulesloaddir}
 %{_modulesloaddir}/fwupd-msr.conf