diff --git a/_service b/_service
index 8b6a01b..a49f2b9 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
git
@PARENT_TAG@
enable
- 1.5.7
+ 1.5.8
*.tar
diff --git a/_servicedata b/_servicedata
index 7e46326..3fdc4a7 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/hughsie/fwupd.git
- 674fccdd0d20f45632490df3075be884b94f8726
\ No newline at end of file
+ f9a8c3d6c6cd39ad6a421593d5203340fc59667f
\ No newline at end of file
diff --git a/fwupd-1.5.7.tar.xz b/fwupd-1.5.7.tar.xz
deleted file mode 100644
index 9ccea90..0000000
--- a/fwupd-1.5.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2fb16f1868ca4ebb8d64ac27424cc45bc7314148d7816ebab00b3d8889143a6
-size 1770356
diff --git a/fwupd-1.5.8.tar.xz b/fwupd-1.5.8.tar.xz
new file mode 100644
index 0000000..0fb11b6
--- /dev/null
+++ b/fwupd-1.5.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:344ad01a19c10f43fd742bbd21aa7653d6807dcdcc3fae27851ae56953400367
+size 2919416
diff --git a/fwupd-bsc1182057-fix-sbat-section-copy.patch b/fwupd-bsc1182057-fix-sbat-section-copy.patch
deleted file mode 100644
index c901ef3..0000000
--- a/fwupd-bsc1182057-fix-sbat-section-copy.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b283395049be8071d3699dfa3a411a3b37406f0b Mon Sep 17 00:00:00 2001
-From: Gary Lin
-Date: Tue, 9 Mar 2021 15:26:20 +0800
-Subject: [PATCH] uefi-capsule: Specify the section flags for .sbat
-
-When using "objcopy -O binary" to generate AArch64 EFI images, it
-silently drops the sections without "alloc" or "load" or the sections
-with "unload", and this caused the content of .sbat was skipped in the
-final EFI image.
-
-This commit sets the common read-only data section flags to .sbat to
-make sure the content will be copied.
-
-Signed-off-by: Gary Lin
----
- plugins/uefi-capsule/efi/generate_sbat.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/uefi-capsule/efi/generate_sbat.py b/plugins/uefi-capsule/efi/generate_sbat.py
-index 227bc841..18f7c4c7 100755
---- a/plugins/uefi-capsule/efi/generate_sbat.py
-+++ b/plugins/uefi-capsule/efi/generate_sbat.py
-@@ -70,6 +70,8 @@ def _generate_sbat(args):
- args.objcopy,
- "--add-section",
- ".sbat={}".format(sfd.name),
-+ "--set-section-flags",
-+ ".sbat=contents,alloc,load,readonly,data",
- args.outfile,
- ]
- subprocess.run(argv, check=True)
---
-2.29.2
-
diff --git a/fwupd.changes b/fwupd.changes
index ffea2a9..4344723 100644
--- a/fwupd.changes
+++ b/fwupd.changes
@@ -1,3 +1,47 @@
+-------------------------------------------------------------------
+Tue Mar 30 03:20:46 UTC 2021 - Gary Ching-Pang Lin
+
+- Update to version 1.5.8:
+ New features:
+ * Add a new internal flag to opt-in to GUID matching
+ * Add D501 Baklava device support
+ * Add fu_device_set_battery_level()
+ * Add missing uint64 read and write helpers
+ * Add Qubes wrapper source and create packages
+ * Allow enabling plugins only matching a specific HwId
+ * Prompt for unlock keypress if reset command is blocked
+ * Remove obsolete dell-dock non-passive update flow support
+ * Remove the Hughski public key
+ * Show a warning when parsing invalid quirk files
+ * Support for GATT characteristic signals/notifications
+ * Support more than one protocol for a given device
+ Fixes:
+ * Align the CCGX DMC firmware to 64 byte chunks
+ * Be more strict for custom quirk keys
+ * Check pixart firmware compatibility with hardware before
+ flashing
+ * Correct a thunderbolt assertion if kernel failed FW read
+ * Correctly erase STM32 devices when transfer size is less
+ than sector size
+ * Detect SREC overflow to avoid adding ~4GB of 0xFF padding
+ * Do not show a critical error when flashing footer-less
+ binary files
+ * Don't allow device updates while needing activation
+ * Fix a regression in the elantp defined IAP start address
+ * Fix a regression where activate stopped working
+ * Fix firmware update of pointing device on Lenovo ThinkPad
+ Nano
+ * Fix the HSI plugin 'Disabled' state
+ * Fix the quirk key name for the Lenovo HDMI with power
+ * Fix writing to the GD32VF103 bootloader
+ * Only call elantp->detach() when writing a firmware blob
+ * Updated StarLabs GUIDs
+ * Wait a few ms for the Logitech hardware to settle after
+ detach
+- Remove GPG-KEY-Hughski-Limited from the filelist
+- Drop upstreamed patch
+ + fwupd-bsc1182057-fix-sbat-section-copy.patch
+
-------------------------------------------------------------------
Fri Mar 12 08:30:32 UTC 2021 - Gary Ching-Pang Lin
diff --git a/fwupd.spec b/fwupd.spec
index eef1b6d..f7eb320 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -30,7 +30,7 @@
%endif
Name: fwupd
-Version: 1.5.7
+Version: 1.5.8
Release: 0
Summary: Device firmware updater daemon
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -44,8 +44,6 @@ Source: %{name}-%{version}.tar.xz
Patch1: fwupd-bsc1130056-change-shim-path.patch
# PATCH-FIX-OPENSUSE fwupd-jscSLE-11766-close-efidir-leap-gap.patch jsc#SLE-11766 qkzhu@suse.com -- Set SLE and openSUSE esp os dir at runtime
Patch2: fwupd-jscSLE-11766-close-efidir-leap-gap.patch
-# PATCH-FIX-UPSTRAEM fwupd-bsc1182057-fix-sbat-section-copy.patch bsc#1182057 glin@suse.com -- Set the proper section flags for .sbat
-Patch3: fwupd-bsc1182057-fix-sbat-section-copy.patch
BuildRequires: dejavu-fonts
%if %{with fish_support}
@@ -349,7 +347,6 @@ fi
%{_sysconfdir}/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service
%{_sysconfdir}/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata
%{_sysconfdir}/pki/fwupd-metadata/LVFS-CA.pem
-%{_sysconfdir}/pki/fwupd/GPG-KEY-Hughski-Limited
%{_sysconfdir}/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service
%{_sysconfdir}/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware
%{_sysconfdir}/pki/fwupd/LVFS-CA.pem