diff --git a/_service b/_service index 09cd911..2c85e80 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ https://github.com/fwupd/fwupd.git git @PARENT_TAG@ - 1.8.9 + 1.8.12 diff --git a/fwupd-1.8.12.obscpio b/fwupd-1.8.12.obscpio new file mode 100644 index 0000000..1f98c12 --- /dev/null +++ b/fwupd-1.8.12.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:649bdae049b2f59b24ff293b80f6efd1dae32281935b187b586284d94c87532e +size 16654861 diff --git a/fwupd-1.8.9.obscpio b/fwupd-1.8.9.obscpio deleted file mode 100644 index c2952aa..0000000 --- a/fwupd-1.8.9.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90cc2b2a3a58bc7a763207abfda9946333adb0d278e83317343a40f69e5810fa -size 16382989 diff --git a/fwupd-bsc1130056-change-shim-path.patch b/fwupd-bsc1130056-change-shim-path.patch index 353bddb..3ad1997 100644 --- a/fwupd-bsc1130056-change-shim-path.patch +++ b/fwupd-bsc1130056-change-shim-path.patch @@ -1,11 +1,11 @@ -Index: fwupd-1.8.5/plugins/uefi-capsule/fu-uefi-bootmgr.c +Index: fwupd-1.8.12/plugins/uefi-capsule/fu-uefi-bootmgr.c =================================================================== ---- fwupd-1.8.5.orig/plugins/uefi-capsule/fu-uefi-bootmgr.c -+++ fwupd-1.8.5/plugins/uefi-capsule/fu-uefi-bootmgr.c +--- fwupd-1.8.12.orig/plugins/uefi-capsule/fu-uefi-bootmgr.c ++++ fwupd-1.8.12/plugins/uefi-capsule/fu-uefi-bootmgr.c @@ -292,7 +292,8 @@ fu_uefi_bootmgr_bootnext(FuDevice *devic + /* test if we should use shim */ secure_boot = fu_efivar_secure_boot_enabled(NULL); if (secure_boot) { - /* test to make sure shim is there if we need it */ - shim_app = fu_uefi_get_esp_app_path(device, esp_path, "shim", error); + shim_app = g_strdup_printf ("%s/shim.efi", + fu_uefi_get_esp_path_for_os (device, esp_path)); diff --git a/fwupd.changes b/fwupd.changes index 7ce3497..2327891 100644 --- a/fwupd.changes +++ b/fwupd.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Mar 2 16:55:23 UTC 2023 - Dominique Leuenberger + +- Update to version 1.8.12: + + Allow setting the package user agent before the client has + connected. + + Fix a small memory leak when refreshing metadata. +- Changes from version 1.8.11: + + Add support for replaying USB devices so they can be emulated + in CI. + + Allow desktop software to inhibit the system to prevent + updates. + + Allow using requirements with depth=0 and no parent. + + Auto-set the CCGX remove-delay now we parse DMC subcomponents. + + Detect and warn users with the broken NVMe firmware 3B2QGXA7. + + Print errors as JSON objects when using fwupdmgr --json. +- Changes from version 1.8.10: + + Add a PE/COFF firmware parser to allow reading coSWID SBoM + data. + + Allow dumping CFI SPI chips using devices like CH341a. + + Refactor the HWIDs functionality to include FDT data. +- Rebase fwupd-bsc1130056-change-shim-path.patch. +- Drop uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch: + fixed upstream. +- Add -Dcompat_cli=true meson parameter: keep compat binaries for + the time being. +- Add xz-devel BuildRequires: needed to link liblzma. + ------------------------------------------------------------------- Wed Jan 18 17:13:29 UTC 2023 - Michal Suchanek diff --git a/fwupd.obsinfo b/fwupd.obsinfo index d460050..541a861 100644 --- a/fwupd.obsinfo +++ b/fwupd.obsinfo @@ -1,4 +1,4 @@ name: fwupd -version: 1.8.9 -mtime: 1672748150 -commit: faeefb66d03f30a76ff42281fff3d6e9536e9ccf +version: 1.8.12 +mtime: 1677250407 +commit: 9b7430107b68b0fb5f683e8ef1e9260296f494a8 diff --git a/fwupd.spec b/fwupd.spec index 1984102..a88c3aa 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -39,7 +39,7 @@ %define shlib_sover 2 Name: fwupd -Version: 1.8.9 +Version: 1.8.12 Release: 0 Summary: Device firmware updater daemon License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -55,8 +55,6 @@ Patch2: fwupd-jscSLE-11766-close-efidir-leap-gap.patch Patch3: harden_fwupd-offline-update.service.patch # PATCH-FEATURE-OPENSUSE harden_fwupd-refresh.service.patch -- Harden services Patch4: harden_fwupd-refresh.service.patch -# PATCH_FIX_UPSTREAM uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch -- https://github.com/fwupd/fwupd/issues/5424 -Patch5: uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch BuildRequires: dejavu-fonts BuildRequires: fdupes @@ -81,6 +79,7 @@ BuildRequires: python3-gobject-Gdk BuildRequires: python3-setuptools BuildRequires: python3-xml BuildRequires: vala +BuildRequires: xz-devel BuildRequires: pkgconfig(appstream-glib) >= 0.5.10 BuildRequires: pkgconfig(bash-completion) BuildRequires: pkgconfig(cairo) @@ -88,6 +87,9 @@ BuildRequires: pkgconfig(colorhug) >= 1.2.12 %ifnarch s390x ppc64le BuildRequires: pkgconfig(flashrom) %endif +%ifarch x86_64 +BuildRequires: pandoc +%endif BuildRequires: pkgconfig(gi-docgen) BuildRequires: pkgconfig(gio-2.0) >= 2.45.8 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.48.8 @@ -232,6 +234,7 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE" -Dplugin_uefi_pk=enabled \ -Defi_binary=false \ -Dsystemd_unit_user=root \ + -Dcompat_cli=true \ %else -Dplugin_uefi_capsule=disabled \ -Dplugin_uefi_pk=disabled \ @@ -258,6 +261,11 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE" -Dtests=false \ %ifarch s390x ppc64le -Dplugin_flashrom=disabled \ +%endif +%ifarch x86_64 + -Dman=enabled \ +%else + -Dman=disabled \ %endif %{nil} %meson_build @@ -340,6 +348,7 @@ rm -fr %{buildroot}%{_datadir}/fish %{_datadir}/%{name}/metainfo/org.freedesktop.fwupd.remotes.lvfs-testing.metainfo.xml %{_datadir}/%{name}/metainfo/org.freedesktop.fwupd.remotes.lvfs.metainfo.xml %{_datadir}/%{name}/remotes.d/vendor/firmware/README.md +%ifarch x86_64 %{_mandir}/man1/fwupdagent.1%{?ext_man} %{_mandir}/man1/fwupdmgr.1%{?ext_man} %{_mandir}/man1/fwupdtool.1%{?ext_man} @@ -347,6 +356,7 @@ rm -fr %{buildroot}%{_datadir}/fish %{_mandir}/man1/dbxtool.1%{?ext_man} %{_mandir}/man1/fwupdate.1%{?ext_man} %endif +%endif %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy %if %{with msr_support} %{_modulesloaddir}/fwupd-msr.conf @@ -383,7 +393,9 @@ rm -fr %{buildroot}%{_datadir}/fish %files -n dfu-tool %{_bindir}/dfu-tool +%ifarch x86_64 %{_mandir}/man1/dfu-tool.1%{?ext_man} +%endif %files -n libfwupd%{shlib_sover} %{_libdir}/libfwupd.so.* @@ -407,7 +419,6 @@ rm -fr %{buildroot}%{_datadir}/fish %files bash-completion %{_datadir}/bash-completion/completions/fwupdmgr %{_datadir}/bash-completion/completions/fwupdtool -%{_datadir}/bash-completion/completions/fwupdagent %if %{with fish_support} %files fish-completion diff --git a/uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch b/uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch deleted file mode 100644 index 9f9d2f4..0000000 --- a/uefi-capsule-Do-not-call-grub2-probe-without-argumen.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9065f50057cb0e9a1609e44882740ba70d98c2a6 Mon Sep 17 00:00:00 2001 -From: Michal Suchanek -Date: Wed, 18 Jan 2023 16:07:05 +0100 -Subject: [PATCH] uefi-capsule: Do not call grub2-probe without arguments - -commit 684bc0381 ("trivial: fix various shellcheck warnings") adds call -to ${grub_probe} without any argument which causes grub2-probe to return -an error, and generating grub configuration fails. - -Add --version argument to avoid the error, and redierct the output to -/dev/null so that it's not included in the grub configuration file. - -The commit also adds superfluous single quotes causing another error: - -/usr/sbin/grub2-probe: error: cannot find a GRUB drive for `${grub_probe} --target=device \${ESP}` | sed -e "s/^/\t/". Check your device.map. - -Fix the quoting to work at least for single device. - -Fixes: #5424 -Fixes: 684bc0381 ("trivial: fix various shellcheck warnings") -Signed-off-by: Michal Suchanek ---- - plugins/uefi-capsule/fwupd.grub.conf.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/uefi-capsule/fwupd.grub.conf.in b/plugins/uefi-capsule/fwupd.grub.conf.in -index 9c3a22f23..6d17fc3cc 100755 ---- a/plugins/uefi-capsule/fwupd.grub.conf.in -+++ b/plugins/uefi-capsule/fwupd.grub.conf.in -@@ -14,8 +14,8 @@ if [ -f @localstatedir@/lib/fwupd/uefi_capsule.conf ] && - cat << EOF - menuentry 'Linux Firmware Updater' \$menuentry_id_option 'fwupd' { - EOF -- ${grub_probe:?} -- prepare_grub_to_access_device '`${grub_probe} --target=device \${ESP}` | sed -e "s/^/\t/"' -+ ${grub_probe:?} --version > /dev/null -+ prepare_grub_to_access_device "$(${grub_probe} --target=device ${ESP})" | sed -e "s/^/\t/" - cat << EOF - chainloader ${EFI_PATH} - } --- -2.39.0 -