pool/fwupd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 733419 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/733419
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fwupd?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2019-10-10 09:47:43 +00:00 committed by Git OBS Bridge
commit 8a15091ab8
7 changed files with 206 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
1.2.10.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9cd36f633e98a1b40f6020fd5e066ed05bfb445be69b8357806b0dd6ae189db
size 1943920

2
_service
View File

@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="revision">refs/tags/1.2.9</param>
<param name="revision">refs/tags/1.3.1</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/hughsie/fwupd.git</param>
<param name="changesrevision">4808c0ebad49041b0ba65dcb937bcaa188bc6365</param></service></servicedata>
<param name="changesrevision">67ad8d0d223978c334cd192a3b4a0a282d22273b</param></service></servicedata>

3
fwupd-1.3.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d0e337bef69f4a567b699787ded486516c2d11fd003176f4f8136695c034662
size 1559832

281
fwupd-bsc1143905-hash-the-source-files.patch
View File

@ -1,281 +0,0 @@
From 14354a72483c5bc88928015a9154ad2055cefabd Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Sun, 25 Aug 2019 08:31:07 +0100
Subject: [PATCH 1/2] Split up source files in the build script
(cherry picked from commit 22d482c244ea8ab6b0e2a417ecc08f2d1949b65f)
---
src/meson.build | 120 +++++++++++++++---------------------------------
1 file changed, 36 insertions(+), 84 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index 92283179..a9f51fe2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -7,7 +7,26 @@ endif
keyring_deps = []
keyring_src = []
test_deps = []
-init_src = []
+libfwupdprivate_src = [
+ 'fu-archive.c',
+ 'fu-chunk.c',
+ 'fu-common.c',
+ 'fu-common-cab.c',
+ 'fu-common-guid.c',
+ 'fu-common-version.c',
+ 'fu-device.c',
+ 'fu-device-locker.c',
+ 'fu-hwids.c',
+ 'fu-history.c',
+ 'fu-io-channel.c',
+ 'fu-plugin.c',
+ 'fu-progressbar.c',
+ 'fu-quirks.c',
+ 'fu-smbios.c',
+ 'fu-test.c',
+ 'fu-udev-device.c',
+ 'fu-usb-device.c',
+]
if get_option('gpg')
keyring_src += 'fu-keyring-gpg.c'
@@ -24,30 +43,13 @@ if get_option('pkcs7')
endif
if get_option('systemd')
- init_src += 'fu-systemd.c'
+ libfwupdprivate_src += 'fu-systemd.c'
endif
libfwupdprivate = static_library(
'fwupdprivate',
sources : [
- init_src,
- 'fu-archive.c',
- 'fu-common.c',
- 'fu-common-guid.c',
- 'fu-common-version.c',
- 'fu-chunk.c',
- 'fu-device.c',
- 'fu-device-locker.c',
- 'fu-hwids.c',
- 'fu-history.c',
- 'fu-io-channel.c',
- 'fu-plugin.c',
- 'fu-progressbar.c',
- 'fu-quirks.c',
- 'fu-smbios.c',
- 'fu-test.c',
- 'fu-udev-device.c',
- 'fu-usb-device.c',
+ libfwupdprivate_src,
],
include_directories : [
include_directories('..'),
@@ -57,11 +59,12 @@ libfwupdprivate = static_library(
giounix,
gudev,
gusb,
- soup,
- sqlite,
libarchive,
+ libgcab,
libjsonglib,
libxmlb,
+ soup,
+ sqlite,
valgrind,
],
link_with : [
@@ -185,34 +188,17 @@ fwupdtool = executable(
sources : [
'fu-tool.c',
keyring_src,
- init_src,
- 'fu-archive.c',
- 'fu-chunk.c',
- 'fu-common.c',
- 'fu-common-cab.c',
- 'fu-common-guid.c',
- 'fu-common-version.c',
+ libfwupdprivate_src,
'fu-config.c',
- 'fu-keyring.c',
- 'fu-keyring-result.c',
- 'fu-engine.c',
- 'fu-hwids.c',
'fu-debug.c',
- 'fu-device.c',
'fu-device-list.c',
- 'fu-device-locker.c',
+ 'fu-engine.c',
'fu-idle.c',
'fu-install-task.c',
- 'fu-io-channel.c',
'fu-keyring.c',
+ 'fu-keyring-result.c',
'fu-keyring-utils.c',
- 'fu-history.c',
- 'fu-plugin.c',
'fu-plugin-list.c',
- 'fu-quirks.c',
- 'fu-smbios.c',
- 'fu-udev-device.c',
- 'fu-usb-device.c',
'fu-util-common.c',
],
include_directories : [
@@ -269,35 +255,18 @@ executable(
fu_hash,
sources : [
keyring_src,
- init_src,
- 'fu-archive.c',
- 'fu-chunk.c',
- 'fu-common.c',
- 'fu-common-cab.c',
- 'fu-common-guid.c',
- 'fu-common-version.c',
+ libfwupdprivate_src,
'fu-config.c',
- 'fu-keyring.c',
- 'fu-keyring-result.c',
- 'fu-engine.c',
- 'fu-main.c',
- 'fu-hwids.c',
'fu-debug.c',
- 'fu-device.c',
'fu-device-list.c',
- 'fu-device-locker.c',
+ 'fu-engine.c',
'fu-idle.c',
- 'fu-io-channel.c',
'fu-install-task.c',
'fu-keyring.c',
+ 'fu-keyring-result.c',
'fu-keyring-utils.c',
- 'fu-history.c',
- 'fu-plugin.c',
+ 'fu-main.c',
'fu-plugin-list.c',
- 'fu-quirks.c',
- 'fu-smbios.c',
- 'fu-udev-device.c',
- 'fu-usb-device.c',
],
include_directories : [
include_directories('..'),
@@ -343,36 +312,19 @@ if get_option('tests')
fu_hash,
sources : [
keyring_src,
- init_src,
- 'fu-self-test.c',
- 'fu-archive.c',
- 'fu-chunk.c',
- 'fu-common.c',
- 'fu-common-cab.c',
- 'fu-common-guid.c',
- 'fu-common-version.c',
+ libfwupdprivate_src,
'fu-config.c',
- 'fu-engine.c',
- 'fu-keyring.c',
- 'fu-keyring-utils.c',
- 'fu-hwids.c',
- 'fu-device.c',
'fu-device-list.c',
- 'fu-device-locker.c',
- 'fu-history.c',
+ 'fu-engine.c',
'fu-idle.c',
'fu-install-task.c',
- 'fu-io-channel.c',
'fu-keyring.c',
'fu-keyring-result.c',
- 'fu-plugin.c',
+ 'fu-keyring-utils.c',
'fu-plugin-list.c',
- 'fu-progressbar.c',
- 'fu-quirks.c',
+ 'fu-self-test.c',
'fu-smbios.c',
'fu-test.c',
- 'fu-udev-device.c',
- 'fu-usb-device.c',
],
include_directories : [
include_directories('..'),
--
2.22.0
From 4e7dc8140865223bc23685b94c2ba10fb3f2e152 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Sun, 25 Aug 2019 09:50:28 +0100
Subject: [PATCH 2/2] Hash the source files when generating the daemon hash
The unstripped static library changes between builds with profiling metadata
when compiling with LTO.
Fixes https://github.com/fwupd/fwupd/issues/1298
(cherry picked from commit 5611fd0581b1c28de97321daefae798a78f475b8)
---
src/fu-hash.py | 17 +++++++++--------
src/meson.build | 4 ++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/fu-hash.py b/src/fu-hash.py
index 13b20fc6..639ca37a 100644
--- a/src/fu-hash.py
+++ b/src/fu-hash.py
@@ -16,17 +16,18 @@ def usage(return_code):
out = sys.stdout
else:
out = sys.stderr
- out.write("usage: fu-hash.py <DAEMON> <HEADER>")
+ out.write("usage: fu-hash.py <HEADER> <SRC1> <SRC2>...")
sys.exit(return_code)
if __name__ == '__main__':
if {'-?', '--help', '--usage'}.intersection(set(sys.argv)):
usage(0)
- if len(sys.argv) != 3:
+ if len(sys.argv) < 3:
usage(1)
- with open(sys.argv[1], 'rb') as f:
- buf = f.read()
- csum = hashlib.sha256(buf).hexdigest()
- with open(sys.argv[2], 'w') as f2:
- f2.write('#pragma once\n')
- f2.write('#define FU_BUILD_HASH "%s"\n' % csum)
+ m = hashlib.sha256()
+ for argv in sys.argv[2:]:
+ with open(argv, 'rb') as f:
+ m.update(f.read())
+ with open(sys.argv[1], 'w') as f2:
+ f2.write('#pragma once\n')
+ f2.write('#define FU_BUILD_HASH "%s"\n' % m.hexdigest())
diff --git a/src/meson.build b/src/meson.build
index a9f51fe2..31513aea 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -174,11 +174,11 @@ resources_src = gnome.compile_resources(
fu_hash = custom_target(
'fu-hash.h',
- input : libfwupdprivate,
+ input : libfwupdprivate_src,
output : 'fu-hash.h',
command : [python3.path(),
join_paths(meson.current_source_dir(), 'fu-hash.py'),
- '@INPUT@', '@OUTPUT@']
+ '@OUTPUT@', '@INPUT@']
)
fwupdtool = executable(
--
2.22.0

171
fwupd.changes
View File

@ -1,3 +1,174 @@
-------------------------------------------------------------------
Wed Sep 18 23:14:43 UTC 2019 - bjorn.lie@gmail.com
- Update to version 1.3.1:
* Allow disabling all plugins
* trivial: Specify the tpm2-tss-devel version in the example spec file
* Move to CI Fedora 30
* modem-manager: Fix two build warnings on Fedora 30
* synapticsmst: Add another name quirk for the ThinkPad USB-C Dock
* Re-introduce GUID support to fwupdmgr and fwupdtool
* uefi-recovery: Add a plugin to add a fake ESRT entry for device recovery
* Add a DMI quirk for the Minnowboard Turbot
* trivial: Make it easy to disable or enable libflashrom for distros
* trivial: Don't use Recommends for RHEL 7
* unifying: fix timeout metadata
* ci: arch: minor improvements
* unifying: fix timeout
* Allow disabling SSL strict mode for broken corporate proxies
* trivial: Allow ignoring the daemon version check by using --force
* Try to only show DMI product name once
* trivial: fu-util-common: Show unknown devices as interesting devices
* dell: Use TSS to query and build TPM vendor strings for GUIDs
* trivial: dell: show reasons for lack of updates in `UpdateError`
* fu-util-common: strip all trailing whitespace in XML description
* trivial: fu-common: match all whitespace not just ' ' in `fu_common_strstrip`
* fu-util: show release output in get-details again
* unifying: use fu_firmware_strparse_uint16 to read be 16bit values
* unifying: fix incomplete hex file parsing
* fu-util/fu-tool: Print devices, remotes, releases using a tree
* Add aliases for `get-upgrades` and `upgrade`
* trivial: UEFI skip self tests if library fails to initialize
* libfwupd: Add a new private function `fwupd_remote_set_remotes_dir`
* trivial: add libtss2-dev into debian/control (Closes: #1324)
* trivial: Fix up the GtkDoc Since lines for API only available in 1.3.x
* trivial: Post branch version bump
* thunderbolt: Add support for kernel safety checks (Fixes: #1312)
* Include the kernel release as a runtime version
* trivial: fu-util: Drop GUID support from get-devices
* synapticsmst: Partially rewrite the plugin (Fixes #1105)
* Remove replug flag after the device comes back from reboot
* trivial: Fix running the tests on devices with the TPM in v1.2 mode
* trivial: fu-util-common: more cleanup related to topology
* trivial: fu-util: cleanup fwupdmgr get-details output
* trivial: Don't use topology printing in --verbose mode
* Make get-devices and get-topology aliases for one another
* trivial: Adjust daemon device sorting
* Make get-topology more useful by showing all information
* trivial: Fix fu_common_string_append_kv() to align properly with idx > 0
* trivial: dell-dock: correct an error preventing write_size from being set
* trivial: Do not warn about deprecated declarations
* trivial: Update BRs for the example Fedora package
* uefi: add test for TPM 2.0 PCR read function
* uefi: use tpm2-tss library to read PCR values
* fu-common: Use environment variables for systemd managed directories
* Use more systemd directives for directories
* trivial: fu-util: fix debug output for devices
* Allow turning off the timestamp prefix for debugging
* Add a ->udev_device_changed plugin vfunc
* Add fu_device_rescan() and a FuDevice->rescan() vfunc
* Remove the duplicate files in meson.build
* Hash the source files when generating the daemon hash
* Split up source files in the build script
* uefi: add support for tpm2-tools 4.X
* trivial: plugins: clarify stance on afuefi.efi
* trivial: plugins/: Update README
* trivial: disable gtkdoc by default
* trivial: update references of hughsie/fwupd to fwupd/fwupd
* Publish docs to fwupd.github.io using CircelCI
* Add support to integrate into the motd (Fixes: #1270)
* Simplify get-devices output to not show un-useful fields
* fu-engine/fu-config: Reload metadata store when configuration changes
* trivial: If no devices support updates, show messaging (Closes: #1295)
* trivial: uefi: set vendor name for system firwmare from DMI data
* unifying: update Solaar url
* thunderbolt: Fix logic to work properly with ICL thunderbolt controller
* Add fu_udev_device_get_device_file() helper
* trivial: Fix regression when using fu_device_incorporate()
* trivial: Fix a potential crash when using FuPlugin in the self tests
* synapticsmst: Make FuSynapticsmstConnection an actual GObject
* synapticsmst: Use the same style as other plugins
* trivial: Add some helper functions for GByteArray
* Do not use FuDevice metadata for the physical and logical IDs
* Use fu_common_string_append_kv() in subclassed device
* synapticsmst: Use G_DECLARE_FINAL_TYPE to simplify the object
* synapticsmst: Add a SynapticsMSTBoardID for another Lenovo dock
* trivial: remove unnecessary CUSTOMERID_DELL define
* synapticsmst: Add a SynapticsMSTBoardID for a Lenovo dock
* synapticsmst: Display the board ID in non-hex form in the error message
* synapticsmst: Use a more suitable icon for the device
* trivial: Remove unused variable
* Never use memcpy() in a possibly unsafe way
* Add a ->to_string() vfunc to FuFirmware
* Use FuFirmware as a container for firmware images
* Allow filtering devices when using the command line tools
* Be more accepting when trying to recover a failed database migration
* trivial: Add translation for X-ThunderboltController
* trivial: fixup standalone installer
* modem-manager: add counterpart GUID for the DW5821e
* solokey: Release the interface and rebind the kernel driver on close
* fu-tool: Port ability to update a single device from fwupdmgr
* uefi: Actually write the new device path if different than before
* Allow setting custom flags when using fwupdate
* trivial: Do not show a critical warning if no firmware is specified
* trivial: Fix overzealous search-replace action in user string
* Verify we don't break the ABI
* Fix a crash when stopping the fwupd service
* Relax the certificate time checks in the self tests for the legacy certificate
* trivial: add cache directory into systemd unit rw paths
* Never show AppStream markup on the console
* Do not segfault when trying to quit the downgrade selection
* trivial: Update icons for Thunderbolt and MST devices
* Add support for the SoloKey Secure
* trivial: Allow a device to *clear* a firmware version
* trivial: debian: For signed package fill out Built-Using (Closes: #932757)
* Allow specifying <firmware>GUID</firmware> to check any version exists
* trivial: post release version bump
* Release fwupd 1.2.10
* Disable the flashrom plugin by default
* trivial: thunderbolt: catch failure setting up device
* dell-esrt: Improve the experience for the plugin (Closes: #1245)
* fu-util: When unlocking prompt for reboot if applicable
* remove those PIDs with Bluetooth interface, Wacom updater doesn't support updating from Bluetooth interface
* flashrom: Only show DEBUG and DEBUG2 output if using --plugin-verbose=flashrom
* flashrom: Only call flashrom_programmer_init() on whitelisted boards
* flashrom: Fix no version format set
* fu-util: Show devices with an UpdateError in get-devices output
* trivial: uefi: use UEFI-dummy for device ID instead of just uefi
* trivial: fix error handling for non UEFI case (#1220)
* Add a specific error code for the low battery case
* Fix Fedora docker build missing directory: dist
* uefi: Determine whether running in legacy mode or not (Fixes: #1220)
* trivial: ci: debian: Only turn on flashrom when running CI
* trivial: Fix typos in error messages
* Allow client code to construct objects from GVariant blobs
* Export functionality to build an array of objects
* flashrom: Use libflashrom
* trivial: Fix the version script to pick up boxed types
* trivial: Correctly order the map entries according to vercmp rules
* trivial: Fix pylint issue in the version script
* Add meson target to fix translations
* Add support for 8bitdo USB Retro Receiver
* Use the newer features of GRWLock rather than reinventing it
* Revert "Allow SuperIO updates to be done live"
* uefi: Try to find a duplicate using the loadopt name
* uefi: Provide a quirk to disable the use of the UX capsule
* trivial: uefi: use the path for efibootmgr that was detected
* synaptics-prometheus: Fix installing CONFIG firmware updates
* synaptics-prometheus: Set the install duration from a quirk
* synaptics-prometheus: Don't emit critial warning when updating config firmware
* synaptics-prometheus: Fix missing field in the IOTA reply struct
* Create SECURITY.md
* redfish: Never set NULL device name
* modem-manager: Never set NULL device name
* ata: Never set NULL device name
* trivial: Add some parameter guards to FuDevice
* trivial: snap: make polkit directories if they don't exist (Fixes: #1205)
* trivial: fu-main: clarify missing PK file error
* synapticsmst: fix GUID generation (Closes: #1207)
* Lite Mk II flag for use-shim-unique
* trivial: circleci: try to fix automatic snap deployment
* Allow SuperIO updates to be done live
* fu-util-common: Support empty proxy strings (Fixes: #1199)
* trivial: uefi: clarify error message
* trivial: Fix non-systemd build
* trivial: Sync example spec file with downstream
* trivial: post release version bump
- Drop fwupd-bsc1143905-hash-the-source-files.patch: Applied upstream.
- Add pkgconfig(tss2-esys) BuildRequires: New dependency.
- Add gtk-doc BuildRequires and pass gtkdoc=true to meson, build
api docs even when using source service.
-------------------------------------------------------------------
Mon Aug 26 06:48:00 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>

42
fwupd.spec
View File

@ -28,17 +28,19 @@
%global efidir sles
%endif
Name: fwupd
Version: 1.2.10
Version: 1.3.1
Release: 0
Summary: Device firmware updater daemon
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Management
URL: https://fwupd.org/
Source: https://github.com/hughsie/%{name}/archive/%{version}.tar.gz
# Do not use upstream tarball, we are using source service!
#Source: https://github.com/hughsie/%%{name}/archive/%%{version}.tar.gz
Source: %{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE fwupd-bsc1130056-shim-path.patch bsc#1130056
Patch1: fwupd-bsc1130056-change-shim-path.patch
# PATCH-FIX-UPSTRAEM fwupd-bsc1143905-hash-the-source-files.patch bsc#1143905
Patch2: fwupd-bsc1143905-hash-the-source-files.patch
BuildRequires: dejavu-fonts
BuildRequires: docbook-utils-minimal
BuildRequires: gcab
@ -47,6 +49,7 @@ BuildRequires: gnutls
BuildRequires: gobject-introspection
BuildRequires: gobject-introspection-devel
BuildRequires: gpgme-devel
BuildRequires: gtk-doc
BuildRequires: help2man
BuildRequires: intltool
BuildRequires: libelf-devel
@ -81,6 +84,7 @@ BuildRequires: pkgconfig(libsoup-2.4) >= 2.51.92
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(tss2-esys)
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(valgrind)
BuildRequires: pkgconfig(xmlb)
@ -143,9 +147,8 @@ the local machine.
%lang_package
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%autosetup -p1
for file in $(grep -l %{_bindir}/env . -r); do
sed -i "s|%{_bindir}/env python3|%{_bindir}/python3|" $file
done
@ -165,6 +168,7 @@ done
-Dplugin_dell=false \
-Dplugin_synaptics=false \
%endif
-Dgtkdoc=true \
-Dtests=false
%meson_build
@ -225,10 +229,12 @@ fi
%files
%license COPYING
%doc README.md
%{_libexecdir}/systemd/system/fwupd.service
%{_libexecdir}/systemd/system/fwupd-offline-update.service
%%dir %{_libexecdir}/systemd/system/system-update.target.wants/
%{_libexecdir}/systemd/system/system-update.target.wants/fwupd-offline-update.service
%{_unitdir}/fwupd.service
%{_unitdir}/fwupd-offline-update.service
%dir %{_unitdir}/system-update.target.wants/
%{_unitdir}/system-update.target.wants/fwupd-offline-update.service
%{_unitdir}/fwupd-refresh.service
%{_unitdir}/fwupd-refresh.timer
%{_libexecdir}/fwupd
%{_bindir}/fwupdmgr
%{_sbindir}/rc%{name}
@ -236,7 +242,19 @@ fi
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.fwupd.conf
%{_datadir}/dbus-1/interfaces/org.freedesktop.fwupd.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.fwupd.service
%{_datadir}/%{name}/
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/metainfo
%dir %{_datadir}/%{name}/quirks.d
%dir %{_datadir}/%{name}/remotes.d
%dir %{_datadir}/%{name}/remotes.d/dell-esrt
%dir %{_datadir}/%{name}/remotes.d/vendor
%dir %{_datadir}/%{name}/remotes.d/vendor/firmware
%{_datadir}/%{name}/firmware-packager
%{_datadir}/%{name}/metainfo/org.freedesktop.fwupd.remotes.lvfs-testing.metainfo.xml
%{_datadir}/%{name}/metainfo/org.freedesktop.fwupd.remotes.lvfs.metainfo.xml
%{_datadir}/%{name}/quirks.d/*.quirk
%{_datadir}/%{name}/remotes.d/dell-esrt/metadata.xml
%{_datadir}/%{name}/remotes.d/vendor/firmware/README.md
%{_mandir}/man1/fwupdmgr.1%{?ext_man}
%{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
%config %{_sysconfdir}/%{name}/