From 33b53c7c27624a6936938e2fb0b2cbf9d15b57a2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 05 2022 14:43:36 +0000 Subject: import fwupd-1.7.4-2.el8 --- diff --git a/.fwupd.metadata b/.fwupd.metadata index a8d094f..4ee6169 100644 --- a/.fwupd.metadata +++ b/.fwupd.metadata @@ -4,6 +4,6 @@ a5f73c606abb93bf61625e4628d27a2cd460f162 SOURCES/DBXUpdate-20160809-x64.cab b5b2dc87daca1d3f8081a323290432c141aa405d SOURCES/DBXUpdate-20200729-aa64.cab 3fb407561768a3a2f5fb49d7738b5e0650e70810 SOURCES/DBXUpdate-20200729-ia32.cab 89db93c9d9d20f81791a262e817b99d8882c8bb0 SOURCES/DBXUpdate-20200729-x64.cab -6e89977a382f3725f9b6abf3262d102163ad20f1 SOURCES/fwupd-1.7.1.tar.xz +0ecfe80ec28ab7517765441b2f032de20e118ca9 SOURCES/fwupd-1.7.4.tar.xz 3dd8f6ba4af65d5ecc304d57fb2453fa08d91199 SOURCES/fwupd-efi-1.1.tar.xz eea74ef2eaf7fd6799ef9933d5d3f57d9e0ce5ca SOURCES/libjcat-0.1.8.tar.xz diff --git a/.gitignore b/.gitignore index 5e6280d..842f036 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ SOURCES/DBXUpdate-20160809-x64.cab SOURCES/DBXUpdate-20200729-aa64.cab SOURCES/DBXUpdate-20200729-ia32.cab SOURCES/DBXUpdate-20200729-x64.cab -SOURCES/fwupd-1.7.1.tar.xz +SOURCES/fwupd-1.7.4.tar.xz SOURCES/fwupd-efi-1.1.tar.xz SOURCES/libjcat-0.1.8.tar.xz diff --git a/SOURCES/centos-ca-secureboot.der b/SOURCES/centos-ca-secureboot.der deleted file mode 100644 index 44a2563..0000000 Binary files a/SOURCES/centos-ca-secureboot.der and /dev/null differ diff --git a/SOURCES/centossecureboot001.der b/SOURCES/centossecureboot001.der deleted file mode 100644 index e8216b1..0000000 Binary files a/SOURCES/centossecureboot001.der and /dev/null differ diff --git a/SOURCES/centossecureboot203.der b/SOURCES/centossecureboot203.der deleted file mode 100644 index 5df41c2..0000000 Binary files a/SOURCES/centossecureboot203.der and /dev/null differ diff --git a/SOURCES/centossecurebootca2.der b/SOURCES/centossecurebootca2.der deleted file mode 100644 index 42bdfcf..0000000 Binary files a/SOURCES/centossecurebootca2.der and /dev/null differ 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 8d18174..423d907 100644 --- a/SPECS/fwupd.spec +++ b/SPECS/fwupd.spec @@ -4,7 +4,7 @@ %global libcurl_version 7.61.0 %global systemd_version 231 %global json_glib_version 1.1.1 -%global fwupdplugin_version 4 +%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 @@ -39,8 +39,8 @@ Summary: Firmware update daemon Name: fwupd -Version: 1.7.1 -Release: 1%{?dist} +Version: 1.7.4 +Release: 2%{?dist} License: LGPLv2+ URL: https://github.com/fwupd/fwupd Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz @@ -56,11 +56,10 @@ 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: centos-ca-secureboot.der -Source301: centossecureboot001.der -Source500: centossecurebootca2.der -Source503: centossecureboot203.der +Source300: redhatsecurebootca3.cer +Source301: redhatsecureboot301.cer +Source500: redhatsecurebootca5.cer +Source503: redhatsecureboot503.cer BuildRequires: efi-srpm-macros BuildRequires: gettext @@ -71,7 +70,6 @@ BuildRequires: libgudev1-devel BuildRequires: libgusb-devel >= %{libgusb_version} BuildRequires: libcurl-devel >= %{libcurl_version} BuildRequires: polkit-devel >= 0.103 -BuildRequires: protobuf-c-devel BuildRequires: sqlite-devel BuildRequires: gpgme-devel BuildRequires: systemd >= %{systemd_version} @@ -83,7 +81,6 @@ BuildRequires: gcab BuildRequires: valgrind BuildRequires: valgrind-devel %endif -BuildRequires: elfutils-libelf-devel BuildRequires: gtk-doc BuildRequires: gnutls-devel BuildRequires: gnutls-utils @@ -160,6 +157,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. @@ -242,8 +240,13 @@ export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 %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 \ -Dsupported_build=true %meson_build @@ -264,8 +267,8 @@ install %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %ifarch x86_64 %global efiarch x64 %global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi -%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp -a %{SOURCE300} -c %{SOURCE301} -n centossecureboot001 -%pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed -a %{SOURCE500} -c %{SOURCE503} -n centossecureboot203 +%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 @@ -401,13 +404,11 @@ done %{_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_altos.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_cfu.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 @@ -439,6 +440,7 @@ done %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_msr.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 %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_optionrom.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_parade_lspcon.so @@ -449,7 +451,6 @@ 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_solokey.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_steelseries.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_superio.so %if 0%{?have_dell} @@ -472,8 +473,8 @@ done %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_dbx.so %{_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_logind.so -%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logitech_bulkcontroller.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 @@ -513,6 +514,9 @@ done %{_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 @@ -520,6 +524,21 @@ done %endif %changelog +* Thu Mar 31 2022 Richard Hughes 1.7.4-2 +- Rebuild to work around gating failures +- Resolves: rhbz#2037294 + +* Thu Jan 13 2022 Richard Hughes 1.7.4-1 +- Include support for Lenovo TBT4 Docking stations +- Do not cause systemd-modules-load failures +- Resolves: rhbz#2038258 +- Resolves: rhbz#2037294 + +* Thu Dec 09 2021 Richard Hughes 1.7.1-2 +- Disable the Logitech bulkcontroller plugin to avoid adding a dep to protobuf-c + which lives in AppStream, not BaseOS. +- Resolves: rhbz#2029333 + * Mon Nov 01 2021 Richard Hughes 1.7.1-1 - New upstream release - Backport upstream changes