From 20196c7e548f742faf3a7591ffeb2a4467fb6be9 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 8 Nov 2023 14:44:37 +0300 Subject: [PATCH] import fwupd-1.8.16-1.el9 --- .fwupd.metadata | 9 +- .gitignore | 9 +- ...ny-of-the-HWIDs-setup-failures-fatal.patch | 110 ------------------ ...-attribute-not-exported-warning-on-d.patch | 60 ---------- ...anager-remove-improper-use-of-assert.patch | 28 ----- ...-build-fix-when-using-ppc64le-system.patch | 24 ---- ...acom-usb-Retry-set_report-on-failure.patch | 46 -------- SOURCES/redhatsecureboot301.cer | Bin 839 -> 0 bytes SOURCES/redhatsecureboot503.cer | Bin 964 -> 0 bytes SOURCES/redhatsecurebootca3.cer | Bin 977 -> 0 bytes SOURCES/redhatsecurebootca5.cer | Bin 920 -> 0 bytes SPECS/fwupd.spec | 37 +++--- 12 files changed, 35 insertions(+), 288 deletions(-) delete mode 100644 SOURCES/0001-Do-not-make-any-of-the-HWIDs-setup-failures-fatal.patch delete mode 100644 SOURCES/0001-Only-include-the-attribute-not-exported-warning-on-d.patch delete mode 100644 SOURCES/0001-modem-manager-remove-improper-use-of-assert.patch delete mode 100644 SOURCES/0001-trivial-Fix-build-fix-when-using-ppc64le-system.patch delete mode 100644 SOURCES/0001-wacom-usb-Retry-set_report-on-failure.patch delete mode 100644 SOURCES/redhatsecureboot301.cer delete mode 100644 SOURCES/redhatsecureboot503.cer delete mode 100644 SOURCES/redhatsecurebootca3.cer delete mode 100644 SOURCES/redhatsecurebootca5.cer diff --git a/.fwupd.metadata b/.fwupd.metadata index 72774da..8ec6c19 100644 --- a/.fwupd.metadata +++ b/.fwupd.metadata @@ -8,5 +8,12 @@ cd2bbe591438fe893b4042dc03d30659c1e31756 SOURCES/DBXUpdate-20210429-x64.cab d3ae610f5b6e602feded54eae8d67ddb7c60e64f SOURCES/DBXUpdate-20220812-aa64.cab 0ac8508ef7a86959e6ab03deec256b19df29677f SOURCES/DBXUpdate-20220812-ia32.cab 60f9aa664cb7588e33ce56d621dafa9b5a71e072 SOURCES/DBXUpdate-20220812-x64.cab -5e77389b263dd463de85db965d478f7182a9ea0a SOURCES/fwupd-1.8.10.tar.xz +46a42362cd34c0d103cf534ca431508d24715e51 SOURCES/DBXUpdate-20230509-aa64.cab +23d9544ef0f9b39a76d258f6d4a4a54d8f7592b2 SOURCES/DBXUpdate-20230509-ia32.cab +bc6a604b29918d67d5fef745ad4375ca3d43d05e SOURCES/DBXUpdate-20230509-x64.cab +0abed3cf70b97366f77616b908af66f7b4ac6f1f SOURCES/fwupd-1.8.16.tar.xz 147b36f75fca288fd01d9ed4150866344d57df27 SOURCES/fwupd-efi-1.4.tar.xz +4a07b56e28741884b86da6ac91f8f9929541a1e4 SOURCES/redhatsecureboot301.cer +33e260486f5c12e47b72b90dfb779ca892f56c45 SOURCES/redhatsecureboot503.cer +cf9230e69000076727e5b784ec871d22716dc5da SOURCES/redhatsecurebootca3.cer +e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer diff --git a/.gitignore b/.gitignore index fbed8bc..fb76075 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,12 @@ SOURCES/DBXUpdate-20210429-x64.cab SOURCES/DBXUpdate-20220812-aa64.cab SOURCES/DBXUpdate-20220812-ia32.cab SOURCES/DBXUpdate-20220812-x64.cab -SOURCES/fwupd-1.8.10.tar.xz +SOURCES/DBXUpdate-20230509-aa64.cab +SOURCES/DBXUpdate-20230509-ia32.cab +SOURCES/DBXUpdate-20230509-x64.cab +SOURCES/fwupd-1.8.16.tar.xz SOURCES/fwupd-efi-1.4.tar.xz +SOURCES/redhatsecureboot301.cer +SOURCES/redhatsecureboot503.cer +SOURCES/redhatsecurebootca3.cer +SOURCES/redhatsecurebootca5.cer diff --git a/SOURCES/0001-Do-not-make-any-of-the-HWIDs-setup-failures-fatal.patch b/SOURCES/0001-Do-not-make-any-of-the-HWIDs-setup-failures-fatal.patch deleted file mode 100644 index 9b7c50c..0000000 --- a/SOURCES/0001-Do-not-make-any-of-the-HWIDs-setup-failures-fatal.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 90e5a58736645cdd37bf4c63f9a4056951dfb3f2 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Tue, 24 Jan 2023 09:52:17 +0000 -Subject: [PATCH] Do not make any of the HWIDs setup failures fatal - -It's perfectly okay to have no HWIDs defined. - -Should help with https://github.com/fwupd/fwupd/issues/5402 ---- - libfwupdplugin/fu-context.c | 73 +++++++++++-------------------------- - 1 file changed, 21 insertions(+), 52 deletions(-) - -diff --git a/libfwupdplugin/fu-context.c b/libfwupdplugin/fu-context.c -index 08618b435..11b4b1b38 100644 ---- a/libfwupdplugin/fu-context.c -+++ b/libfwupdplugin/fu-context.c -@@ -767,6 +767,8 @@ fu_context_security_changed(FuContext *self) - g_signal_emit(self, signals[SIGNAL_SECURITY_CHANGED], 0); - } - -+typedef gboolean (*FuContextHwidsSetupFunc)(FuContext *self, FuHwids *hwids, GError **error); -+ - /** - * fu_context_load_hwinfo: - * @self: a #FuContext -@@ -786,62 +788,29 @@ fu_context_load_hwinfo(FuContext *self, FuContextHwidFlags flags, GError **error - GPtrArray *guids; - g_autoptr(GError) error_hwids = NULL; - g_autoptr(GError) error_bios_settings = NULL; -+ struct { -+ const gchar *name; -+ FuContextHwidFlags flag; -+ FuContextHwidsSetupFunc func; -+ } hwids_setup_map[] = {{"config", FU_CONTEXT_HWID_FLAG_LOAD_CONFIG, fu_hwids_config_setup}, -+ {"smbios", FU_CONTEXT_HWID_FLAG_LOAD_SMBIOS, fu_hwids_smbios_setup}, -+ {"fdt", FU_CONTEXT_HWID_FLAG_LOAD_FDT, fu_hwids_fdt_setup}, -+ {"kenv", FU_CONTEXT_HWID_FLAG_LOAD_KENV, fu_hwids_kenv_setup}, -+ {"dmi", FU_CONTEXT_HWID_FLAG_LOAD_DMI, fu_hwids_dmi_setup}, -+ {NULL, FU_CONTEXT_HWID_FLAG_NONE, NULL}}; - - g_return_val_if_fail(FU_IS_CONTEXT(self), FALSE); - g_return_val_if_fail(error == NULL || *error == NULL, FALSE); - -- if ((flags & FU_CONTEXT_HWID_FLAG_LOAD_CONFIG) > 0) { -- g_autoptr(GError) error_local = NULL; -- if (!fu_hwids_config_setup(self, priv->hwids, &error_local)) { -- if (!g_error_matches(error_local, FWUPD_ERROR, FWUPD_ERROR_NOT_SUPPORTED)) { -- g_propagate_prefixed_error(error, -- g_steal_pointer(&error_local), -- "Failed to load HWIDs config: "); -- return FALSE; -- } -- } -- } -- if ((flags & FU_CONTEXT_HWID_FLAG_LOAD_DMI) > 0) { -- g_autoptr(GError) error_local = NULL; -- if (!fu_hwids_dmi_setup(self, priv->hwids, &error_local)) { -- if (!g_error_matches(error_local, FWUPD_ERROR, FWUPD_ERROR_NOT_SUPPORTED)) { -- g_propagate_prefixed_error(error, -- g_steal_pointer(&error_local), -- "Failed to load HWIDs DMI: "); -- return FALSE; -- } -- } -- } -- if ((flags & FU_CONTEXT_HWID_FLAG_LOAD_FDT) > 0) { -- g_autoptr(GError) error_local = NULL; -- if (!fu_hwids_fdt_setup(self, priv->hwids, &error_local)) { -- if (!g_error_matches(error_local, FWUPD_ERROR, FWUPD_ERROR_NOT_SUPPORTED)) { -- g_propagate_prefixed_error(error, -- g_steal_pointer(&error_local), -- "Failed to load HWIDs FDT: "); -- return FALSE; -- } -- } -- } -- if ((flags & FU_CONTEXT_HWID_FLAG_LOAD_KENV) > 0) { -- g_autoptr(GError) error_local = NULL; -- if (!fu_hwids_kenv_setup(self, priv->hwids, &error_local)) { -- if (!g_error_matches(error_local, FWUPD_ERROR, FWUPD_ERROR_NOT_SUPPORTED)) { -- g_propagate_prefixed_error(error, -- g_steal_pointer(&error_local), -- "Failed to load HWIDs kenv: "); -- return FALSE; -- } -- } -- } -- if ((flags & FU_CONTEXT_HWID_FLAG_LOAD_SMBIOS) > 0) { -- g_autoptr(GError) error_local = NULL; -- if (!fu_hwids_smbios_setup(self, priv->hwids, &error_local)) { -- if (!g_error_matches(error_local, FWUPD_ERROR, FWUPD_ERROR_NOT_SUPPORTED)) { -- g_propagate_prefixed_error(error, -- g_steal_pointer(&error_local), -- "Failed to load SMBIOS: "); -- return FALSE; -+ /* run all the HWID setup funcs */ -+ for (guint i = 0; hwids_setup_map[i].name != NULL; i++) { -+ if ((flags & hwids_setup_map[i].flag) > 0) { -+ g_autoptr(GError) error_local = NULL; -+ if (!hwids_setup_map[i].func(self, priv->hwids, &error_local)) { -+ g_debug("failed to load %s: %s", -+ hwids_setup_map[i].name, -+ error_local->message); -+ break; - } - } - } --- -2.39.1 - diff --git a/SOURCES/0001-Only-include-the-attribute-not-exported-warning-on-d.patch b/SOURCES/0001-Only-include-the-attribute-not-exported-warning-on-d.patch deleted file mode 100644 index 65c2246..0000000 --- a/SOURCES/0001-Only-include-the-attribute-not-exported-warning-on-d.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 19db23f9b8a64597564ce1b474eb6c384a57125f Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Wed, 2 Nov 2022 09:31:53 +0000 -Subject: [PATCH] Only include the 'attribute not exported' warning on debug - builds - -End users are not really capable of fixing the root issue, and people seem -overly worried that something bad has gone wrong. - -Fixes https://github.com/fwupd/fwupd/issues/5077 ---- - libfwupdplugin/fu-bios-settings.c | 2 +- - libfwupdplugin/fu-self-test.c | 2 ++ - plugins/lenovo-thinklmi/fu-self-test.c | 2 ++ - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libfwupdplugin/fu-bios-settings.c b/libfwupdplugin/fu-bios-settings.c -index 6151c8289..8ea1269d7 100644 ---- a/libfwupdplugin/fu-bios-settings.c -+++ b/libfwupdplugin/fu-bios-settings.c -@@ -276,7 +276,7 @@ fu_bios_setting_set_type(FuBiosSettings *self, FwupdBiosSetting *attr, GError ** - - /* lenovo thinklmi seems to be missing it even though it's mandatory :/ */ - if (!fu_bios_setting_get_key(attr, "type", &data, &error_key)) { --#if GLIB_CHECK_VERSION(2, 64, 0) -+#if GLIB_CHECK_VERSION(2, 64, 0) && !defined(SUPPORTED_BUILD) - g_warning_once("KERNEL BUG: 'type' attribute not exported: (%s)", - error_key->message); - #else -diff --git a/libfwupdplugin/fu-self-test.c b/libfwupdplugin/fu-self-test.c -index c105fa271..c670b3a80 100644 ---- a/libfwupdplugin/fu-self-test.c -+++ b/libfwupdplugin/fu-self-test.c -@@ -3117,7 +3117,9 @@ fu_bios_settings_load_func(void) - test_dir = g_test_build_filename(G_TEST_DIST, "tests", "bios-attrs", "lenovo-p620", NULL); - (void)g_setenv("FWUPD_SYSFSFWATTRIBDIR", test_dir, TRUE); - -+#if GLIB_CHECK_VERSION(2, 64, 0) && !defined(SUPPORTED_BUILD) - g_test_expect_message("FuBiosSettings", G_LOG_LEVEL_WARNING, "*BUG*"); -+#endif - ret = fu_context_reload_bios_settings(ctx, &error); - g_assert_no_error(error); - g_assert_true(ret); -diff --git a/plugins/lenovo-thinklmi/fu-self-test.c b/plugins/lenovo-thinklmi/fu-self-test.c -index 4777a2ae1..9e20a8cf5 100644 ---- a/plugins/lenovo-thinklmi/fu-self-test.c -+++ b/plugins/lenovo-thinklmi/fu-self-test.c -@@ -39,7 +39,9 @@ fu_test_self_init(FuTest *self, GError **error_global) - g_autoptr(FuProgress) progress = fu_progress_new(G_STRLOC); - g_autoptr(GError) error = NULL; - -+#if GLIB_CHECK_VERSION(2, 64, 0) && !defined(SUPPORTED_BUILD) - g_test_expect_message("FuBiosSettings", G_LOG_LEVEL_WARNING, "*KERNEL*BUG*"); -+#endif - - ret = fu_context_load_quirks(ctx, - FU_QUIRKS_LOAD_FLAG_NO_CACHE | FU_QUIRKS_LOAD_FLAG_NO_VERIFY, --- -2.39.1 - diff --git a/SOURCES/0001-modem-manager-remove-improper-use-of-assert.patch b/SOURCES/0001-modem-manager-remove-improper-use-of-assert.patch deleted file mode 100644 index 4b97ef0..0000000 --- a/SOURCES/0001-modem-manager-remove-improper-use-of-assert.patch +++ /dev/null @@ -1,28 +0,0 @@ -From af5fb429c8e726d1d7455b2d0e5d4263edbd4290 Mon Sep 17 00:00:00 2001 -From: Ivan Mikhanchuk -Date: Tue, 24 Jan 2023 17:06:09 -0800 -Subject: [PATCH] modem-manager: remove improper use of assert - -FuSaharaLoader being NULL is normal for devices that only -support Firehose and don't use Sahara QDL port. ---- - plugins/modem-manager/fu-sahara-loader.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/plugins/modem-manager/fu-sahara-loader.c b/plugins/modem-manager/fu-sahara-loader.c -index 89c620fbe..78f24036f 100644 ---- a/plugins/modem-manager/fu-sahara-loader.c -+++ b/plugins/modem-manager/fu-sahara-loader.c -@@ -206,7 +206,8 @@ fu_sahara_loader_close(FuSaharaLoader *self, GError **error) - gboolean - fu_sahara_loader_qdl_is_open(FuSaharaLoader *self) - { -- g_return_val_if_fail(self != NULL, FALSE); -+ if (self == NULL) -+ return FALSE; - - return fu_usb_device_is_open(self->usb_device); - } --- -2.39.1 - diff --git a/SOURCES/0001-trivial-Fix-build-fix-when-using-ppc64le-system.patch b/SOURCES/0001-trivial-Fix-build-fix-when-using-ppc64le-system.patch deleted file mode 100644 index 5fb8fa3..0000000 --- a/SOURCES/0001-trivial-Fix-build-fix-when-using-ppc64le-system.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7f427d567d497048772bad59e098528605e563ce Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Mon, 23 Jan 2023 11:22:43 +0000 -Subject: [PATCH] trivial: Fix build fix when using ppc64le system - ---- - src/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/meson.build b/src/meson.build -index b9f6736f2..f3ca734ee 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -197,6 +197,7 @@ plugins_hdr = custom_target('fwupd-generate-plugins-header', - fwupdengine = library( - 'fwupdengine', - resources_src, -+ plugins_hdr, - sources: fwupd_engine_src, - install: true, - install_rpath: libdir_pkg, --- -2.39.1 - diff --git a/SOURCES/0001-wacom-usb-Retry-set_report-on-failure.patch b/SOURCES/0001-wacom-usb-Retry-set_report-on-failure.patch deleted file mode 100644 index 9fc7302..0000000 --- a/SOURCES/0001-wacom-usb-Retry-set_report-on-failure.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8076090a000d4adde59fddeadb17a6f769993d1e Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -Date: Tue, 17 Jan 2023 14:24:14 -0800 -Subject: [PATCH] wacom-usb: Retry set_report on failure - -Sometimes the flash process will randomly hang and time-out when sending -data to the device. We currently do not use any retry logic, so if this -happens the flash attempt is treated as a failure. This can be a source -of worry or frustration, especially if subsequent manual retries fail -in a similar way. - -Adding FU_HID_DEVICE_FLAG_RETRY_FAILURE to the list of flags used when -calling fu_hid_device_set_report allows fwupd to try sending a block -multiple times if such a time-out (or other error) occurs. This makes -the flash process less prone to failure. - -Signed-off-by: Jason Gerecke ---- - plugins/wacom-usb/fu-wac-device.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/plugins/wacom-usb/fu-wac-device.c b/plugins/wacom-usb/fu-wac-device.c -index 9162d19a9..714761b1e 100644 ---- a/plugins/wacom-usb/fu-wac-device.c -+++ b/plugins/wacom-usb/fu-wac-device.c -@@ -182,7 +182,8 @@ fu_wac_device_set_feature_report(FuWacDevice *self, - buf, - bufsz, - FU_WAC_DEVICE_TIMEOUT, -- flags | FU_HID_DEVICE_FLAG_IS_FEATURE, -+ flags | FU_HID_DEVICE_FLAG_IS_FEATURE | -+ FU_HID_DEVICE_FLAG_RETRY_FAILURE, - error); - } - -@@ -920,6 +921,7 @@ fu_wac_device_init(FuWacDevice *self) - fu_device_set_install_duration(FU_DEVICE(self), 10); - fu_device_set_remove_delay(FU_DEVICE(self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE); - fu_device_set_firmware_gtype(FU_DEVICE(self), FU_TYPE_WAC_FIRMWARE); -+ fu_device_retry_set_delay(FU_DEVICE(self), 30); /* ms */ - } - - static void --- -2.39.1 - diff --git a/SOURCES/redhatsecureboot301.cer b/SOURCES/redhatsecureboot301.cer deleted file mode 100644 index 4ff8b79e6736e566dbf39603e0887a53345aa4e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 zcmXqLVs5=#_OQj1C) zic(WD5=-=w^K%X4#CZ)(42%qc(A3<>AWEFq*xbO#zzobaj4}u^)G^S4Sf`BDy5h|A zyv)3GQtWJER6_O@BP#=Q6C*!^K@%evQxhX2!zT5vqmx`?o`(oz{$eeCezR_cLPyl% zHpefqUbuO&%O^nA}y6#9BjM%~U7Q(5kw6_YN1epR)|xb9Elg4_B`%!~|-ixmyz4P=2K zFU!Xw#v&5#_@80Rp3FS`6#W&an$HJBb(91l2O=d+v%~@6}B_2%&Mg` zDvt6_STWb-ZhXD^RgaJz3Cq5o4B43+oEZD&XVQnj{jXOGHfUJJB>qmC?A`ut>Ahpw zdM-|DZzz7Yc^I3-u|J*vqdKqQ`kIF?LJd~2r8XOg&f%Z+Yj((@r{(*;Y?_w8rSDJJ zntk_K74NJ(drfx5hIZaKImf>p{fSPd=}qfHlV8OA-0dHz$M#&#on!XF_3NjY{(Hxy zbKN4k{8NvC{Y9;Yo!51>R!)l5n2-{5CgAUe(k!NLc|1u*B2w==ttY-NzWb+N=75O& zzv2uf{%c3S9%5x`<-dQv`g=w9>l=;D-vz#WO}UeuefPU1`=|Tw9$I=mIi&>vg+x|L diff --git a/SOURCES/redhatsecureboot503.cer b/SOURCES/redhatsecureboot503.cer deleted file mode 100644 index 50e375c7461e78286033119e7b6f9d55fdb3543c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 964 zcmXqLVm@Hd#I#}oGZP~d6DPygP|MB7r^(JY;AP{~YV&CO&dbQi&B|a9ZzyIU!p0oR z!o|ZIl$xU8kyxUm;F*`KXQ*f(4-#kQk${RT1g9pK7NsgU<>!|uI6Eqs8Y&qmz)j<1 z6ca8^O-{^7Eh=#+N=?Z~EYVBO&oz(}=QT1gFf*_;G%zqQvWODrHMTG?G_-(n4bpHr zK*K-{;sAMU4hYUn&&$k9S1>g&CdwU6j7rFUXJlnyZerwTFlb`rVrpV!WSFGBlyl!b z@AvOl&N7VJBQfm-*Gb3trqyBYpMP7O)-t#1KVhSL*Xm1lv+vaB_D}D5y>Gs;>;9|c zS*nVeCj;4XQqR$0JPJB$l15Dm#Ah z*G9?ng;qBhTt7zi_9piIB1HKryy*<#h?ozG0H9pAq!Hx`|9`sDeVhoQ|+Ba2Qv zo-yfhS&G=>BcJvO?o=@Oz`Lz_kxrWF{OxXgEW`@xmVMa7-nq`c>PBzQ|M_C~MBFr9 zPrLh_iJ6gsadCw~nE?+l)MbSk8UM2|888^|fq48N9t$%QdxL=(h_4Fb^B8ckacHwK zva+%>GaJZ)#Q9jnSVS6UDoF(Enx4Ng{cq63UVh2ku$$W8v?Qy{B4HrbAaW*u>2r;Y zU7miEXYbA6p6F6GYkog++yK)hFm4zb1h29y$1xV|D)`m!I6+~4tbNet)HA$J5+1X7 z^`aP;7*9J<6!|s6!sq4b3!SQO4a7XUc(LMA*hcX#E?K3&s2<&fsu=j-COdYrFG zd%)%2@WE8TTRmd4$Nz&#rSC6shKtRebdaxGHOuddxkF-v`v-gbQf5te+s{&O)6ChW zul|Xwxt5?3lD7D>ylk9WZ60mkc^MhGSs4s`4b=@)*_cCF zn1$tnQd1N>5=#_OQj1C) zic(WD5=-=w^K%X4#CZ)(42%qc(8R>VG)kP;*xbO#zzoWzwslR6O2{5!WMyD(V&rEq zXkz4IYGPz$nC+~vi6EDouC4!V-;tv&JA zN}nf->iaHo2tM8rAb&8=Njdj{a^${=Z?aE)&k<1VH{Q3Wx7jKD-_5CYum4K4d~JV` z`ccOE*<7!m22LI4&u3g0F3h!NN?ysm?c*7~^lIfF3D-Xhnr_&uU!bJ$?ZS8WW+A0- zr9raw{Iep~On)hDAUrqc*pZy>@YoE^;z#ABPp))utMY{K9XOZuN+87Vv97^}gccFK z6&c%&T=rzVyKuJ1S>c?Rq?77kYS zv==`X%}MC|0a-81!fL?G$oL;QPJxLO7^jR3 zp{b9(0{X(lQ;+K%h_CKtxc%nd+9kH!CBia&JkgcqO9LvF9(I1~^2+p(_fBqs&+@+g zjZG)^b(y8?lr#NV`RkoR|I-BpaSiJiPBV7drX0Bbe!0fPB95K&)ygj1YM5%bK;(6L z=7Y@r2hM%A`uyr;o|A^(c{icYtu_B=WuE^MZ_<i|1QMhsQHT z4}wg*#%C!d<*ePQAKPyWoS|9R;jPUx*P-5Ksuo_~6c3tyKHzf+y+r*{_;vOAw> zmv4Wk&h*1hGe;ze)#t#BH;PsH)$e|FOmna8+@9jW!^ymRMf{q+C84h)mppfN*sxn6 NnfI|Q%N6m!6aeL$dME$@ diff --git a/SOURCES/redhatsecurebootca5.cer b/SOURCES/redhatsecurebootca5.cer deleted file mode 100644 index dfb0284954861282d1a0ce16c8c5cdc71c27659f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 920 zcmXqLVxD5q#8k6@nTe5!iIbtZm{+@~;bN2lFB_*;n@8JsUPeZ4RtAH3LoovpHs(+k zE*{>X)D#7e#1b6^&%9(kLq!95kT^4s1XNrhI5oMnC{@8JKfgr5*-^pNP{}|6ZW6NxP$#b?ru1p1aqn$3D)YB{Qqo zjCvjz?|=HkE#3AN-xTZpws*U~)f@DZ{t~uwMZy8<;F%jD%$u6!n#qYzp^Sryh{C;x9qf@!N=T4ui@b#({ zSD&^p3kNZ=9lAQ9%xdfP9doNToV+k2^LHOFD{5oE&78StJa^8n7$i2k94PWc<&xr*# z`sciS&XK#@>h!OC8{=mczNLHbADCJ+pE=-CsaDOF#s}?5Q)1qq&%R~#cz>QmiAiVx zk5XXYstAL9d+iK-w@u$FESybMIPOFY~9lmn~9nUf%vMc88@((p0B(#qL+!COmt7`j5IhPVzo{cRPw} Pd!}BnFF!b8N6JS4>O*3Z diff --git a/SPECS/fwupd.spec b/SPECS/fwupd.spec index 07415c2..ce20e8e 100644 --- a/SPECS/fwupd.spec +++ b/SPECS/fwupd.spec @@ -53,19 +53,13 @@ Summary: Firmware update daemon Name: fwupd -Version: 1.8.10 -Release: 2%{?dist} +Version: 1.8.16 +Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/fwupd/fwupd Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz Source2: http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.4.tar.xz -Patch1: 0001-trivial-Fix-build-fix-when-using-ppc64le-system.patch -Patch2: 0001-Only-include-the-attribute-not-exported-warning-on-d.patch -Patch3: 0001-Do-not-make-any-of-the-HWIDs-setup-failures-fatal.patch -Patch4: 0001-modem-manager-remove-improper-use-of-assert.patch -Patch5: 0001-wacom-usb-Retry-set_report-on-failure.patch - Patch101: 0001-generate_binary-Add-NX-COMPAT-flag-manually-when-gen.patch Source10: http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab @@ -78,6 +72,9 @@ 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 # these are numbered high just to keep them wildly away from colliding with # the real package sources, in order to reduce churn. @@ -208,11 +205,6 @@ can be flashed using flashrom. It is probably not required on servers. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 mkdir -p subprojects/fwupd-efi tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 @@ -279,6 +271,7 @@ cd - -Dplugin_modem_manager=disabled \ %endif -Dman=true \ + -Dcompat_cli=true \ -Dbluez=disabled \ -Dcbor=disabled \ -Dplugin_android_boot=disabled \ @@ -304,7 +297,10 @@ cd - # on RHEL the LVFS is disabled by default mkdir -p %{buildroot}/%{_datadir}/dbxtool -install %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{buildroot}/%{_datadir}/dbxtool +install \ + %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \ + %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} \ + %{buildroot}/%{_datadir}/dbxtool # sign fwupd.efi loader %ifarch x86_64 @@ -340,7 +336,7 @@ done %systemd_postun_with_restart pesign.service %files -f %{name}.lang -%doc README.md AUTHORS +%doc README.md %license COPYING %config(noreplace)%{_sysconfdir}/fwupd/daemon.conf %if 0%{?have_uefi} @@ -390,7 +386,6 @@ done %{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf %{_datadir}/bash-completion/completions/fwupdmgr %{_datadir}/bash-completion/completions/fwupdtool -%{_datadir}/bash-completion/completions/fwupdagent %{_datadir}/fish/vendor_completions.d/fwupdmgr.fish %{_datadir}/fwupd/metainfo/org.freedesktop.fwupd*.metainfo.xml %if 0%{?have_dell} @@ -412,6 +407,9 @@ done %{_datadir}/dbxtool/DBXUpdate-20220812-aa64.cab %{_datadir}/dbxtool/DBXUpdate-20220812-ia32.cab %{_datadir}/dbxtool/DBXUpdate-20220812-x64.cab +%{_datadir}/dbxtool/DBXUpdate-20230509-aa64.cab +%{_datadir}/dbxtool/DBXUpdate-20230509-ia32.cab +%{_datadir}/dbxtool/DBXUpdate-20230509-x64.cab %{_mandir}/man1/fwupdtool.1* %{_mandir}/man1/fwupdagent.1* %{_mandir}/man1/dfu-tool.1* @@ -439,7 +437,7 @@ done %dir %{_datadir}/fwupd/quirks.d %{_datadir}/fwupd/quirks.d/builtin.quirk.gz %if 0%{?have_uefi} -%{_sysconfdir}/grub.d/35_fwupd +%config(noreplace)%{_sysconfdir}/grub.d/35_fwupd %endif %{_libdir}/libfwupd.so.2* %{_libdir}/girepository-1.0/Fwupd-2.0.typelib @@ -486,13 +484,16 @@ done %endif %{_datadir}/installed-tests/fwupd/chassis_type %{_datadir}/installed-tests/fwupd/sys_vendor -%{_datadir}/fwupd/device-tests/*.json %{_libexecdir}/installed-tests/fwupd/* %dir %{_sysconfdir}/fwupd/remotes.d %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/fwupd-tests.conf %endif %changelog +* Fri Jun 09 2023 Richard Hughes 1.8.16-1 +- Update to latest stable upstream version. +- Resolves: rhbz#2209944 + * Thu Feb 02 2023 Richard Hughes 1.8.10-2 - Rebuild because distrobaker did entirely the wrong thing. - Resolves: rhbz#2128384, needed for rhbz#2119436 and rhbz#2128384