From 0830a78595d8e6585922d89b1eb86ba4a6d29bc1 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 22 Jul 2022 11:56:05 +0100 Subject: [PATCH] New upstream release --- .fwupd.metadata | 1 + .gitignore | 2 + ...ompiling-with-new-versions-of-efivar.patch | 58 ----------- fwupd.spec | 97 ++++++++++++------- sources | 4 +- 5 files changed, 66 insertions(+), 96 deletions(-) create mode 100644 .fwupd.metadata delete mode 100644 0001-Fix-compiling-with-new-versions-of-efivar.patch diff --git a/.fwupd.metadata b/.fwupd.metadata new file mode 100644 index 0000000..e7ed92c --- /dev/null +++ b/.fwupd.metadata @@ -0,0 +1 @@ +46402fb832a7143ab24ff2775d49882bc98781ce fwupd-1.8.3.tar.xz diff --git a/.gitignore b/.gitignore index 51ef855..c67fc31 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,5 @@ /fwupd-1.7.1.tar.xz /fwupd-efi-1.1.tar.xz /fwupd-1.7.4.tar.xz +/fwupd-1.8.3.tar.xz +/fwupd-efi-1.3.tar.xz diff --git a/0001-Fix-compiling-with-new-versions-of-efivar.patch b/0001-Fix-compiling-with-new-versions-of-efivar.patch deleted file mode 100644 index 03caf6d..0000000 --- a/0001-Fix-compiling-with-new-versions-of-efivar.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e74d38bfd3097471fe60dbe843a68c16516a78da Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Mon, 17 Jan 2022 14:50:47 +0000 -Subject: [PATCH] Fix compiling with new versions of efivar - -Fixes https://github.com/fwupd/fwupd/issues/4181 ---- - meson.build | 5 +++++ - plugins/uefi-capsule/fu-uefi-common.h | 3 +++ - 2 files changed, 8 insertions(+) - -diff --git a/meson.build b/meson.build -index 833bdbf56..691cc8a58 100644 ---- a/meson.build -+++ b/meson.build -@@ -412,6 +412,11 @@ endif - if build_standalone and get_option('plugin_uefi_capsule') - efiboot = dependency('efiboot') - -+ efivar = dependency('efivar') -+ if cc.has_header_symbol('efivar/efivar-types.h', 'efi_time_t', dependencies : efivar) -+ conf.set('HAVE_EFI_TIME_T', '1') -+ endif -+ - efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') - conf.set_quoted('EFI_APP_LOCATION', efi_app_location) - -diff --git a/plugins/uefi-capsule/fu-uefi-common.h b/plugins/uefi-capsule/fu-uefi-common.h -index a21806d6b..1d616c9e0 100644 ---- a/plugins/uefi-capsule/fu-uefi-common.h -+++ b/plugins/uefi-capsule/fu-uefi-common.h -@@ -9,6 +9,7 @@ - - #include - -+#include - #include - - #define EFI_CAPSULE_HEADER_FLAGS_PERSIST_ACROSS_RESET 0x00010000 -@@ -17,6 +18,7 @@ - - #define EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED 0x0000000000000004ULL - -+#ifndef HAVE_EFI_TIME_T - typedef struct __attribute__((__packed__)) { - guint16 year; - guint8 month; -@@ -30,6 +32,7 @@ typedef struct __attribute__((__packed__)) { - guint8 daylight; - guint8 pad2; - } efi_time_t; -+#endif - - typedef struct __attribute__((__packed__)) { - fwupd_guid_t guid; --- -2.35.1 - diff --git a/fwupd.spec b/fwupd.spec index 3a6b673..bb7f612 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -5,7 +5,7 @@ %global libjcat_version 0.1.0 %global systemd_version 231 %global json_glib_version 1.1.1 -%global fwupdplugin_version 5 +%global fwupdplugin_version 7 # 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 @@ -23,6 +23,11 @@ %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 %global have_flashrom 1 @@ -37,6 +42,11 @@ %global have_dell 1 %endif +# AMD PSP is only available on x86 +%ifarch x86_64 +%global have_pci_psp 1 +%endif + # only available recently %if 0%{?fedora} >= 30 %global have_modem_manager 1 @@ -44,12 +54,12 @@ Summary: Firmware update daemon Name: fwupd -Version: 1.7.4 -Release: 3%{?dist} +Version: 1.8.3 +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.1.tar.xz +Source2: http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.3.tar.xz Source10: http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab Source11: http://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab @@ -65,9 +75,6 @@ Source301: redhatsecureboot301.cer Source500: redhatsecurebootca5.cer Source503: redhatsecureboot503.cer -# Backported from upstream -Patch1: 0001-Fix-compiling-with-new-versions-of-efivar.patch - BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libxmlb-devel >= %{libxmlb_version} @@ -87,7 +94,6 @@ BuildRequires: gcab BuildRequires: valgrind BuildRequires: valgrind-devel %endif -BuildRequires: gtk-doc BuildRequires: gnutls-devel BuildRequires: gnutls-utils BuildRequires: meson @@ -199,7 +205,7 @@ tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 %build %meson \ - -Ddocs=gtkdoc \ + -Ddocs=disabled \ -Dlvfs=disabled \ %if 0%{?enable_tests} -Dtests=true \ @@ -212,19 +218,24 @@ tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 -Dplugin_dummy=false \ %endif %if 0%{?have_flashrom} - -Dplugin_flashrom=true \ + -Dplugin_flashrom=enabled \ %else - -Dplugin_flashrom=false \ + -Dplugin_flashrom=disabled \ %endif %if 0%{?have_msr} - -Dplugin_msr=true \ + -Dplugin_msr=enabled \ %else - -Dplugin_msr=false \ + -Dplugin_msr=disabled \ +%endif +%if 0%{?have_gpio} + -Dplugin_gpio=enabled \ +%else + -Dplugin_gpio=disabled \ %endif - -Dplugin_thunderbolt=true \ %if 0%{?have_uefi} - -Dplugin_uefi_capsule=true \ - -Dplugin_uefi_pk=true \ + -Dplugin_uefi_capsule=enabled \ + -Dplugin_uefi_pk=enabled \ + -Dplugin_tpm=enabled \ -Defi_os_dir=%{efi_vendor} \ %ifarch x86_64 -Dfwupd-efi:efi_sbat_distro_id="rhel" \ @@ -236,30 +247,30 @@ tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 %endif -Dplugin_tpm=true \ %else - -Dplugin_uefi_capsule=false \ - -Dplugin_uefi_pk=false \ - -Dplugin_tpm=false \ + -Dplugin_uefi_capsule=disabled \ + -Dplugin_uefi_pk=disabled \ + -Dplugin_tpm=disabled \ %endif %if 0%{?have_dell} - -Dplugin_dell=true \ - -Dplugin_synaptics_mst=true \ + -Dplugin_dell=enabled \ %else - -Dplugin_dell=false \ - -Dplugin_synaptics_mst=false \ + -Dplugin_dell=disabled \ %endif %if 0%{?have_modem_manager} - -Dplugin_modem_manager=true \ + -Dplugin_modem_manager=enabled \ %else - -Dplugin_modem_manager=false \ + -Dplugin_modem_manager=disabled \ %endif -Dplugin_logitech_bulkcontroller=false \ -Dman=true \ - -Dbluez=false \ - -Dplugin_cfu=false \ - -Dplugin_mtd=false \ - -Dplugin_powerd=false \ - -Dplugin_uf2=false \ - -Dsupported_build=true + -Dbluez=disabled \ + -Dcbor=disabled \ + -Dplugin_cfu=disabled \ + -Dplugin_mtd=disabled \ + -Dplugin_powerd=disabled \ + -Dplugin_uf2=disabled \ + -Dgresource_quirks=disabled \ + -Dsupported_build=enabled %meson_build @@ -350,8 +361,8 @@ done %{_sysconfdir}/pki/fwupd-metadata %if 0%{?have_msr} /usr/lib/modules-load.d/fwupd-msr.conf +%config(noreplace)%{_sysconfdir}/fwupd/msr.conf %endif -/usr/lib/modules-load.d/fwupd-redfish.conf %{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf %{_datadir}/bash-completion/completions/fwupdmgr %{_datadir}/bash-completion/completions/fwupdtool @@ -410,7 +421,6 @@ done /usr/lib/udev/rules.d/*.rules /usr/lib/systemd/system-shutdown/fwupd.shutdown %dir %{_libdir}/fwupd-plugins-%{fwupdplugin_version} -%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_dmar.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_facp.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_phat.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_amt.so @@ -418,7 +428,9 @@ done %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ata.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_bcm57xx.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ccgx.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ch341a.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_colorhug.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_corsair.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cros_ec.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cpu.so %if 0%{?have_dell} @@ -435,6 +447,10 @@ done %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ep963x.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fastboot.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fresco_pd.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_genesys.so +%if 0%{?have_gpio} +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_gpio.so +%endif %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_hailuck.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_iommu.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_jabra.so @@ -446,8 +462,13 @@ done %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_swap.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_tainted.so %if 0%{?have_msr} +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_dmar.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_ivrs.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_msr.so %endif +%if 0%{?have_pci_psp} +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_psp.so +%endif %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_nitrokey.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_nordic_hid.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_nvme.so @@ -460,11 +481,10 @@ done %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_redfish.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_rts54hid.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_rts54hub.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_scsi.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_steelseries.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_superio.so -%if 0%{?have_dell} %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_mst.so -%endif %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_cape.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_cxaudio.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_prometheus.so @@ -485,6 +505,7 @@ done %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_recovery.so %endif %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_usi_dock.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_vbe.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logind.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logitech_hidpp.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_upower.so @@ -509,7 +530,6 @@ done %files devel %{_datadir}/gir-1.0/Fwupd-2.0.gir %{_datadir}/gir-1.0/FwupdPlugin-1.0.gir -%{_datadir}/gtk-doc/html/fwupd %{_datadir}/vala/vapi %{_includedir}/fwupd-1 %{_libdir}/libfwupd*.so @@ -531,12 +551,17 @@ done %{_datadir}/installed-tests/fwupd/efi %endif %{_datadir}/fwupd/device-tests/*.json +%{_datadir}/fwupd/host-emulate.d/*.json.gz %{_libexecdir}/installed-tests/fwupd/* %dir %{_sysconfdir}/fwupd/remotes.d %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/fwupd-tests.conf %endif %changelog +* Fri Jul 22 2022 Richard Hughes 1.8.3-1 +- New upstream release +- Resolves: rhbz#2059075 + * Wed Apr 06 2022 Richard Hughes 1.7.4-3 - Disable the Logitech bulkcontroller plugin to avoid adding a dep to protobuf-c which lives in AppStream, not BaseOS. diff --git a/sources b/sources index da58ab3..44366d4 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (fwupd-1.7.4.tar.xz) = af038ba0d32bf97b2a0ea53b431628a5b5c948e161219c2f679d0b481c27e7f3488ac28a27a26aa9490df23d652110e70ba98d700eeb8ff0f99acc08f87e2d8c -SHA512 (fwupd-efi-1.1.tar.xz) = 9070672f5238b3cbbd8d67dd72f822ccae58d73a380851ba7f69e4fbd415b96db2e79a73ddd12cb959ef5f158d55846ade7d45ea1d555ac2f4c923d5c3ab85f2 +SHA512 (fwupd-1.8.3.tar.xz) = 1044eb59b9dfb0c477b858564cc09f7bbbf59042aac84d133f83fb902342618bc8ffeddf816c706aea3ad473d5a3ca38b194b65e1d396e83764854b1d562d1ae +SHA512 (fwupd-efi-1.3.tar.xz) = 582bc0298f773b3017fab317a392b6fe95a9d1698bfe17e56370515f4563c8d45c12f28ae52d304866e4b077043bb0c9d5c1abf4b75ded5f70b6d8ccad495ea5 SHA512 (DBXUpdate-20100307-x64.cab) = f8ad56cf015f4cdc5c305856ff1f7a8589c25a2a671708c61883f427f38eb9b6a7abd3f2c8d79ef9d5076222255e42585917f8705a2a4b13f860bad4e02ec409 SHA512 (DBXUpdate-20140413-x64.cab) = 75771876a2309fa8ca083c2e76520173d434229b7cacf1e7636bd9b1bc4f871d745c348b9792bfb65fd9f40ef54c25bb427b1431151e817e7050b7829456731a SHA512 (DBXUpdate-20160809-x64.cab) = c27c564999ae84515540f1a598cd0fd9ef3a80cdfaaf439f1c4cb04eaee0e73074548b6d76c21ca3af1ba9c4c0625907e821582998eb5617e33ecd412e6c8a13