diff --git a/fwupd-1.8.17.tar.xz b/fwupd-1.9.4.tar.xz similarity index 33% rename from fwupd-1.8.17.tar.xz rename to fwupd-1.9.4.tar.xz index 3ddfd82454c238fe9ef25f2bd4d392651e053952..b6c8b566f8d179e6de0ddf3f34a3b0ee7e68f7b7 100644 Binary files a/fwupd-1.8.17.tar.xz and b/fwupd-1.9.4.tar.xz differ diff --git a/fwupd-efi.patch b/fwupd-efi.patch index 4692efa952a3125ef289a863333d7abe4124a4ed..ad1672ede5b4137019a496a118ac7ab9e0b2ff37 100644 --- a/fwupd-efi.patch +++ b/fwupd-efi.patch @@ -1,234 +1,3 @@ -diff -urN fwupd-1.8.6-0/contrib/flatpak/flathub.json fwupd-1.8.6/contrib/flatpak/flathub.json ---- fwupd-1.8.6-0/contrib/flatpak/flathub.json 1970-01-01 00:00:00.000000000 +0000 -+++ fwupd-1.8.6/contrib/flatpak/flathub.json 2022-11-08 05:41:54.000000000 +0000 -@@ -0,0 +1,3 @@ -+{ -+ "skip-appstream-check": true -+} -diff -urN fwupd-1.8.6-0/contrib/flatpak/org.freedesktop.fwupd.json fwupd-1.8.6/contrib/flatpak/org.freedesktop.fwupd.json ---- fwupd-1.8.6-0/contrib/flatpak/org.freedesktop.fwupd.json 1970-01-01 00:00:00.000000000 +0000 -+++ fwupd-1.8.6/contrib/flatpak/org.freedesktop.fwupd.json 2022-11-08 05:41:54.000000000 +0000 -@@ -0,0 +1,220 @@ -+{ -+ "app-id": "org.freedesktop.fwupd", -+ "runtime": "org.gnome.Platform", -+ "runtime-version": "3.30", -+ "branch": "stable", -+ "sdk": "org.gnome.Sdk", -+ "command": "/app/libexec/fwupd/fwupdtool", -+ "finish-args": [ -+ "--device=all", -+ "--filesystem=/boot", -+ "--filesystem=/sys", -+ "--filesystem=xdg-download", -+ "--share=network", -+ "--system-talk-name=org.freedesktop.fwupd", -+ "--system-talk-name=org.freedesktop.UPower" -+ ], -+ "cleanup": [ -+ "*.a", -+ "*.la", -+ "/include", -+ "/lib/girepository-1.0", -+ "/lib/pkgconfig", -+ "/share/bash-completion", -+ "/share/dbus-1/system-services", -+ "/share/gir-1.0", -+ "/share/gtk-doc", -+ "/share/info", -+ "/share/man", -+ "/share/pkgconfig" -+ ], -+ "modules": [ -+ "shared-modules/udev/udev-175.json", -+ { -+ "name": "libusb", -+ "config-opts": [ -+ "--disable-static" -+ ], -+ "sources": [ -+ { -+ "type": "archive", -+ "url": "https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2", -+ "sha256": "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157" -+ } -+ ] -+ }, -+ { -+ "name": "gusb", -+ "buildsystem": "meson", -+ "config-opts": [ -+ "-Ddocs=false", -+ "-Dvapi=false", -+ "-Dtests=false" -+ ], -+ "cleanup": [ -+ "/bin/gusbcmd" -+ ], -+ "sources": [ -+ { -+ "type": "archive", -+ "url": "https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.0.tar.xz", -+ "sha256": "d8e7950f99b6ae4c3e9b8c65f3692b9635289e6cff8de40c4af41b2e9b348edc" -+ } -+ ] -+ }, -+ { -+ "name": "efivar", -+ "buildsystem": "simple", -+ "build-commands": [ -+ "make prefix=/app libdir=/app/lib", -+ "make install prefix=/app libdir=/app/lib" -+ ], -+ "cleanup": [ -+ "/bin/efivar" -+ ], -+ "sources": [ -+ { -+ "type": "archive", -+ "url": "https://github.com/rhboot/efivar/releases/download/35/efivar-35.tar.bz2", -+ "sha256": "1e033dc5d099a44fd473b0887dbcc4b105613efab0fb3c5df9f111ea5d147394" -+ } -+ ] -+ }, -+ { -+ "name": "libsmbios_c", -+ "only-arches": [ -+ "x86_64" -+ ], -+ "config-opts": [ -+ "--disable-doxygen", -+ "--disable-graphviz", -+ "--disable-python" -+ ], -+ "cleanup": [ -+ "/sbin/smbios*", -+ "/share/locale/*/LC_MESSAGES/libsmbios.mo" -+ ], -+ "sources": [ -+ { -+ "type": "archive", -+ "url": "https://github.com/dell/libsmbios/archive/v2.4.2.tar.gz", -+ "sha256": "ebfe18415e24bbec06d0a9ea1066c8dcd82982555373712713d7e194138650de" -+ } -+ ] -+ }, -+ { -+ "name": "gnu-efi", -+ "only-arches": [ -+ "aarch64", -+ "x86_64" -+ ], -+ "buildsystem": "simple", -+ "build-commands": [ -+ "make", -+ "make PREFIX=/app install" -+ ], -+ "no-autogen": true, -+ "cleanup": [ -+ "/bin/efivar" -+ ], -+ "sources": [ -+ { -+ "type": "archive", -+ "url": "http://superb-dca2.dl.sourceforge.net/project/gnu-efi/gnu-efi-3.0.9.tar.bz2", -+ "sha256": "6715ea7eae1c7e4fc5041034bd3f107ec2911962ed284a081e491646b12277f0" -+ } -+ ] -+ }, -+ { -+ "name": "python3-olefile", -+ "only-arches": [ -+ "aarch64", -+ "x86_64" -+ ], -+ "buildsystem": "simple", -+ "build-commands": [ -+ "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} olefile" -+ ], -+ "sources": [ -+ { -+ "type": "file", -+ "url": "https://pypi.python.org/packages/35/17/c15d41d5a8f8b98cc3df25eb00c5cee76193114c78e5674df6ef4ac92647/olefile-0.44.zip", -+ "sha256": "61f2ca0cd0aa77279eb943c07f607438edf374096b66332fae1ee64a6f0f73ad" -+ } -+ ] -+ }, -+ { -+ "name": "python3-pillow", -+ "only-arches": [ -+ "aarch64", -+ "x86_64" -+ ], -+ "buildsystem": "simple", -+ "build-commands": [ -+ "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} Pillow" -+ ], -+ "cleanup": [ -+ "/bin/*.py" -+ ], -+ "sources": [ -+ { -+ "type": "file", -+ "url": "https://pypi.python.org/packages/93/73/66854f63b1941aad9af18a1de59f9cf95ad1a87c801540222e332f6688d7/Pillow-4.1.1.tar.gz", -+ "sha256": "00b6a5f28d00f720235a937ebc2f50f4292a5c7e2d6ab9a8b26153b625c4f431" -+ } -+ ] -+ }, -+ { -+ "name": "fwupd", -+ "buildsystem": "meson", -+ "config-opts": [ -+ "-Dconsolekit=false", -+ "-Ddaemon=false", -+ "-Dgpg=false", -+ "-Dgtkdoc=false", -+ "-Dintrospection=false", -+ "-Dman=false", -+ "-Dpkcs7=false", -+ "-Dsystemd=false", -+ "-Dtests=false", -+ "-Defi-includedir=/app/include/efi", -+ "-Defi-ldsdir=/app/lib", -+ "-Defi-libdir=/app/lib", -+ "--sysconfdir=/app/etc", -+ "--localstatedir=/var/data" -+ ], -+ "build-options" : { -+ "arch": { -+ "i386": { -+ "config-opts": [ -+ "-Dplugin_dell=false", -+ "-Dplugin_uefi=false" -+ ] -+ }, -+ "arm": { -+ "config-opts": [ -+ "-Dplugin_dell=false", -+ "-Dplugin_uefi=false" -+ ] -+ }, -+ "aarch64": { -+ "config-opts": [ -+ "-Dplugin_dell=false" -+ ] -+ } -+ } -+ }, -+ "cleanup": [ -+ "/etc/dbus-1/system.d/org.freedesktop.fwupd.conf", -+ "/share/fwupd/remotes.d/vendor" -+ ], -+ "sources": [ -+ { -+ "type": "archive", -+ "url": "https://people.freedesktop.org/~hughsient/releases/fwupd-1.1.3.tar.xz", -+ "sha256": "474568a98af8ae82255c18da90ce2e4d290875da98638c4b1c44632c758314af" -+ } -+ ] -+ } -+ ] -+} diff -urN fwupd-1.8.6-0/contrib/flatpak/shared-modules/.git fwupd-1.8.6/contrib/flatpak/shared-modules/.git --- fwupd-1.8.6-0/contrib/flatpak/shared-modules/.git 1970-01-01 00:00:00.000000000 +0000 +++ fwupd-1.8.6/contrib/flatpak/shared-modules/.git 2022-11-08 05:41:54.000000000 +0000 diff --git a/fwupd.spec b/fwupd.spec index 1087e592a41b1ec677726a539a7676712e1afa78..b68154026d7aaa49430079850701162ad9e462b7 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -42,12 +42,12 @@ Name: fwupd -Version: 1.8.17 -Release: 8 -License: LGPLv2+ +Version: 1.9.4 +Release: 1 +License: LGPL-2.1-or-later Summary: Make updating firmware on Linux automatic, safe and reliable URL: https://github.com/fwupd/fwupd -Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz +Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz Source2: http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.1.tar.xz Source3: centos-ca-secureboot.der Source4: centossecureboot001.der @@ -88,6 +88,7 @@ BuildRequires: libarchive-devel BuildRequires: gobject-introspection-devel BuildRequires: gcab meson >= 0.61.0 BuildRequires: protobuf-c protobuf-c-devel tpm2-tss-devel +BuildRequires: gi-docgen %ifarch %{valgrind_arches} BuildRequires: valgrind BuildRequires: valgrind-devel @@ -173,7 +174,7 @@ Man pages and other related documents for fwupd. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 +%patch -P 0 -p1 mkdir -p subprojects/fwupd-efi tar xfs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 @@ -233,8 +234,8 @@ sed -ri '1s=^#!/usr/bin/(env )?python3=#!%{__python3}=' \ -Dplugin_gpio=disabled \ %endif %if 0%{?have_uefi} - -Dplugin_uefi_capsule=true \ - -Dplugin_uefi_pk=false \ + -Dplugin_uefi_capsule=enabled \ + -Dplugin_uefi_pk=enabled \ %ifarch x86_64 -Dfwupd-efi:efi_sbat_distro_id="rhel" \ -Dfwupd-efi:efi_sbat_distro_summary="Red Hat Enterprise Linux" \ @@ -243,11 +244,11 @@ sed -ri '1s=^#!/usr/bin/(env )?python3=#!%{__python3}=' \ -Dfwupd-efi:efi_sbat_distro_url="mail:secalert@redhat.com" \ -Dfwupd-efi:efi-libdir="/usr/lib64" \ %endif - -Dplugin_tpm=false \ + -Dplugin_tpm=disabled \ %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=enabled \ @@ -346,14 +347,7 @@ done %files -f %{name}.lang %doc README.md %license COPYING -%config(noreplace)%{_sysconfdir}/fwupd/daemon.conf -%if 0%{?have_uefi} -%config(noreplace)%{_sysconfdir}/fwupd/uefi_capsule.conf -%endif -%config(noreplace)%{_sysconfdir}/fwupd/redfish.conf -%if 0%{?have_thunderbolt} -%config(noreplace)%{_sysconfdir}/fwupd/thunderbolt.conf -%endif +%config(noreplace)%{_sysconfdir}/fwupd/fwupd.conf %dir %{_libexecdir}/fwupd %{_libexecdir}/fwupd/fwupd # depending on compiler behavior @@ -385,7 +379,6 @@ 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 @@ -483,9 +476,24 @@ done %files help -%{_datadir}/man/man1/* +%{_mandir}/man1/* +%{_mandir}/man5/* +%{_mandir}/man8/* %changelog +* Wed May 14 2025 yaoxin <1024769339@qq.com> - 1.9.4-1 +- Update to 1.9.4: + * Do not add gl32xx disk partitions as extra devices + * Do not assume the logical block size is always 0x200 + * Ensure the AppStream ID is set on historical releases + * Fix a possible CFU crash when adding modules + * Fix 'fwupdmgr get-history --json' output to only show one release + * Fix 'fwupdmgr modify-remote' on ChromeOS + * Fix incorrect OEM trusted reports flags being set when not matching + * Fix regression in returning device history with libxmlb 0.3.12 + * Fix some Wacom hardware by only attempting retries for the busy error state + * Fix transaction timed out issue for T99W373 QDU device + * Mon Dec 30 2024 Wenlong Zhang - 1.8.17-8 - skip fu-self-test for loongarch64