system/fwupd: Updated for version 1.2.10.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

4 files changed, 28 insertions, 32 deletions

diff --git a/system/fwupd/README b/system/fwupd/README
index bea04d075c1d0..060baa0925994 100644
--- a/system/fwupd/README
+++ b/system/fwupd/README
@@ -7,4 +7,4 @@ Options (all default to false):
   ENABLE_UEFI: true|false - requires pygobject3-python3 python3-pillow
                                      py3cairo
 
-  https://github.com/hughsie/fwupd/blob/1.2.6/meson_options.txt
+  https://github.com/hughsie/fwupd/blob/1.2.10/meson_options.txt
diff --git a/system/fwupd/doinst.sh b/system/fwupd/doinst.sh
index d98d893e0a14e..544d2273cef55 100644
--- a/system/fwupd/doinst.sh
+++ b/system/fwupd/doinst.sh
@@ -8,18 +8,18 @@ config() {
   fi
 }
 
-config etc/fwupd/daemon.conf.new
-if [ -e etc/fwupd/uefi.conf ] ; then
-  config etc/fwupd/uefi.conf.new
-fi
-config etc/fwupd/remotes.d/fwupd.conf.new
-config etc/fwupd/remotes.d/fwupd-tests.conf.new
-config etc/fwupd/remotes.d/lvfs-testing.conf.new
-config etc/fwupd/remotes.d/lvfs.conf.new
-config etc/fwupd/remotes.d/vendor.conf.new
-
-config etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new
-config etc/pki/fwupd-metadata/LVFS-CA.pem.new
 config etc/pki/fwupd/GPG-KEY-Hughski-Limited.new
+config etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware.new
 config etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service.new
 config etc/pki/fwupd/LVFS-CA.pem.new
+config etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata.new
+config etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new
+config etc/pki/fwupd-metadata/LVFS-CA.pem.new
+config etc/fwupd/remotes.d/lvfs.conf.new
+config etc/fwupd/remotes.d/lvfs-testing.conf.new
+config etc/fwupd/remotes.d/vendor.conf.new
+config etc/fwupd/remotes.d/vendor-directory.conf.new
+config etc/fwupd/remotes.d/fwupd-tests.conf.new
+config etc/fwupd/daemon.conf.new
+config etc/fwupd/redfish.conf.new
+config etc/fwupd/uefi.conf.new
diff --git a/system/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild
index 009fc4c394eac..42be43104ff88 100644
--- a/system/fwupd/fwupd.SlackBuild
+++ b/system/fwupd/fwupd.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fwupd
-VERSION=${VERSION:-1.2.6}
+VERSION=${VERSION:-1.2.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -97,25 +97,21 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mv $PKG/etc/fwupd/daemon.conf $PKG/etc/fwupd/daemon.conf.new
-mv $PKG/etc/fwupd/redfish.conf $PKG/etc/fwupd/redfish.conf.new
-mv $PKG/etc/fwupd/remotes.d/fwupd.conf $PKG/etc/fwupd/remotes.d/fwupd.conf.new
-mv $PKG/etc/fwupd/remotes.d/fwupd-tests.conf $PKG/etc/fwupd/remotes.d/fwupd-tests.conf.new
-mv $PKG/etc/fwupd/remotes.d/lvfs-testing.conf $PKG/etc/fwupd/remotes.d/lvfs-testing.conf.new
-mv $PKG/etc/fwupd/remotes.d/lvfs.conf $PKG/etc/fwupd/remotes.d/lvfs.conf.new
-mv $PKG/etc/fwupd/remotes.d/vendor.conf $PKG/etc/fwupd/remotes.d/vendor.conf.new
-
-if [ -e $PKG/etc/fwupd/uefi.conf ] ; then
-  mv $PKG/etc/fwupd/uefi.conf $PKG/etc/fwupd/uefi.conf.new
-fi
-
-mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata.new
-mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new
-mv $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem.new
 mv $PKG/etc/pki/fwupd/GPG-KEY-Hughski-Limited $PKG/etc/pki/fwupd/GPG-KEY-Hughski-Limited.new
 mv $PKG/etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware $PKG/etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware.new
 mv $PKG/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service.new
 mv $PKG/etc/pki/fwupd/LVFS-CA.pem $PKG/etc/pki/fwupd/LVFS-CA.pem.new
+mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata.new
+mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new
+mv $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem.new
+mv $PKG/etc/fwupd/remotes.d/lvfs.conf $PKG/etc/fwupd/remotes.d/lvfs.conf.new
+mv $PKG/etc/fwupd/remotes.d/lvfs-testing.conf $PKG/etc/fwupd/remotes.d/lvfs-testing.conf.new
+mv $PKG/etc/fwupd/remotes.d/vendor.conf $PKG/etc/fwupd/remotes.d/vendor.conf.new
+mv $PKG/etc/fwupd/remotes.d/vendor-directory.conf $PKG/etc/fwupd/remotes.d/vendor-directory.conf.new
+mv $PKG/etc/fwupd/remotes.d/fwupd-tests.conf $PKG/etc/fwupd/remotes.d/fwupd-tests.conf.new
+mv $PKG/etc/fwupd/daemon.conf $PKG/etc/fwupd/daemon.conf.new
+mv $PKG/etc/fwupd/redfish.conf $PKG/etc/fwupd/redfish.conf.new
+mv $PKG/etc/fwupd/uefi.conf $PKG/etc/fwupd/uefi.conf.new
 
 rm -rf $PKG/usr/share/installed-tests
 
diff --git a/system/fwupd/fwupd.info b/system/fwupd/fwupd.info
index f5d3edab5c5d9..55746cbe50b6f 100644
--- a/system/fwupd/fwupd.info
+++ b/system/fwupd/fwupd.info
@@ -1,8 +1,8 @@
 PRGNAM="fwupd"
-VERSION="1.2.6"
+VERSION="1.2.10"
 HOMEPAGE="https://www.fwupd.org"
-DOWNLOAD="https://github.com/hughsie/fwupd/archive/1.2.6/fwupd-1.2.6.tar.gz"
-MD5SUM="90edcb71e700127a799e7cdc411fc892"
+DOWNLOAD="https://github.com/hughsie/fwupd/archive/1.2.10/fwupd-1.2.10.tar.gz"
+MD5SUM="ad3765dc9409fa1d9b46dc712fd041e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libxmlb libgusb efivar json-glib gcab"