From 675cfdaaf7af60c7e04c61dc0eb3447a7e5371c9 Mon Sep 17 00:00:00 2001
From: Andrew Clemons <andrew.clemons@gmail.com>
Date: Sat, 27 Oct 2018 17:00:31 +1300
Subject: system/fwupd: Updated for version 1.1.3.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
---
 system/fwupd/README           |  8 +++-----
 system/fwupd/fwupd.SlackBuild | 16 ++++++++--------
 system/fwupd/fwupd.info       |  8 ++++----
 3 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'system')

diff --git a/system/fwupd/README b/system/fwupd/README
index 2b5f47d732..97f9f4281f 100644
--- a/system/fwupd/README
+++ b/system/fwupd/README
@@ -4,9 +4,7 @@ This project aims to make updating firmware on Linux automatic, safe and
 reliable.
 
 Options (all default to false):
-  ENABLE_DELL: true|false - requires fwupdate (and transitively libsmbios)
-  ENABLE_SYNAPTICS: true|false - requires ENABLE_DELL=true and its dependencies
-  ENABLE_UEFI: true|false - requires fwupdate
-  ENABLE_UEFI_LABELS: true|false - requires pygobject3-python3 python3-pillow py3cairo
+  ENABLE_UEFI: true|false - requires pygobject3-python3 python3-pillow
+                                     py3cairo
 
-  https://github.com/hughsie/fwupd/blob/1.0.5/meson_options.txt
+  https://github.com/hughsie/fwupd/blob/1.1.3/meson_options.txt
diff --git a/system/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild
index 5a672dce7a..a9cc33a1f2 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.0.9}
+VERSION=${VERSION:-1.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,12 +69,10 @@ 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 {} \;
 
-ENABLE_SYNAPTICS=${ENABLE_SYNAPTICS:-false}
-ENABLE_DELL=${ENABLE_DELL:-false}
 ENABLE_UEFI=${ENABLE_UEFI:-false}
-ENABLE_UEFI_LABELS=${ENABLE_UEFI_LABELS:-false}
 
 # altos is disabled because meson seems unable to find libelf on slack.
+# dell is disabled because libsmbios is too old
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -86,10 +84,8 @@ meson --prefix=/usr \
   --mandir=/usr/man \
   -Dsystemd=false \
   -Dplugin_altos=false \
-  -Dplugin_dell=$ENABLE_DELL \
-  -Dplugin_synaptics=$ENABLE_SYNAPTICS \
-  -Dplugin_uefi=$ENABLE_UEFI \
-  -Dplugin_uefi_labels=$ENABLE_UEFI_LABELS \
+  -Dplugin_dell=false \
+  -Dplugin_uefi="$ENABLE_UEFI" \
   build
 
 ninja -C build
@@ -102,14 +98,18 @@ 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/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
+mv $PKG/etc/fwupd/uefi.conf $PKG/etc/fwupd/uefi.conf.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/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
 
diff --git a/system/fwupd/fwupd.info b/system/fwupd/fwupd.info
index 0b188ac8d2..c0260168a5 100644
--- a/system/fwupd/fwupd.info
+++ b/system/fwupd/fwupd.info
@@ -1,10 +1,10 @@
 PRGNAM="fwupd"
-VERSION="1.0.9"
+VERSION="1.1.3"
 HOMEPAGE="http://www.fwupd.org"
-DOWNLOAD="https://github.com/hughsie/fwupd/archive/1.0.9/fwupd-1.0.9.tar.gz"
-MD5SUM="c2800f2b09aca10e75525b3d464a84ac"
+DOWNLOAD="https://github.com/hughsie/fwupd/archive/1.1.3/fwupd-1.1.3.tar.gz"
+MD5SUM="e182e2f771ff7a72d3a633c166276670"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="appstream-glib libgusb"
+REQUIRES="appstream-glib libgusb efivar"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
-- 
cgit v1.2.3