diff --git a/.fwupd.metadata b/.fwupd.metadata index cb59244..4e7622e 100644 --- a/.fwupd.metadata +++ b/.fwupd.metadata @@ -1 +1,8 @@ -9b651aadcfa14f6f783c73e74b8bdac3c4373244 SOURCES/fwupd-1.5.9.tar.xz +b2620c36bd23ca699567fd4e4add039ee4375247 SOURCES/DBXUpdate-20100307-x64.cab +dfdb1d0d42c1563ca63bd45c7e2ddc48cbfc5023 SOURCES/DBXUpdate-20140413-x64.cab +a5f73c606abb93bf61625e4628d27a2cd460f162 SOURCES/DBXUpdate-20160809-x64.cab +b5b2dc87daca1d3f8081a323290432c141aa405d SOURCES/DBXUpdate-20200729-aa64.cab +3fb407561768a3a2f5fb49d7738b5e0650e70810 SOURCES/DBXUpdate-20200729-ia32.cab +89db93c9d9d20f81791a262e817b99d8882c8bb0 SOURCES/DBXUpdate-20200729-x64.cab +b2919819889051bcaa089a4b7e75e30ea2d80d68 SOURCES/fwupd-1.7.9.tar.xz +1a586c3634ef190e6128351ee60fd17d0e584f7c SOURCES/fwupd-efi-1.3.tar.xz diff --git a/.gitignore b/.gitignore index cd62dee..b3b2db8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,8 @@ -SOURCES/fwupd-1.5.9.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/fwupd-1.7.9.tar.xz +SOURCES/fwupd-efi-1.3.tar.xz diff --git a/SOURCES/13524af2029c2a8a3fb32ef27c39c214d9b5b13c.patch b/SOURCES/13524af2029c2a8a3fb32ef27c39c214d9b5b13c.patch deleted file mode 100644 index a498076..0000000 --- a/SOURCES/13524af2029c2a8a3fb32ef27c39c214d9b5b13c.patch +++ /dev/null @@ -1,109 +0,0 @@ -commit 4706031223f6809b40ef7d4c3f14103941621d57 -Author: Richard Hughes -Date: Fri Apr 9 15:20:13 2021 +0100 - - Write BMP data directly without using PIL - - This allows us to drop a build-time dep. - -diff --git a/plugins/uefi-capsule/make-images.py b/plugins/uefi-capsule/make-images.py -index f1b00b8d..1d15bcf3 100755 ---- a/plugins/uefi-capsule/make-images.py -+++ b/plugins/uefi-capsule/make-images.py -@@ -16,6 +16,8 @@ import argparse - import tarfile - import math - import io -+import struct -+ - from typing import Dict, Optional, Any - - import cairo -@@ -24,7 +26,6 @@ import gi - gi.require_version("Pango", "1.0") - gi.require_version("PangoCairo", "1.0") - from gi.repository import Pango, PangoCairo --from PIL import Image - - - def languages(podir: str): -@@ -60,6 +61,33 @@ class PotFile: - continue - - -+def _cairo_surface_write_to_bmp(img: cairo.ImageSurface) -> bytes: -+ -+ data = bytes(img.get_data()) -+ return ( -+ b"BM" -+ + struct.pack( -+ " int: - - # open output archive -@@ -164,20 +192,14 @@ def main(args) -> int: - fs.foreach(do_write, None) - img.flush() - -- # write PNG -- with io.BytesIO() as io_png: -- img.write_to_png(io_png) -- io_png.seek(0) -- -- # convert to BMP and add to archive -- with io.BytesIO() as io_bmp: -- pimg = Image.open(io_png) -- pimg.save(io_bmp, format="BMP") -- filename = "fwupd-{}-{}-{}.bmp".format(lang, width, height) -- tarinfo = tarfile.TarInfo(filename) -- tarinfo.size = io_bmp.tell() -- io_bmp.seek(0) -- tar.addfile(tarinfo, fileobj=io_bmp) -+ # convert to BMP and add to archive -+ with io.BytesIO() as io_bmp: -+ io_bmp.write(_cairo_surface_write_to_bmp(img)) -+ filename = "fwupd-{}-{}-{}.bmp".format(lang, width, height) -+ tarinfo = tarfile.TarInfo(filename) -+ tarinfo.size = io_bmp.tell() -+ io_bmp.seek(0) -+ tar.addfile(tarinfo, fileobj=io_bmp) - - # success - return 0 -diff --git a/po/test-deps b/po/test-deps -index f5276daa..27b4055b 100755 ---- a/po/test-deps -+++ b/po/test-deps -@@ -34,12 +34,6 @@ except ValueError: - print("Error: missing cairo gobject introspection library") - err = 1 - --try: -- from PIL import Image --except ImportError: -- print("Error: missing dependency python pillow (python3-pil)") -- err = 1 -- - try: - import cairo - except ImportError: diff --git a/SOURCES/redhatsecureboot301.cer b/SOURCES/redhatsecureboot301.cer new file mode 100644 index 0000000..4ff8b79 Binary files /dev/null and b/SOURCES/redhatsecureboot301.cer differ diff --git a/SOURCES/redhatsecureboot503.cer b/SOURCES/redhatsecureboot503.cer new file mode 100644 index 0000000..50e375c Binary files /dev/null and b/SOURCES/redhatsecureboot503.cer differ diff --git a/SOURCES/redhatsecurebootca3.cer b/SOURCES/redhatsecurebootca3.cer new file mode 100644 index 0000000..b235400 Binary files /dev/null and b/SOURCES/redhatsecurebootca3.cer differ diff --git a/SOURCES/redhatsecurebootca5.cer b/SOURCES/redhatsecurebootca5.cer new file mode 100644 index 0000000..dfb0284 Binary files /dev/null and b/SOURCES/redhatsecurebootca5.cer differ diff --git a/SPECS/fwupd.spec b/SPECS/fwupd.spec index f236dd0..d4ace74 100644 --- a/SPECS/fwupd.spec +++ b/SPECS/fwupd.spec @@ -5,6 +5,7 @@ %global libjcat_version 0.1.0 %global systemd_version 231 %global json_glib_version 1.1.1 +%global fwupdplugin_version 5 # 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 @@ -43,14 +44,26 @@ Summary: Firmware update daemon Name: fwupd -Version: 1.5.9 -Release: 3%{?dist} +Version: 1.7.9 +Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/fwupd/fwupd Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz - -# backport from upstream -Patch0: 13524af2029c2a8a3fb32ef27c39c214d9b5b13c.patch +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 +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 + +# these are numbered high just to keep them wildly away from colliding with +# the real package sources, in order to reduce churn. +Source300: redhatsecurebootca3.cer +Source301: redhatsecureboot301.cer +Source500: redhatsecurebootca5.cer +Source503: redhatsecureboot503.cer BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} @@ -71,12 +84,10 @@ BuildRequires: gcab BuildRequires: valgrind BuildRequires: valgrind-devel %endif -BuildRequires: elfutils-libelf-devel BuildRequires: gtk-doc BuildRequires: gnutls-devel BuildRequires: gnutls-utils BuildRequires: meson -BuildRequires: help2man BuildRequires: json-glib-devel >= %{json_glib_version} BuildRequires: vala BuildRequires: bash-completion @@ -88,6 +99,7 @@ BuildRequires: flashrom-devel >= 1.2-2 %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} @@ -100,7 +112,7 @@ BuildRequires: fontconfig BuildRequires: google-noto-sans-cjk-ttc-fonts BuildRequires: gnu-efi-devel BuildRequires: tpm2-tss-devel >= 2.2.3 -BuildRequires: pesign +BuildRequires: pesign >= 113-20 %endif %if 0%{?have_dell} @@ -150,6 +162,7 @@ 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. @@ -157,6 +170,7 @@ 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 @@ -166,6 +180,7 @@ might have mobile broadband hardware. It is probably not required on servers. %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 @@ -175,10 +190,14 @@ can be flashed using flashrom. It is probably not required on servers. %prep %autosetup -p1 +mkdir -p subprojects/fwupd-efi +tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 + %build %meson \ - -Dgtkdoc=true \ + -Ddocs=gtkdoc \ + -Dlvfs=disabled \ %if 0%{?enable_tests} -Dtests=true \ %else @@ -203,11 +222,15 @@ can be flashed using flashrom. It is probably not required on servers. %if 0%{?have_uefi} -Dplugin_uefi_capsule=true \ -Dplugin_uefi_pk=true \ - -Defi_sbat_distro_id="rhel" \ - -Defi_sbat_distro_summary="Red Hat Enterprise Linux" \ - -Defi_sbat_distro_pkgname="%{name}" \ - -Defi_sbat_distro_version="%{version}" \ - -Defi_sbat_distro_url="mail:secalert@redhat.com" \ + -Defi_os_dir=%{efi_vendor} \ +%ifarch x86_64 + -Dfwupd-efi:efi_sbat_distro_id="rhel" \ + -Dfwupd-efi:efi_sbat_distro_summary="Red Hat Enterprise Linux" \ + -Dfwupd-efi:efi_sbat_distro_pkgname="%{name}" \ + -Dfwupd-efi:efi_sbat_distro_version="%{version}" \ + -Dfwupd-efi:efi_sbat_distro_url="mail:secalert@redhat.com" \ + -Dfwupd-efi:efi-libdir="/usr/lib64" \ +%endif -Dplugin_tpm=true \ %else -Dplugin_uefi_capsule=false \ @@ -226,8 +249,14 @@ can be flashed using flashrom. It is probably not required on servers. %else -Dplugin_modem_manager=false \ %endif + -Dplugin_logitech_bulkcontroller=false \ -Dman=true \ -Dbluez=false \ + -Dplugin_cfu=false \ + -Dplugin_mtd=false \ + -Dplugin_powerd=false \ + -Dplugin_uf2=false \ + -Dplugin_gpio=false \ -Dsupported_build=true %meson_build @@ -240,19 +269,17 @@ can be flashed using flashrom. It is probably not required on servers. %install %meson_install +# on RHEL the LVFS is disabled by default +mkdir -p %{buildroot}/%{_datadir}/dbxtool +install %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{buildroot}/%{_datadir}/dbxtool + # sign fwupd.efi loader -%if 0%{?have_uefi} %ifarch x86_64 %global efiarch x64 -%endif -%ifarch aarch64 -%global efiarch aa64 -%endif %global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi -%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp -%define __pesign_client_cert fwupd-signer -%pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed -rm -vf %{fwup_efi_fn}.tmp +%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp -a %{SOURCE300} -c %{SOURCE301} -n redhatsecureboot301 +%pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed -a %{SOURCE500} -c %{SOURCE503} -n redhatsecureboot503 +rm -fv %{fwup_efi_fn}.tmp %endif mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg @@ -283,7 +310,6 @@ done %doc README.md AUTHORS %license COPYING %config(noreplace)%{_sysconfdir}/fwupd/daemon.conf -%config(noreplace)%{_sysconfdir}/fwupd/upower.conf %if 0%{?have_uefi} %config(noreplace)%{_sysconfdir}/fwupd/uefi_capsule.conf %endif @@ -297,9 +323,10 @@ done %{_libexecdir}/fwupd/fwupdoffline %if 0%{?have_uefi} %{_libexecdir}/fwupd/efi/*.efi +%ifarch x86_64 %{_libexecdir}/fwupd/efi/*.efi.signed +%endif %{_bindir}/fwupdate -%{_bindir}/fwupdtpmevlog %endif %{_bindir}/dfu-tool %if 0%{?have_uefi} @@ -321,6 +348,7 @@ done %{_sysconfdir}/pki/fwupd-metadata %if 0%{?have_msr} /usr/lib/modules-load.d/fwupd-msr.conf +%config(noreplace)%{_sysconfdir}/fwupd/msr.conf %endif %{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf %{_datadir}/bash-completion/completions/fwupdmgr @@ -336,6 +364,13 @@ done %{_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 +%dir %{_datadir}/dbxtool +%{_datadir}/dbxtool/DBXUpdate-20100307-x64.cab +%{_datadir}/dbxtool/DBXUpdate-20140413-x64.cab +%{_datadir}/dbxtool/DBXUpdate-20160809-x64.cab +%{_datadir}/dbxtool/DBXUpdate-20200729-aa64.cab +%{_datadir}/dbxtool/DBXUpdate-20200729-ia32.cab +%{_datadir}/dbxtool/DBXUpdate-20200729-x64.cab %{_mandir}/man1/fwupdtool.1* %{_mandir}/man1/fwupdagent.1* %{_mandir}/man1/dfu-tool.1* @@ -345,7 +380,6 @@ done %{_mandir}/man1/fwupdmgr.1* %if 0%{?have_uefi} %{_mandir}/man1/fwupdate.1* -%{_mandir}/man1/fwupdtpmevlog.1* %endif %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg @@ -363,96 +397,110 @@ done %dir %{_localstatedir}/cache/fwupd %dir %{_datadir}/fwupd/quirks.d %{_datadir}/fwupd/quirks.d/*.quirk -%{_localstatedir}/lib/fwupd/builder/README.md -%{_libdir}/libfwupd*.so.* +%{_datadir}/doc/fwupd/builder/README.md +%if 0%{?have_uefi} +%{_sysconfdir}/grub.d/35_fwupd +%endif +%{_libdir}/libfwupd.so.2* +%{_libdir}/libfwupdplugin.so.%{fwupdplugin_version}* %{_libdir}/girepository-1.0/Fwupd-2.0.typelib %{_libdir}/girepository-1.0/FwupdPlugin-1.0.typelib /usr/lib/udev/rules.d/*.rules /usr/lib/systemd/system-shutdown/fwupd.shutdown -%dir %{_libdir}/fwupd-plugins-3 -%{_libdir}/fwupd-plugins-3/libfu_plugin_acpi_dmar.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_acpi_facp.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_altos.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_amt.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_ata.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_bcm57xx.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_ccgx.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_colorhug.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_cros_ec.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_cpu.so +%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 +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_analogix.so +%{_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_colorhug.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cros_ec.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cpu.so %if 0%{?have_dell} -%{_libdir}/fwupd-plugins-3/libfu_plugin_dell.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_dell_esrt.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell_esrt.so %endif -%{_libdir}/fwupd-plugins-3/libfu_plugin_dell_dock.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_dfu.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_dfu_csr.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_ebitdo.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_elantp.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_emmc.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_ep963x.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_fastboot.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_fresco_pd.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_hailuck.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_iommu.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_jabra.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_lockdown.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_sleep.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_swap.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_tainted.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell_dock.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dfu.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dfu_csr.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ebitdo.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_elantp.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_elanfp.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_emmc.so +%{_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 +%{_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 +%if 0%{?have_uefi} +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_lenovo_thinklmi.so +%endif +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_lockdown.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_sleep.so +%{_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-3/libfu_plugin_msr.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_msr.so %endif -%{_libdir}/fwupd-plugins-3/libfu_plugin_nitrokey.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_nvme.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_optionrom.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_pci_bcr.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_pci_mei.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_pixart_rf.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_redfish.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_rts54hid.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_rts54hub.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_solokey.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_steelseries.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_superio.so +%{_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 +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_optionrom.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_parade_lspcon.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_bcr.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_mei.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pixart_rf.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_realtek_mst.so +%{_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-3/libfu_plugin_synaptics_mst.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_mst.so %endif -%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_cxaudio.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_prometheus.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_rmi.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_system76_launch.so +%{_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 +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_rmi.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_system76_launch.so %if 0%{?enable_dummy} -%{_libdir}/fwupd-plugins-3/libfu_plugin_test.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_invalid.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_test.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_invalid.so %endif -%{_libdir}/fwupd-plugins-3/libfu_plugin_thelio_io.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_thunderbolt.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_thelio_io.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_thunderbolt.so %if 0%{?have_uefi} -%{_libdir}/fwupd-plugins-3/libfu_plugin_tpm.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_tpm_eventlog.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_bios.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_capsule.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_dbx.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_pk.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_recovery.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_tpm.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_bios.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_capsule.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_dbx.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_pk.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_recovery.so %endif -%{_libdir}/fwupd-plugins-3/libfu_plugin_logind.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_logitech_hidpp.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_upower.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_vli.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_wacom_raw.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_wacom_usb.so -%{_libdir}/fwupd-plugins-3/libfu_plugin_goodixmoc.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_usi_dock.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 +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_vli.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_wacom_raw.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_wacom_usb.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_goodixmoc.so %ghost %{_localstatedir}/lib/fwupd/gnupg %if 0%{?have_modem_manager} %files plugin-modem-manager -%{_libdir}/fwupd-plugins-3/libfu_plugin_modem_manager.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_modem_manager.so %endif %if 0%{?have_flashrom} %files plugin-flashrom -%{_libdir}/fwupd-plugins-3/libfu_plugin_flashrom.so +%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_flashrom.so %endif %if 0%{?have_uefi} %{_datadir}/fwupd/uefi-capsule-ux.tar.xz @@ -467,20 +515,58 @@ done %{_libdir}/libfwupd*.so %{_libdir}/pkgconfig/fwupd.pc %{_libdir}/pkgconfig/fwupdplugin.pc +%if 0%{?have_uefi} +%{_libdir}/pkgconfig/fwupd-efi.pc +%endif %files tests %if 0%{?enable_tests} %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/*.sh +%if 0%{?have_uefi} +%{_datadir}/installed-tests/fwupd/efi +%endif +%{_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 +* Mon Jul 25 2022 Richard Hughes 1.7.8-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. +- Use the efi_vendor variable from EFI-RPM +- Resolves: rhbz#2064904 + +* Thu Jan 13 2022 Richard Hughes 1.7.4-1 +- New upstream release +- Backport Fedora 34 changes +- Include support for Lenovo TBT4 Docking stations +- Do not cause systemd-modules-load failures +- Build against a new enough pesign +- Resolves: rhbz#2007520 + +* Mon Nov 01 2021 Richard Hughes 1.7.1-1 +- New upstream release +- Backport Fedora 34 changes +- Include support for Dell TBT4 Docking stations +- Resolves: rhbz#1974347 +- Resolves: rhbz#1991426 + +* Fri Sep 24 2021 Richard Hughes 1.5.9-4 +- Rebuilt to use redhatsecureboot503 signatures +- Undo last Fedora sync to use the RHEL-specific patches +- Resolves: rhbz#2007520 + * Mon Aug 09 2021 Mohan Boddu - 1.5.9-3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688