system/fwupd: Updated for version 1.7.10.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 35 insertions, 41 deletions

diff --git a/system/fwupd/README b/system/fwupd/README
index b3fdb92c32a4..3c3572a55404 100644
--- a/system/fwupd/README
+++ b/system/fwupd/README
@@ -2,3 +2,7 @@ fwupd - A simple daemon to allow session software to update firmware
 
 This project aims to make updating firmware on Linux automatic, safe and
 reliable.
+
+Warning: This SlackBuild requires network access when it runs, meaning
+it downloads files from the Internet with root access. You should
+decide for yourself whether or not you think this is a good idea.
diff --git a/system/fwupd/doinst.sh b/system/fwupd/doinst.sh
index b76f0ec18b9f..a3e59ba6c32d 100644
--- a/system/fwupd/doinst.sh
+++ b/system/fwupd/doinst.sh
@@ -8,22 +8,17 @@ config() {
   fi
 }
 
-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/msr.conf.new
 config etc/fwupd/redfish.conf.new
+config etc/fwupd/remotes.d/dell-esrt.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-directory.conf.new
+config etc/fwupd/remotes.d/vendor.conf.new
 config etc/fwupd/thunderbolt.conf.new
-config etc/fwupd/upower.conf.new
+config etc/fwupd/uefi_capsule.conf.new
 
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
diff --git a/system/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild
index 4a13c70e21b9..656819936d8d 100644
--- a/system/fwupd/fwupd.SlackBuild
+++ b/system/fwupd/fwupd.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for fwupd
 
-# Copyright 2017-2021 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fwupd
-VERSION=${VERSION:-1.3.12}
+VERSION=${VERSION:-1.7.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +39,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -79,9 +77,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# uefi requires tss2-esys which is not on slackbuilds.org
-# dell is disabled because it requires uefi
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 meson --prefix=/usr \
@@ -90,10 +85,15 @@ meson --prefix=/usr \
   --libexecdir=/usr/libexec \
   --buildtype=release \
   --mandir=/usr/man \
-  -Dsystemd=false \
-  -Dplugin_dell=false \
+  -Dbuild=all \
+  -Defi_binary=false \
+  -Dlzma=true \
+  -Dplugin_flashrom=false \
+  -Dplugin_modem_manager=true \
   -Dplugin_tpm=false \
-  -Dplugin_uefi=false \
+  -Dsupported_build=true \
+  -Dsystemd=false \
+  -Dgcab:docs=false \
   build
 
 "${NINJA:=ninja}" -C build
@@ -105,22 +105,17 @@ 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/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/msr.conf $PKG/etc/fwupd/msr.conf.new
 mv $PKG/etc/fwupd/redfish.conf $PKG/etc/fwupd/redfish.conf.new
+mv $PKG/etc/fwupd/remotes.d/dell-esrt.conf $PKG/etc/fwupd/remotes.d/dell-esrt.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-directory.conf $PKG/etc/fwupd/remotes.d/vendor-directory.conf.new
+mv $PKG/etc/fwupd/remotes.d/vendor.conf $PKG/etc/fwupd/remotes.d/vendor.conf.new
 mv $PKG/etc/fwupd/thunderbolt.conf $PKG/etc/fwupd/thunderbolt.conf.new
-mv $PKG/etc/fwupd/upower.conf $PKG/etc/fwupd/upower.conf.new
+mv $PKG/etc/fwupd/uefi_capsule.conf $PKG/etc/fwupd/uefi_capsule.conf.new
 
 rm -rf $PKG/usr/share/installed-tests
 
diff --git a/system/fwupd/fwupd.info b/system/fwupd/fwupd.info
index c94b9851baba..43e94894b762 100644
--- a/system/fwupd/fwupd.info
+++ b/system/fwupd/fwupd.info
@@ -1,10 +1,10 @@
 PRGNAM="fwupd"
-VERSION="1.3.12"
+VERSION="1.7.10"
 HOMEPAGE="https://www.fwupd.org"
-DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.3.12/fwupd-1.3.12.tar.gz"
-MD5SUM="f29c98ae0500aa47976c3fcb882d3ea8"
+DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.7.10/fwupd-1.7.10.tar.gz"
+MD5SUM="0cbd3b06b7f6c9452931384fa1ed075f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libxmlb libgusb gcab"
+REQUIRES="libxmlb libgusb gcab libsmbios protobuf-c python-toml python3-typogrify"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"