Rebase to fix SAST failures

Resolves: #RHEL-34698

.gitignore

@@ -120,3 +120,17 @@
 /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.spec

@@ -48,12 +48,26 @@
 
 Summary:   Firmware update daemon
 Name:      fwupd
-Version:   1.9.13
+Version:   1.9.19
 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}
@@ -62,17 +76,12 @@ BuildRequires: libgusb-devel >= %{libgusb_version}
 BuildRequires: libcurl-devel >= %{libcurl_version}
 BuildRequires: libjcat-devel >= %{libjcat_version}
 BuildRequires: polkit-devel >= 0.103
-BuildRequires: protobuf-c-devel
 BuildRequires: python3-packaging
 BuildRequires: python3-jinja2
 BuildRequires: sqlite-devel
 BuildRequires: systemd >= %{systemd_version}
 BuildRequires: systemd-devel
 BuildRequires: libarchive-devel
-BuildRequires: libcbor-devel
-%if 0%{?rhel} >= 10 || 0%{?fedora} >= 28
-BuildRequires: passim-devel
-%endif
 BuildRequires: gobject-introspection-devel
 %ifarch %{valgrind_arches}
 BuildRequires: valgrind
@@ -84,7 +93,11 @@ 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
@@ -121,11 +134,7 @@ Provides: dbxtool
 
 # optional, but a really good idea
 Recommends: udisks2
-Recommends: bluez
 Recommends: jq
-%if 0%{?rhel} >= 10 || 0%{?fedora} >= 28
-Recommends: passim
-%endif
 
 %if 0%{?have_modem_manager}
 Recommends: %{name}-plugin-modem-manager
@@ -231,12 +240,23 @@ or server machines.
 %else
     -Dplugin_modem_manager=disabled \
 %endif
-    -Dman=true \
+    -Dbluez=disabled \
-    -Dsystemd_unit_user="" \
+    -Dcbor=disabled \
-    -Dbluez=enabled \
-    -Dplugin_powerd=disabled \
     -Dlaunchd=disabled \
-    -Dsupported_build=enabled
+    -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
 
@@ -248,6 +268,13 @@ or server machines.
 %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
@@ -306,6 +333,7 @@ systemctl --no-reload preset fwupd-refresh.timer &>/dev/null || :
 %{_datadir}/fish/vendor_completions.d/fwupdmgr.fish
 %{_datadir}/fwupd/metainfo/org.freedesktop.fwupd*.metainfo.xml
 %{_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
@@ -389,7 +417,6 @@ systemctl --no-reload preset fwupd-refresh.timer &>/dev/null || :
 %{_datadir}/fwupd/device-tests/*.json
 %endif
 %{_libexecdir}/installed-tests/fwupd/*
-%dir %{_sysconfdir}/fwupd/remotes.d
 %{_datadir}/fwupd/remotes.d/fwupd-tests.conf
 %endif
 

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.hardware-fwupd.tier0.functional}

sources

@@ -1 +1,14 @@
-SHA512 (fwupd-1.9.13.tar.xz) = 240e057e33e861a84638866a43a7cae33bc3f12d48d5cf2ad3f8bdfb92824057472d1981ac2145d2024f31727f8413c555ce907dea28f4f7232e4604e24703ab
+SHA512 (fwupd-1.9.19.tar.xz) = e20f16aa2cf528ecc6262a5c343287aef64fb37667f8d3972daa70f96364041daa0b23149acbd20cbeff059f6428c6c2a317973bc1dd40a39e239350b0eb011e
+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