diff -Nru fwupd-1.2.4/.circleci/config.yml fwupd-1.2.5/.circleci/config.yml
--- fwupd-1.2.4/.circleci/config.yml	1970-01-01 00:00:00.000000000 +0000
+++ fwupd-1.2.5/.circleci/config.yml	2019-02-25 09:42:18.000000000 +0000
@@ -0,0 +1,64 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: cibuilds/snapcraft:stable
+    steps:
+      - checkout
+      - run:
+          name: "Update apt"
+          command: apt update
+      - run:
+          name: "Build Snap"
+          command: snapcraft
+      - persist_to_workspace:
+          root: .
+          paths:
+            - "*.snap"
+
+  publish-edge:
+    docker:
+      - image: cibuilds/snapcraft:stable
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: "Publish to Store"
+          command: |
+            mkdir .snapcraft
+            echo $SNAPCRAFT_LOGIN_FILE | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg
+            snapcraft push *.snap --release edge
+
+  publish-stable:
+    docker:
+      - image: cibuilds/snapcraft:stable
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: "Publish to Store"
+          command: |
+            mkdir .snapcraft
+            echo $SNAPCRAFT_LOGIN_FILE | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg
+            snapcraft push *.snap --release stable
+
+workflows:
+  version: 2
+  main:
+    jobs:
+      - build
+      - publish-edge:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master
+      - publish-stable:
+          requires:
+            - build
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^\d+\.\d+\.\d+$/
+
diff -Nru fwupd-1.2.4/contrib/ci/debian_s390x.sh fwupd-1.2.5/contrib/ci/debian_s390x.sh
--- fwupd-1.2.4/contrib/ci/debian_s390x.sh	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/ci/debian_s390x.sh	2019-02-25 09:42:18.000000000 +0000
@@ -3,6 +3,12 @@
 set -x
 
 export LC_ALL=C.UTF-8
+
+#evaluate using Debian's build flags
+eval "$(dpkg-buildflags --export=sh)"
+#filter out -Bsymbolic-functions
+export LDFLAGS=$(dpkg-buildflags --get LDFLAGS | sed "s/-Wl,-Bsymbolic-functions\s//")
+
 rm -rf build
 mkdir -p build
 cp contrib/ci/s390x_cross.txt build/
@@ -12,7 +18,6 @@
 	--werror \
 	-Dplugin_uefi=false \
 	-Dplugin_dell=false \
-	-Dplugin_nvme=false \
 	-Dplugin_redfish=false \
 	-Dintrospection=false \
 	-Dgtkdoc=false \
diff -Nru fwupd-1.2.4/contrib/ci/dependencies.xml fwupd-1.2.5/contrib/ci/dependencies.xml
--- fwupd-1.2.4/contrib/ci/dependencies.xml	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/ci/dependencies.xml	2019-02-25 09:42:18.000000000 +0000
@@ -174,14 +174,14 @@
   <dependency type="build" id="debhelper">
     <distro id="debian">
       <control>
-        <version>(>= 10.3)</version>
+        <version>(>= 11)</version>
       </control>
       <package variant="x86_64" />
       <package variant="i386" />
     </distro>
     <distro id="ubuntu">
       <control>
-        <version>(>= 10.3)</version>
+        <version>(>= 11)</version>
       </control>
       <package variant="x86_64" />
     </distro>
@@ -554,18 +554,18 @@
     <distro id="fedora">
       <package>libxmlb-devel</package>
     </distro>
-<!--
     <distro id="debian">
       <control>
-        <version>(>= 0.1.3)</version>
+        <version>(>= 0.1.5)</version>
       </control>
       <package variant="x86_64" />
       <package variant="s390x">libxmlb-dev:s390x</package>
       <package variant="i386" />
     </distro>
+<!--
     <distro id="ubuntu">
       <control>
-        <version>(>= 0.1.3)</version>
+        <version>(>= 0.1.5)</version>
       </control>
       <package variant="x86_64" />
     </distro>
@@ -747,7 +747,10 @@
       <package variant="i386" />
     </distro>
     <distro id="ubuntu">
-      <control />
+      <control>
+        <inclusive>i386</inclusive>
+        <inclusive>amd64</inclusive>
+      </control>
       <package variant="x86_64" />
     </distro>
   </dependency>
@@ -1105,21 +1108,6 @@
       <package variant="i386" />
     </distro>
     <distro id="ubuntu">
-      <control />
-      <package variant="x86_64" />
-    </distro>
-  </dependency>
-  <dependency type="build" id="uuid-dev">
-    <distro id="centos">
-      <package>libuuid-devel</package>
-    </distro>
-    <distro id="debian">
-      <control />
-      <package variant="x86_64" />
-      <package variant="s390x">uuid-dev:s390x</package>
-      <package variant="i386" />
-    </distro>
-    <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
     </distro>
diff -Nru fwupd-1.2.4/contrib/ci/Dockerfile-debian.in fwupd-1.2.5/contrib/ci/Dockerfile-debian.in
--- fwupd-1.2.4/contrib/ci/Dockerfile-debian.in	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/ci/Dockerfile-debian.in	2019-02-25 09:42:18.000000000 +0000
@@ -1,4 +1,4 @@
-FROM %%%ARCH_PREFIX%%%debian:testing
+FROM %%%ARCH_PREFIX%%%debian:unstable
 %%%OS%%%
 RUN echo fubar > /etc/machine-id
 %%%ARCH_SPECIFIC_COMMAND%%%
diff -Nru fwupd-1.2.4/contrib/ci/ubuntu.sh fwupd-1.2.5/contrib/ci/ubuntu.sh
--- fwupd-1.2.4/contrib/ci/ubuntu.sh	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/ci/ubuntu.sh	2019-02-25 09:42:18.000000000 +0000
@@ -2,9 +2,14 @@
 set -e
 set -x
 
+#evaluate using Ubuntu's buildflags
+eval "$(dpkg-buildflags --export=sh)"
+#filter out -Bsymbolic-functions
+export LDFLAGS=$(dpkg-buildflags --get LDFLAGS | sed "s/-Wl,-Bsymbolic-functions\s//")
+
 rm -rf build
 meson build --werror
 #build with clang and -Werror
-ninja -C build -v
+ninja -C build test -v
 #run static analysis (these mostly won't be critical)
 ninja -C build scan-build -v
diff -Nru fwupd-1.2.4/contrib/debian/compat fwupd-1.2.5/contrib/debian/compat
--- fwupd-1.2.4/contrib/debian/compat	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/debian/compat	2019-02-25 09:42:18.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru fwupd-1.2.4/contrib/debian/control.in fwupd-1.2.5/contrib/debian/control.in
--- fwupd-1.2.4/contrib/debian/control.in	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/debian/control.in	2019-02-25 09:42:18.000000000 +0000
@@ -6,7 +6,7 @@
            Matthias Klumpp <mak@debian.org>,
            Mario Limonciello <mario.limonciello@dell.com>
 Build-Depends: %%%DYNAMIC%%%
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
 Section: admin
 Homepage: https://github.com/hughsie/fwupd
 Vcs-Git: https://salsa.debian.org/efi-team/fwupd.git
@@ -30,7 +30,8 @@
 Package: fwupd
 Architecture: linux-any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         shared-mime-info
 Recommends: python3,
 	    bolt,
 	    tpm2-tools,
diff -Nru fwupd-1.2.4/contrib/debian/fwupd.install fwupd-1.2.5/contrib/debian/fwupd.install
--- fwupd-1.2.4/contrib/debian/fwupd.install	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/debian/fwupd.install	2019-02-25 09:42:18.000000000 +0000
@@ -4,6 +4,7 @@
 usr/share/bash-completion
 usr/share/fwupd/*
 usr/share/dbus-1/*
+usr/share/icons/*
 usr/share/polkit-1/*
 usr/share/locale
 usr/share/metainfo/*
diff -Nru fwupd-1.2.4/contrib/debian/lintian/fwupd fwupd-1.2.5/contrib/debian/lintian/fwupd
--- fwupd-1.2.4/contrib/debian/lintian/fwupd	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/debian/lintian/fwupd	2019-02-25 09:42:18.000000000 +0000
@@ -4,3 +4,5 @@
 fwupd binary: systemd-service-file-missing-install-key lib/systemd/system/system-update.target.wants/fwupd-offline-update.service
 #see debian bug 896012
 fwupd: library-not-linked-against-libc usr/lib/*/fwupd-plugins-3/libfu_plugin_upower.so
+#EFI applications are PE executables
+fwupd: executable-not-elf-or-script usr/lib/fwupd/efi/*.efi
diff -Nru fwupd-1.2.4/contrib/debian/rules fwupd-1.2.5/contrib/debian/rules
--- fwupd-1.2.4/contrib/debian/rules	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/debian/rules	2019-02-25 09:42:18.000000000 +0000
@@ -3,6 +3,7 @@
 
 export LC_ALL := C.UTF-8
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
 
 #GPGME needs this for proper building on 32 bit archs
 ifeq "$(DEB_HOST_ARCH_BITS)" "32"
@@ -10,8 +11,7 @@
 endif
 
 ifneq ($(CI),)
-	export CI=--werror --wrap-mode=forcefallback
-	export DHSLIBS=-- --ignore-missing-info
+	export CI=--werror
 endif
 
 SB_STYLE := debian
@@ -24,7 +24,7 @@
 endif
 
 %:
-	dh $@ --with gir,systemd
+	dh $@ --with gir
 
 override_dh_auto_clean:
 	rm -fr debian/build
@@ -87,7 +87,7 @@
 	fi
 
 override_dh_builddeb:
-	dh_builddeb -- -Zxz
+	dh_builddeb
 ifeq (ubuntu,$(SB_STYLE))
 	if [ -d debian/tmp/usr/lib/fwupd/efi/ ]; then \
 		mkdir -p debian/fwupd-images/$(deb_version) ;\
diff -Nru fwupd-1.2.4/contrib/firmware-packager/firmware-packager fwupd-1.2.5/contrib/firmware-packager/firmware-packager
--- fwupd-1.2.4/contrib/firmware-packager/firmware-packager	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/firmware-packager/firmware-packager	2019-02-25 09:42:18.000000000 +0000
@@ -70,7 +70,7 @@
 
 def create_firmware_cab(exe, folder):
     with cd(folder):
-        if os.name is "nt":
+        if os.name == "nt":
           directive = os.path.join (folder, "directive")
           with open (directive, 'w') as wfd:
             wfd.write('"firmware.cab"\r\n')
diff -Nru fwupd-1.2.4/contrib/firmware-packager/meson.build fwupd-1.2.5/contrib/firmware-packager/meson.build
--- fwupd-1.2.4/contrib/firmware-packager/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/firmware-packager/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -1,2 +1,4 @@
-install_data('firmware-packager',
-             install_dir : 'share/fwupd')
+if get_option('firmware-packager')
+  install_data('firmware-packager',
+               install_dir : 'share/fwupd')
+endif
diff -Nru fwupd-1.2.4/contrib/fwupd.spec.in fwupd-1.2.5/contrib/fwupd.spec.in
--- fwupd-1.2.4/contrib/fwupd.spec.in	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/fwupd.spec.in	2019-02-25 09:42:18.000000000 +0000
@@ -54,7 +54,6 @@
 %endif
 BuildRequires: elfutils-libelf-devel
 BuildRequires: gtk-doc
-BuildRequires: libuuid-devel
 BuildRequires: gnutls-devel
 BuildRequires: gnutls-utils
 BuildRequires: meson
@@ -244,6 +243,7 @@
 %{_datadir}/man/man1/dfu-tool.1.gz
 %{_datadir}/man/man1/fwupdmgr.1.gz
 %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml
+%{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg
 %{_datadir}/fwupd/firmware-packager
 %{_unitdir}/fwupd-offline-update.service
 %{_unitdir}/fwupd.service
diff -Nru fwupd-1.2.4/contrib/standalone-installer/assets/header.py fwupd-1.2.5/contrib/standalone-installer/assets/header.py
--- fwupd-1.2.4/contrib/standalone-installer/assets/header.py	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/contrib/standalone-installer/assets/header.py	2019-02-25 09:42:18.000000000 +0000
@@ -209,7 +209,7 @@
         try:
             install_snap (directory, verbose, uninstall)
             return True
-        except:
+        except Exception as _:
             if verbose:
                 print ("Snap installation failed")
             if not try_flatpak:
diff -Nru fwupd-1.2.4/data/bash-completion/fwupdtool.in fwupd-1.2.5/data/bash-completion/fwupdtool.in
--- fwupd-1.2.4/data/bash-completion/fwupdtool.in	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/data/bash-completion/fwupdtool.in	2019-02-25 09:42:18.000000000 +0000
@@ -23,6 +23,8 @@
 	'--force'
 	'--show-all-devices'
 	'--plugin-whitelist'
+	'--prepare'
+	'--cleanup'
 )
 
 _show_plugins()
diff -Nru fwupd-1.2.4/data/meson.build fwupd-1.2.5/data/meson.build
--- fwupd-1.2.4/data/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/data/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -18,6 +18,10 @@
   install_dir: join_paths(datadir, 'metainfo')
 )
 
+install_data(['org.freedesktop.fwupd.svg'],
+  install_dir : join_paths(datadir, 'icons', 'hicolor', 'scalable', 'apps')
+)
+
 install_data(['org.freedesktop.fwupd.conf'],
   install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
 )
diff -Nru fwupd-1.2.4/data/org.freedesktop.fwupd.metainfo.xml fwupd-1.2.5/data/org.freedesktop.fwupd.metainfo.xml
--- fwupd-1.2.4/data/org.freedesktop.fwupd.metainfo.xml	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/data/org.freedesktop.fwupd.metainfo.xml	2019-02-25 09:42:18.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2017 Richard Hughes <richard@hughsie.com> -->
-<component type="generic">
+<component type="console-application">
   <id>org.freedesktop.fwupd</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.0+</project_license>
@@ -31,6 +31,29 @@
     <content_attribute id="social-info">moderate</content_attribute>
   </content_rating>
   <releases>
+    <release version="1.2.5" date="2019-02-25">
+      <description>
+        <p>This release adds the following features:</p>
+        <ul>
+          <li>Allow a device to be updated using more than one plugin</li>
+          <li>Report the DeviceInstanceIDs from fwupdmgr when run as root</li>
+        </ul>
+        <p>This release fixes the following bugs:</p>
+        <ul>
+          <li>Add an extra check for Dell NVMe drives to avoid false positives</li>
+          <li>Call composite prepare and cleanup using fwupdtool</li>
+          <li>Correct handling of CAB files with nested directories</li>
+          <li>Detect and special case Dell ATA hardware</li>
+          <li>Do not fail fwupdtool if dbus is unavailable</li>
+          <li>Do not unconditionally enable Werror for the EFI binary</li>
+          <li>Fill holes when reading SREC files</li>
+          <li>Filter the last supported payloads of certain Dell docks</li>
+          <li>Fix flashing failure with latest Intuos Pro tablet</li>
+          <li>Fix potential segfault when applying UEFI updates</li>
+          <li>Fix unifying regression when recovering from failed flash</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.2.4" date="2019-02-01">
       <description>
         <p>This release adds the following features:</p>
diff -Nru fwupd-1.2.4/data/org.freedesktop.fwupd.svg fwupd-1.2.5/data/org.freedesktop.fwupd.svg
--- fwupd-1.2.4/data/org.freedesktop.fwupd.svg	1970-01-01 00:00:00.000000000 +0000
+++ fwupd-1.2.5/data/org.freedesktop.fwupd.svg	2019-02-25 09:42:18.000000000 +0000
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 128 128"
+   style="display:inline;enable-background:new"
+   version="1.0"
+   id="svg11300"
+   height="128"
+   width="128"
+   sodipodi:docname="org.freedesktop.fwupd.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview21"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="62.010516"
+     inkscape:cy="69.937009"
+     inkscape:window-x="0"
+     inkscape:window-y="826"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11300" />
+  <title
+     id="title4162">Adwaita Icon Template</title>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient1494">
+      <stop
+         id="stop1490"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop1492"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="20"
+       x2="280"
+       y1="172"
+       x1="280"
+       id="linearGradient1496"
+       xlink:href="#linearGradient1494" />
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>GNOME Design Team</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:title>Adwaita Icon Template</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <dc:date />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier />
+        <dc:relation />
+        <dc:language />
+        <dc:coverage />
+        <dc:description />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="color:#000000;overflow:visible;opacity:1;fill:#f6f6f4;fill-opacity:1;stroke:#989994;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     d="m 25.720703,17.548828 v 2.607422 h -4.683594 v 17.324219 h 13.78711 V 20.15625 h -4.683594 v -2.607422 z"
+     id="rect4643"
+     inkscape:connector-curvature="0" />
+  <path
+     style="color:#000000;overflow:visible;opacity:1;fill:#f6f6f4;fill-opacity:1;stroke:#989994;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     d="M 49.638672,17.548828 V 20.15625 H 44.953125 V 37.480469 H 58.742188 V 20.15625 h -4.683594 v -2.607422 z"
+     id="rect4643-6"
+     inkscape:connector-curvature="0" />
+  <path
+     style="color:#000000;overflow:visible;opacity:1;fill:#f6f6f4;fill-opacity:1;stroke:#989994;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     d="M 73.556641,17.548828 V 20.15625 H 68.871094 V 37.480469 H 82.660156 V 20.15625 h -4.685547 v -2.607422 z"
+     id="rect4643-3"
+     inkscape:connector-curvature="0" />
+  <path
+     style="color:#000000;overflow:visible;opacity:1;fill:#f6f6f4;fill-opacity:1;stroke:#989994;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     d="M 97.472656,17.548828 V 20.15625 H 92.789062 V 37.480469 H 106.57617 V 20.15625 h -4.68359 v -2.607422 z"
+     id="rect4643-2"
+     inkscape:connector-curvature="0" />
+  <path
+     style="color:#000000;overflow:visible;opacity:1;fill:#f6f6f4;fill-opacity:1;stroke:#989994;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     d="m 92.789062,90.310547 v 17.324223 h 4.683594 v 2.60742 h 4.419924 v -2.60742 h 4.68359 V 90.310547 Z"
+     id="rect4643-27"
+     inkscape:connector-curvature="0" />
+  <path
+     style="color:#000000;overflow:visible;opacity:1;fill:#f6f6f4;fill-opacity:1;stroke:#989994;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     d="m 68.871094,90.310547 v 17.324223 h 4.685547 v 2.60742 h 4.417968 v -2.60742 h 4.685547 V 90.310547 Z"
+     id="rect4643-6-3"
+     inkscape:connector-curvature="0" />
+  <path
+     style="color:#000000;overflow:visible;opacity:1;fill:#f6f6f4;fill-opacity:1;stroke:#989994;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     d="m 44.953125,90.310547 v 17.324223 h 4.685547 v 2.60742 h 4.419922 v -2.60742 h 4.683594 V 90.310547 Z"
+     id="rect4643-3-6"
+     inkscape:connector-curvature="0" />
+  <path
+     style="color:#000000;overflow:visible;opacity:1;fill:#f6f6f4;fill-opacity:1;stroke:#989994;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
+     d="m 21.037109,90.310547 v 17.324223 h 4.683594 v 2.60742 h 4.419922 v -2.60742 h 4.683594 V 90.310547 Z"
+     id="rect4643-2-1"
+     inkscape:connector-curvature="0" />
+  <rect
+     ry="7.6098905"
+     rx="7.6980834"
+     y="25.731514"
+     x="14.039638"
+     height="76.49028"
+     width="99.979324"
+     id="rect920"
+     style="opacity:1;vector-effect:none;fill:#3e3a47;fill-opacity:1;stroke:#989994;stroke-width:3.9915576;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <g
+     transform="rotate(-30,82.546211,221.81151)"
+     id="g1710" />
+  <g
+     id="g1480"
+     style="fill:url(#linearGradient1496);fill-opacity:1"
+     transform="translate(0,-172)" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:33.5784874px;line-height:17.9884758px;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;fill:#dedfda;fill-opacity:1;stroke:#6b6d67;stroke-width:0.44971189;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
+     x="25.814859"
+     y="68.982178"
+     id="text832"
+     inkscape:export-xdpi="281.42465"
+     inkscape:export-ydpi="281.42465"><tspan
+       sodipodi:role="line"
+       id="tspan830"
+       x="25.814859"
+       y="68.982178"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.9884758px;line-height:8.9942379px;font-family:'Petyka - Retro Computer___SHORT';-inkscape-font-specification:'Petyka - Retro Computer___SHORT';stroke:#6b6d67;stroke-width:0.44971189;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#dedfda;fill-opacity:1;">fwupd</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.19264412px;line-height:6.53177357px;font-family:Cantarell;-inkscape-font-specification:Cantarell;letter-spacing:0px;word-spacing:0px;display:inline;fill:#dedfda;fill-opacity:1;stroke:#6b6d67;stroke-width:0.16329435;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new;"
+     x="26.370913"
+     y="77.332085"
+     id="text832-7"
+     inkscape:export-xdpi="281.42465"
+     inkscape:export-ydpi="281.42465"><tspan
+       sodipodi:role="line"
+       id="tspan830-9"
+       x="26.370913"
+       y="77.332085"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.53177357px;line-height:3.26588678px;font-family:'Petyka - Retro Computer___SHORT';-inkscape-font-specification:'Petyka - Retro Computer___SHORT';stroke:#6b6d67;stroke-width:0.16329435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#dedfda;fill-opacity:1;">firmware</tspan><tspan
+       sodipodi:role="line"
+       x="26.370913"
+       y="83.863861"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.53177357px;line-height:3.26588678px;font-family:'Petyka - Retro Computer___SHORT';-inkscape-font-specification:'Petyka - Retro Computer___SHORT';stroke:#6b6d67;stroke-width:0.16329435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#dedfda;fill-opacity:1;"
+       id="tspan4796">updater</tspan></text>
+</svg>
diff -Nru fwupd-1.2.4/data/remotes.d/lvfs.metainfo.xml fwupd-1.2.5/data/remotes.d/lvfs.metainfo.xml
--- fwupd-1.2.4/data/remotes.d/lvfs.metainfo.xml	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/data/remotes.d/lvfs.metainfo.xml	2019-02-25 09:42:18.000000000 +0000
@@ -4,7 +4,7 @@
 <component type="source">
   <id>org.freedesktop.fwupd.remotes.lvfs</id>
   <name>Linux Vendor Firmware Service (stable firmware)</name>
-  <metadata_license>CC0</metadata_license>
+  <metadata_license>CC0-1.0</metadata_license>
   <agreement version_id="1.0">
     <agreement_section>
       <description>
diff -Nru fwupd-1.2.4/data/remotes.d/lvfs-testing.metainfo.xml fwupd-1.2.5/data/remotes.d/lvfs-testing.metainfo.xml
--- fwupd-1.2.4/data/remotes.d/lvfs-testing.metainfo.xml	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/data/remotes.d/lvfs-testing.metainfo.xml	2019-02-25 09:42:18.000000000 +0000
@@ -4,7 +4,7 @@
 <component type="source">
   <id>org.freedesktop.fwupd.remotes.lvfs-testing</id>
   <name>Linux Vendor Firmware Service (testing firmware)</name>
-  <metadata_license>CC0</metadata_license>
+  <metadata_license>CC0-1.0</metadata_license>
   <agreement version_id="1.0">
     <agreement_section>
       <description>
diff -Nru fwupd-1.2.4/debian/changelog fwupd-1.2.5/debian/changelog
--- fwupd-1.2.4/debian/changelog	2019-02-15 14:06:55.000000000 +0000
+++ fwupd-1.2.5/debian/changelog	2019-02-26 22:30:52.000000000 +0000
@@ -1,3 +1,10 @@
+fwupd (1.2.5-1) unstable; urgency=medium
+
+  * New upstream version (1.2.5)
+  * Drop all patches, upstream
+
+ -- Mario Limonciello <mario.limonciello@dell.com>  Tue, 26 Feb 2019 16:30:52 -0600
+
 fwupd (1.2.4-3) unstable; urgency=medium
 
   * Backport a patch from master that fixes FTBFS with newer glib
diff -Nru fwupd-1.2.4/debian/compat fwupd-1.2.5/debian/compat
--- fwupd-1.2.4/debian/compat	2019-02-15 14:05:53.000000000 +0000
+++ fwupd-1.2.5/debian/compat	2019-02-26 22:30:52.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru fwupd-1.2.4/debian/control fwupd-1.2.5/debian/control
--- fwupd-1.2.4/debian/control	2019-02-15 14:06:55.000000000 +0000
+++ fwupd-1.2.5/debian/control	2019-02-26 22:30:52.000000000 +0000
@@ -8,7 +8,7 @@
 Build-Depends:
 	bash-completion,
 	bubblewrap,
-	debhelper (>= 10.3),
+	debhelper (>= 11),
 	dh-strip-nondeterminism,
 	fontconfig,
 	fonts-noto,
@@ -52,10 +52,9 @@
 	systemd (>= 231),
 	udev,
 	umockdev,
-	uuid-dev,
 	valac,
 	valgrind [!ia64 !riscv64 !x32 !mips !sparc64 !sh4 !ppc64 !powerpcspe !hppa !alpha !mips64el !armhf !armel !mipsel !m68k],
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
 Section: admin
 Homepage: https://github.com/hughsie/fwupd
 Vcs-Git: https://salsa.debian.org/efi-team/fwupd.git
diff -Nru fwupd-1.2.4/debian/control.in fwupd-1.2.5/debian/control.in
--- fwupd-1.2.4/debian/control.in	2019-02-15 14:05:53.000000000 +0000
+++ fwupd-1.2.5/debian/control.in	2019-02-26 22:30:52.000000000 +0000
@@ -6,7 +6,7 @@
            Matthias Klumpp <mak@debian.org>,
            Mario Limonciello <mario.limonciello@dell.com>
 Build-Depends: %%%DYNAMIC%%%
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
 Section: admin
 Homepage: https://github.com/hughsie/fwupd
 Vcs-Git: https://salsa.debian.org/efi-team/fwupd.git
diff -Nru fwupd-1.2.4/debian/fwupd.install fwupd-1.2.5/debian/fwupd.install
--- fwupd-1.2.4/debian/fwupd.install	2019-02-15 14:05:53.000000000 +0000
+++ fwupd-1.2.5/debian/fwupd.install	2019-02-26 22:30:52.000000000 +0000
@@ -4,6 +4,7 @@
 usr/share/bash-completion
 usr/share/fwupd/*
 usr/share/dbus-1/*
+usr/share/icons/*
 usr/share/polkit-1/*
 usr/share/locale
 usr/share/metainfo/*
diff -Nru fwupd-1.2.4/debian/libfwupd2.symbols fwupd-1.2.5/debian/libfwupd2.symbols
--- fwupd-1.2.4/debian/libfwupd2.symbols	2019-02-15 14:05:53.000000000 +0000
+++ fwupd-1.2.5/debian/libfwupd2.symbols	2019-02-26 22:30:52.000000000 +0000
@@ -23,6 +23,7 @@
  LIBFWUPD_1.2.1@LIBFWUPD_1.2.1 1.2.1
  LIBFWUPD_1.2.2@LIBFWUPD_1.2.2 1.2.2
  LIBFWUPD_1.2.4@LIBFWUPD_1.2.4 1.2.4
+ LIBFWUPD_1.2.5@LIBFWUPD_1.2.5 1.2.5
  fwupd_build_history_report_json@LIBFWUPD_1.0.4 1.0.4
  fwupd_build_machine_id@LIBFWUPD_1.0.4 1.0.4
  fwupd_build_user_agent@LIBFWUPD_1.0.3 1.0.3
@@ -59,6 +60,7 @@
  fwupd_device_add_flag@LIBFWUPD_0.9.3 1.0.0
  fwupd_device_add_guid@LIBFWUPD_0.9.3 1.0.0
  fwupd_device_add_icon@LIBFWUPD_0.9.8 1.0.0
+ fwupd_device_add_instance_id@LIBFWUPD_1.2.5 1.2.5
  fwupd_device_add_release@LIBFWUPD_0.9.8 1.0.0
  fwupd_device_compare@LIBFWUPD_1.1.1 1.1.1
  fwupd_device_flag_from_string@LIBFWUPD_0.7.0 1.0.0
@@ -74,6 +76,7 @@
  fwupd_device_get_icons@LIBFWUPD_0.9.8 1.0.0
  fwupd_device_get_id@LIBFWUPD_0.9.3 1.0.0
  fwupd_device_get_install_duration@LIBFWUPD_1.1.3 1.1.3
+ fwupd_device_get_instance_ids@LIBFWUPD_1.2.5 1.2.5
  fwupd_device_get_modified@LIBFWUPD_0.9.3 1.0.0
  fwupd_device_get_name@LIBFWUPD_0.9.3 1.0.0
  fwupd_device_get_parent@LIBFWUPD_1.0.8 1.0.8
@@ -94,6 +97,7 @@
  fwupd_device_get_version_lowest@LIBFWUPD_0.9.3 1.0.0
  fwupd_device_has_flag@LIBFWUPD_0.9.3 1.0.0
  fwupd_device_has_guid@LIBFWUPD_0.9.3 1.0.0
+ fwupd_device_has_instance_id@LIBFWUPD_1.2.5 1.2.5
  fwupd_device_incorporate@LIBFWUPD_1.1.0 1.1.0
  fwupd_device_new@LIBFWUPD_0.9.3 1.0.0
  fwupd_device_remove_flag@LIBFWUPD_0.9.3 1.0.0
@@ -125,6 +129,11 @@
  fwupd_error_quark@LIBFWUPD_0.1.1 1.0.0
  fwupd_error_to_string@LIBFWUPD_0.7.0 1.0.0
  fwupd_get_os_release@LIBFWUPD_1.0.7 1.0.7
+ fwupd_guid_from_string@LIBFWUPD_1.2.5 1.2.5
+ fwupd_guid_hash_data@LIBFWUPD_1.2.5 1.2.5
+ fwupd_guid_hash_string@LIBFWUPD_1.2.5 1.2.5
+ fwupd_guid_is_valid@LIBFWUPD_1.2.5 1.2.5
+ fwupd_guid_to_string@LIBFWUPD_1.2.5 1.2.5
  fwupd_keyring_kind_from_string@LIBFWUPD_0.9.7 1.0.0
  fwupd_keyring_kind_to_string@LIBFWUPD_0.9.7 1.0.0
  fwupd_release_add_checksum@LIBFWUPD_0.9.3 1.0.0
diff -Nru fwupd-1.2.4/debian/lintian/fwupd fwupd-1.2.5/debian/lintian/fwupd
--- fwupd-1.2.4/debian/lintian/fwupd	2019-02-15 14:05:53.000000000 +0000
+++ fwupd-1.2.5/debian/lintian/fwupd	2019-02-26 22:30:52.000000000 +0000
@@ -4,3 +4,5 @@
 fwupd binary: systemd-service-file-missing-install-key lib/systemd/system/system-update.target.wants/fwupd-offline-update.service
 #see debian bug 896012
 fwupd: library-not-linked-against-libc usr/lib/*/fwupd-plugins-3/libfu_plugin_upower.so
+#EFI applications are PE executables
+fwupd: executable-not-elf-or-script usr/lib/fwupd/efi/*.efi
diff -Nru fwupd-1.2.4/debian/patches/0001-Fix-the-self-tests-when-using-glib2-2.59.0.patch fwupd-1.2.5/debian/patches/0001-Fix-the-self-tests-when-using-glib2-2.59.0.patch
--- fwupd-1.2.4/debian/patches/0001-Fix-the-self-tests-when-using-glib2-2.59.0.patch	2019-02-15 14:05:51.000000000 +0000
+++ fwupd-1.2.5/debian/patches/0001-Fix-the-self-tests-when-using-glib2-2.59.0.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-From b1d1c3b0890481c4f838caf1e2cde76b55b983c8 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Sat, 2 Feb 2019 13:04:44 +0000
-Subject: [PATCH] Fix the self tests when using glib2 >=2.59.0
-
-Replace the non-breaking space with a traditional space rather than changing
-the expected output with #ifdef to allow running the tests with a daemon
-compiled against an older glib2 version.
----
- libfwupd/fwupd-self-test.c | 61 +++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 60 insertions(+), 1 deletion(-)
-
-diff --git a/libfwupd/fwupd-self-test.c b/libfwupd/fwupd-self-test.c
-index c0ee284..68395e4 100644
---- a/libfwupd/fwupd-self-test.c
-+++ b/libfwupd/fwupd-self-test.c
-@@ -43,6 +43,60 @@ fu_test_compare_lines (const gchar *txt1, const gchar *txt2, GError **error)
- 	return FALSE;
- }
- 
-+/* https://gitlab.gnome.org/GNOME/glib/issues/225 */
-+static guint
-+_g_string_replace (GString *string, const gchar *search, const gchar *replace)
-+{
-+	gchar *tmp;
-+	guint count = 0;
-+	gsize search_idx = 0;
-+	gsize replace_len;
-+	gsize search_len;
-+
-+	g_return_val_if_fail (string != NULL, 0);
-+	g_return_val_if_fail (search != NULL, 0);
-+	g_return_val_if_fail (replace != NULL, 0);
-+
-+	/* nothing to do */
-+	if (string->len == 0)
-+		return 0;
-+
-+	search_len = strlen (search);
-+	replace_len = strlen (replace);
-+
-+	do {
-+		tmp = g_strstr_len (string->str + search_idx, -1, search);
-+		if (tmp == NULL)
-+			break;
-+
-+		/* advance the counter in case @replace contains @search */
-+		search_idx = (gsize) (tmp - string->str);
-+
-+		/* reallocate the string if required */
-+		if (search_len > replace_len) {
-+			g_string_erase (string,
-+					(gssize) search_idx,
-+					(gssize) (search_len - replace_len));
-+			memcpy (tmp, replace, replace_len);
-+		} else if (search_len < replace_len) {
-+			g_string_insert_len (string,
-+					     (gssize) search_idx,
-+					     replace,
-+					     (gssize) (replace_len - search_len));
-+			/* we have to treat this specially as it could have
-+			 * been reallocated when the insertion happened */
-+			memcpy (string->str + search_idx, replace, replace_len);
-+		} else {
-+			/* just memcmp in the new string */
-+			memcpy (tmp, replace, replace_len);
-+		}
-+		search_idx += replace_len;
-+		count++;
-+	} while (TRUE);
-+
-+	return count;
-+}
-+
- static void
- fwupd_enums_func (void)
- {
-@@ -211,6 +265,7 @@ fwupd_device_func (void)
- 	g_autoptr(FwupdDevice) dev = NULL;
- 	g_autoptr(FwupdRelease) rel = NULL;
- 	g_autoptr(GError) error = NULL;
-+	g_autoptr(GString) str_ascii = NULL;
- 
- 	/* create dummy object */
- 	dev = fwupd_device_new ();
-@@ -243,7 +298,11 @@ fwupd_device_func (void)
- 	g_assert (fwupd_device_has_guid (dev, "00000000-0000-0000-0000-000000000000"));
- 	g_assert (!fwupd_device_has_guid (dev, "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"));
- 
--	ret = fu_test_compare_lines (str,
-+	/* convert the new non-breaking space back into a normal space:
-+	 * https://gitlab.gnome.org/GNOME/glib/commit/76af5dabb4a25956a6c41a75c0c7feeee74496da */
-+	str_ascii = g_string_new (str);
-+	_g_string_replace (str_ascii, " ", " ");
-+	ret = fu_test_compare_lines (str_ascii->str,
- 		"ColorHug2\n"
- 		"  DeviceId:             USB:foo\n"
- 		"  Guid:                 2082b5e0-7a64-478a-b1b2-e3404fab6dad\n"
--- 
-2.7.4
-
diff -Nru fwupd-1.2.4/debian/patches/0001-trivial-contrib-debian-use-libxmlb-from-Debian-archi.patch fwupd-1.2.5/debian/patches/0001-trivial-contrib-debian-use-libxmlb-from-Debian-archi.patch
--- fwupd-1.2.4/debian/patches/0001-trivial-contrib-debian-use-libxmlb-from-Debian-archi.patch	2019-02-15 14:05:53.000000000 +0000
+++ fwupd-1.2.5/debian/patches/0001-trivial-contrib-debian-use-libxmlb-from-Debian-archi.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-From cddb434b2d5d7490a3de1ecdd2885bb8688b0ab3 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@dell.com>
-Date: Wed, 6 Feb 2019 20:40:08 -0600
-Subject: [PATCH] trivial: contrib/debian: use libxmlb from Debian archives
-
----
- contrib/ci/dependencies.xml | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/contrib/ci/dependencies.xml b/contrib/ci/dependencies.xml
-index e96cacd..95347c7 100644
---- a/contrib/ci/dependencies.xml
-+++ b/contrib/ci/dependencies.xml
-@@ -554,18 +554,18 @@
-     <distro id="fedora">
-       <package>libxmlb-devel</package>
-     </distro>
--<!--
-     <distro id="debian">
-       <control>
--        <version>(>= 0.1.3)</version>
-+        <version>(>= 0.1.5)</version>
-       </control>
-       <package variant="x86_64" />
-       <package variant="s390x">libxmlb-dev:s390x</package>
-       <package variant="i386" />
-     </distro>
-+<!--
-     <distro id="ubuntu">
-       <control>
--        <version>(>= 0.1.3)</version>
-+        <version>(>= 0.1.5)</version>
-       </control>
-       <package variant="x86_64" />
-     </distro>
--- 
-2.7.4
-
diff -Nru fwupd-1.2.4/debian/patches/0001-trivial-Fix-potential-compile-failures-for-high-j-va.patch fwupd-1.2.5/debian/patches/0001-trivial-Fix-potential-compile-failures-for-high-j-va.patch
--- fwupd-1.2.4/debian/patches/0001-trivial-Fix-potential-compile-failures-for-high-j-va.patch	2019-02-15 14:05:53.000000000 +0000
+++ fwupd-1.2.5/debian/patches/0001-trivial-Fix-potential-compile-failures-for-high-j-va.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,183 +0,0 @@
-From 34f8e1507db437c033e4ed5c3ccd9d420120ea38 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 1 Feb 2019 16:47:03 +0000
-Subject: [PATCH] trivial: Fix potential compile failures for high -j values
-
----
- plugins/ata/meson.build          | 1 +
- plugins/dell/meson.build         | 1 +
- plugins/dfu/meson.build          | 2 ++
- plugins/nitrokey/meson.build     | 1 +
- plugins/nvme/meson.build         | 1 +
- plugins/redfish/meson.build      | 1 +
- plugins/synapticsmst/meson.build | 1 +
- plugins/thunderbolt/meson.build  | 2 ++
- plugins/udev/meson.build         | 1 +
- plugins/uefi/meson.build         | 1 +
- plugins/unifying/meson.build     | 1 +
- plugins/wacom-usb/meson.build    | 1 +
- 12 files changed, 14 insertions(+)
-
-diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build
-index cd26e39..7171e6b 100644
---- a/plugins/ata/meson.build
-+++ b/plugins/ata/meson.build
-@@ -36,6 +36,7 @@ if get_option('tests')
-   cargs += '-DTESTDATADIR="' + testdatadir + '"'
-   e = executable(
-     'ata-self-test',
-+    fu_hash,
-     sources : [
-       'fu-self-test.c',
-       'fu-ata-device.c',
-diff --git a/plugins/dell/meson.build b/plugins/dell/meson.build
-index df96b97..2c0532f 100644
---- a/plugins/dell/meson.build
-+++ b/plugins/dell/meson.build
-@@ -37,6 +37,7 @@ if get_option('tests')
-   cargs += '-DPLUGINBUILDDIR="' + meson.current_build_dir() + '"'
-   e = executable(
-     'dell-self-test',
-+    fu_hash,
-     sources : [
-       'fu-self-test.c',
-       'fu-dell-smi.c',
-diff --git a/plugins/dfu/meson.build b/plugins/dfu/meson.build
-index f9d9632..fc517fc 100644
---- a/plugins/dfu/meson.build
-+++ b/plugins/dfu/meson.build
-@@ -6,6 +6,7 @@ install_data(['dfu.quirk'],
- 
- dfu = static_library(
-   'dfu',
-+  fu_hash,
-   sources : [
-     'dfu-cipher-xtea.c',
-     'dfu-common.c',
-@@ -117,6 +118,7 @@ if get_option('tests')
-   cargs += '-DTESTDATADIR="' + testdatadir + '"'
-   e = executable(
-     'dfu-self-test',
-+    fu_hash,
-     sources : [
-       'dfu-self-test.c'
-     ],
-diff --git a/plugins/nitrokey/meson.build b/plugins/nitrokey/meson.build
-index 4691149..225b49b 100644
---- a/plugins/nitrokey/meson.build
-+++ b/plugins/nitrokey/meson.build
-@@ -30,6 +30,7 @@ shared_module('fu_plugin_nitrokey',
- if get_option('tests')
-   e = executable(
-     'nitrokey-self-test',
-+    fu_hash,
-     sources : [
-       'fu-nitrokey-common.c',
-       'fu-self-test.c',
-diff --git a/plugins/nvme/meson.build b/plugins/nvme/meson.build
-index 614ccc6..5ec0a86 100644
---- a/plugins/nvme/meson.build
-+++ b/plugins/nvme/meson.build
-@@ -38,6 +38,7 @@ if get_option('tests')
-   cargs += '-DTESTDATADIR="' + testdatadir + '"'
-   e = executable(
-     'nvme-self-test',
-+    fu_hash,
-     sources : [
-       'fu-self-test.c',
-       'fu-nvme-common.c',
-diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
-index a4cdba5..5c88504 100644
---- a/plugins/redfish/meson.build
-+++ b/plugins/redfish/meson.build
-@@ -32,6 +32,7 @@ install_data(['redfish.conf'],
- if get_option('tests')
-   e = executable(
-     'redfish-self-test',
-+    fu_hash,
-     sources : [
-       'fu-self-test.c',
-       'fu-redfish-client.c',
-diff --git a/plugins/synapticsmst/meson.build b/plugins/synapticsmst/meson.build
-index 0f1abdb..046ac6e 100644
---- a/plugins/synapticsmst/meson.build
-+++ b/plugins/synapticsmst/meson.build
-@@ -35,6 +35,7 @@ if get_option('tests')
-   cargs += '-DSOURCEDIR="' + meson.current_source_dir() + '"'
-   e = executable(
-     'synapticsmst-self-test',
-+    fu_hash,
-     sources : [
-       'fu-self-test.c',
-       'synapticsmst-common.c',
-diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
-index 10991e5..c15e4d8 100644
---- a/plugins/thunderbolt/meson.build
-+++ b/plugins/thunderbolt/meson.build
-@@ -26,6 +26,7 @@ testdatadir_src = join_paths(meson.source_root(), 'data', 'tests')
- testdatadir_dst = join_paths(meson.build_root(), 'data', 'tests')
- cargs += '-DTESTDATADIR="' + testdatadir_src + ':' + testdatadir_dst + '"'
- executable('tbtfwucli',
-+  fu_hash,
-   sources : [
-     'fu-thunderbolt-tool.c',
-   ],
-@@ -50,6 +51,7 @@ if get_option('tests') and umockdev.found() and gio.version().version_compare('>
-   cargs += '-DPLUGINBUILDDIR="' + meson.current_build_dir() + '"'
-   e = executable(
-     'thunderbolt-self-test',
-+    fu_hash,
-     sources : [
-       'fu-self-test.c',
-       'fu-plugin-thunderbolt.c',
-diff --git a/plugins/udev/meson.build b/plugins/udev/meson.build
-index 334b14a..dfc05de 100644
---- a/plugins/udev/meson.build
-+++ b/plugins/udev/meson.build
-@@ -50,6 +50,7 @@ if get_option('tests')
-   cargs += '-DTESTDATADIR="' + testdatadir + '"'
-   e = executable(
-     'udev-self-test',
-+    fu_hash,
-     sources : [
-       'fu-self-test.c',
-       'fu-rom.c',
-diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
-index 2492e4e..fd1b397 100644
---- a/plugins/uefi/meson.build
-+++ b/plugins/uefi/meson.build
-@@ -83,6 +83,7 @@ if get_option('tests')
-   cargs += '-DTESTDATADIR="' + testdatadir + '"'
-   e = executable(
-     'uefi-self-test',
-+    fu_hash,
-     sources : [
-       'fu-self-test.c',
-       'fu-uefi-bgrt.c',
-diff --git a/plugins/unifying/meson.build b/plugins/unifying/meson.build
-index 7e04912..f90d1fb 100644
---- a/plugins/unifying/meson.build
-+++ b/plugins/unifying/meson.build
-@@ -39,6 +39,7 @@ shared_module('fu_plugin_unifying',
- if get_option('tests')
-   e = executable(
-     'unifying-self-test',
-+    fu_hash,
-     sources : [
-       'fu-unifying-self-test.c',
-       'fu-unifying-common.c',
-diff --git a/plugins/wacom-usb/meson.build b/plugins/wacom-usb/meson.build
-index e2a3f37..fd92ed4 100644
---- a/plugins/wacom-usb/meson.build
-+++ b/plugins/wacom-usb/meson.build
-@@ -38,6 +38,7 @@ if get_option('tests')
-   cargs += '-DTESTDATADIR="' + testdatadir + '"'
-   e = executable(
-     'wacom-usb-self-test',
-+    fu_hash,
-     sources : [
-       'fu-self-test.c',
-       'fu-wac-common.c',
--- 
-2.7.4
-
diff -Nru fwupd-1.2.4/debian/patches/series fwupd-1.2.5/debian/patches/series
--- fwupd-1.2.4/debian/patches/series	2019-02-15 14:06:07.000000000 +0000
+++ fwupd-1.2.5/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-0001-trivial-contrib-debian-use-libxmlb-from-Debian-archi.patch
-0001-trivial-Fix-potential-compile-failures-for-high-j-va.patch
-0001-Fix-the-self-tests-when-using-glib2-2.59.0.patch
diff -Nru fwupd-1.2.4/debian/rules fwupd-1.2.5/debian/rules
--- fwupd-1.2.4/debian/rules	2019-02-15 14:05:53.000000000 +0000
+++ fwupd-1.2.5/debian/rules	2019-02-26 22:30:52.000000000 +0000
@@ -11,8 +11,7 @@
 endif
 
 ifneq ($(CI),)
-	export CI=--werror --wrap-mode=forcefallback
-	export DHSLIBS=-- --ignore-missing-info
+	export CI=--werror
 endif
 
 regenerate_control:
@@ -29,7 +28,7 @@
 
 %:
 	[ -f debian/control ] || debian/rules regenerate_control
-	dh $@ --with gir,systemd
+	dh $@ --with gir
 
 override_dh_auto_clean: regenerate_control
 	rm -fr debian/build
@@ -92,7 +91,7 @@
 	fi
 
 override_dh_builddeb:
-	dh_builddeb -- -Zxz
+	dh_builddeb
 ifeq (ubuntu,$(SB_STYLE))
 	if [ -d debian/tmp/usr/lib/fwupd/efi/ ]; then \
 		mkdir -p debian/fwupd-images/$(deb_version) ;\
diff -Nru fwupd-1.2.4/.lgtm.yml fwupd-1.2.5/.lgtm.yml
--- fwupd-1.2.4/.lgtm.yml	1970-01-01 00:00:00.000000000 +0000
+++ fwupd-1.2.5/.lgtm.yml	2019-02-25 09:42:18.000000000 +0000
@@ -0,0 +1,21 @@
+extraction:
+  python:
+    python_setup:
+      version: "3"
+  cpp:
+    prepare:
+      packages:
+      - bsdtar
+      - python3-gi
+      - libcogl-pango-dev
+      - python3-pil
+      - python3-cairo
+    after_prepare:
+    - "wget -O libxmlb.zip https://github.com/hughsie/libxmlb/archive/0.1.5.zip"
+    - "mkdir -p subprojects/libxmlb"
+    - "bsdtar --strip-components=1 -xvf libxmlb.zip -C subprojects/libxmlb"
+    index:
+      build_command:
+      - "meson setup build"
+      - "ninja -C build"
+ 
diff -Nru fwupd-1.2.4/libfwupd/fwupd-client.h fwupd-1.2.5/libfwupd/fwupd-client.h
--- fwupd-1.2.4/libfwupd/fwupd-client.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-client.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_CLIENT_H
-#define __FWUPD_CLIENT_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -129,6 +128,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FWUPD_CLIENT_H */
-
diff -Nru fwupd-1.2.4/libfwupd/fwupd-common.c fwupd-1.2.5/libfwupd/fwupd-common.c
--- fwupd-1.2.4/libfwupd/fwupd-common.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-common.c	2019-02-25 09:42:18.000000000 +0000
@@ -16,6 +16,10 @@
 #include <sys/utsname.h>
 #include <json-glib/json-glib.h>
 
+#if !GLIB_CHECK_VERSION(2,54,0)
+#include <errno.h>
+#endif
+
 /**
  * fwupd_checksum_guess_kind:
  * @checksum: A checksum
@@ -512,3 +516,305 @@
 	}
 	return data;
 }
+
+#define FWUPD_GUID_NAMESPACE_DEFAULT	"6ba7b810-9dad-11d1-80b4-00c04fd430c8"
+#define FWUPD_GUID_NAMESPACE_MICROSOFT	"70ffd812-4c7f-4c7d-0000-000000000000"
+
+typedef struct __attribute__((packed)) {
+	guint32		a;
+	guint16		b;
+	guint16		c;
+	guint16		d;
+	guint8		e[6];
+} fwupd_guid_native_t;
+
+/**
+ * fwupd_guid_to_string:
+ * @guid: a #fwupd_guid_t to read
+ * @flags: some %FwupdGuidFlags, e.g. %FWUPD_GUID_FLAG_MIXED_ENDIAN
+ *
+ * Returns a text GUID of mixed or BE endian for a packed buffer.
+ *
+ * Returns: A new GUID
+ *
+ * Since: 1.2.5
+ **/
+gchar *
+fwupd_guid_to_string (const fwupd_guid_t *guid, FwupdGuidFlags flags)
+{
+	fwupd_guid_native_t gnat;
+
+	g_return_val_if_fail (guid != NULL, NULL);
+
+	/* copy to avoid issues with aligning */
+	memcpy (&gnat, guid, sizeof(gnat));
+
+	/* mixed is bizaar, but specified as the DCE encoding */
+	if (flags & FWUPD_GUID_FLAG_MIXED_ENDIAN) {
+		return g_strdup_printf ("%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x",
+					GUINT32_FROM_LE(gnat.a),
+					GUINT16_FROM_LE(gnat.b),
+					GUINT16_FROM_LE(gnat.c),
+					GUINT16_FROM_BE(gnat.d),
+					gnat.e[0], gnat.e[1],
+					gnat.e[2], gnat.e[3],
+					gnat.e[4], gnat.e[5]);
+	}
+	return g_strdup_printf ("%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x",
+				GUINT32_FROM_BE(gnat.a),
+				GUINT16_FROM_BE(gnat.b),
+				GUINT16_FROM_BE(gnat.c),
+				GUINT16_FROM_BE(gnat.d),
+				gnat.e[0], gnat.e[1],
+				gnat.e[2], gnat.e[3],
+				gnat.e[4], gnat.e[5]);
+}
+
+#if !GLIB_CHECK_VERSION(2,54,0)
+static gboolean
+str_has_sign (const gchar *str)
+{
+	return str[0] == '-' || str[0] == '+';
+}
+
+static gboolean
+str_has_hex_prefix (const gchar *str)
+{
+	return str[0] == '0' && g_ascii_tolower (str[1]) == 'x';
+}
+
+static gboolean
+g_ascii_string_to_unsigned (const gchar *str,
+			    guint base,
+			    guint64 min,
+			    guint64 max,
+			    guint64 *out_num,
+			    GError **error)
+{
+	const gchar *end_ptr = NULL;
+	gint saved_errno = 0;
+	guint64 number;
+
+	g_return_val_if_fail (str != NULL, FALSE);
+	g_return_val_if_fail (base >= 2 && base <= 36, FALSE);
+	g_return_val_if_fail (min <= max, FALSE);
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (str[0] == '\0') {
+		g_set_error_literal (error,
+				     G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
+				     "Empty string is not a number");
+		return FALSE;
+	}
+
+	errno = 0;
+	number = g_ascii_strtoull (str, (gchar **)&end_ptr, base);
+	saved_errno = errno;
+
+	if (g_ascii_isspace (str[0]) || str_has_sign (str) ||
+	    (base == 16 && str_has_hex_prefix (str)) ||
+	    (saved_errno != 0 && saved_errno != ERANGE) ||
+	    end_ptr == NULL ||
+	    *end_ptr != '\0') {
+		g_set_error (error,
+			     G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
+			     "“%s” is not an unsigned number", str);
+		return FALSE;
+	}
+	if (saved_errno == ERANGE || number < min || number > max) {
+		g_autofree gchar *min_str = g_strdup_printf ("%" G_GUINT64_FORMAT, min);
+		g_autofree gchar *max_str = g_strdup_printf ("%" G_GUINT64_FORMAT, max);
+		g_set_error (error,
+			     G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
+			     "Number “%s” is out of bounds [%s, %s]",
+			     str, min_str, max_str);
+		return FALSE;
+	}
+	if (out_num != NULL)
+		*out_num = number;
+	return TRUE;
+}
+#endif /* GLIB_CHECK_VERSION(2,54,0) */
+
+/**
+ * fwupd_guid_from_string:
+ * @guidstr: (nullable): a GUID, e.g. `00112233-4455-6677-8899-aabbccddeeff`
+ * @guid: a #fwupd_guid_t, or NULL to just check the GUID
+ * @flags: some %FwupdGuidFlags, e.g. %FWUPD_GUID_FLAG_MIXED_ENDIAN
+ * @error: A #GError or %NULL
+ *
+ * Converts a string GUID into its binary encoding. All string GUIDs are
+ * formatted as big endian but on-disk can be encoded in different ways.
+ *
+ * Returns: %TRUE for success
+ *
+ * Since: 1.2.5
+ **/
+gboolean
+fwupd_guid_from_string (const gchar *guidstr,
+			fwupd_guid_t *guid,
+			FwupdGuidFlags flags,
+			GError **error)
+{
+	fwupd_guid_native_t gu = { 0x0 };
+	gboolean mixed_endian = flags & FWUPD_GUID_FLAG_MIXED_ENDIAN;
+	guint64 tmp;
+	g_auto(GStrv) split = NULL;
+
+	g_return_val_if_fail (guidstr != NULL, FALSE);
+
+	/* split into sections */
+	if (strlen (guidstr) != 36) {
+		g_set_error_literal (error,
+				     G_IO_ERROR,
+				     G_IO_ERROR_INVALID_DATA,
+				     "is not valid format");
+		return FALSE;
+	}
+	split = g_strsplit (guidstr, "-", 5);
+	if (g_strv_length (split) != 5) {
+		g_set_error_literal (error,
+				     G_IO_ERROR,
+				     G_IO_ERROR_INVALID_DATA,
+				     "is not valid format, no dashes");
+		return FALSE;
+	}
+	if (strlen (split[0]) != 8 && strlen (split[1]) != 4 &&
+	    strlen (split[2]) != 4 && strlen (split[3]) != 4 &&
+	    strlen (split[4]) != 12) {
+		g_set_error_literal (error,
+				     G_IO_ERROR,
+				     G_IO_ERROR_INVALID_DATA,
+				     "is not valid format, not GUID");
+		return FALSE;
+	}
+
+	/* parse */
+	if (!g_ascii_string_to_unsigned (split[0], 16, 0, 0xffffffff, &tmp, error))
+		return FALSE;
+	gu.a = mixed_endian ? GUINT32_TO_LE(tmp) : GUINT32_TO_BE(tmp);
+	if (!g_ascii_string_to_unsigned (split[1], 16, 0, 0xffff, &tmp, error))
+		return FALSE;
+	gu.b = mixed_endian ? GUINT16_TO_LE(tmp) : GUINT16_TO_BE(tmp);
+	if (!g_ascii_string_to_unsigned (split[2], 16, 0, 0xffff, &tmp, error))
+		return FALSE;
+	gu.c = mixed_endian ? GUINT16_TO_LE(tmp) : GUINT16_TO_BE(tmp);
+	if (!g_ascii_string_to_unsigned (split[3], 16, 0, 0xffff, &tmp, error))
+		return FALSE;
+	gu.d = GUINT16_TO_BE(tmp);
+	for (guint i = 0; i < 6; i++) {
+		gchar buffer[3] = { 0x0 };
+		memcpy (buffer, split[4] + (i * 2), 2);
+		if (!g_ascii_string_to_unsigned (buffer, 16, 0, 0xff, &tmp, error))
+			return FALSE;
+		gu.e[i] = tmp;
+	}
+	if (guid != NULL)
+		memcpy (guid, &gu, sizeof(gu));
+
+	/* success */
+	return TRUE;
+}
+
+/**
+ * fwupd_guid_hash_data:
+ * @data: data to hash
+ * @datasz: length of @data
+ * @flags: some %FwupdGuidFlags, e.g. %FWUPD_GUID_FLAG_NAMESPACE_MICROSOFT
+ *
+ * Returns a GUID for some data. This uses a hash and so even small
+ * differences in the @data will produce radically different return values.
+ *
+ * The implementation is taken from RFC4122, Section 4.1.3; specifically
+ * using a type-5 SHA-1 hash.
+ *
+ * Returns: A new GUID, or %NULL for internal error
+ *
+ * Since: 1.2.5
+ **/
+gchar *
+fwupd_guid_hash_data (const guint8 *data, gsize datasz, FwupdGuidFlags flags)
+{
+	const gchar *namespace_id = FWUPD_GUID_NAMESPACE_DEFAULT;
+	gsize digestlen = 20;
+	guint8 hash[20];
+	fwupd_guid_t uu_namespace;
+	fwupd_guid_t uu_new;
+	g_autoptr(GChecksum) csum = NULL;
+
+	g_return_val_if_fail (namespace_id != NULL, NULL);
+	g_return_val_if_fail (data != NULL, NULL);
+	g_return_val_if_fail (datasz != 0, NULL);
+
+	/* old MS GUID */
+	if (flags & FWUPD_GUID_FLAG_NAMESPACE_MICROSOFT)
+		namespace_id = FWUPD_GUID_NAMESPACE_MICROSOFT;
+
+	/* convert the namespace to binary: hardcoded BE, not @flags */
+	if (!fwupd_guid_from_string (namespace_id, &uu_namespace, FWUPD_GUID_FLAG_NONE, NULL))
+		return NULL;
+
+	/* hash the namespace and then the string */
+	csum = g_checksum_new (G_CHECKSUM_SHA1);
+	g_checksum_update (csum, (guchar *) &uu_namespace, sizeof(uu_namespace));
+	g_checksum_update (csum, (guchar *) data, (gssize) datasz);
+	g_checksum_get_digest (csum, hash, &digestlen);
+
+	/* copy most parts of the hash 1:1 */
+	memcpy (uu_new, hash, sizeof(uu_new));
+
+	/* set specific bits according to Section 4.1.3 */
+	uu_new[6] = (guint8) ((uu_new[6] & 0x0f) | (5 << 4));
+	uu_new[8] = (guint8) ((uu_new[8] & 0x3f) | 0x80);
+	return fwupd_guid_to_string ((const fwupd_guid_t *) &uu_new, flags);
+}
+
+/**
+ * fwupd_guid_is_valid:
+ * @guid: string to check, e.g. `00112233-4455-6677-8899-aabbccddeeff`
+ *
+ * Checks the string is a valid GUID.
+ *
+ * Returns: %TRUE if @guid was a valid GUID, %FALSE otherwise
+ *
+ * Since: 1.2.5
+ **/
+gboolean
+fwupd_guid_is_valid (const gchar *guid)
+{
+	if (guid == NULL)
+		return FALSE;
+	if (!fwupd_guid_from_string (guid, NULL, FWUPD_GUID_FLAG_NONE, NULL))
+		return FALSE;
+	if (g_strcmp0 (guid, "00000000-0000-0000-0000-000000000000") == 0)
+		return FALSE;
+	return TRUE;
+}
+
+/**
+ * fwupd_guid_hash_string:
+ * @str: A source string to use as a key
+ *
+ * Returns a GUID for a given string. This uses a hash and so even small
+ * differences in the @str will produce radically different return values.
+ *
+ * The default implementation is taken from RFC4122, Section 4.1.3; specifically
+ * using a type-5 SHA-1 hash with a DNS namespace.
+ * The same result can be obtained with this simple python program:
+ *
+ *    #!/usr/bin/python
+ *    import uuid
+ *    print uuid.uuid5(uuid.NAMESPACE_DNS, 'python.org')
+ *
+ * Returns: A new GUID, or %NULL if the string was invalid
+ *
+ * Since: 1.2.5
+ **/
+gchar *
+fwupd_guid_hash_string (const gchar *str)
+{
+	if (str == NULL || str[0] == '\0')
+		return NULL;
+	return fwupd_guid_hash_data ((const guint8 *) str, strlen (str),
+				     FWUPD_GUID_FLAG_NONE);
+}
diff -Nru fwupd-1.2.4/libfwupd/fwupd-common.h fwupd-1.2.5/libfwupd/fwupd-common.h
--- fwupd-1.2.4/libfwupd/fwupd-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,17 +4,39 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_COMMON_H
-#define __FWUPD_COMMON_H
+#pragma once
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 #define FWUPD_DBUS_PATH			"/"
 #define FWUPD_DBUS_SERVICE		"org.freedesktop.fwupd"
 #define FWUPD_DBUS_INTERFACE		"org.freedesktop.fwupd"
 
 #define FWUPD_DEVICE_ID_ANY		"*"
 
+/**
+ * FwupdGuidFlags:
+ * @FWUPD_GUID_FLAG_NONE:			No trust
+ * @FWUPD_GUID_FLAG_NAMESPACE_MICROSOFT:	Use the Microsoft-compatible namespace
+ * @FWUPD_GUID_FLAG_MIXED_ENDIAN:		Use EFI mixed endian representation
+ *
+ * The flags to show how the data should be converted.
+ **/
+typedef enum {
+	FWUPD_GUID_FLAG_NONE			= 0,		/* Since: 1.2.5 */
+	FWUPD_GUID_FLAG_NAMESPACE_MICROSOFT	= 1 << 0,	/* Since: 1.2.5 */
+	FWUPD_GUID_FLAG_MIXED_ENDIAN		= 1 << 1,	/* Since: 1.2.5 */
+	/*< private >*/
+	FWUPD_GUID_FLAG_LAST
+} FwupdGuidFlags;
+
+/* GObject Introspection does not understand typedefs with sizes */
+#ifndef __GI_SCANNER__
+typedef guint8 fwupd_guid_t[16];
+#endif
+
 const gchar	*fwupd_checksum_get_best		(GPtrArray	*checksums);
 const gchar	*fwupd_checksum_get_by_kind		(GPtrArray	*checksums,
 							 GChecksumType	 kind);
@@ -27,4 +49,25 @@
 gchar		*fwupd_build_history_report_json	(GPtrArray	*devices,
 							 GError		**error);
 
-#endif /* __FWUPD_COMMON_H */
+#ifndef __GI_SCANNER__
+gchar		*fwupd_guid_to_string			(const fwupd_guid_t *guid,
+							 FwupdGuidFlags	 flags);
+gboolean	 fwupd_guid_from_string			(const gchar	*guidstr,
+							 fwupd_guid_t	*guid,
+							 FwupdGuidFlags	 flags,
+							 GError		**error);
+#else
+gchar		*fwupd_guid_to_string			(const guint8	 guid[16],
+							 FwupdGuidFlags	 flags);
+gboolean	 fwupd_guid_from_string			(const gchar	*guidstr,
+							 guint8		 guid[16],
+							 FwupdGuidFlags	 flags,
+							 GError		**error);
+#endif
+gboolean	 fwupd_guid_is_valid			(const gchar	*guid);
+gchar		*fwupd_guid_hash_string			(const gchar	*str);
+gchar		*fwupd_guid_hash_data			(const guint8	*data,
+							 gsize		 datasz,
+							 FwupdGuidFlags	 flags);
+
+G_END_DECLS
diff -Nru fwupd-1.2.4/libfwupd/fwupd-common-private.h fwupd-1.2.5/libfwupd/fwupd-common-private.h
--- fwupd-1.2.4/libfwupd/fwupd-common-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-common-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_COMMON_PRIVATE_H
-#define __FWUPD_COMMON_PRIVATE_H
+#pragma once
 
 #include <glib.h>
 
 #include "fwupd-common.h"
 
+G_BEGIN_DECLS
+
 gchar		*fwupd_checksum_format_for_display	(const gchar	*checksum);
 
-#endif /* __FWUPD_COMMON_PRIVATE_H */
+G_END_DECLS
diff -Nru fwupd-1.2.4/libfwupd/fwupd-deprecated.h fwupd-1.2.5/libfwupd/fwupd-deprecated.h
--- fwupd-1.2.4/libfwupd/fwupd-deprecated.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-deprecated.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_DEPRECATED_H
-#define __FWUPD_DEPRECATED_H
+#pragma once
+
+G_BEGIN_DECLS
 
 /* indeed, nothing */
 
-#endif /* __FWUPD_DEPRECATED_H */
+G_END_DECLS
diff -Nru fwupd-1.2.4/libfwupd/fwupd-device.c fwupd-1.2.5/libfwupd/fwupd-device.c
--- fwupd-1.2.4/libfwupd/fwupd-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -34,6 +34,7 @@
 	guint64				 modified;
 	guint64				 flags;
 	GPtrArray			*guids;
+	GPtrArray			*instance_ids;
 	GPtrArray			*icons;
 	gchar				*name;
 	gchar				*serial;
@@ -363,6 +364,69 @@
 }
 
 /**
+ * fwupd_device_get_instance_ids:
+ * @device: A #FwupdDevice
+ *
+ * Gets the InstanceIDs.
+ *
+ * Returns: (element-type utf8) (transfer none): the InstanceID
+ *
+ * Since: 1.2.5
+ **/
+GPtrArray *
+fwupd_device_get_instance_ids (FwupdDevice *device)
+{
+	FwupdDevicePrivate *priv = GET_PRIVATE (device);
+	g_return_val_if_fail (FWUPD_IS_DEVICE (device), NULL);
+	return priv->instance_ids;
+}
+
+/**
+ * fwupd_device_has_instance_id:
+ * @device: A #FwupdDevice
+ * @instance_id: the InstanceID, e.g. `PCI\VEN_10EC&DEV_525A`
+ *
+ * Finds out if the device has this specific InstanceID.
+ *
+ * Returns: %TRUE if the InstanceID is found
+ *
+ * Since: 1.2.5
+ **/
+gboolean
+fwupd_device_has_instance_id (FwupdDevice *device, const gchar *instance_id)
+{
+	FwupdDevicePrivate *priv = GET_PRIVATE (device);
+
+	g_return_val_if_fail (FWUPD_IS_DEVICE (device), FALSE);
+
+	for (guint i = 0; i < priv->instance_ids->len; i++) {
+		const gchar *instance_id_tmp = g_ptr_array_index (priv->instance_ids, i);
+		if (g_strcmp0 (instance_id, instance_id_tmp) == 0)
+			return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * fwupd_device_add_instance_id:
+ * @device: A #FwupdDevice
+ * @instance_id: the GUID, e.g. `PCI\VEN_10EC&DEV_525A`
+ *
+ * Adds the InstanceID if it does not already exist.
+ *
+ * Since: 1.2.5
+ **/
+void
+fwupd_device_add_instance_id (FwupdDevice *device, const gchar *instance_id)
+{
+	FwupdDevicePrivate *priv = GET_PRIVATE (device);
+	g_return_if_fail (FWUPD_IS_DEVICE (device));
+	if (fwupd_device_has_instance_id (device, instance_id))
+		return;
+	g_ptr_array_add (priv->instance_ids, g_strdup (instance_id));
+}
+
+/**
  * fwupd_device_get_icons:
  * @device: A #FwupdDevice
  *
@@ -990,6 +1054,10 @@
 		const gchar *tmp = g_ptr_array_index (priv_donor->guids, i);
 		fwupd_device_add_guid (self, tmp);
 	}
+	for (guint i = 0; i < priv_donor->instance_ids->len; i++) {
+		const gchar *tmp = g_ptr_array_index (priv_donor->instance_ids, i);
+		fwupd_device_add_instance_id (self, tmp);
+	}
 	for (guint i = 0; i < priv_donor->icons->len; i++) {
 		const gchar *tmp = g_ptr_array_index (priv_donor->icons, i);
 		fwupd_device_add_icon (self, tmp);
@@ -1152,6 +1220,12 @@
 					       FWUPD_RESULT_KEY_SERIAL,
 					       g_variant_new_string (priv->serial));
 		}
+		if (priv->instance_ids->len > 0) {
+			const gchar * const *tmp = (const gchar * const *) priv->instance_ids->pdata;
+			g_variant_builder_add (&builder, "{sv}",
+					       FWUPD_RESULT_KEY_INSTANCE_IDS,
+					       g_variant_new_strv (tmp, priv->instance_ids->len));
+		}
 	}
 
 	/* create an array with all the metadata in */
@@ -1228,6 +1302,12 @@
 			fwupd_device_add_guid (device, guids[i]);
 		return;
 	}
+	if (g_strcmp0 (key, FWUPD_RESULT_KEY_INSTANCE_IDS) == 0) {
+		g_autofree const gchar **instance_ids = g_variant_get_strv (value, NULL);
+		for (guint i = 0; instance_ids != NULL && instance_ids[i] != NULL; i++)
+			fwupd_device_add_instance_id (device, instance_ids[i]);
+		return;
+	}
 	if (g_strcmp0 (key, FWUPD_RESULT_KEY_ICON) == 0) {
 		g_autofree const gchar **icons = g_variant_get_strv (value, NULL);
 		for (guint i = 0; icons != NULL && icons[i] != NULL; i++)
@@ -1547,6 +1627,7 @@
 {
 	FwupdDevicePrivate *priv = GET_PRIVATE (device);
 	GString *str;
+	g_autoptr(GHashTable) ids = NULL;
 
 	g_return_val_if_fail (FWUPD_IS_DEVICE (device), NULL);
 
@@ -1557,9 +1638,23 @@
 		str = g_string_append (str, "Unknown Device\n");
 	fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DEVICE_ID, priv->id);
 	fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_PARENT_DEVICE_ID, priv->parent_id);
+	ids = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+	for (guint i = 0; i < priv->instance_ids->len; i++) {
+		const gchar *instance_id = g_ptr_array_index (priv->instance_ids, i);
+		g_hash_table_insert (ids,
+				     fwupd_guid_hash_string (instance_id),
+				     g_strdup (instance_id));
+	}
 	for (guint i = 0; i < priv->guids->len; i++) {
 		const gchar *guid = g_ptr_array_index (priv->guids, i);
-		fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_GUID, guid);
+		const gchar *instance_id = g_hash_table_lookup (ids, guid);
+		if (instance_id == NULL) {
+			fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_GUID, guid);
+		} else {
+			g_autofree gchar *tmp = NULL;
+			tmp = g_strdup_printf ("%s <- %s", guid, instance_id);
+			fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_GUID, tmp);
+		}
 	}
 	fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_SERIAL, priv->serial);
 	fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_SUMMARY, priv->summary);
@@ -1616,6 +1711,7 @@
 {
 	FwupdDevicePrivate *priv = GET_PRIVATE (device);
 	priv->guids = g_ptr_array_new_with_free_func (g_free);
+	priv->instance_ids = g_ptr_array_new_with_free_func (g_free);
 	priv->icons = g_ptr_array_new_with_free_func (g_free);
 	priv->checksums = g_ptr_array_new_with_free_func (g_free);
 	priv->releases = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
@@ -1644,6 +1740,7 @@
 	g_free (priv->version_lowest);
 	g_free (priv->version_bootloader);
 	g_ptr_array_unref (priv->guids);
+	g_ptr_array_unref (priv->instance_ids);
 	g_ptr_array_unref (priv->icons);
 	g_ptr_array_unref (priv->checksums);
 	g_ptr_array_unref (priv->releases);
diff -Nru fwupd-1.2.4/libfwupd/fwupd-device.h fwupd-1.2.5/libfwupd/fwupd-device.h
--- fwupd-1.2.4/libfwupd/fwupd-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_DEVICE_H
-#define __FWUPD_DEVICE_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -102,6 +101,11 @@
 							 const gchar	*guid);
 GPtrArray	*fwupd_device_get_guids			(FwupdDevice	*device);
 const gchar	*fwupd_device_get_guid_default		(FwupdDevice	*device);
+void		 fwupd_device_add_instance_id		(FwupdDevice	*device,
+							 const gchar	*instance_id);
+gboolean	 fwupd_device_has_instance_id		(FwupdDevice	*device,
+							 const gchar	*instance_id);
+GPtrArray	*fwupd_device_get_instance_ids		(FwupdDevice	*device);
 void		 fwupd_device_add_icon			(FwupdDevice	*device,
 							 const gchar	*icon);
 GPtrArray	*fwupd_device_get_icons			(FwupdDevice	*device);
@@ -123,6 +127,3 @@
 							 FwupdDevice	*device2);
 
 G_END_DECLS
-
-#endif /* __FWUPD_DEVICE_H */
-
diff -Nru fwupd-1.2.4/libfwupd/fwupd-device-private.h fwupd-1.2.5/libfwupd/fwupd-device-private.h
--- fwupd-1.2.4/libfwupd/fwupd-device-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-device-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_DEVICE_PRIVATE_H
-#define __FWUPD_DEVICE_PRIVATE_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -22,5 +21,3 @@
 
 G_END_DECLS
 
-#endif /* __FWUPD_DEVICE_PRIVATE_H */
-
diff -Nru fwupd-1.2.4/libfwupd/fwupd-enums.c fwupd-1.2.5/libfwupd/fwupd-enums.c
--- fwupd-1.2.4/libfwupd/fwupd-enums.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-enums.c	2019-02-25 09:42:18.000000000 +0000
@@ -155,6 +155,10 @@
 		return "wait-for-replug";
 	if (device_flag == FWUPD_DEVICE_FLAG_IGNORE_VALIDATION)
 		return "ignore-validation";
+	if (device_flag == FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED)
+		return "another-write-required";
+	if (device_flag == FWUPD_DEVICE_FLAG_NO_AUTO_INSTANCE_IDS)
+		return "no-auto-instance-ids";
 	if (device_flag == FWUPD_DEVICE_FLAG_UNKNOWN)
 		return "unknown";
 	return NULL;
@@ -211,6 +215,10 @@
 		return FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG;
 	if (g_strcmp0 (device_flag, "ignore-validation") == 0)
 		return FWUPD_DEVICE_FLAG_IGNORE_VALIDATION;
+	if (g_strcmp0 (device_flag, "another-write-required") == 0)
+		return FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED;
+	if (g_strcmp0 (device_flag, "no-auto-instance-ids") == 0)
+		return FWUPD_DEVICE_FLAG_NO_AUTO_INSTANCE_IDS;
 	return FWUPD_DEVICE_FLAG_UNKNOWN;
 }
 
diff -Nru fwupd-1.2.4/libfwupd/fwupd-enums.h fwupd-1.2.5/libfwupd/fwupd-enums.h
--- fwupd-1.2.4/libfwupd/fwupd-enums.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-enums.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_ENUMS_H
-#define __FWUPD_ENUMS_H
+#pragma once
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 /**
  * FwupdStatus:
  * @FWUPD_STATUS_UNKNOWN:			Unknown state
@@ -84,6 +85,8 @@
  * @FWUPD_DEVICE_FLAG_IGNORE_VALIDATION:	Ignore validation safety checks when flashing this device
  * @FWUPD_DEVICE_FLAG_TRUSTED:			Extra metadata can be exposed about this device
  * @FWUPD_DEVICE_FLAG_NEEDS_SHUTDOWN:		Requires system shutdown to apply firmware
+ * @FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED:	Requires the update to be retried with a new plugin
+ * @FWUPD_DEVICE_FLAG_NO_AUTO_INSTANCE_IDS:	Do not add instance IDs from the device baseclass
  *
  * The device flags.
  **/
@@ -106,6 +109,8 @@
 #define FWUPD_DEVICE_FLAG_IGNORE_VALIDATION	(1u << 15)	/* Since: 1.1.2 */
 #define FWUPD_DEVICE_FLAG_TRUSTED		(1u << 16)	/* Since: 1.1.2 */
 #define FWUPD_DEVICE_FLAG_NEEDS_SHUTDOWN	(1u << 17)	/* Since: 1.2.4 */
+#define FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED (1u << 18)	/* Since: 1.2.5 */
+#define FWUPD_DEVICE_FLAG_NO_AUTO_INSTANCE_IDS	(1u << 19)	/* Since: 1.2.5 */
 #define FWUPD_DEVICE_FLAG_UNKNOWN		G_MAXUINT64	/* Since: 0.7.3 */
 typedef guint64 FwupdDeviceFlags;
 
@@ -180,4 +185,4 @@
 FwupdKeyringKind fwupd_keyring_kind_from_string		(const gchar	*keyring_kind);
 const gchar	*fwupd_keyring_kind_to_string		(FwupdKeyringKind keyring_kind);
 
-#endif /* __FWUPD_ENUMS_H */
+G_END_DECLS
diff -Nru fwupd-1.2.4/libfwupd/fwupd-enums-private.h fwupd-1.2.5/libfwupd/fwupd-enums-private.h
--- fwupd-1.2.4/libfwupd/fwupd-enums-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-enums-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_ENUMS_PRIVATE_H
-#define __FWUPD_ENUMS_PRIVATE_H
+#pragma once
+
+G_BEGIN_DECLS
 
 #define FWUPD_RESULT_KEY_APPSTREAM_ID		"AppstreamId"	/* s */
 #define FWUPD_RESULT_KEY_CHECKSUM		"Checksum"	/* as */
@@ -19,6 +20,7 @@
 #define FWUPD_RESULT_KEY_FLASHES_LEFT		"FlashesLeft"	/* u */
 #define FWUPD_RESULT_KEY_INSTALL_DURATION	"InstallDuration"	/* u */
 #define FWUPD_RESULT_KEY_GUID			"Guid"		/* as */
+#define FWUPD_RESULT_KEY_INSTANCE_IDS		"InstanceIds"	/* as */
 #define FWUPD_RESULT_KEY_HOMEPAGE		"Homepage"	/* s */
 #define FWUPD_RESULT_KEY_DETAILS_URL		"DetailsUrl"	/* s */
 #define FWUPD_RESULT_KEY_SOURCE_URL		"SourceUrl"	/* s */
@@ -45,4 +47,4 @@
 #define FWUPD_RESULT_KEY_VERSION_LOWEST		"VersionLowest"	/* s */
 #define FWUPD_RESULT_KEY_VERSION		"Version"	/* s */
 
-#endif /* __FWUPD_ENUMS_PRIVATE_H */
+G_END_DECLS
diff -Nru fwupd-1.2.4/libfwupd/fwupd-error.h fwupd-1.2.5/libfwupd/fwupd-error.h
--- fwupd-1.2.4/libfwupd/fwupd-error.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-error.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_ERROR_H
-#define __FWUPD_ERROR_H
+#pragma once
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 #define FWUPD_ERROR			fwupd_error_quark()
 
 /**
@@ -53,4 +54,4 @@
 const gchar	*fwupd_error_to_string			(FwupdError	 error);
 FwupdError	 fwupd_error_from_string		(const gchar	*error);
 
-#endif /* __FWUPD_ERROR_H */
+G_END_DECLS
diff -Nru fwupd-1.2.4/libfwupd/fwupd.h fwupd-1.2.5/libfwupd/fwupd.h
--- fwupd-1.2.4/libfwupd/fwupd.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,14 +4,13 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
+#pragma once
+
 /**
  * SECTION:fwupd
  * @short_description: Helper objects for accessing fwupd
  */
 
-#ifndef __FWUPD_H__
-#define __FWUPD_H__
-
 #define __FWUPD_H_INSIDE__
 
 #include <libfwupd/fwupd-client.h>
@@ -28,6 +27,3 @@
 #endif
 
 #undef __FWUPD_H_INSIDE__
-
-#endif /* __FWUPD_H__ */
-
diff -Nru fwupd-1.2.4/libfwupd/fwupd.map fwupd-1.2.5/libfwupd/fwupd.map
--- fwupd-1.2.4/libfwupd/fwupd.map	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd.map	2019-02-25 09:42:18.000000000 +0000
@@ -307,3 +307,16 @@
     fwupd_release_set_update_message;
   local: *;
 } LIBFWUPD_1.2.2;
+
+LIBFWUPD_1.2.5 {
+  global:
+    fwupd_device_add_instance_id;
+    fwupd_device_get_instance_ids;
+    fwupd_device_has_instance_id;
+    fwupd_guid_from_string;
+    fwupd_guid_hash_data;
+    fwupd_guid_hash_string;
+    fwupd_guid_is_valid;
+    fwupd_guid_to_string;
+  local: *;
+} LIBFWUPD_1.2.4;
diff -Nru fwupd-1.2.4/libfwupd/fwupd-release.h fwupd-1.2.5/libfwupd/fwupd-release.h
--- fwupd-1.2.4/libfwupd/fwupd-release.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-release.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_RELEASE_H
-#define __FWUPD_RELEASE_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -101,6 +100,3 @@
 							 const gchar	*update_message);
 
 G_END_DECLS
-
-#endif /* __FWUPD_RELEASE_H */
-
diff -Nru fwupd-1.2.4/libfwupd/fwupd-release-private.h fwupd-1.2.5/libfwupd/fwupd-release-private.h
--- fwupd-1.2.4/libfwupd/fwupd-release-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-release-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_RELEASE_PRIVATE_H
-#define __FWUPD_RELEASE_PRIVATE_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -18,5 +17,3 @@
 
 G_END_DECLS
 
-#endif /* __FWUPD_RELEASE_PRIVATE_H */
-
diff -Nru fwupd-1.2.4/libfwupd/fwupd-remote.h fwupd-1.2.5/libfwupd/fwupd-remote.h
--- fwupd-1.2.4/libfwupd/fwupd-remote.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-remote.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_REMOTE_H
-#define __FWUPD_REMOTE_H
+#pragma once
 
 #include "fwupd-enums.h"
 
@@ -71,6 +70,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FWUPD_REMOTE_H */
-
diff -Nru fwupd-1.2.4/libfwupd/fwupd-remote-private.h fwupd-1.2.5/libfwupd/fwupd-remote-private.h
--- fwupd-1.2.4/libfwupd/fwupd-remote-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-remote-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FWUPD_REMOTE_PRIVATE_H
-#define __FWUPD_REMOTE_PRIVATE_H
+#pragma once
 
 #include "fwupd-remote.h"
 
@@ -27,6 +26,3 @@
 gchar		**fwupd_remote_get_order_before		(FwupdRemote	*self);
 
 G_END_DECLS
-
-#endif /* __FWUPD_REMOTE_PRIVATE_H */
-
diff -Nru fwupd-1.2.4/libfwupd/fwupd-self-test.c fwupd-1.2.5/libfwupd/fwupd-self-test.c
--- fwupd-1.2.4/libfwupd/fwupd-self-test.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-self-test.c	2019-02-25 09:42:18.000000000 +0000
@@ -43,6 +43,60 @@
 	return FALSE;
 }
 
+/* https://gitlab.gnome.org/GNOME/glib/issues/225 */
+static guint
+_g_string_replace (GString *string, const gchar *search, const gchar *replace)
+{
+	gchar *tmp;
+	guint count = 0;
+	gsize search_idx = 0;
+	gsize replace_len;
+	gsize search_len;
+
+	g_return_val_if_fail (string != NULL, 0);
+	g_return_val_if_fail (search != NULL, 0);
+	g_return_val_if_fail (replace != NULL, 0);
+
+	/* nothing to do */
+	if (string->len == 0)
+		return 0;
+
+	search_len = strlen (search);
+	replace_len = strlen (replace);
+
+	do {
+		tmp = g_strstr_len (string->str + search_idx, -1, search);
+		if (tmp == NULL)
+			break;
+
+		/* advance the counter in case @replace contains @search */
+		search_idx = (gsize) (tmp - string->str);
+
+		/* reallocate the string if required */
+		if (search_len > replace_len) {
+			g_string_erase (string,
+					(gssize) search_idx,
+					(gssize) (search_len - replace_len));
+			memcpy (tmp, replace, replace_len);
+		} else if (search_len < replace_len) {
+			g_string_insert_len (string,
+					     (gssize) search_idx,
+					     replace,
+					     (gssize) (replace_len - search_len));
+			/* we have to treat this specially as it could have
+			 * been reallocated when the insertion happened */
+			memcpy (string->str + search_idx, replace, replace_len);
+		} else {
+			/* just memcmp in the new string */
+			memcpy (tmp, replace, replace_len);
+		}
+		search_idx += replace_len;
+		count++;
+	} while (TRUE);
+
+	return count;
+}
+
 static void
 fwupd_enums_func (void)
 {
@@ -211,6 +265,7 @@
 	g_autoptr(FwupdDevice) dev = NULL;
 	g_autoptr(FwupdRelease) rel = NULL;
 	g_autoptr(GError) error = NULL;
+	g_autoptr(GString) str_ascii = NULL;
 
 	/* create dummy object */
 	dev = fwupd_device_new ();
@@ -243,7 +298,11 @@
 	g_assert (fwupd_device_has_guid (dev, "00000000-0000-0000-0000-000000000000"));
 	g_assert (!fwupd_device_has_guid (dev, "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"));
 
-	ret = fu_test_compare_lines (str,
+	/* convert the new non-breaking space back into a normal space:
+	 * https://gitlab.gnome.org/GNOME/glib/commit/76af5dabb4a25956a6c41a75c0c7feeee74496da */
+	str_ascii = g_string_new (str);
+	_g_string_replace (str_ascii, " ", " ");
+	ret = fu_test_compare_lines (str_ascii->str,
 		"ColorHug2\n"
 		"  DeviceId:             USB:foo\n"
 		"  Guid:                 2082b5e0-7a64-478a-b1b2-e3404fab6dad\n"
@@ -401,6 +460,58 @@
 	g_assert_cmpstr (mhash2, !=, mhash1);
 }
 
+static void
+fwupd_common_guid_func (void)
+{
+	g_autofree gchar *guid1 = NULL;
+	g_autofree gchar *guid2 = NULL;
+	g_autofree gchar *guid_be = NULL;
+	g_autofree gchar *guid_me = NULL;
+	fwupd_guid_t buf = { 0x0 };
+	gboolean ret;
+	g_autoptr(GError) error = NULL;
+
+	/* invalid */
+	g_assert (!fwupd_guid_is_valid (NULL));
+	g_assert (!fwupd_guid_is_valid (""));
+	g_assert (!fwupd_guid_is_valid ("1ff60ab2-3905-06a1-b476"));
+	g_assert (!fwupd_guid_is_valid ("1ff60ab2-XXXX-XXXX-XXXX-0371f00c9e9b"));
+	g_assert (!fwupd_guid_is_valid (" 1ff60ab2-3905-06a1-b476-0371f00c9e9b"));
+	g_assert (!fwupd_guid_is_valid ("00000000-0000-0000-0000-000000000000"));
+
+	/* valid */
+	g_assert (fwupd_guid_is_valid ("1ff60ab2-3905-06a1-b476-0371f00c9e9b"));
+
+	/* make valid */
+	guid1 = fwupd_guid_hash_string ("python.org");
+	g_assert_cmpstr (guid1, ==, "886313e1-3b8a-5372-9b90-0c9aee199e5d");
+
+	guid2 = fwupd_guid_hash_string ("8086:0406");
+	g_assert_cmpstr (guid2, ==, "1fbd1f2c-80f4-5d7c-a6ad-35c7b9bd5486");
+
+	/* round-trip BE */
+	ret = fwupd_guid_from_string ("00112233-4455-6677-8899-aabbccddeeff", &buf,
+				      FWUPD_GUID_FLAG_NONE, &error);
+	g_assert_true (ret);
+	g_assert_no_error (error);
+	g_assert (memcmp (buf, "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff", sizeof(buf)) == 0);
+	guid_be = fwupd_guid_to_string ((const fwupd_guid_t *) &buf, FWUPD_GUID_FLAG_NONE);
+	g_assert_cmpstr (guid_be, ==, "00112233-4455-6677-8899-aabbccddeeff");
+
+	/* round-trip mixed encoding */
+	ret = fwupd_guid_from_string ("00112233-4455-6677-8899-aabbccddeeff", &buf,
+				      FWUPD_GUID_FLAG_MIXED_ENDIAN, &error);
+	g_assert_true (ret);
+	g_assert_no_error (error);
+	g_assert (memcmp (buf, "\x33\x22\x11\x00\x55\x44\x77\x66\x88\x99\xaa\xbb\xcc\xdd\xee\xff", sizeof(buf)) == 0);
+	guid_me = fwupd_guid_to_string ((const fwupd_guid_t *) &buf, FWUPD_GUID_FLAG_MIXED_ENDIAN);
+	g_assert_cmpstr (guid_me, ==, "00112233-4455-6677-8899-aabbccddeeff");
+
+	/* check failure */
+	g_assert_false (fwupd_guid_from_string ("001122334455-6677-8899-aabbccddeeff", NULL, 0, NULL));
+	g_assert_false (fwupd_guid_from_string ("0112233-4455-6677-8899-aabbccddeeff", NULL, 0, NULL));
+}
+
 int
 main (int argc, char **argv)
 {
@@ -413,6 +524,7 @@
 	/* tests go here */
 	g_test_add_func ("/fwupd/enums", fwupd_enums_func);
 	g_test_add_func ("/fwupd/common{machine-hash}", fwupd_common_machine_hash_func);
+	g_test_add_func ("/fwupd/common{guid}", fwupd_common_guid_func);
 	g_test_add_func ("/fwupd/release", fwupd_release_func);
 	g_test_add_func ("/fwupd/device", fwupd_device_func);
 	g_test_add_func ("/fwupd/remote{download}", fwupd_remote_download_func);
diff -Nru fwupd-1.2.4/libfwupd/fwupd-version.h.in fwupd-1.2.5/libfwupd/fwupd-version.h.in
--- fwupd-1.2.4/libfwupd/fwupd-version.h.in	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/libfwupd/fwupd-version.h.in	2019-02-25 09:42:18.000000000 +0000
@@ -3,6 +3,9 @@
  *
  * SPDX-License-Identifier: LGPL-2.1+
  */
+
+#pragma once
+
 /**
  * SECTION:fwupd-version
  * @short_description: Obtains the version for the installed fwupd
@@ -15,9 +18,6 @@
 #error "Only <fwupd.h> can be included directly."
 #endif
 
-#ifndef __FWUPD_VERSION_H
-#define __FWUPD_VERSION_H
-
 /**
  * FWUPD_MAJOR_VERSION:
  *
@@ -59,5 +59,3 @@
      (FWUPD_MAJOR_VERSION == (major) && FWUPD_MINOR_VERSION > (minor)) || \
      (FWUPD_MAJOR_VERSION == (major) && FWUPD_MINOR_VERSION == (minor) && \
       FWUPD_MICRO_VERSION >= (micro)))
-
-#endif /* __FWUPD_VERSION_H */
diff -Nru fwupd-1.2.4/meson.build fwupd-1.2.5/meson.build
--- fwupd-1.2.4/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -1,5 +1,5 @@
 project('fwupd', 'c',
-  version : '1.2.4',
+  version : '1.2.5',
   license : 'LGPL-2.1+',
   meson_version : '>=0.47.0',
   default_options : ['warning_level=2', 'c_std=c99'],
@@ -77,7 +77,7 @@
   '-Wmissing-prototypes',
   '-Wnested-externs',
   '-Wno-cast-function-type',
-  '-Wno-error=cpp',
+  '-Wno-address-of-packed-member',  # incompatable with g_autoptr()
   '-Wno-unknown-pragmas',
   '-Wno-discarded-qualifiers',
   '-Wno-missing-field-initializers',
@@ -183,7 +183,6 @@
   conf.set('ENABLE_GPG', '1')
 endif
 libm = cc.find_library('m', required: false)
-uuid = dependency('uuid')
 libgcab = dependency('libgcab-1.0')
 if libgcab.version().version_compare('>= 0.8')
   conf.set('HAVE_GCAB_0_8', '1')
@@ -254,7 +253,6 @@
 endif
 
 if get_option('plugin_nvme')
-  efivar = dependency('efivar')
   if not cc.has_header('linux/nvme_ioctl.h')
     error('NVMe support requires kernel >= 4.4')
   endif
diff -Nru fwupd-1.2.4/meson_options.txt fwupd-1.2.5/meson_options.txt
--- fwupd-1.2.4/meson_options.txt	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/meson_options.txt	2019-02-25 09:42:18.000000000 +0000
@@ -1,5 +1,6 @@
 option('daemon', type : 'boolean', value : true, description : 'enable the fwupd daemon')
 option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
+option('firmware-packager', type : 'boolean', value : true, description : 'enable firmware-packager installation')
 option('gpg', type : 'boolean', value : true, description : 'enable the GPG verification support')
 option('gtkdoc', type : 'boolean', value : true, description : 'enable developer documentation')
 option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
diff -Nru fwupd-1.2.4/plugins/altos/fu-altos-device.h fwupd-1.2.5/plugins/altos/fu-altos-device.h
--- fwupd-1.2.4/plugins/altos/fu-altos-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/altos/fu-altos-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_ALTOS_DEVICE_H
-#define __FU_ALTOS_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -35,5 +34,3 @@
 FuAltosDeviceKind fu_altos_device_get_kind		(FuAltosDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_ALTOS_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/altos/fu-altos-firmware.h fwupd-1.2.5/plugins/altos/fu-altos-firmware.h
--- fwupd-1.2.4/plugins/altos/fu-altos-firmware.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/altos/fu-altos-firmware.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_ALTOS_FIRMWARE_H
-#define __FU_ALTOS_FIRMWARE_H
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -21,5 +20,3 @@
 						 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_ALTOS_FIRMWARE_H */
diff -Nru fwupd-1.2.4/plugins/amt/fu-plugin-amt.c fwupd-1.2.5/plugins/amt/fu-plugin-amt.c
--- fwupd-1.2.4/plugins/amt/fu-plugin-amt.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/amt/fu-plugin-amt.c	2019-02-25 09:42:18.000000000 +0000
@@ -13,7 +13,6 @@
 #include <linux/mei.h>
 #include <string.h>
 #include <sys/ioctl.h>
-#include <uuid.h>
 
 #include "fu-plugin-vfuncs.h"
 
@@ -446,10 +445,10 @@
 static FuDevice *
 fu_plugin_amt_create_device (GError **error)
 {
-	gchar guid_buf[37];
 	guint8 state;
 	struct amt_code_versions ver;
-	uuid_t uu;
+	fwupd_guid_t uu;
+	g_autofree gchar *guid_buf = NULL;
 	g_autofree struct amt_host_if_resp_header *response = NULL;
 	g_autoptr(FuDevice) dev = NULL;
 	g_autoptr(GString) version_bl = g_string_new (NULL);
@@ -507,7 +506,7 @@
 
 	/* add guid */
 	memcpy (&uu, &ctx->guid, 16);
-	uuid_unparse (uu, guid_buf);
+	guid_buf = fwupd_guid_to_string ((const fwupd_guid_t *) &uu, FWUPD_GUID_FLAG_NONE);
 	fu_device_add_guid (dev, guid_buf);
 
 	/* get version numbers */
diff -Nru fwupd-1.2.4/plugins/amt/meson.build fwupd-1.2.5/plugins/amt/meson.build
--- fwupd-1.2.4/plugins/amt/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/amt/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -18,6 +18,5 @@
   c_args : cargs,
   dependencies : [
     plugin_deps,
-    uuid,
   ],
 )
diff -Nru fwupd-1.2.4/plugins/ata/fu-ata-device.c fwupd-1.2.5/plugins/ata/fu-ata-device.c
--- fwupd-1.2.4/plugins/ata/fu-ata-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/ata/fu-ata-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -71,6 +71,7 @@
 struct _FuAtaDevice {
 	FuUdevDevice		 parent_instance;
 	guint			 pci_depth;
+	guint			 usb_depth;
 	gint			 fd;
 	guint16			 transfer_blocks;
 	guint8			 transfer_mode;
@@ -108,7 +109,7 @@
 
 	/* remove whitespace before returning */
 	if (str->len > 0) {
-		g_strchomp (str->str);
+		g_strstrip (str->str);
 		if (str->str[0] == '\0')
 			return NULL;
 	}
@@ -124,6 +125,7 @@
 	g_string_append_printf (str, "    transfer-mode:\t0x%x\n", (guint) self->transfer_mode);
 	g_string_append_printf (str, "    transfer-size:\t0x%x\n", (guint) self->transfer_blocks);
 	g_string_append_printf (str, "    pci-depth:\t\t%u\n", self->pci_depth);
+	g_string_append_printf (str, "    usb-depth:\t\t%u\n", self->usb_depth);
 }
 
 /* https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifiers-for-ide-devices */
@@ -137,6 +139,48 @@
 	return g_string_free (str, FALSE);
 }
 
+static gchar *
+fu_ata_device_get_guid_safe (const guint16 *buf, guint16 addr_start)
+{
+	if (!fu_common_guid_is_plausible ((guint8 *) (buf + addr_start)))
+		return NULL;
+	return fwupd_guid_to_string ((const fwupd_guid_t *) (buf + addr_start),
+				     FWUPD_GUID_FLAG_MIXED_ENDIAN);
+}
+
+static void
+fu_ata_device_parse_id_maybe_dell (FuAtaDevice *self, const guint16 *buf)
+{
+	g_autofree gchar *component_id = NULL;
+	g_autofree gchar *guid_efi = NULL;
+	g_autofree gchar *guid_id = NULL;
+	g_autofree gchar *guid = NULL;
+
+	/* add extra component ID if set */
+	component_id = fu_ata_device_get_string (buf, 137, 140);
+	if (component_id == NULL ||
+	   !g_str_is_ascii (component_id) ||
+	    strlen (component_id) < 6) {
+		g_debug ("invalid component ID, skipping");
+		return;
+	}
+
+	/* do not add the FuUdevDevice instance IDs as generic firmware
+	 * should not be used on these OEM-specific devices */
+	fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_NO_AUTO_INSTANCE_IDS);
+
+	/* add instance ID *and* GUID as using no-auto-instance-ids */
+	guid_id = g_strdup_printf ("STORAGE-DELL-%s", component_id);
+	fu_device_add_instance_id (FU_DEVICE (self), guid_id);
+	guid = fwupd_guid_hash_string (guid_id);
+	fu_device_add_guid (FU_DEVICE (self), guid);
+
+	/* also add the EFI GUID */
+	guid_efi = fu_ata_device_get_guid_safe (buf, 129);
+	if (guid_efi != NULL)
+		fu_device_add_guid (FU_DEVICE (self), guid_efi);
+}
+
 static gboolean
 fu_ata_device_parse_id (FuAtaDevice *self, const guint8 *buf, gsize sz, GError **error)
 {
@@ -170,6 +214,8 @@
 		return FALSE;
 	}
 
+	fu_ata_device_parse_id_maybe_dell (self, id);
+
 	/* firmware will be applied when the device restarts */
 	if (self->transfer_mode == ATA_SUBCMD_MICROCODE_DOWNLOAD_CHUNKS)
 		fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_NEEDS_REBOOT);
@@ -213,21 +259,28 @@
 	if (sku != NULL)
 		g_debug ("SKU=%s", sku);
 
-	/* add extra GUIDs */
+	/* if we have vendor defined identify blocks don't add generic GUID */
+	if (fu_device_get_guids (device)->len != 0)
+		return TRUE;
+
+	/* add extra GUIDs if none detected from identify block */
 	name_pad = fu_ata_device_pad_string_for_id (fu_device_get_name (device));
 	if (name_pad != NULL &&
 	    fu_device_get_version (device) != NULL) {
 		g_autofree gchar *tmp = NULL;
 		tmp = g_strdup_printf ("IDE\\%s%s", name_pad,
 				       fu_device_get_version (device));
-		fu_device_add_guid (device, tmp);
+		fu_device_add_instance_id (device, tmp);
 	}
 	if (name_pad != NULL) {
 		g_autofree gchar *tmp = NULL;
 		tmp = g_strdup_printf ("IDE\\0%s", name_pad);
-		fu_device_add_guid (device, tmp);
+		fu_device_add_instance_id (device, tmp);
 	}
 
+	/* add the name fallback */
+	fu_device_add_instance_id (device, fu_device_get_name (device));
+
 	return TRUE;
 }
 
@@ -262,9 +315,10 @@
 	if (!fu_udev_device_set_physical_id (device, "scsi", error))
 		return FALSE;
 
-	/* look at the PCI depth to work out if in an external enclosure */
+	/* look at the PCI and USB depth to work out if in an external enclosure */
 	self->pci_depth = fu_udev_device_get_slot_depth (device, "pci");
-	if (self->pci_depth <= 2)
+	self->usb_depth = fu_udev_device_get_slot_depth (device, "usb");
+	if (self->pci_depth <= 2 && self->usb_depth <= 2)
 		fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL);
 
 	return TRUE;
@@ -408,9 +462,6 @@
 	if (!fu_ata_device_parse_id (self, id, sizeof(id), error))
 		return FALSE;
 
-	/* add the name fallback */
-	fu_device_add_guid (device, fu_device_get_name (device));
-
 	/* success */
 	return TRUE;
 }
diff -Nru fwupd-1.2.4/plugins/ata/fu-ata-device.h fwupd-1.2.5/plugins/ata/fu-ata-device.h
--- fwupd-1.2.4/plugins/ata/fu-ata-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/ata/fu-ata-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_ATA_DEVICE_H
-#define __FU_ATA_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -24,5 +23,3 @@
 guint16		 fu_ata_device_get_transfer_blocks	(FuAtaDevice	*self);
 
 G_END_DECLS
-
-#endif /* __FU_ATA_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/ata/meson.build fwupd-1.2.5/plugins/ata/meson.build
--- fwupd-1.2.4/plugins/ata/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/ata/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -36,6 +36,7 @@
   cargs += '-DTESTDATADIR="' + testdatadir + '"'
   e = executable(
     'ata-self-test',
+    fu_hash,
     sources : [
       'fu-self-test.c',
       'fu-ata-device.c',
diff -Nru fwupd-1.2.4/plugins/colorhug/fu-colorhug-common.h fwupd-1.2.5/plugins/colorhug/fu-colorhug-common.h
--- fwupd-1.2.4/plugins/colorhug/fu-colorhug-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/colorhug/fu-colorhug-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_COLORHUG_COMMON_H
-#define __FU_COLORHUG_COMMON_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -54,5 +53,3 @@
 const gchar	*ch_strerror			(ChError	 error_enum);
 
 G_END_DECLS
-
-#endif /* __FU_COLORHUG_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/colorhug/fu-colorhug-device.h fwupd-1.2.5/plugins/colorhug/fu-colorhug-device.h
--- fwupd-1.2.4/plugins/colorhug/fu-colorhug-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/colorhug/fu-colorhug-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_COLORHUG_DEVICE_H
-#define __FU_COLORHUG_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -22,5 +21,3 @@
 							 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_COLORHUG_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/csr/fu-csr-device.h fwupd-1.2.5/plugins/csr/fu-csr-device.h
--- fwupd-1.2.4/plugins/csr/fu-csr-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/csr/fu-csr-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_CSR_DEVICE_H
-#define __FU_CSR_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -17,5 +16,3 @@
 FuCsrDevice	*fu_csr_device_new		(FuUsbDevice		*device);
 
 G_END_DECLS
-
-#endif /* __FU_CSR_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/dell/fu-dell-smi.h fwupd-1.2.5/plugins/dell/fu-dell-smi.h
--- fwupd-1.2.4/plugins/dell/fu-dell-smi.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell/fu-dell-smi.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_DELL_COMMON_H
-#define __FU_DELL_COMMON_H
+#pragma once
 
 #include "fu-device.h"
 #include <smbios_c/smi.h>
@@ -126,5 +125,3 @@
 /* VID/PID of ethernet controller on dock */
 #define DOCK_NIC_VID		0x0bda
 #define DOCK_NIC_PID		0x8153
-
-#endif /* __FU_DELL_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/dell/fu-plugin-dell.c fwupd-1.2.5/plugins/dell/fu-plugin-dell.c
--- fwupd-1.2.4/plugins/dell/fu-plugin-dell.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell/fu-plugin-dell.c	2019-02-25 09:42:18.000000000 +0000
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "fu-common-guid.h"
+#include "fwupd-common.h"
 #include "fu-plugin-dell.h"
 #include "fu-plugin-vfuncs.h"
 #include "fu-device-metadata.h"
@@ -627,11 +627,11 @@
 	}
 
 	tpm_guid_raw = g_strdup_printf ("%04x-%s", system_id, tpm_mode);
-	tpm_guid = fu_common_guid_from_string (tpm_guid_raw);
+	tpm_guid = fwupd_guid_hash_string (tpm_guid_raw);
 	tpm_id = g_strdup_printf ("DELL-%s" G_GUINT64_FORMAT, tpm_guid);
 
 	tpm_guid_raw_alt = g_strdup_printf ("%04x-%s", system_id, tpm_mode_alt);
-	tpm_guid_alt = fu_common_guid_from_string (tpm_guid_raw_alt);
+	tpm_guid_alt = fwupd_guid_hash_string (tpm_guid_raw_alt);
 	tpm_id_alt = g_strdup_printf ("DELL-%s" G_GUINT64_FORMAT, tpm_guid_alt);
 
 	g_debug ("Creating primary TPM GUID %s and secondary TPM GUID %s",
@@ -729,7 +729,7 @@
 			device_id = g_strdup_printf ("TBT-%04x%04x", 0x00d4u,
 						     (unsigned) system_id);
 			fu_device_set_vendor_id (device, vendor_id);
-			fu_device_add_guid (device, device_id);
+			fu_device_add_instance_id (device, device_id);
 			fu_device_add_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE);
 		}
 	}
diff -Nru fwupd-1.2.4/plugins/dell/fu-plugin-dell.h fwupd-1.2.5/plugins/dell/fu-plugin-dell.h
--- fwupd-1.2.4/plugins/dell/fu-plugin-dell.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell/fu-plugin-dell.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_PLUGIN_DELL_H
-#define __FU_PLUGIN_DELL_H
+#pragma once
 
 #include "fu-plugin.h"
 #include "fu-dell-smi.h"
@@ -40,5 +39,3 @@
 #define TPM_TYPE_MASK	0x0F00
 #define TPM_1_2_MODE	0x0001
 #define TPM_2_0_MODE	0x0002
-
-#endif /* __FU_PLUGIN_DELL_H */
diff -Nru fwupd-1.2.4/plugins/dell/fu-self-test.c fwupd-1.2.5/plugins/dell/fu-self-test.c
--- fwupd-1.2.4/plugins/dell/fu-self-test.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell/fu-self-test.c	2019-02-25 09:42:18.000000000 +0000
@@ -237,7 +237,7 @@
 	g_assert_false (fu_device_has_flag (device_v12, FWUPD_DEVICE_FLAG_UPDATABLE));
 
 	/* With one flash left we need an override */
-	ret = fu_plugin_runner_update (plugin_uefi, device_v20, NULL, blob_fw,
+	ret = fu_plugin_runner_update (plugin_uefi, device_v20, blob_fw,
 				       FWUPD_INSTALL_FLAG_NONE, &error);
 	g_assert_error (error, FWUPD_ERROR, FWUPD_ERROR_NOT_SUPPORTED);
 	g_assert_false (ret);
@@ -246,7 +246,7 @@
 	/* test override */
 	g_test_expect_message ("FuPluginUefi", G_LOG_LEVEL_WARNING,
 			       "missing or invalid embedded capsule header");
-	ret = fu_plugin_runner_update (plugin_uefi, device_v20, NULL, blob_fw,
+	ret = fu_plugin_runner_update (plugin_uefi, device_v20, blob_fw,
 				       FWUPD_INSTALL_FLAG_FORCE, &error);
 	g_test_assert_expected_messages ();
 	g_assert_no_error (error);
diff -Nru fwupd-1.2.4/plugins/dell/meson.build fwupd-1.2.5/plugins/dell/meson.build
--- fwupd-1.2.4/plugins/dell/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -37,6 +37,7 @@
   cargs += '-DPLUGINBUILDDIR="' + meson.current_build_dir() + '"'
   e = executable(
     'dell-self-test',
+    fu_hash,
     sources : [
       'fu-self-test.c',
       'fu-dell-smi.c',
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-common.h fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-common.h
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -13,8 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_COMMON_H
-#define __FU_DELL_DOCK_COMMON_H
+#pragma once
 
 #include "config.h"
 
@@ -26,8 +25,8 @@
 #include "fu-dell-dock-hid.h"
 #include "fu-dell-dock-status.h"
 
-#define 	DELL_DOCK_EC_GUID		"USB\\VID_413C&PID_B06E&hub&embedded"
-#define 	DELL_DOCK_TBT_GUID		"TBT-00d4b070"
+#define 	DELL_DOCK_EC_INSTANCE_ID	"USB\\VID_413C&PID_B06E&hub&embedded"
+#define 	DELL_DOCK_TBT_INSTANCE_ID	"TBT-00d4b070"
 
 gboolean	fu_dell_dock_set_power		(FuDevice *device,
 						 guint8 target,
@@ -36,5 +35,3 @@
 void		 fu_dell_dock_will_replug	(FuDevice *device);
 
 void		 fu_dell_dock_clone_updatable	(FuDevice *device);
-
-#endif /* __FU_DELL_DOCK_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-hid.h fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-hid.h
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-hid.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-hid.h	2019-02-25 09:42:18.000000000 +0000
@@ -14,8 +14,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_HID_H
-#define __FU_DELL_DOCK_HID_H
+#pragma once
 
 #include "config.h"
 
@@ -92,5 +91,3 @@
 gboolean	fu_dell_dock_hid_tbt_authenticate	(FuDevice *self,
 							 const FuHIDI2CParameters *parameters,
 							 GError **error);
-
-#endif /* __FU_DELL_DOCK_HID_H */
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-hub.c fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-hub.c
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-hub.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-hub.c	2019-02-25 09:42:18.000000000 +0000
@@ -32,14 +32,14 @@
 static gboolean
 fu_dell_dock_hub_probe (FuDevice *device, GError **error)
 {
-	g_autofree gchar *guid = NULL;
+	g_autofree gchar *devid = NULL;
 
-	guid = g_strdup_printf ("USB\\VID_%04X&PID_%04X&hub",
+	devid = g_strdup_printf ("USB\\VID_%04X&PID_%04X&hub",
 			     (guint) fu_usb_device_get_vid (FU_USB_DEVICE (device)),
 			     (guint) fu_usb_device_get_pid (FU_USB_DEVICE (device)));
 
 	fu_device_set_logical_id (device, "hub");
-	fu_device_add_guid (device, guid);
+	fu_device_add_instance_id (device, devid);
 
 	return TRUE;
 }
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-hub.h fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-hub.h
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-hub.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-hub.h	2019-02-25 09:42:18.000000000 +0000
@@ -13,8 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_HUB_H
-#define __FU_DELL_DOCK_HUB_H
+#pragma once
 
 #include "config.h"
 
@@ -28,5 +27,3 @@
 FuDellDockHub 	*fu_dell_dock_hub_new		(FuUsbDevice *device);
 
 G_END_DECLS
-
-#endif /* __FU_DELL_DOCK_HUB_H */
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-ec.c fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-ec.c
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-ec.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-ec.c	2019-02-25 09:42:18.000000000 +0000
@@ -66,6 +66,7 @@
 
 typedef enum {
 	FU_DELL_DOCK_DEVICETYPE_MAIN_EC = 0,
+	FU_DELL_DOCK_DEVICETYPE_PD  = 1,
 	FU_DELL_DOCK_DEVICETYPE_HUB = 3,
 	FU_DELL_DOCK_DEVICETYPE_MST = 4,
 	FU_DELL_DOCK_DEVICETYPE_TBT = 5,
@@ -142,6 +143,7 @@
 	guint64				 blob_version_offset;
 	guint8				 passive_flow;
 	guint32				 dock_unlock_status;
+	gboolean		 	 pd_blacklist;
 };
 
 static gboolean	fu_dell_dock_get_ec_status	(FuDevice *device,
@@ -222,6 +224,8 @@
 		else if (sub_type == SUBTYPE_GEN1)
 			return "USB 3.1 Gen1";
 		return NULL;
+	case FU_DELL_DOCK_DEVICETYPE_PD:
+		return "PD";
 	default:
 		return NULL;
 	}
@@ -308,6 +312,8 @@
 	const FuDellDockDockInfoHeader *header = NULL;
 	const FuDellDockEcQueryEntry *device_entry = NULL;
 	const FuDellDockEcAddrMap *map = NULL;
+	const gchar *hub_version;
+	guint32 oldest_base_pd = 0;
 	g_autoptr(GBytes) data = NULL;
 
 	g_return_val_if_fail (device != NULL, FALSE);
@@ -401,6 +407,17 @@
 				self->raw_versions->hub2_version = device_entry[i].version.version_32;
 			else if (map->sub_type == SUBTYPE_GEN1)
 				self->raw_versions->hub1_version = device_entry[i].version.version_32;
+		} else if (map->device_type == FU_DELL_DOCK_DEVICETYPE_PD &&
+			   map->location == LOCATION_BASE &&
+			   map->sub_type == 0) {
+			if (oldest_base_pd == 0 ||
+			    device_entry[i].version.version_32 < oldest_base_pd)
+				oldest_base_pd = GUINT32_TO_BE (device_entry[i].version.version_32);
+			g_debug ("\tParsed version: %02x.%02x.%02x.%02x",
+				 device_entry[i].version.version_8[0],
+				 device_entry[i].version.version_8[1],
+				 device_entry[i].version.version_8[2],
+				 device_entry[i].version.version_8[3]);
 		}
 	}
 
@@ -431,13 +448,29 @@
 	fu_device_set_version_lowest (device, self->ec_minimum_version);
 
 
-	/* TODO: Drop if minimum EC is set to 23+
+	/* TODO: Drop part of clause if minimum EC is set to 26+
 	 * Determine if the passive flow should be used when flashing
 	 */
-	if (fu_common_vercmp (self->ec_version, "00.00.00.23") >= 0) {
+	hub_version = fu_device_get_version (self->symbiote);
+	if (fu_common_vercmp (self->ec_version, "00.00.00.26") >= 0 &&
+	    fu_common_vercmp (hub_version, "1.42") >= 0) {
 		g_debug ("using passive flow");
 		self->passive_flow = PASSIVE_REBOOT_MASK;
 		fu_device_set_custom_flags (device, "skip-restart");
+	} else {
+		g_debug ("not using passive flow (EC: %s Hub2: %s)",
+			 self->ec_version, hub_version);
+	}
+	/* TODO: drop if minimum board is to 5+ and minimum EC to 24+ */
+	if (self->data->board_id == 4 && oldest_base_pd >= 0x18) {
+		if (fu_common_vercmp (self->ec_version, "00.00.00.24") < 0)
+			self->pd_blacklist = TRUE;
+		if (fu_common_vercmp (self->ec_version, "00.00.00.23") == 0) {
+			fu_device_remove_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE);
+			fu_device_set_update_error (device, "No more updates will "
+							    "be released for this "
+							    "dock SKU");
+		}
 	}
 	return TRUE;
 }
@@ -551,6 +584,10 @@
 				self->data->module_type);
 	g_string_append_printf (str, "\tminimum ec: %s\n",
 				self->ec_minimum_version);
+	g_string_append_printf (str, "\tblacklist pd: %d\n",
+				self->pd_blacklist);
+	g_string_append_printf (str, "\tpassive flow: %d\n",
+				self->passive_flow);
 }
 
 gboolean
@@ -742,6 +779,18 @@
 	dynamic_version = g_strndup ((gchar *) data + self->blob_version_offset, 11);
 	g_debug ("writing EC firmware version %s", dynamic_version);
 
+	/* TODO: drop if minimum board set to 5+ and minimum EC to 24+ */
+	if (self->pd_blacklist &&
+	    fu_common_vercmp (dynamic_version, "00.00.00.24") >= 0) {
+		g_set_error (error, FWUPD_ERROR, FWUPD_ERROR_INVALID_FILE,
+			     "%s can not flash firmware %s. "
+			     "only firmware %s -> 00.00.00.23 can be flashed.",
+			     fu_device_get_name (device),
+			     dynamic_version,
+			     self->ec_minimum_version);
+		return FALSE;
+	}
+
 	if (!fu_dell_dock_ec_modify_lock (device, self->unlock_target, TRUE, error))
 		return FALSE;
 
@@ -884,7 +933,7 @@
 fu_dell_dock_ec_probe (FuDevice *device, GError **error)
 {
 	/* this will trigger setting up all the quirks */
-	fu_device_add_guid (device, DELL_DOCK_EC_GUID);
+	fu_device_add_instance_id (device, DELL_DOCK_EC_INSTANCE_ID);
 
 	return TRUE;
 }
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-ec.h fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-ec.h
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-ec.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-ec.h	2019-02-25 09:42:18.000000000 +0000
@@ -13,8 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_EC_H
-#define __FU_DELL_DOCK_EC_H
+#pragma once
 
 #include "config.h"
 
@@ -48,5 +47,3 @@
 							 GBytes *blob_fw,
 							 GError **error);
 FuDevice 	*fu_dell_dock_ec_get_symbiote		(FuDevice *device);
-
-#endif /* __FU_DELL_DOCK_EC_H */
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-mst.c fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-mst.c
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-mst.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-mst.c	2019-02-25 09:42:18.000000000 +0000
@@ -385,7 +385,7 @@
 static gboolean
 fu_dell_dock_mst_check_offset (guint8 byte, guint8 offset)
 {
-	if ((byte & offset) > 0)
+	if ((byte & offset) != 0)
 		return TRUE;
 	return FALSE;
 }
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-mst.h fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-mst.h
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-mst.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-mst.h	2019-02-25 09:42:18.000000000 +0000
@@ -13,8 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_I2C_MST_H
-#define __FU_DELL_DOCK_I2C_MST_H
+#pragma once
 
 #include "config.h"
 
@@ -28,5 +27,3 @@
 FuDellDockMst 	*fu_dell_dock_mst_new	(void);
 
 G_END_DECLS
-
-#endif /* __FU_DELL_DOCK_I2C_MST_H */
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-tbt.c fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-tbt.c
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-tbt.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-tbt.c	2019-02-25 09:42:18.000000000 +0000
@@ -215,7 +215,7 @@
 	FuDevice *parent = fu_device_get_parent (device);
 	fu_device_set_physical_id (device, fu_device_get_physical_id (parent));
 	fu_device_set_logical_id (FU_DEVICE (device), "tbt");
-	fu_device_add_guid (device, DELL_DOCK_TBT_GUID);
+	fu_device_add_instance_id (device, DELL_DOCK_TBT_INSTANCE_ID);
 
 	return TRUE;
 }
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-tbt.h fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-tbt.h
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-i2c-tbt.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-i2c-tbt.h	2019-02-25 09:42:18.000000000 +0000
@@ -14,8 +14,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELLDOCK_I2C_TBT_H
-#define __FU_DELLDOCK_I2C_TBT_H
+#pragma once
 
 #include "config.h"
 
@@ -29,6 +28,3 @@
 FuDellDockTbt 	*fu_dell_dock_tbt_new	(void);
 
 G_END_DECLS
-
-
-#endif /* __FU_DELLDOCK_I2C_TBT_H */
diff -Nru fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-status.h fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-status.h
--- fwupd-1.2.4/plugins/dell-dock/fu-dell-dock-status.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dell-dock/fu-dell-dock-status.h	2019-02-25 09:42:18.000000000 +0000
@@ -13,8 +13,7 @@
  * SPDX-License-Identifier: LGPL-2.1+ OR MIT
  */
 
-#ifndef __FU_DELL_DOCK_STATUS_H
-#define __FU_DELL_DOCK_STATUS_H
+#pragma once
 
 #include "config.h"
 
@@ -28,5 +27,3 @@
 FuDellDockStatus	*fu_dell_dock_status_new	(void);
 
 G_END_DECLS
-
-#endif /* __FU_DELL_DOCK_STATUS_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-cipher-xtea.h fwupd-1.2.5/plugins/dfu/dfu-cipher-xtea.h
--- fwupd-1.2.4/plugins/dfu/dfu-cipher-xtea.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-cipher-xtea.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_XTEA_H
-#define __DFU_FORMAT_XTEA_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -22,5 +21,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_XTEA_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-common.h fwupd-1.2.5/plugins/dfu/dfu-common.h
--- fwupd-1.2.4/plugins/dfu/dfu-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_COMMON_H
-#define __DFU_COMMON_H
+#pragma once
 
 #include <glib.h>
 #include <gusb.h>
@@ -171,5 +170,3 @@
 							 gint		 max_tokens);
 
 G_END_DECLS
-
-#endif /* __DFU_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-device.h fwupd-1.2.5/plugins/dfu/dfu-device.h
--- fwupd-1.2.4/plugins/dfu/dfu-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_DEVICE_H
-#define __DFU_DEVICE_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -162,5 +161,3 @@
 GUsbContext	*dfu_device_get_usb_context		(DfuDevice	*device);
 
 G_END_DECLS
-
-#endif /* __DFU_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-device-private.h fwupd-1.2.5/plugins/dfu/dfu-device-private.h
--- fwupd-1.2.4/plugins/dfu/dfu-device-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-device-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_DEVICE_PRIVATE_H
-#define __DFU_DEVICE_PRIVATE_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -26,5 +25,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_DEVICE_PRIVATE_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-element.h fwupd-1.2.5/plugins/dfu/dfu-element.h
--- fwupd-1.2.4/plugins/dfu/dfu-element.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-element.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_ELEMENT_H
-#define __DFU_ELEMENT_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -41,5 +40,3 @@
 gchar		*dfu_element_to_string		(DfuElement	*element);
 
 G_END_DECLS
-
-#endif /* __DFU_ELEMENT_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-firmware.h fwupd-1.2.5/plugins/dfu/dfu-firmware.h
--- fwupd-1.2.4/plugins/dfu/dfu-firmware.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-firmware.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FIRMWARE_H
-#define __DFU_FIRMWARE_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -120,5 +119,3 @@
 						 const gchar	*key);
 
 G_END_DECLS
-
-#endif /* __DFU_FIRMWARE_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-format-dfu.h fwupd-1.2.5/plugins/dfu/dfu-format-dfu.h
--- fwupd-1.2.4/plugins/dfu/dfu-format-dfu.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-format-dfu.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_DFU_H
-#define __DFU_FORMAT_DFU_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -23,5 +22,3 @@
 							GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_DFU_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-format-dfuse.h fwupd-1.2.5/plugins/dfu/dfu-format-dfuse.h
--- fwupd-1.2.4/plugins/dfu/dfu-format-dfuse.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-format-dfuse.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_DFUSE_H
-#define __DFU_FORMAT_DFUSE_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -23,5 +22,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_DFUSE_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-format-ihex.h fwupd-1.2.5/plugins/dfu/dfu-format-ihex.h
--- fwupd-1.2.4/plugins/dfu/dfu-format-ihex.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-format-ihex.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_IHEX_H
-#define __DFU_FORMAT_IHEX_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -23,5 +22,3 @@
 							GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_IHEX_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-format-metadata.h fwupd-1.2.5/plugins/dfu/dfu-format-metadata.h
--- fwupd-1.2.4/plugins/dfu/dfu-format-metadata.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-format-metadata.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_METADATA_H
-#define __DFU_FORMAT_METADATA_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -22,5 +21,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_METADATA_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-format-raw.h fwupd-1.2.5/plugins/dfu/dfu-format-raw.h
--- fwupd-1.2.4/plugins/dfu/dfu-format-raw.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-format-raw.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_RAW_H
-#define __DFU_FORMAT_RAW_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -23,5 +22,3 @@
 							GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_RAW_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-format-srec.c fwupd-1.2.5/plugins/dfu/dfu-format-srec.c
--- fwupd-1.2.4/plugins/dfu/dfu-format-srec.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-format-srec.c	2019-02-25 09:42:18.000000000 +0000
@@ -264,14 +264,35 @@
 				g_debug ("ignoring data at 0x%x as before start address 0x%x",
 					 (guint) rec_addr32, (guint) start_addr);
 			} else {
+				guint bytecnt = 0;
+				guint32 len_hole = rec_addr32 - addr32_last;
+
+				/* fill any holes, but only up to 1Mb to avoid a DoS */
+				if (addr32_last > 0 && len_hole > 0x100000) {
+					g_set_error (error,
+						     FWUPD_ERROR,
+						     FWUPD_ERROR_INVALID_FILE,
+						     "hole of 0x%x bytes too large to fill",
+						     (guint) len_hole);
+					return FALSE;
+				}
+				if (addr32_last > 0x0 && len_hole > 1) {
+					g_debug ("filling address 0x%08x to 0x%08x",
+						 addr32_last + 1, addr32_last + len_hole - 1);
+					for (guint j = 0; j < len_hole; j++)
+						g_string_append_c (outbuf, 0xff);
+				}
+
+				/* add data */
 				for (guint8 i = 4 + (addrsz * 2); i <= rec_count * 2; i += 2) {
 					guint8 tmp = dfu_utils_buffer_parse_uint8 (line + i);
 					g_string_append_c (outbuf, tmp);
+					bytecnt++;
 				}
 				if (element_address == 0x0)
 					element_address = rec_addr32;
+				addr32_last = rec_addr32 + bytecnt;
 			}
-			addr32_last = rec_addr32++;
 			data_cnt++;
 		}
 	}
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-format-srec.h fwupd-1.2.5/plugins/dfu/dfu-format-srec.h
--- fwupd-1.2.4/plugins/dfu/dfu-format-srec.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-format-srec.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_FORMAT_SREC_H
-#define __DFU_FORMAT_SREC_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -28,5 +27,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_FORMAT_SREC_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-image.h fwupd-1.2.5/plugins/dfu/dfu-image.h
--- fwupd-1.2.4/plugins/dfu/dfu-image.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-image.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_IMAGE_H
-#define __DFU_IMAGE_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -43,5 +42,3 @@
 gchar		*dfu_image_to_string		(DfuImage	*image);
 
 G_END_DECLS
-
-#endif /* __DFU_IMAGE_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-patch.h fwupd-1.2.5/plugins/dfu/dfu-patch.h
--- fwupd-1.2.4/plugins/dfu/dfu-patch.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-patch.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_PATCH_H
-#define __DFU_PATCH_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -54,5 +53,3 @@
 GBytes		*dfu_patch_get_checksum_new	(DfuPatch	*self);
 
 G_END_DECLS
-
-#endif /* __DFU_PATCH_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-sector.h fwupd-1.2.5/plugins/dfu/dfu-sector.h
--- fwupd-1.2.4/plugins/dfu/dfu-sector.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-sector.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_SECTOR_H
-#define __DFU_SECTOR_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -49,5 +48,3 @@
 gchar		*dfu_sector_to_string		(DfuSector	*sector);
 
 G_END_DECLS
-
-#endif /* __DFU_SECTOR_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-sector-private.h fwupd-1.2.5/plugins/dfu/dfu-sector-private.h
--- fwupd-1.2.4/plugins/dfu/dfu-sector-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-sector-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_SECTOR_PRIVATE_H
-#define __DFU_SECTOR_PRIVATE_H
+#pragma once
 
 #include "dfu-sector.h"
 
@@ -19,5 +18,3 @@
 					 DfuSectorCap	 cap);
 
 G_END_DECLS
-
-#endif /* __DFU_SECTOR_PRIVATE_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-target-avr.h fwupd-1.2.5/plugins/dfu/dfu-target-avr.h
--- fwupd-1.2.4/plugins/dfu/dfu-target-avr.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-target-avr.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_TARGET_AVR_H
-#define __DFU_TARGET_AVR_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -25,5 +24,3 @@
 DfuTarget	*dfu_target_avr_new		(void);
 
 G_END_DECLS
-
-#endif /* __DFU_TARGET_AVR_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-target.h fwupd-1.2.5/plugins/dfu/dfu-target.h
--- fwupd-1.2.4/plugins/dfu/dfu-target.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-target.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_TARGET_H
-#define __DFU_TARGET_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -91,5 +90,3 @@
 DfuCipherKind	 dfu_target_get_cipher_kind		(DfuTarget	*target);
 
 G_END_DECLS
-
-#endif /* __DFU_TARGET_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-target-private.h fwupd-1.2.5/plugins/dfu/dfu-target-private.h
--- fwupd-1.2.4/plugins/dfu/dfu-target-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-target-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_TARGET_PRIVATE_H
-#define __DFU_TARGET_PRIVATE_H
+#pragma once
 
 #include <gusb.h>
 
@@ -56,5 +55,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __DFU_TARGET_PRIVATE_H */
diff -Nru fwupd-1.2.4/plugins/dfu/dfu-target-stm.h fwupd-1.2.5/plugins/dfu/dfu-target-stm.h
--- fwupd-1.2.4/plugins/dfu/dfu-target-stm.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/dfu-target-stm.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __DFU_TARGET_STM_H
-#define __DFU_TARGET_STM_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -25,5 +24,3 @@
 DfuTarget	*dfu_target_stm_new		(void);
 
 G_END_DECLS
-
-#endif /* __DFU_TARGET_STM_H */
diff -Nru fwupd-1.2.4/plugins/dfu/meson.build fwupd-1.2.5/plugins/dfu/meson.build
--- fwupd-1.2.4/plugins/dfu/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/dfu/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -6,6 +6,7 @@
 
 dfu = static_library(
   'dfu',
+  fu_hash,
   sources : [
     'dfu-cipher-xtea.c',
     'dfu-common.c',
@@ -117,6 +118,7 @@
   cargs += '-DTESTDATADIR="' + testdatadir + '"'
   e = executable(
     'dfu-self-test',
+    fu_hash,
     sources : [
       'dfu-self-test.c'
     ],
diff -Nru fwupd-1.2.4/plugins/ebitdo/fu-ebitdo-common.h fwupd-1.2.5/plugins/ebitdo/fu-ebitdo-common.h
--- fwupd-1.2.4/plugins/ebitdo/fu-ebitdo-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/ebitdo/fu-ebitdo-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_EBITDO_COMMON_H
-#define __FU_EBITDO_COMMON_H
+#pragma once
 
 #include <glib.h>
 
@@ -70,5 +69,3 @@
 const gchar	*fu_ebitdo_pkt_type_to_string	(FuEbitdoPktType	 type);
 void		 fu_ebitdo_dump_firmware_header	(FuEbitdoFirmwareHeader	*hdr);
 void		 fu_ebitdo_dump_pkt		(FuEbitdoPkt		*hdr);
-
-#endif /* __FU_EBITDO_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/ebitdo/fu-ebitdo-device.h fwupd-1.2.5/plugins/ebitdo/fu-ebitdo-device.h
--- fwupd-1.2.4/plugins/ebitdo/fu-ebitdo-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/ebitdo/fu-ebitdo-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_EBITDO_DEVICE_H
-#define __FU_EBITDO_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -20,5 +19,3 @@
 const guint32	*fu_ebitdo_device_get_serial		(FuEbitdoDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_EBITDO_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/fastboot/fu-fastboot-device.h fwupd-1.2.5/plugins/fastboot/fu-fastboot-device.h
--- fwupd-1.2.4/plugins/fastboot/fu-fastboot-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/fastboot/fu-fastboot-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_FASTBOOT_DEVICE_H
-#define __FU_FASTBOOT_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -17,5 +16,3 @@
 FuFastbootDevice	*fu_fastboot_device_new	(FuUsbDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_FASTBOOT_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/nitrokey/fu-nitrokey-common.h fwupd-1.2.5/plugins/nitrokey/fu-nitrokey-common.h
--- fwupd-1.2.4/plugins/nitrokey/fu-nitrokey-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/nitrokey/fu-nitrokey-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_NITROKEY_COMMON_H
-#define __FU_NITROKEY_COMMON_H
+#pragma once
 
 #include <glib.h>
 
@@ -65,5 +64,3 @@
 } NitrokeyGetDeviceStatusPayload;
 
 G_END_DECLS
-
-#endif /* __FU_NITROKEY_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/nitrokey/fu-nitrokey-device.h fwupd-1.2.5/plugins/nitrokey/fu-nitrokey-device.h
--- fwupd-1.2.4/plugins/nitrokey/fu-nitrokey-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/nitrokey/fu-nitrokey-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_NITROKEY_DEVICE_H
-#define __FU_NITROKEY_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -22,5 +21,3 @@
 FuNitrokeyDevice *fu_nitrokey_device_new	(FuUsbDevice		*device);
 
 G_END_DECLS
-
-#endif /* __FU_NITROKEY_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/nitrokey/meson.build fwupd-1.2.5/plugins/nitrokey/meson.build
--- fwupd-1.2.4/plugins/nitrokey/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/nitrokey/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -30,6 +30,7 @@
 if get_option('tests')
   e = executable(
     'nitrokey-self-test',
+    fu_hash,
     sources : [
       'fu-nitrokey-common.c',
       'fu-self-test.c',
diff -Nru fwupd-1.2.4/plugins/nvme/fu-nvme-common.h fwupd-1.2.5/plugins/nvme/fu-nvme-common.h
--- fwupd-1.2.4/plugins/nvme/fu-nvme-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/nvme/fu-nvme-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_NVME_COMMON_H
-#define __FU_NVME_COMMON_H
+#pragma once
 
 #include <glib.h>
 
@@ -125,5 +124,3 @@
 const gchar	*fu_nvme_status_to_string	(guint32	 status);
 
 G_END_DECLS
-
-#endif /* __FU_NVME_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/nvme/fu-nvme-device.c fwupd-1.2.5/plugins/nvme/fu-nvme-device.c
--- fwupd-1.2.4/plugins/nvme/fu-nvme-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/nvme/fu-nvme-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -15,7 +15,6 @@
 
 #include <glib/gstdio.h>
 
-#include <efivar.h>
 #include <linux/nvme_ioctl.h>
 
 #include "fu-chunk.h"
@@ -79,23 +78,10 @@
 static gchar *
 fu_nvme_device_get_guid_safe (const guint8 *buf, guint16 addr_start)
 {
-	efi_guid_t guid_tmp;
-	guint guint_sum = 0;
-	g_autofree char *guid = NULL;
-
-	/* check the GUID is plausible */
-	for (guint i = 0; i < 16; i++)
-		guint_sum += buf[addr_start + i];
-	if (guint_sum == 0x00)
+	if (!fu_common_guid_is_plausible (buf + addr_start))
 		return NULL;
-	if (guint_sum < 0xff) {
-		g_warning ("implausible GUID with sum %02x", guint_sum);
-		return NULL;
-	}
-	memcpy (&guid_tmp, buf + addr_start, 16);
-	if (efi_guid_to_str (&guid_tmp, &guid) < 0)
-		return NULL;
-	return g_strdup (guid);
+	return fwupd_guid_to_string ((const fwupd_guid_t *) (buf + addr_start),
+				     FWUPD_GUID_FLAG_MIXED_ENDIAN);
 }
 
 static gboolean
@@ -188,17 +174,28 @@
 fu_nvme_device_parse_cns_maybe_dell (FuNvmeDevice *self, const guint8 *buf)
 {
 	g_autofree gchar *component_id = NULL;
+	g_autofree gchar *devid = NULL;
 	g_autofree gchar *guid_efi = NULL;
-	g_autofree gchar *guid_id = NULL;
+	g_autofree gchar *guid = NULL;
 
 	/* add extra component ID if set */
 	component_id = fu_nvme_device_get_string_safe (buf, 0xc36, 0xc3d);
-	if (component_id == NULL || strlen (component_id) < 4) {
+	if (component_id == NULL ||
+	   !g_str_is_ascii (component_id) ||
+	    strlen (component_id) < 6) {
 		g_debug ("invalid component ID, skipping");
 		return;
 	}
-	guid_id = g_strdup_printf ("STORAGE-DELL-%s", component_id);
-	fu_device_add_guid (FU_DEVICE (self), guid_id);
+
+	/* do not add the FuUdevDevice instance IDs as generic firmware
+	 * should not be used on these OEM-specific devices */
+	fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_NO_AUTO_INSTANCE_IDS);
+
+	/* add instance ID *and* GUID as using no-auto-instance-ids */
+	devid = g_strdup_printf ("STORAGE-DELL-%s", component_id);
+	fu_device_add_instance_id (FU_DEVICE (self), devid);
+	guid = fwupd_guid_hash_string (devid);
+	fu_device_add_guid (FU_DEVICE (self), guid);
 
 	/* also add the EFI GUID */
 	guid_efi = fu_nvme_device_get_guid_safe (buf, 0x0c26);
@@ -300,7 +297,7 @@
 	/* fall back to the device description */
 	if (fu_device_get_guids (FU_DEVICE (self))->len == 0) {
 		g_debug ("no vendor GUID, falling back to mn");
-		fu_device_add_guid (FU_DEVICE (self), mn);
+		fu_device_add_instance_id (FU_DEVICE (self), mn);
 	}
 	return TRUE;
 }
diff -Nru fwupd-1.2.4/plugins/nvme/fu-nvme-device.h fwupd-1.2.5/plugins/nvme/fu-nvme-device.h
--- fwupd-1.2.4/plugins/nvme/fu-nvme-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/nvme/fu-nvme-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_NVME_DEVICE_H
-#define __FU_NVME_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -20,5 +19,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_NVME_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/nvme/fu-self-test.c fwupd-1.2.5/plugins/nvme/fu-self-test.c
--- fwupd-1.2.4/plugins/nvme/fu-self-test.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/nvme/fu-self-test.c	2019-02-25 09:42:18.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include <fwupd.h>
 
+#include "fu-device-private.h"
 #include "fu-nvme-device.h"
 #include "fu-test.h"
 
@@ -29,6 +30,7 @@
 	dev = fu_nvme_device_new_from_blob ((guint8 *)data, sz, &error);
 	g_assert_no_error (error);
 	g_assert_nonnull (dev);
+	fu_device_convert_instance_ids (FU_DEVICE (dev));
 	g_assert_cmpstr (fu_device_get_name (FU_DEVICE (dev)), ==, "THNSN5512GPU7 TOSHIBA");
 	g_assert_cmpstr (fu_device_get_version (FU_DEVICE (dev)), ==, "410557LA");
 	g_assert_cmpstr (fu_device_get_serial (FU_DEVICE (dev)), ==, "37RSDEADBEEF");
diff -Nru fwupd-1.2.4/plugins/nvme/meson.build fwupd-1.2.5/plugins/nvme/meson.build
--- fwupd-1.2.4/plugins/nvme/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/nvme/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -29,7 +29,6 @@
   ],
   dependencies : [
     plugin_deps,
-    efivar,
   ],
 )
 
@@ -38,6 +37,7 @@
   cargs += '-DTESTDATADIR="' + testdatadir + '"'
   e = executable(
     'nvme-self-test',
+    fu_hash,
     sources : [
       'fu-self-test.c',
       'fu-nvme-common.c',
@@ -51,7 +51,6 @@
     ],
     dependencies : [
       plugin_deps,
-      efivar,
     ],
     link_with : [
       libfwupdprivate,
diff -Nru fwupd-1.2.4/plugins/redfish/fu-redfish-client.h fwupd-1.2.5/plugins/redfish/fu-redfish-client.h
--- fwupd-1.2.4/plugins/redfish/fu-redfish-client.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/redfish/fu-redfish-client.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_REDFISH_CLIENT_H
-#define __FU_REDFISH_CLIENT_H
+#pragma once
 
 #include <gio/gio.h>
 
@@ -40,7 +39,3 @@
 GPtrArray	*fu_redfish_client_get_devices	(FuRedfishClient	*self);
 
 G_END_DECLS
-
-#endif /* __FU_REDFISH_CLIENT_H */
-
-/* vim: set noexpandtab: */
diff -Nru fwupd-1.2.4/plugins/redfish/fu-redfish-common.h fwupd-1.2.5/plugins/redfish/fu-redfish-common.h
--- fwupd-1.2.4/plugins/redfish/fu-redfish-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/redfish/fu-redfish-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_REDFISH_COMMON_H
-#define __FU_REDFISH_COMMON_H
+#pragma once
 
 #include <gio/gio.h>
 #include <efivar.h>
@@ -49,7 +48,3 @@
 gchar		*fu_redfish_common_buffer_to_ipv6	(const guint8	*buffer);
 
 G_END_DECLS
-
-#endif /* __FU_REDFISH_COMMON_H */
-
-/* vim: set noexpandtab: */
diff -Nru fwupd-1.2.4/plugins/redfish/meson.build fwupd-1.2.5/plugins/redfish/meson.build
--- fwupd-1.2.4/plugins/redfish/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/redfish/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -32,6 +32,7 @@
 if get_option('tests')
   e = executable(
     'redfish-self-test',
+    fu_hash,
     sources : [
       'fu-self-test.c',
       'fu-redfish-client.c',
diff -Nru fwupd-1.2.4/plugins/rts54hid/fu-rts54hid-common.h fwupd-1.2.5/plugins/rts54hid/fu-rts54hid-common.h
--- fwupd-1.2.4/plugins/rts54hid/fu-rts54hid-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/rts54hid/fu-rts54hid-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -6,8 +6,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_RTS54HID_COMMON_H
-#define __FU_RTS54HID_COMMON_H
+#pragma once
 
 #define FU_RTS54HID_TRANSFER_BLOCK_SIZE			0x80
 #define FU_RTS54HID_REPORT_LENGTH			0xc0
@@ -68,5 +67,3 @@
 	/* <private >*/
 	FU_RTS54HID_EXT_LAST,
 } FuRts54HidExt;
-
-#endif /* __FU_RTS54HID_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/rts54hid/fu-rts54hid-device.h fwupd-1.2.5/plugins/rts54hid/fu-rts54hid-device.h
--- fwupd-1.2.4/plugins/rts54hid/fu-rts54hid-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/rts54hid/fu-rts54hid-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_RTS54HID_DEVICE_H
-#define __FU_RTS54HID_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -25,5 +24,3 @@
 							 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_RTS54HID_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/rts54hid/fu-rts54hid-module.h fwupd-1.2.5/plugins/rts54hid/fu-rts54hid-module.h
--- fwupd-1.2.4/plugins/rts54hid/fu-rts54hid-module.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/rts54hid/fu-rts54hid-module.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_RTS54HID_MODULE_H
-#define __FU_RTS54HID_MODULE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -17,5 +16,3 @@
 FuRts54HidModule	*fu_rts54hid_module_new		(void);
 
 G_END_DECLS
-
-#endif /* __FU_RTS54HID_MODULE_H */
diff -Nru fwupd-1.2.4/plugins/rts54hub/fu-rts54hub-device.h fwupd-1.2.5/plugins/rts54hub/fu-rts54hub-device.h
--- fwupd-1.2.4/plugins/rts54hub/fu-rts54hub-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/rts54hub/fu-rts54hub-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_RTS54HUB_DEVICE_H
-#define __FU_RTS54HUB_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -17,5 +16,3 @@
 FuRts54HubDevice	*fu_rts54hub_device_new		(FuUsbDevice		*device);
 
 G_END_DECLS
-
-#endif /* __FU_RTS54HUB_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/steelseries/fu-steelseries-device.h fwupd-1.2.5/plugins/steelseries/fu-steelseries-device.h
--- fwupd-1.2.4/plugins/steelseries/fu-steelseries-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/steelseries/fu-steelseries-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_STEELSERIES_DEVICE_H
-#define __FU_STEELSERIES_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -22,5 +21,3 @@
 FuSteelseriesDevice	*fu_steelseries_device_new	(FuUsbDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_STEELSERIES_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/superio/fu-superio-common.c fwupd-1.2.5/plugins/superio/fu-superio-common.c
--- fwupd-1.2.4/plugins/superio/fu-superio-common.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/superio/fu-superio-common.c	2019-02-25 09:42:18.000000000 +0000
@@ -80,14 +80,63 @@
 gboolean
 fu_superio_set_ldn (gint fd, guint16 port, guint8 ldn, GError **error)
 {
-	return fu_superio_regwrite (fd, port, LDN_SEL, ldn, error);
+	return fu_superio_regwrite (fd, port, SIO_LDNxx_IDX_LDNSEL, ldn, error);
+}
+
+const gchar *
+fu_superio_ldn_to_text (guint8 ldn)
+{
+	if (ldn == SIO_LDN_FDC)
+		return "Floppy Disk Controller";
+	if (ldn == SIO_LDN_GPIO)
+		return "General Purpose IO";
+	if (ldn == SIO_LDN_PARALLEL_PORT)
+		return "Parallel Port";
+	if (ldn == SIO_LDN_UART1)
+		return "Serial Port 1";
+	if (ldn == SIO_LDN_UART2)
+		return "Serial Port 2";
+	if (ldn == SIO_LDN_UART3)
+		return "Serial Port 3";
+	if (ldn == SIO_LDN_UART4)
+		return "Serial Port 4";
+	if (ldn == SIO_LDN_SWUC)
+		return "System Wake-Up Control";
+	if (ldn == SIO_LDN_KBC_MOUSE)
+		return "KBC/Mouse";
+	if (ldn == SIO_LDN_KBC_KEYBOARD)
+		return "KBC/Keyboard";
+	if (ldn == SIO_LDN_CIR)
+		return "Consumer IR";
+	if (ldn == SIO_LDN_SMFI)
+		return "Shared Memory/Flash";
+	if (ldn == SIO_LDN_RTCT)
+		return "RTC-like Timer";
+	if (ldn == SIO_LDN_SSSP1)
+		return "Serial Peripheral";
+	if (ldn == SIO_LDN_PECI)
+		return "Platform Environmental Control";
+	if (ldn == SIO_LDN_PM1)
+		return "Power Management 1";
+	if (ldn == SIO_LDN_PM2)
+		return "Power Management 2";
+	if (ldn == SIO_LDN_PM3)
+		return "Power Management 3";
+	if (ldn == SIO_LDN_PM4)
+		return "Power Management 4";
+	if (ldn == SIO_LDN_PM5)
+		return "Power Management 5";
+	return NULL;
 }
 
 gboolean
 fu_superio_regdump (gint fd, guint16 port, guint8 ldn, GError **error)
 {
-	g_autofree gchar *title = NULL;
+	const gchar *ldnstr = fu_superio_ldn_to_text (ldn);
 	guint8 buf[0xff] = { 0x00 };
+	guint16 iobad0 = 0x0;
+	guint16 iobad1 = 0x0;
+	g_autoptr(GString) str = g_string_new (NULL);
 
 	/* set LDN */
 	if (!fu_superio_set_ldn (fd, port, ldn, error))
@@ -96,7 +145,21 @@
 		if (!fu_superio_regval (fd, port, i, &buf[i], error))
 			return FALSE;
 	}
-	title = g_strdup_printf ("PORT:0x%04x LDN:0x%02x", port, ldn);
-	fu_common_dump_raw (G_LOG_DOMAIN, title, buf, 0x100);
+
+	/* get the i/o base addresses */
+	if (!fu_superio_regval16 (fd, port, SIO_LDNxx_IDX_IOBAD0, &iobad0, error))
+		return FALSE;
+	if (!fu_superio_regval16 (fd, port, SIO_LDNxx_IDX_IOBAD1, &iobad1, error))
+		return FALSE;
+
+	g_string_append_printf (str, "PORT:0x%04x ", port);
+	g_string_append_printf (str, "LDN:0x%02x ", ldn);
+	if (iobad0 != 0x0)
+		g_string_append_printf (str, "IOBAD0:0x%04x ", iobad0);
+	if (iobad1 != 0x0)
+		g_string_append_printf (str, "IOBAD1:0x%04x ", iobad1);
+	if (ldnstr != NULL)
+		g_string_append_printf (str, "(%s)", ldnstr);
+	fu_common_dump_raw (G_LOG_DOMAIN, str->str, buf, 0x100);
 	return TRUE;
 }
diff -Nru fwupd-1.2.4/plugins/superio/fu-superio-common.h fwupd-1.2.5/plugins/superio/fu-superio-common.h
--- fwupd-1.2.4/plugins/superio/fu-superio-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/superio/fu-superio-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,16 +4,52 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_SUPERIO_COMMON_H
-#define __FU_SUPERIO_COMMON_H
+#pragma once
 
 #include "fu-plugin.h"
 
 G_BEGIN_DECLS
 
-#define LDN_SEL			0x07	/* LDN select register */
-#define MAXLDN			0x14	/* maximum LDN */
+/* for all LDNs */
+#define SIO_LDNxx_IDX_LDNSEL		0x07
+#define SIO_LDNxx_IDX_CHIPID1		0x20
+#define SIO_LDNxx_IDX_CHIPID2		0x21
+#define SIO_LDNxx_IDX_CHIPVER		0x22
+#define SIO_LDNxx_IDX_SIOCTRL		0x23
+#define SIO_LDNxx_IDX_SIOIRQ		0x25
+#define SIO_LDNxx_IDX_SIOGP		0x26
+#define SIO_LDNxx_IDX_SIOPWR		0x2d
+#define SIO_LDNxx_IDX_D2ADR		0x2e
+#define SIO_LDNxx_IDX_D2DAT		0x2f
+
+#define SIO_LDNxx_IDX_IOBAD0		0x60 /* 16 bit */
+#define SIO_LDNxx_IDX_IOBAD1		0x62 /* 16 bit */
+
+typedef enum {
+	SIO_LDN_FDC			= 0x00,	/* IT87 */
+	SIO_LDN_UART1			= 0x01,	/* IT87+IT89 */
+	SIO_LDN_UART2			= 0x02,	/* IT87+IT89 */
+	SIO_LDN_PARALLEL_PORT		= 0x03,	/* IT87 */
+	SIO_LDN_SWUC			= 0x04,	/* IT87+IT89 */
+	SIO_LDN_KBC_MOUSE		= 0x05,	/* IT87+IT89 */
+	SIO_LDN_KBC_KEYBOARD		= 0x06,	/* IT87+IT89 */
+	SIO_LDN_GPIO			= 0x07,	/* IT87 */
+	SIO_LDN_UART3			= 0x08,	/* IT87 */
+	SIO_LDN_UART4			= 0x09,	/* IT87 */
+	SIO_LDN_CIR			= 0x0a,	/* IT89 */
+	SIO_LDN_SMFI			= 0x0f,	/* IT89 */
+	SIO_LDN_RTCT			= 0x10,	/* IT89 */
+	SIO_LDN_PM1			= 0x11,	/* IT89 */
+	SIO_LDN_PM2			= 0x12,	/* IT89 */
+	SIO_LDN_SSSP1			= 0x13,	/* IT89 */
+	SIO_LDN_PECI			= 0x14,	/* IT89 */
+	SIO_LDN_PM3			= 0x17,	/* IT89 */
+	SIO_LDN_PM4			= 0x18,	/* IT89 */
+	SIO_LDN_PM5			= 0x19,	/* IT89 */
+	SIO_LDN_LAST			= 0x1a
+} SioLdn;
 
+const gchar	*fu_superio_ldn_to_text	(guint8		 ldn);
 gboolean	 fu_superio_outb	(gint		 fd,
 					 guint16	 port,
 					 guint8		 data,
@@ -47,5 +83,3 @@
 					 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_SUPERIO_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/superio/fu-superio-device.c fwupd-1.2.5/plugins/superio/fu-superio-device.c
--- fwupd-1.2.4/plugins/superio/fu-superio-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/superio/fu-superio-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -17,13 +17,24 @@
 
 #define FU_PLUGIN_SUPERIO_TIMEOUT	0.25 /* s */
 
-#define KB_IBF			(1 << 1)  /* i/p buffer full */
-#define KB_OBF			(1 << 0)  /* o/p buffer full */
-
-#define SIO_CMD_GET_PARAM	0x80
-#define SIO_CMD_SET_PARAM	0x81
-#define SIO_CMD_GET_NAME_STR	0x92
-#define SIO_CMD_GET_VERSION_STR	0x93
+/* EC Status Register (see ec/google/chromeec/ec_commands.h) */
+#define SIO_STATUS_EC_OBF		(1 << 0)	/* o/p buffer full */
+#define SIO_STATUS_EC_IBF		(1 << 1)	/* i/p buffer full */
+#define SIO_STATUS_EC_IS_BUSY		(1 << 2)
+#define SIO_STATUS_EC_IS_CMD		(1 << 3)
+#define SIO_STATUS_EC_BURST_ENABLE	(1 << 4)
+#define SIO_STATUS_EC_SCI		(1 << 5)	/* 1 if more events in queue */
+
+/* EC Command Register (see KB3700-ds-01.pdf) */
+#define SIO_CMD_EC_READ			0x80
+#define SIO_CMD_EC_WRITE		0x81
+#define SIO_CMD_EC_BURST_ENABLE		0x82
+#define SIO_CMD_EC_BURST_DISABLE	0x83
+#define SIO_CMD_EC_QUERY_EVENT		0x84
+
+/* unknown source, IT87 only */
+#define SIO_CMD_EC_GET_NAME_STR		0x92
+#define SIO_CMD_EC_GET_VERSION_STR	0x93
 
 struct _FuSuperioDevice {
 	FuDevice		 parent_instance;
@@ -57,8 +68,9 @@
 {
 	guint16 id_tmp;
 
-	/* check matches */
-	if (!fu_superio_regval16 (self->fd, self->port, 0x20, &id_tmp, error))
+	/* check ID, which can be done from any LDN */
+	if (!fu_superio_regval16 (self->fd, self->port,
+				  SIO_LDNxx_IDX_CHIPID1, &id_tmp, error))
 		return FALSE;
 	if (self->id != id_tmp) {
 		g_set_error (error,
@@ -82,7 +94,7 @@
 			return FALSE;
 		if (g_timer_elapsed (timer, NULL) > FU_PLUGIN_SUPERIO_TIMEOUT)
 			break;
-		if (set && (status & mask) > 0)
+		if (set && (status & mask) != 0)
 			return TRUE;
 		if (!set && (status & mask) == 0)
 			return TRUE;
@@ -100,7 +112,7 @@
 			   guint8 *data,
 			   GError **error)
 {
-	if (!fu_superio_device_wait_for (self, KB_OBF, TRUE, error))
+	if (!fu_superio_device_wait_for (self, SIO_STATUS_EC_OBF, TRUE, error))
 		return FALSE;
 	return fu_superio_inb (self->fd, port, data, error);
 }
@@ -111,7 +123,7 @@
 			    guint8 data,
 			    GError **error)
 {
-	if (!fu_superio_device_wait_for (self, KB_IBF, FALSE, error))
+	if (!fu_superio_device_wait_for (self, SIO_STATUS_EC_IBF, FALSE, error))
 		return FALSE;
 	return fu_superio_outb (self->fd, port, data, error);
 }
@@ -125,7 +137,7 @@
 		guint8 unused = 0;
 		if (!fu_superio_inb (self->fd, self->pm1_iobad1, &status, error))
 			return FALSE;
-		if ((status & KB_OBF) == 0)
+		if ((status & SIO_STATUS_EC_OBF) == 0)
 			break;
 		if (!fu_superio_inb (self->fd, self->pm1_iobad0, &unused, error))
 			return FALSE;
@@ -143,7 +155,8 @@
 static gboolean
 fu_superio_device_ec_get_param (FuSuperioDevice *self, guint8 param, guint8 *data, GError **error)
 {
-	if (!fu_superio_device_ec_write (self, self->pm1_iobad1, SIO_CMD_GET_PARAM, error))
+	if (!fu_superio_device_ec_write (self, self->pm1_iobad1,
+					 SIO_CMD_EC_READ, error))
 		return FALSE;
 	if (!fu_superio_device_ec_write (self, self->pm1_iobad0, param, error))
 		return FALSE;
@@ -154,7 +167,8 @@
 static gboolean
 fu_superio_device_ec_set_param (FuSuperioDevice *self, guint8 param, guint8 data, GError **error)
 {
-	if (!fu_superio_device_ec_write (self, self->pm1_iobad1, SIO_CMD_SET_PARAM, error))
+	if (!fu_superio_device_ec_write (self, self->pm1_iobad1,
+					 SIO_CMD_EC_WRITE, error))
 		return FALSE;
 	if (!fu_superio_device_ec_write (self, self->pm1_iobad0, param, error))
 		return FALSE;
@@ -204,12 +218,12 @@
 fu_superio_device_probe (FuDevice *device, GError **error)
 {
 	FuSuperioDevice *self = FU_SUPERIO_DEVICE (device);
-	g_autofree gchar *guid = NULL;
+	g_autofree gchar *devid = NULL;
 
 	/* use the chipset name as the logical ID and for the GUID */
 	fu_device_set_logical_id (device, self->chipset);
-	guid = g_strdup_printf ("SuperIO-%s", self->chipset);
-	fu_device_add_guid (device, guid);
+	devid = g_strdup_printf ("SuperIO-%s", self->chipset);
+	fu_device_add_instance_id (device, devid);
 	return TRUE;
 }
 
@@ -232,13 +246,13 @@
 	self->size = ((guint32) size_tmp) << 10;
 
 	/* get EC strings */
-	name = fu_superio_device_ec_get_str (self, SIO_CMD_GET_NAME_STR, error);
+	name = fu_superio_device_ec_get_str (self, SIO_CMD_EC_GET_NAME_STR, error);
 	if (name == NULL) {
 		g_prefix_error (error, "failed to get EC name: ");
 		return FALSE;
 	}
 	fu_device_set_name (FU_DEVICE (self), name);
-	version = fu_superio_device_ec_get_str (self, SIO_CMD_GET_VERSION_STR, error);
+	version = fu_superio_device_ec_get_str (self, SIO_CMD_EC_GET_VERSION_STR, error);
 	if (version == NULL) {
 		g_prefix_error (error, "failed to get EC version: ");
 		return FALSE;
@@ -287,22 +301,26 @@
 
 	/* dump LDNs */
 	if (g_getenv ("FWUPD_SUPERIO_VERBOSE") != NULL) {
-		for (guint j = 0; j < MAXLDN; j++) {
+		for (guint j = 0; j < SIO_LDN_LAST; j++) {
 			if (!fu_superio_regdump (self->fd, self->port, j, error))
 				return FALSE;
 		}
 	}
 
 	/* set Power Management I/F Channel 1 LDN */
-	if (!fu_superio_set_ldn (self->fd, self->port, 0x11, error))
+	if (!fu_superio_set_ldn (self->fd, self->port, SIO_LDN_PM1, error))
 		return FALSE;
 
 	/* get the PM1 IOBAD0 address */
-	if (!fu_superio_regval16 (self->fd, self->port, 0x60, &self->pm1_iobad0, error))
+	if (!fu_superio_regval16 (self->fd, self->port,
+				  SIO_LDNxx_IDX_IOBAD0,
+				  &self->pm1_iobad0, error))
 		return FALSE;
 
 	/* get the PM1 IOBAD1 address */
-	if (!fu_superio_regval16 (self->fd, self->port, 0x62, &self->pm1_iobad1, error))
+	if (!fu_superio_regval16 (self->fd, self->port,
+				  SIO_LDNxx_IDX_IOBAD1,
+				  &self->pm1_iobad1, error))
 		return FALSE;
 
 	/* dump PMC register map */
@@ -315,7 +333,7 @@
 				continue;
 			}
 		}
-		fu_common_dump_raw (G_LOG_DOMAIN, "EC PMC Registers", buf, 0x100);
+		fu_common_dump_raw (G_LOG_DOMAIN, "EC Registers", buf, 0x100);
 	}
 
 	/* IT85xx */
@@ -335,6 +353,43 @@
 }
 
 static gboolean
+fu_superio_device_attach (FuDevice *device, GError **error)
+{
+	FuSuperioDevice *self = FU_SUPERIO_DEVICE (device);
+
+	/* re-enable HOSTWA -- use 0xfd for LCFC */
+	if (!fu_superio_device_ec_write (self, self->pm1_iobad1, 0xfc, error))
+		return FALSE;
+
+	/* success */
+	return TRUE;
+}
+
+static gboolean
+fu_superio_device_detach (FuDevice *device, GError **error)
+{
+	FuSuperioDevice *self = FU_SUPERIO_DEVICE (device);
+	guint8 tmp = 0x00;
+
+	/* turn off HOSTWA bit, keeping HSEMIE and HSEMW high */
+	if (!fu_superio_device_ec_write (self, self->pm1_iobad1, 0xdc, error))
+		return FALSE;
+	if (!fu_superio_device_ec_read (self, self->pm1_iobad0, &tmp, error))
+		return FALSE;
+	if (tmp != 0x33) {
+		g_set_error (error,
+			     G_IO_ERROR,
+			     G_IO_ERROR_NOT_SUPPORTED,
+			     "failed to clear HOSTWA, got 0x%02x, expected 0x33",
+			     tmp);
+		return FALSE;
+	}
+
+	/* success */
+	return TRUE;
+}
+
+static gboolean
 fu_superio_device_close (FuDevice *device, GError **error)
 {
 	FuSuperioDevice *self = FU_SUPERIO_DEVICE (device);
@@ -367,6 +422,8 @@
 	object_class->finalize = fu_superio_device_finalize;
 	klass_device->to_string = fu_superio_device_to_string;
 	klass_device->open = fu_superio_device_open;
+	klass_device->attach = fu_superio_device_attach;
+	klass_device->detach = fu_superio_device_detach;
 	klass_device->probe = fu_superio_device_probe;
 	klass_device->setup = fu_superio_device_setup;
 	klass_device->close = fu_superio_device_close;
diff -Nru fwupd-1.2.4/plugins/superio/fu-superio-device.h fwupd-1.2.5/plugins/superio/fu-superio-device.h
--- fwupd-1.2.4/plugins/superio/fu-superio-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/superio/fu-superio-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_SUPERIO_DEVICE_H
-#define __FU_SUPERIO_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -19,5 +18,3 @@
 						 guint16		 port);
 
 G_END_DECLS
-
-#endif /* __FU_SUPERIO_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/synapticsmst/fu-plugin-synapticsmst.c fwupd-1.2.5/plugins/synapticsmst/fu-plugin-synapticsmst.c
--- fwupd-1.2.4/plugins/synapticsmst/fu-plugin-synapticsmst.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/synapticsmst/fu-plugin-synapticsmst.c	2019-02-25 09:42:18.000000000 +0000
@@ -41,9 +41,8 @@
 					   const gchar *str)
 {
 	guint16 board_id = synapticsmst_device_get_board_id (device);
-	g_autofree gchar *guid = g_strdup_printf ("MST-%s-%u", str, board_id);
-
-	fu_device_add_guid (fu_device, guid);
+	g_autofree gchar *devid = g_strdup_printf ("MST-%s-%u", str, board_id);
+	fu_device_add_instance_id (fu_device, devid);
 }
 
 /* creates MST-$str-$chipid-$BOARDID */
diff -Nru fwupd-1.2.4/plugins/synapticsmst/meson.build fwupd-1.2.5/plugins/synapticsmst/meson.build
--- fwupd-1.2.4/plugins/synapticsmst/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/synapticsmst/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -35,6 +35,7 @@
   cargs += '-DSOURCEDIR="' + meson.current_source_dir() + '"'
   e = executable(
     'synapticsmst-self-test',
+    fu_hash,
     sources : [
       'fu-self-test.c',
       'synapticsmst-common.c',
diff -Nru fwupd-1.2.4/plugins/synapticsmst/synapticsmst-common.h fwupd-1.2.5/plugins/synapticsmst/synapticsmst-common.h
--- fwupd-1.2.4/plugins/synapticsmst/synapticsmst-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/synapticsmst/synapticsmst-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __SYNAPTICSMST_COMMON_H
-#define __SYNAPTICSMST_COMMON_H
+#pragma once
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -108,5 +107,3 @@
 #pragma clang diagnostic ignored "-Wunused-function"
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(SynapticsMSTConnection, synapticsmst_common_free)
 #pragma clang diagnostic pop
-
-#endif /* __SYNAPTICSMST_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/synapticsmst/synapticsmst-device.h fwupd-1.2.5/plugins/synapticsmst/synapticsmst-device.h
--- fwupd-1.2.4/plugins/synapticsmst/synapticsmst-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/synapticsmst/synapticsmst-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -6,8 +6,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __SYNAPTICSMST_DEVICE_H
-#define __SYNAPTICSMST_DEVICE_H
+#pragma once
 
 #include <gio/gio.h>
 
@@ -86,5 +85,3 @@
 								 GError	**error);
 
 G_END_DECLS
-
-#endif /* __SYNAPTICSMST_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/test/fu-plugin-test.c fwupd-1.2.5/plugins/test/fu-plugin-test.c
--- fwupd-1.2.4/plugins/test/fu-plugin-test.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/test/fu-plugin-test.c	2019-02-25 09:42:18.000000000 +0000
@@ -164,6 +164,17 @@
 	} else {
 		fu_device_set_version (device, "1.2.3");
 	}
+
+	/* do this all over again */
+	if (g_strcmp0 (g_getenv ("FWUPD_PLUGIN_TEST"), "another-write-required") == 0) {
+		g_unsetenv ("FWUPD_PLUGIN_TEST");
+		fu_device_add_flag (device, FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED);
+	}
+
+	/* for the self tests only */
+	fu_device_set_metadata_integer (device, "nr-update",
+					fu_device_get_metadata_integer (device, "nr-update") + 1);
+
 	return TRUE;
 }
 
diff -Nru fwupd-1.2.4/plugins/thunderbolt/fu-plugin-thunderbolt.c fwupd-1.2.5/plugins/thunderbolt/fu-plugin-thunderbolt.c
--- fwupd-1.2.4/plugins/thunderbolt/fu-plugin-thunderbolt.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/thunderbolt/fu-plugin-thunderbolt.c	2019-02-25 09:42:18.000000000 +0000
@@ -369,12 +369,14 @@
 	if (vendor_id != NULL)
 		fu_device_set_vendor_id (dev, vendor_id);
 	if (device_id != NULL)
-		fu_device_add_guid (dev, device_id);
+		fu_device_add_instance_id (dev, device_id);
 	if (version != NULL)
 		fu_device_set_version (dev, version);
 	if (is_host)
 		fu_device_add_flag (dev, FWUPD_DEVICE_FLAG_INTERNAL);
 
+	/* we never open the device, so convert the instance IDs */
+	fu_device_setup (dev, NULL);
 	fu_plugin_cache_add (plugin, id, dev);
 	fu_plugin_device_add (plugin, dev);
 
diff -Nru fwupd-1.2.4/plugins/thunderbolt/fu-self-test.c fwupd-1.2.5/plugins/thunderbolt/fu-self-test.c
--- fwupd-1.2.4/plugins/thunderbolt/fu-self-test.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/thunderbolt/fu-self-test.c	2019-02-25 09:42:18.000000000 +0000
@@ -1131,7 +1131,7 @@
 	/* simulate an update, where the device goes away and comes back
 	 * after the time in the last parameter (given in ms) */
 	up_ctx = mock_tree_prepare_for_update (tree, plugin, "42.23", fw_data, 1000);
-	ret = fu_plugin_runner_update (plugin, tree->fu_device, NULL, fw_data, 0, &error);
+	ret = fu_plugin_runner_update (plugin, tree->fu_device, fw_data, 0, &error);
 	g_assert_no_error (error);
 	g_assert_true (ret);
 
@@ -1180,7 +1180,7 @@
 	up_ctx = mock_tree_prepare_for_update (tree, plugin, "42.23", fw_data, 1000);
 	up_ctx->result = UPDATE_FAIL_DEVICE_INTERNAL;
 
-	ret = fu_plugin_runner_update (plugin, tree->fu_device, NULL, fw_data, 0, &error);
+	ret = fu_plugin_runner_update (plugin, tree->fu_device, fw_data, 0, &error);
 	g_assert_no_error (error);
 	g_assert_true (ret);
 
@@ -1228,7 +1228,7 @@
 	up_ctx = mock_tree_prepare_for_update (tree, plugin, "42.23", fw_data, 1000);
 	up_ctx->result = UPDATE_FAIL_DEVICE_NOSHOW;
 
-	ret = fu_plugin_runner_update (plugin, tree->fu_device, NULL, fw_data, 0, &error);
+	ret = fu_plugin_runner_update (plugin, tree->fu_device, fw_data, 0, &error);
 	g_assert_no_error (error);
 	g_assert_true (ret);
 
diff -Nru fwupd-1.2.4/plugins/thunderbolt/fu-thunderbolt-image.h fwupd-1.2.5/plugins/thunderbolt/fu-thunderbolt-image.h
--- fwupd-1.2.4/plugins/thunderbolt/fu-thunderbolt-image.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/thunderbolt/fu-thunderbolt-image.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_THUNDERBOLT_IMAGE_H__
-#define __FU_THUNDERBOLT_IMAGE_H__
+#pragma once
 
 #include <glib.h>
 
@@ -26,5 +25,3 @@
 gboolean	fu_thunderbolt_image_controller_is_native	(GBytes    *controller_fw,
 								 gboolean  *is_native,
 								 GError   **error);
-
-#endif /* __FU_THUNDERBOLT_IMAGE_H__ */
diff -Nru fwupd-1.2.4/plugins/thunderbolt/meson.build fwupd-1.2.5/plugins/thunderbolt/meson.build
--- fwupd-1.2.4/plugins/thunderbolt/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/thunderbolt/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -26,6 +26,7 @@
 testdatadir_dst = join_paths(meson.build_root(), 'data', 'tests')
 cargs += '-DTESTDATADIR="' + testdatadir_src + ':' + testdatadir_dst + '"'
 executable('tbtfwucli',
+  fu_hash,
   sources : [
     'fu-thunderbolt-tool.c',
   ],
@@ -50,6 +51,7 @@
   cargs += '-DPLUGINBUILDDIR="' + meson.current_build_dir() + '"'
   e = executable(
     'thunderbolt-self-test',
+    fu_hash,
     sources : [
       'fu-self-test.c',
       'fu-plugin-thunderbolt.c',
diff -Nru fwupd-1.2.4/plugins/udev/fu-plugin-udev.c fwupd-1.2.5/plugins/udev/fu-plugin-udev.c
--- fwupd-1.2.4/plugins/udev/fu-plugin-udev.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/udev/fu-plugin-udev.c	2019-02-25 09:42:18.000000000 +0000
@@ -93,6 +93,10 @@
 	if (g_file_test (rom_fn, G_FILE_TEST_EXISTS))
 		fu_device_set_metadata (FU_DEVICE (device), "RomFilename", rom_fn);
 
+	/* we never open the device, so convert the instance IDs */
+	if (!fu_device_setup (FU_DEVICE (device), error))
+		return FALSE;
+
 	/* insert to hash */
 	fu_plugin_device_add (plugin, FU_DEVICE (device));
 	return TRUE;
diff -Nru fwupd-1.2.4/plugins/udev/fu-rom.c fwupd-1.2.5/plugins/udev/fu-rom.c
--- fwupd-1.2.4/plugins/udev/fu-rom.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/udev/fu-rom.c	2019-02-25 09:42:18.000000000 +0000
@@ -10,7 +10,6 @@
 #include <glib/gstdio.h>
 #include <string.h>
 
-#include "fu-common-guid.h"
 #include "fu-rom.h"
 
 static void fu_rom_finalize			 (GObject *object);
@@ -549,7 +548,6 @@
 	guint32 sz = buffer_sz;
 	guint32 jump = 0;
 	guint32 hdr_sz = 0;
-	g_autofree gchar *id = NULL;
 	g_autoptr(GChecksum) checksum_sha1 = g_checksum_new (G_CHECKSUM_SHA1);
 	g_autoptr(GChecksum) checksum_sha256 = g_checksum_new (G_CHECKSUM_SHA256);
 
@@ -687,10 +685,8 @@
 	g_ptr_array_add (self->checksums, g_strdup (g_checksum_get_string (checksum_sha256)));
 
 	/* update guid */
-	id = g_strdup_printf ("PCI\\VEN_%04X&DEV_%04X",
-			      self->vendor_id, self->device_id);
-	self->guid = fu_common_guid_from_string (id);
-	g_debug ("using %s for %s", self->guid, id);
+	self->guid = g_strdup_printf ("PCI\\VEN_%04X&DEV_%04X",
+				      self->vendor_id, self->device_id);
 
 	/* not known */
 	if (self->version == NULL) {
diff -Nru fwupd-1.2.4/plugins/udev/fu-rom.h fwupd-1.2.5/plugins/udev/fu-rom.h
--- fwupd-1.2.4/plugins/udev/fu-rom.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/udev/fu-rom.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_ROM_H
-#define __FU_ROM_H
+#pragma once
 
 #include <gio/gio.h>
 
@@ -54,6 +53,3 @@
 const gchar	*fu_rom_kind_to_string			(FuRomKind	 kind);
 
 G_END_DECLS
-
-#endif /* __FU_ROM_H */
-
diff -Nru fwupd-1.2.4/plugins/udev/meson.build fwupd-1.2.5/plugins/udev/meson.build
--- fwupd-1.2.4/plugins/udev/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/udev/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -50,6 +50,7 @@
   cargs += '-DTESTDATADIR="' + testdatadir + '"'
   e = executable(
     'udev-self-test',
+    fu_hash,
     sources : [
       'fu-self-test.c',
       'fu-rom.c',
diff -Nru fwupd-1.2.4/plugins/uefi/efi/fwup-cleanups.h fwupd-1.2.5/plugins/uefi/efi/fwup-cleanups.h
--- fwupd-1.2.4/plugins/uefi/efi/fwup-cleanups.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/efi/fwup-cleanups.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
+#pragma once
+
 #define _DEFINE_CLEANUP_FUNCTION0(Type, name, func) \
   static inline VOID name(VOID *v) \
   { \
diff -Nru fwupd-1.2.4/plugins/uefi/efi/fwup-common.h fwupd-1.2.5/plugins/uefi/efi/fwup-common.h
--- fwupd-1.2.4/plugins/uefi/efi/fwup-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/efi/fwup-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef _FWUP_COMMON_H
-#define _FWUP_COMMON_H
+#pragma once
 
 #include "fwup-efi.h"
 
@@ -22,5 +21,3 @@
 
 #define fwup_new(struct_type, n)	((struct_type*)fwup_malloc((n)*sizeof(struct_type)))
 #define fwup_new0(struct_type, n)	((struct_type*)fwup_malloc0((n)*sizeof(struct_type)))
-
-#endif /* _FWUP_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/uefi/efi/fwupdate.c fwupd-1.2.5/plugins/uefi/efi/fwupdate.c
--- fwupd-1.2.4/plugins/uefi/efi/fwupdate.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/efi/fwupdate.c	2019-02-25 09:42:18.000000000 +0000
@@ -595,7 +595,7 @@
 {
 	EFI_STATUS rc;
 	for (UINTN i = 0; i < FWUP_NUM_CAPSULE_UPDATES_MAX; i++) {
-		if (updates[i]->name == NULL)
+		if (updates[i] == NULL || updates[i]->name == NULL)
 			break;
 		rc = fwup_set_variable(updates[i]->name, &fwupdate_guid,
 				       updates[i]->info, updates[i]->size,
diff -Nru fwupd-1.2.4/plugins/uefi/efi/fwup-debug.h fwupd-1.2.5/plugins/uefi/efi/fwup-debug.h
--- fwupd-1.2.4/plugins/uefi/efi/fwup-debug.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/efi/fwup-debug.h	2019-02-25 09:42:18.000000000 +0000
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef _FWUP_DEBUG_H
-#define _FWUP_DEBUG_H
+#pragma once
 
 typedef enum {
 	FWUP_DEBUG_LEVEL_DEBUG,
@@ -28,5 +27,3 @@
 #define fwup_debug(fmt, args...) fwup_log(FWUP_DEBUG_LEVEL_DEBUG, __func__, __FILE__, __LINE__, fmt, ## args )
 #define fwup_info(fmt, args...) fwup_log(FWUP_DEBUG_LEVEL_INFO, __func__, __FILE__, __LINE__, fmt, ## args )
 #define fwup_warning(fmt, args...) fwup_log(FWUP_DEBUG_LEVEL_WARNING, __func__, __FILE__, __LINE__, fmt, ## args )
-
-#endif /* _FWUP_DEBUG_H */
diff -Nru fwupd-1.2.4/plugins/uefi/efi/fwup-efi.h fwupd-1.2.5/plugins/uefi/efi/fwup-efi.h
--- fwupd-1.2.4/plugins/uefi/efi/fwup-efi.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/efi/fwup-efi.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef _FWUP_EFI_H
-#define _FWUP_EFI_H
+#pragma once
 
 #define FWUPDATE_ATTEMPT_UPDATE		0x00000001
 #define FWUPDATE_ATTEMPTED		0x00000002
@@ -68,5 +67,3 @@
 					 VOID		**buf_out,
 					 UINTN		*buf_size_out,
 					 UINT32		*attrs_out);
-
-#endif /* _FWUP_EFI_H */
diff -Nru fwupd-1.2.4/plugins/uefi/efi/meson.build fwupd-1.2.5/plugins/uefi/efi/meson.build
--- fwupd-1.2.4/plugins/uefi/efi/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/efi/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -53,7 +53,6 @@
                 '--param=ssp-buffer-size=4',
                 '-fexceptions',
                 '-Wall',
-                '-Werror',
                 '-Wextra',
                 '-Wvla',
                 '-std=gnu11',
@@ -66,10 +65,14 @@
                 '-fno-merge-constants',
                 '-Wsign-compare',
                 '-Wno-missing-field-initializers',
+                '-Wno-address-of-packed-member',
                 '-grecord-gcc-switches',
                 '-DDEBUGDIR="@0@"'.format(debugdir),
                 '-isystem', efi_incdir,
                 '-isystem', join_paths(efi_incdir, gnu_efi_path_arch)]
+if get_option('werror')
+    compile_args += '-Werror'
+endif
 if efi_arch == 'x86_64'
   compile_args += ['-mno-red-zone',
                    '-mno-sse',
diff -Nru fwupd-1.2.4/plugins/uefi/fu-ucs2.h fwupd-1.2.5/plugins/uefi/fu-ucs2.h
--- fwupd-1.2.4/plugins/uefi/fu-ucs2.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/fu-ucs2.h	2019-02-25 09:42:18.000000000 +0000
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UCS2_H
-#define __FU_UCS2_H
+#pragma once
 
 #include <glib.h>
 
@@ -16,5 +15,3 @@
 						 gssize		 max);
 gchar		*fu_ucs2_to_uft8		(const guint16	*str,
 						 gssize		 max);
-
-#endif /* __FU_UCS2_H */
diff -Nru fwupd-1.2.4/plugins/uefi/fu-uefi-bgrt.h fwupd-1.2.5/plugins/uefi/fu-uefi-bgrt.h
--- fwupd-1.2.4/plugins/uefi/fu-uefi-bgrt.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/fu-uefi-bgrt.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_BGRT_H
-#define __FU_UEFI_BGRT_H
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -22,5 +21,3 @@
 guint32		 fu_uefi_bgrt_get_height	(FuUefiBgrt	*self);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_BGRT_H */
diff -Nru fwupd-1.2.4/plugins/uefi/fu-uefi-bootmgr.h fwupd-1.2.5/plugins/uefi/fu-uefi-bootmgr.h
--- fwupd-1.2.4/plugins/uefi/fu-uefi-bootmgr.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/fu-uefi-bootmgr.h	2019-02-25 09:42:18.000000000 +0000
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_BOOTMGR_H
-#define __FU_UEFI_BOOTMGR_H
+#pragma once
 
 #include <glib.h>
 #include <efivar.h>
@@ -25,5 +24,3 @@
 						 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_BOOTMGR_H */
diff -Nru fwupd-1.2.4/plugins/uefi/fu-uefi-common.c fwupd-1.2.5/plugins/uefi/fu-uefi-common.c
--- fwupd-1.2.4/plugins/uefi/fu-uefi-common.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/fu-uefi-common.c	2019-02-25 09:42:18.000000000 +0000
@@ -376,17 +376,14 @@
 fu_uefi_prefix_efi_errors (GError **error)
 {
 	g_autoptr(GString) str = g_string_new (NULL);
-	gint rc = 1;
-	for (gint i = 0; rc > 0; i++) {
+	for (gint i = 0; ; i++) {
 		gchar *filename = NULL;
 		gchar *function = NULL;
 		gchar *message = NULL;
 		gint line = 0;
 		gint err = 0;
-
-		rc = efi_error_get (i, &filename, &function, &line,
-				    &message, &err);
-		if (rc <= 0)
+		if (efi_error_get (i, &filename, &function, &line,
+				   &message, &err) <= 0)
 			break;
 		g_string_append_printf (str, "{error #%d} %s:%d %s(): %s: %s\t",
 					i, filename, line, function,
diff -Nru fwupd-1.2.4/plugins/uefi/fu-uefi-common.h fwupd-1.2.5/plugins/uefi/fu-uefi-common.h
--- fwupd-1.2.4/plugins/uefi/fu-uefi-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/fu-uefi-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_COMMON_H
-#define __FU_UEFI_COMMON_H
+#pragma once
 
 #include <glib.h>
 #include <efivar.h>
@@ -87,5 +86,3 @@
 gboolean	 fu_uefi_prefix_efi_errors	(GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/uefi/fu-uefi-device.c fwupd-1.2.5/plugins/uefi/fu-uefi-device.c
--- fwupd-1.2.4/plugins/uefi/fu-uefi-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/fu-uefi-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -477,7 +477,7 @@
 {
 	FuUefiDevice *self = FU_UEFI_DEVICE (device);
 	FuVersionFormat version_format;
-	g_autofree gchar *guid_devid = NULL;
+	g_autofree gchar *devid = NULL;
 	g_autofree gchar *guid_strup = NULL;
 	g_autofree gchar *version_lowest = NULL;
 	g_autofree gchar *version = NULL;
@@ -516,7 +516,7 @@
 	} else {
 		/* this is probably system firmware */
 		fu_device_add_icon (device, "computer");
-		fu_device_add_guid (device, "main-system-firmware");
+		fu_device_add_instance_id (device, "main-system-firmware");
 	}
 
 	/* set the PCR0 as the device checksum */
@@ -529,8 +529,8 @@
 	/* Windows seems to be case insensitive, but for convenience we'll
 	 * match the upper case values typically specified in the .inf file */
 	guid_strup = g_ascii_strup (self->fw_class, -1);
-	guid_devid = g_strdup_printf ("UEFI\\RES_{%s}", guid_strup);
-	fu_device_add_guid (device, guid_devid);
+	devid = g_strdup_printf ("UEFI\\RES_{%s}", guid_strup);
+	fu_device_add_instance_id (device, devid);
 	return TRUE;
 }
 
@@ -594,7 +594,7 @@
 	fu_device_set_id (FU_DEVICE (self), id);
 
 	/* this is invalid */
-	if (!fu_common_guid_is_valid (self->fw_class)) {
+	if (!fwupd_guid_is_valid (self->fw_class)) {
 		g_set_error (error,
 			     FWUPD_ERROR,
 			     FWUPD_ERROR_NOT_SUPPORTED,
@@ -619,8 +619,8 @@
 	self->fw_class = g_strdup (fu_device_get_guid_default (dev));
 	tmp = fu_device_get_metadata (dev, FU_DEVICE_METADATA_UEFI_DEVICE_KIND);
 	self->kind = fu_uefi_device_kind_from_string (tmp);
-	self->capsule_flags = 0; /* FIXME? */
-	self->fw_version = 0; /* FIXME? */
+	self->capsule_flags = fu_device_get_metadata_integer (dev, FU_DEVICE_METADATA_UEFI_CAPSULE_FLAGS);
+	self->fw_version = fu_device_get_metadata_integer (dev, FU_DEVICE_METADATA_UEFI_FW_VERSION);
 	g_assert (self->fw_class != NULL);
 	return self;
 }
diff -Nru fwupd-1.2.4/plugins/uefi/fu-uefi-device.h fwupd-1.2.5/plugins/uefi/fu-uefi-device.h
--- fwupd-1.2.4/plugins/uefi/fu-uefi-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/fu-uefi-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_DEVICE_H
-#define __FU_UEFI_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 #include "fu-uefi-device.h"
@@ -60,5 +59,3 @@
 gboolean	 fu_uefi_missing_capsule_header		(FuDevice *device);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/uefi/fu-uefi-pcrs.h fwupd-1.2.5/plugins/uefi/fu-uefi-pcrs.h
--- fwupd-1.2.4/plugins/uefi/fu-uefi-pcrs.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/fu-uefi-pcrs.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_PCRS_H
-#define __FU_UEFI_PCRS_H
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -19,5 +18,3 @@
 						 guint		 idx);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_PCRS_H */
diff -Nru fwupd-1.2.4/plugins/uefi/fu-uefi-update-info.h fwupd-1.2.5/plugins/uefi/fu-uefi-update-info.h
--- fwupd-1.2.4/plugins/uefi/fu-uefi-update-info.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/fu-uefi-update-info.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_UPDATE_INFO_H
-#define __FU_UEFI_UPDATE_INFO_H
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -32,5 +31,3 @@
 FuUefiUpdateInfoStatus fu_uefi_update_info_get_status	(FuUefiUpdateInfo	*self);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_UPDATE_INFO_H */
diff -Nru fwupd-1.2.4/plugins/uefi/fu-uefi-vars.h fwupd-1.2.5/plugins/uefi/fu-uefi-vars.h
--- fwupd-1.2.4/plugins/uefi/fu-uefi-vars.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/fu-uefi-vars.h	2019-02-25 09:42:18.000000000 +0000
@@ -5,8 +5,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UEFI_VARS_H
-#define __FU_UEFI_VARS_H
+#pragma once
 
 #include <glib.h>
 
@@ -47,5 +46,3 @@
 						 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_UEFI_VARS_H */
diff -Nru fwupd-1.2.4/plugins/uefi/meson.build fwupd-1.2.5/plugins/uefi/meson.build
--- fwupd-1.2.4/plugins/uefi/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/uefi/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -83,6 +83,7 @@
   cargs += '-DTESTDATADIR="' + testdatadir + '"'
   e = executable(
     'uefi-self-test',
+    fu_hash,
     sources : [
       'fu-self-test.c',
       'fu-uefi-bgrt.c',
diff -Nru fwupd-1.2.4/plugins/unifying/fu-plugin-unifying.c fwupd-1.2.5/plugins/unifying/fu-plugin-unifying.c
--- fwupd-1.2.4/plugins/unifying/fu-plugin-unifying.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/fu-plugin-unifying.c	2019-02-25 09:42:18.000000000 +0000
@@ -88,12 +88,16 @@
 
 	/* runtime */
 	if (fu_device_has_custom_flag (FU_DEVICE (device), "is-receiver")) {
-		dev = g_object_new (FU_TYPE_UNIFYING_RUNTIME, NULL);
+		dev = g_object_new (FU_TYPE_UNIFYING_RUNTIME,
+				    "version-format", FU_VERSION_FORMAT_PLAIN,
+				    NULL);
 		fu_device_incorporate (dev, FU_DEVICE (device));
 	} else {
 
 		/* create device so we can run ->probe() and add UFY GUIDs */
-		dev = g_object_new (FU_TYPE_UNIFYING_PERIPHERAL, NULL);
+		dev = g_object_new (FU_TYPE_UNIFYING_PERIPHERAL,
+				    "version-format", FU_VERSION_FORMAT_PLAIN,
+				    NULL);
 		fu_device_incorporate (dev, FU_DEVICE (device));
 		if (!fu_device_probe (dev, error))
 			return FALSE;
@@ -131,10 +135,14 @@
 		return TRUE;
 	}
 	if (fu_device_has_custom_flag (FU_DEVICE (device), "is-nordic")) {
-		dev = g_object_new (FU_TYPE_UNIFYING_BOOTLOADER_NORDIC, NULL);
+		dev = g_object_new (FU_TYPE_UNIFYING_BOOTLOADER_NORDIC,
+				    "version-format", FU_VERSION_FORMAT_PLAIN,
+				    NULL);
 		fu_device_incorporate (dev, FU_DEVICE (device));
 	} else if (fu_device_has_custom_flag (FU_DEVICE (device), "is-texas")) {
-		dev = g_object_new (FU_TYPE_UNIFYING_BOOTLOADER_TEXAS, NULL);
+		dev = g_object_new (FU_TYPE_UNIFYING_BOOTLOADER_TEXAS,
+				    "version-format", FU_VERSION_FORMAT_PLAIN,
+				    NULL);
 		fu_device_incorporate (dev, FU_DEVICE (device));
 		g_usleep (200*1000);
 	}
diff -Nru fwupd-1.2.4/plugins/unifying/fu-unifying-bootloader.h fwupd-1.2.5/plugins/unifying/fu-unifying-bootloader.h
--- fwupd-1.2.4/plugins/unifying/fu-unifying-bootloader.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/fu-unifying-bootloader.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_BOOTLOADER_H
-#define __FU_UNIFYING_BOOTLOADER_H
+#pragma once
 
 #include "fu-usb-device.h"
 
@@ -79,5 +78,3 @@
 guint16		 fu_unifying_bootloader_get_blocksize	(FuUnifyingBootloader	*self);
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_BOOTLOADER_H */
diff -Nru fwupd-1.2.4/plugins/unifying/fu-unifying-bootloader-nordic.h fwupd-1.2.5/plugins/unifying/fu-unifying-bootloader-nordic.h
--- fwupd-1.2.4/plugins/unifying/fu-unifying-bootloader-nordic.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/fu-unifying-bootloader-nordic.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_BOOTLOADER_NORDIC_H
-#define __FU_UNIFYING_BOOTLOADER_NORDIC_H
+#pragma once
 
 #include "fu-unifying-bootloader.h"
 
@@ -15,5 +14,3 @@
 G_DECLARE_FINAL_TYPE (FuUnifyingBootloaderNordic, fu_unifying_bootloader_nordic, FU, UNIFYING_BOOTLOADER_NORDIC, FuUnifyingBootloader)
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_BOOTLOADER_NORDIC_H */
diff -Nru fwupd-1.2.4/plugins/unifying/fu-unifying-bootloader-texas.h fwupd-1.2.5/plugins/unifying/fu-unifying-bootloader-texas.h
--- fwupd-1.2.4/plugins/unifying/fu-unifying-bootloader-texas.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/fu-unifying-bootloader-texas.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_BOOTLOADER_TEXAS_H
-#define __FU_UNIFYING_BOOTLOADER_TEXAS_H
+#pragma once
 
 #include "fu-unifying-bootloader.h"
 
@@ -15,5 +14,3 @@
 G_DECLARE_FINAL_TYPE (FuUnifyingBootloaderTexas, fu_unifying_bootloader_texas, FU, UNIFYING_BOOTLOADER_TEXAS, FuUnifyingBootloader)
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_BOOTLOADER_TEXAS_H */
diff -Nru fwupd-1.2.4/plugins/unifying/fu-unifying-common.h fwupd-1.2.5/plugins/unifying/fu-unifying-common.h
--- fwupd-1.2.4/plugins/unifying/fu-unifying-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/fu-unifying-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_COMMON_H
-#define __FU_UNIFYING_COMMON_H
+#pragma once
 
 #include <glib.h>
 
@@ -31,5 +30,3 @@
 						 guint16	 build);
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/unifying/fu-unifying-hidpp.h fwupd-1.2.5/plugins/unifying/fu-unifying-hidpp.h
--- fwupd-1.2.4/plugins/unifying/fu-unifying-hidpp.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/fu-unifying-hidpp.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_HIDPP_H
-#define __FU_UNIFYING_HIDPP_H
+#pragma once
 
 #include <gio/gio.h>
 
@@ -151,5 +150,3 @@
 						 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_HIDPP_H */
diff -Nru fwupd-1.2.4/plugins/unifying/fu-unifying-hidpp-msg.h fwupd-1.2.5/plugins/unifying/fu-unifying-hidpp-msg.h
--- fwupd-1.2.4/plugins/unifying/fu-unifying-hidpp-msg.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/fu-unifying-hidpp-msg.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_HIDPP_MSG_H
-#define __FU_UNIFYING_HIDPP_MSG_H
+#pragma once
 
 #include <glib.h>
 
@@ -57,5 +56,3 @@
 const gchar	*fu_unifying_hidpp_msg_fcn_id_to_string		(FuUnifyingHidppMsg	*msg);
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_HIDPP_MSG_H */
diff -Nru fwupd-1.2.4/plugins/unifying/fu-unifying-peripheral.c fwupd-1.2.5/plugins/unifying/fu-unifying-peripheral.c
--- fwupd-1.2.4/plugins/unifying/fu-unifying-peripheral.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/fu-unifying-peripheral.c	2019-02-25 09:42:18.000000000 +0000
@@ -465,7 +465,7 @@
 static gboolean
 fu_unifying_peripheral_probe (FuUdevDevice *device, GError **error)
 {
-	g_autofree gchar *guid = NULL;
+	g_autofree gchar *devid = NULL;
 
 	/* set the physical ID */
 	if (!fu_udev_device_set_physical_id (device, "hid", error))
@@ -475,10 +475,10 @@
 	fu_device_set_vendor_id (FU_DEVICE (device), "USB:0x046D");
 
 	/* this is a non-standard extension */
-	guid = g_strdup_printf ("UFY\\VID_%04X&PID_%04X",
-				fu_udev_device_get_vendor (device),
-				fu_udev_device_get_model (device));
-	fu_device_add_guid (FU_DEVICE (device), guid);
+	devid = g_strdup_printf ("UFY\\VID_%04X&PID_%04X",
+				 fu_udev_device_get_vendor (device),
+				 fu_udev_device_get_model (device));
+	fu_device_add_instance_id (FU_DEVICE (device), devid);
 	return TRUE;
 }
 
diff -Nru fwupd-1.2.4/plugins/unifying/fu-unifying-peripheral.h fwupd-1.2.5/plugins/unifying/fu-unifying-peripheral.h
--- fwupd-1.2.4/plugins/unifying/fu-unifying-peripheral.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/fu-unifying-peripheral.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_PERIPHERAL_H
-#define __FU_UNIFYING_PERIPHERAL_H
+#pragma once
 
 #include "fu-udev-device.h"
 
@@ -15,5 +14,3 @@
 G_DECLARE_FINAL_TYPE (FuUnifyingPeripheral, fu_unifying_peripheral, FU, UNIFYING_PERIPHERAL, FuUdevDevice)
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_PERIPHERAL_H */
diff -Nru fwupd-1.2.4/plugins/unifying/fu-unifying-runtime.h fwupd-1.2.5/plugins/unifying/fu-unifying-runtime.h
--- fwupd-1.2.4/plugins/unifying/fu-unifying-runtime.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/fu-unifying-runtime.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UNIFYING_DEVICE_RUNTIME_H
-#define __FU_UNIFYING_DEVICE_RUNTIME_H
+#pragma once
 
 #include "fu-udev-device.h"
 
@@ -15,5 +14,3 @@
 G_DECLARE_FINAL_TYPE (FuUnifyingRuntime, fu_unifying_runtime, FU, UNIFYING_RUNTIME, FuUdevDevice)
 
 G_END_DECLS
-
-#endif /* __FU_UNIFYING_DEVICE_RUNTIME_H */
diff -Nru fwupd-1.2.4/plugins/unifying/meson.build fwupd-1.2.5/plugins/unifying/meson.build
--- fwupd-1.2.4/plugins/unifying/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/unifying/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -39,6 +39,7 @@
 if get_option('tests')
   e = executable(
     'unifying-self-test',
+    fu_hash,
     sources : [
       'fu-unifying-self-test.c',
       'fu-unifying-common.c',
diff -Nru fwupd-1.2.4/plugins/wacom-raw/fu-plugin-wacom-raw.c fwupd-1.2.5/plugins/wacom-raw/fu-plugin-wacom-raw.c
--- fwupd-1.2.4/plugins/wacom-raw/fu-plugin-wacom-raw.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-raw/fu-plugin-wacom-raw.c	2019-02-25 09:42:18.000000000 +0000
@@ -56,7 +56,7 @@
 		return TRUE;
 
 	/* EMR */
-	if (fu_device_has_guid (FU_DEVICE (device), "WacomEMR")) {
+	if (fu_device_has_instance_id (FU_DEVICE (device), "WacomEMR")) {
 		g_autoptr(FuWacomEmrDevice) dev = fu_wacom_emr_device_new (device);
 		g_autoptr(FuDeviceLocker) locker = fu_device_locker_new (dev, error);
 		if (locker == NULL)
@@ -65,7 +65,7 @@
 	}
 
 	/* AES */
-	if (fu_device_has_guid (FU_DEVICE (device), "WacomAES")) {
+	if (fu_device_has_instance_id (FU_DEVICE (device), "WacomAES")) {
 		g_autoptr(FuWacomAesDevice) dev = fu_wacom_aes_device_new (device);
 		g_autoptr(FuDeviceLocker) locker = fu_device_locker_new (dev, error);
 		if (locker == NULL)
diff -Nru fwupd-1.2.4/plugins/wacom-raw/fu-wacom-aes-device.c fwupd-1.2.5/plugins/wacom-raw/fu-wacom-aes-device.c
--- fwupd-1.2.4/plugins/wacom-raw/fu-wacom-aes-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-raw/fu-wacom-aes-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -129,9 +129,9 @@
 		if (!fu_wacom_aes_device_obtain_hwid (self, &error_local)) {
 			g_debug ("failed to get HwID: %s", error_local->message);
 		} else {
-			g_autofree gchar *guid = NULL;
-			guid = g_strdup_printf ("WACOM\\HWID_%04X", self->hwid);
-			fu_device_add_guid (device, guid);
+			g_autofree gchar *devid = NULL;
+			devid = g_strdup_printf ("WACOM\\HWID_%04X", self->hwid);
+			fu_device_add_instance_id (device, devid);
 		}
 	}
 
diff -Nru fwupd-1.2.4/plugins/wacom-raw/fu-wacom-aes-device.h fwupd-1.2.5/plugins/wacom-raw/fu-wacom-aes-device.h
--- fwupd-1.2.4/plugins/wacom-raw/fu-wacom-aes-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-raw/fu-wacom-aes-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WACOM_AES_DEVICE_H
-#define __FU_WACOM_AES_DEVICE_H
+#pragma once
 
 #include "fu-wacom-device.h"
 
@@ -17,5 +16,3 @@
 FuWacomAesDevice	*fu_wacom_aes_device_new	(FuUdevDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_WACOM_AES_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/wacom-raw/fu-wacom-common.h fwupd-1.2.5/plugins/wacom-raw/fu-wacom-common.h
--- fwupd-1.2.4/plugins/wacom-raw/fu-wacom-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-raw/fu-wacom-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WACOM_COMMON_H
-#define __FU_WACOM_COMMON_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -76,5 +75,3 @@
 						 guint16	 datasz);
 
 G_END_DECLS
-
-#endif /* __FU_WACOM_COMMON_H */
diff -Nru fwupd-1.2.4/plugins/wacom-raw/fu-wacom-device.c fwupd-1.2.5/plugins/wacom-raw/fu-wacom-device.c
--- fwupd-1.2.4/plugins/wacom-raw/fu-wacom-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-raw/fu-wacom-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -73,13 +73,13 @@
 
 	/* W9013 */
 	if (rsp.resp == 0x2e) {
-		fu_device_add_guid (FU_DEVICE (self), "WacomEMR_W9013");
+		fu_device_add_instance_id (FU_DEVICE (self), "WacomEMR_W9013");
 		return TRUE;
 	}
 
 	/* W9021 */
 	if (rsp.resp == 0x45) {
-		fu_device_add_guid (FU_DEVICE (self), "WacomEMR_W9021");
+		fu_device_add_instance_id (FU_DEVICE (self), "WacomEMR_W9021");
 		return TRUE;
 	}
 
diff -Nru fwupd-1.2.4/plugins/wacom-raw/fu-wacom-device.h fwupd-1.2.5/plugins/wacom-raw/fu-wacom-device.h
--- fwupd-1.2.4/plugins/wacom-raw/fu-wacom-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-raw/fu-wacom-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WACOM_DEVICE_H
-#define __FU_WACOM_DEVICE_H
+#pragma once
 
 #include "fu-wacom-common.h"
 #include "fu-udev-device.h"
@@ -52,5 +51,3 @@
 guint		 fu_wacom_device_get_base_addr	(FuWacomDevice	*self);
 
 G_END_DECLS
-
-#endif /* __FU_WACOM_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/wacom-raw/fu-wacom-emr-device.c fwupd-1.2.5/plugins/wacom-raw/fu-wacom-emr-device.c
--- fwupd-1.2.4/plugins/wacom-raw/fu-wacom-emr-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-raw/fu-wacom-emr-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -186,7 +186,7 @@
 	guint8 idx = 0;
 
 	/* erase W9013 */
-	if (fu_device_has_guid (device, "WacomEMR_W9013")) {
+	if (fu_device_has_instance_id (device, "WacomEMR_W9013")) {
 		fu_device_set_status (device, FWUPD_STATUS_DEVICE_ERASE);
 		if (!fu_wacom_emr_device_w9013_erase_data (self, error))
 			return FALSE;
@@ -197,7 +197,7 @@
 	}
 
 	/* erase W9021 */
-	if (fu_device_has_guid (device, "WacomEMR_W9021")) {
+	if (fu_device_has_instance_id (device, "WacomEMR_W9021")) {
 		if (!fu_wacom_device_w9021_erase_all (self, error))
 			return FALSE;
 	}
diff -Nru fwupd-1.2.4/plugins/wacom-raw/fu-wacom-emr-device.h fwupd-1.2.5/plugins/wacom-raw/fu-wacom-emr-device.h
--- fwupd-1.2.4/plugins/wacom-raw/fu-wacom-emr-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-raw/fu-wacom-emr-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WACOM_EMR_DEVICE_H
-#define __FU_WACOM_EMR_DEVICE_H
+#pragma once
 
 #include "fu-wacom-device.h"
 
@@ -17,5 +16,3 @@
 FuWacomEmrDevice	*fu_wacom_emr_device_new	(FuUdevDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_WACOM_EMR_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-plugin-wacom-usb.c fwupd-1.2.5/plugins/wacom-usb/fu-plugin-wacom-usb.c
--- fwupd-1.2.4/plugins/wacom-usb/fu-plugin-wacom-usb.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-plugin-wacom-usb.c	2019-02-25 09:42:18.000000000 +0000
@@ -42,3 +42,34 @@
 		return FALSE;
 	return fu_device_write_firmware (device, blob_fw, error);
 }
+
+static FuDevice *
+fu_plugin_wacom_usb_get_device (GPtrArray *devices)
+{
+	for (guint i = 0; i < devices->len; i++) {
+		FuDevice *dev = g_ptr_array_index (devices, i);
+		if (FU_IS_WAC_DEVICE (dev))
+			return dev;
+	}
+	return NULL;
+}
+
+gboolean
+fu_plugin_composite_cleanup (FuPlugin *plugin,
+			     GPtrArray *devices,
+			     GError **error)
+{
+	FuDevice *device = fu_plugin_wacom_usb_get_device (devices);
+	g_autoptr(FuDeviceLocker) locker = NULL;
+
+	/* not us */
+	if (device == NULL)
+		return TRUE;
+
+	/* reboot, which switches the boot index of the firmware */
+	locker = fu_device_locker_new (device, error);
+	if (locker == NULL)
+		return FALSE;
+	fu_device_set_status (device, FWUPD_STATUS_DEVICE_RESTART);
+	return fu_wac_device_update_reset (FU_WAC_DEVICE (device), error);
+}
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-common.c fwupd-1.2.5/plugins/wacom-usb/fu-wac-common.c
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-common.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-common.c	2019-02-25 09:42:18.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include <string.h>
 
+#include "fu-common.h"
 #include "fu-wac-common.h"
 
 guint32
@@ -76,14 +77,10 @@
 void
 fu_wac_buffer_dump (const gchar *title, guint8 cmd, const guint8 *buf, gsize sz)
 {
-	if (g_getenv ("FWUPD_WAC_VERBOSE") == NULL)
+	g_autofree gchar *tmp = NULL;
+	if (g_getenv ("FWUPD_WACOM_USB_VERBOSE") == NULL)
 		return;
-	g_print ("%s %s (%" G_GSIZE_FORMAT "):\n",
-		 title, fu_wac_report_id_to_string (cmd), sz);
-	for (gsize i = 0; i < sz; i++) {
-		g_print ("%02x ", buf[i]);
-		if (i > 0 && (i + 1) % 256 == 0)
-			g_print ("\n");
-	}
-	g_print ("\n");
+	tmp = g_strdup_printf ("%s %s (%" G_GSIZE_FORMAT ")",
+			       title, fu_wac_report_id_to_string (cmd), sz);
+	fu_common_dump_raw (G_LOG_DOMAIN, tmp, buf, sz);
 }
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-common.h fwupd-1.2.5/plugins/wacom-usb/fu-wac-common.h
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_HID_H
-#define __FU_WAC_HID_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -50,5 +49,3 @@
 							 gsize		 sz);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_HID_H */
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-device.c fwupd-1.2.5/plugins/wacom-usb/fu-wac-device.c
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -153,7 +153,8 @@
 	guint8 cmd = buf[0];
 
 	/* hit hardware */
-	fu_wac_buffer_dump ("GET", cmd, buf, bufsz);
+	if ((flags & FU_WAC_DEVICE_FEATURE_FLAG_NO_DEBUG) == 0)
+		fu_wac_buffer_dump ("GET", cmd, buf, bufsz);
 	if (!g_usb_device_control_transfer (usb_device,
 					    G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST,
 					    G_USB_DEVICE_REQUEST_TYPE_CLASS,
@@ -167,7 +168,8 @@
 		g_prefix_error (error, "Failed to get feature report: ");
 		return FALSE;
 	}
-	fu_wac_buffer_dump ("GE2", cmd, buf, sz);
+	if ((flags & FU_WAC_DEVICE_FEATURE_FLAG_NO_DEBUG) == 0)
+		fu_wac_buffer_dump ("GE2", cmd, buf, sz);
 
 	/* check packet */
 	if ((flags & FU_WAC_DEVICE_FEATURE_FLAG_ALLOW_TRUNC) == 0 && sz != bufsz) {
@@ -597,6 +599,13 @@
 		if (blob_block == NULL)
 			break;
 
+		/* ignore empty blocks */
+		if (dfu_utils_bytes_is_empty (blob_block)) {
+			g_debug ("empty block, ignoring");
+			fu_device_set_progress_full (device, blocks_done++, blocks_total);
+			continue;
+		}
+
 		/* erase entire block */
 		if (!fu_wac_device_erase_block (self, i, error))
 			return FALSE;
@@ -637,6 +646,7 @@
 		return FALSE;
 	for (guint16 i = 0; i < self->flash_descriptors->len; i++) {
 		FuWacFlashDescriptor *fd = g_ptr_array_index (self->flash_descriptors, i);
+		GBytes *blob_block;
 		guint32 csum_rom;
 
 		/* if page is protected */
@@ -644,8 +654,11 @@
 			continue;
 
 		/* no more written pages */
-		if (g_hash_table_lookup (fd_blobs, fd) == NULL)
-			break;
+		blob_block = g_hash_table_lookup (fd_blobs, fd);
+		if (blob_block == NULL)
+			continue;
+		if (dfu_utils_bytes_is_empty (blob_block))
+			continue;
 
 		/* check checksum matches */
 		csum_rom = g_array_index (self->checksums, guint32, i);
@@ -670,10 +683,7 @@
 
 	/* update progress */
 	fu_device_set_progress_full (device, blocks_total, blocks_total);
-
-	/* reboot, which switches the boot index of the firmware */
-	fu_device_set_status (device, FWUPD_STATUS_DEVICE_RESTART);
-	return fu_wac_device_update_reset (self, error);
+	return TRUE;
 }
 
 static gboolean
@@ -864,6 +874,7 @@
 	self->firmware_index = 0xffff;
 	fu_device_add_icon (FU_DEVICE (self), "input-tablet");
 	fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
+	fu_device_set_install_duration (FU_DEVICE (self), 10);
 }
 
 static void
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-device.h fwupd-1.2.5/plugins/wacom-usb/fu-wac-device.h
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_DEVICE_H
-#define __FU_WAC_DEVICE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -17,6 +16,7 @@
 typedef enum {
 	FU_WAC_DEVICE_FEATURE_FLAG_NONE			= 0,
 	FU_WAC_DEVICE_FEATURE_FLAG_ALLOW_TRUNC		= 1 << 0,
+	FU_WAC_DEVICE_FEATURE_FLAG_NO_DEBUG		= 1 << 1,
 	FU_WAC_DEVICE_FEATURE_FLAG_LAST
 } FuWacDeviceFeatureFlags;
 
@@ -35,5 +35,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_DEVICE_H */
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-firmware.h fwupd-1.2.5/plugins/wacom-usb/fu-wac-firmware.h
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-firmware.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-firmware.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_FIRMWARE_H
-#define __FU_WAC_FIRMWARE_H
+#pragma once
 
 #include <gio/gio.h>
 
@@ -19,5 +18,3 @@
 						 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_FIRMWARE_H */
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-module-bluetooth.c fwupd-1.2.5/plugins/wacom-usb/fu-wac-module-bluetooth.c
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-module-bluetooth.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-module-bluetooth.c	2019-02-25 09:42:18.000000000 +0000
@@ -39,8 +39,8 @@
 
 	/* find out what bits are set */
 	for (guint i = 0; i < 8; i++) {
-		c[i] = (*crc & 1 << i) > 0;
-		m[i] = (data & 1 << i) > 0;
+		c[i] = (*crc & (1 << i)) != 0;
+		m[i] = (data & (1 << i)) != 0;
 	}
 
 	/* do CRC on byte */
@@ -107,7 +107,6 @@
 static gboolean
 fu_wac_module_bluetooth_write_firmware (FuDevice *device, GBytes *blob, GError **error)
 {
-	FuWacDevice *parent = FU_WAC_DEVICE (fu_device_get_parent (device));
 	FuWacModule *self = FU_WAC_MODULE (device);
 	const guint8 *data;
 	gsize len = 0;
@@ -157,16 +156,14 @@
 
 	/* update progress */
 	fu_device_set_progress_full (device, blocks_total, blocks_total);
-
-	/* reboot */
-	fu_device_set_status (device, FWUPD_STATUS_DEVICE_RESTART);
-	return fu_wac_device_update_reset (parent, error);
+	return TRUE;
 }
 
 static void
 fu_wac_module_bluetooth_init (FuWacModuleBluetooth *self)
 {
 	fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
+	fu_device_set_install_duration (FU_DEVICE (self), 30);
 }
 
 static void
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-module-bluetooth.h fwupd-1.2.5/plugins/wacom-usb/fu-wac-module-bluetooth.h
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-module-bluetooth.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-module-bluetooth.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_MODULE_BLUETOOTH_H
-#define __FU_WAC_MODULE_BLUETOOTH_H
+#pragma once
 
 #include "fu-wac-module.h"
 
@@ -17,5 +16,3 @@
 FuWacModule	*fu_wac_module_bluetooth_new	(GUsbDevice	*usb_device);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_MODULE_BLUETOOTH_H */
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-module.c fwupd-1.2.5/plugins/wacom-usb/fu-wac-module.c
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-module.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-module.c	2019-02-25 09:42:18.000000000 +0000
@@ -15,21 +15,21 @@
 #include "dfu-common.h"
 #include "dfu-firmware.h"
 
-#define FU_WAC_MODLE_STATUS_OK				0
-#define FU_WAC_MODLE_STATUS_BUSY			1
-#define FU_WAC_MODLE_STATUS_ERR_CRC			2
-#define FU_WAC_MODLE_STATUS_ERR_CMD			3
-#define FU_WAC_MODLE_STATUS_ERR_HW_ACCESS_FAIL		4
-#define FU_WAC_MODLE_STATUS_ERR_FLASH_NO_SUPPORT	5
-#define FU_WAC_MODLE_STATUS_ERR_MODE_WRONG		6
-#define FU_WAC_MODLE_STATUS_ERR_MPU_NO_SUPPORT		7
-#define FU_WAC_MODLE_STATUS_ERR_VERSION_NO_SUPPORT	8
-#define FU_WAC_MODLE_STATUS_ERR_ERASE			9
-#define FU_WAC_MODLE_STATUS_ERR_WRITE			10
-#define FU_WAC_MODLE_STATUS_ERR_EXIT			11
-#define FU_WAC_MODLE_STATUS_ERR				12
-#define FU_WAC_MODLE_STATUS_ERR_INVALID_OP		13
-#define FU_WAC_MODLE_STATUS_ERR_WRONG_IMAGE		14
+#define FU_WAC_MODULE_STATUS_OK				0
+#define FU_WAC_MODULE_STATUS_BUSY			1
+#define FU_WAC_MODULE_STATUS_ERR_CRC			2
+#define FU_WAC_MODULE_STATUS_ERR_CMD			3
+#define FU_WAC_MODULE_STATUS_ERR_HW_ACCESS_FAIL		4
+#define FU_WAC_MODULE_STATUS_ERR_FLASH_NO_SUPPORT	5
+#define FU_WAC_MODULE_STATUS_ERR_MODE_WRONG		6
+#define FU_WAC_MODULE_STATUS_ERR_MPU_NO_SUPPORT		7
+#define FU_WAC_MODULE_STATUS_ERR_VERSION_NO_SUPPORT	8
+#define FU_WAC_MODULE_STATUS_ERR_ERASE			9
+#define FU_WAC_MODULE_STATUS_ERR_WRITE			10
+#define FU_WAC_MODULE_STATUS_ERR_EXIT			11
+#define FU_WAC_MODULE_STATUS_ERR			12
+#define FU_WAC_MODULE_STATUS_ERR_INVALID_OP		13
+#define FU_WAC_MODULE_STATUS_ERR_WRONG_IMAGE		14
 
 typedef struct {
 	GUsbDevice		*usb_device;
@@ -77,35 +77,35 @@
 static const gchar *
 fu_wac_module_status_to_string (guint8 status)
 {
-	if (status == FU_WAC_MODLE_STATUS_OK)
+	if (status == FU_WAC_MODULE_STATUS_OK)
 		return "ok";
-	if (status == FU_WAC_MODLE_STATUS_BUSY)
+	if (status == FU_WAC_MODULE_STATUS_BUSY)
 		return "busy";
-	if (status == FU_WAC_MODLE_STATUS_ERR_CRC)
+	if (status == FU_WAC_MODULE_STATUS_ERR_CRC)
 		return "err-crc";
-	if (status == FU_WAC_MODLE_STATUS_ERR_CMD)
+	if (status == FU_WAC_MODULE_STATUS_ERR_CMD)
 		return "err-cmd";
-	if (status == FU_WAC_MODLE_STATUS_ERR_HW_ACCESS_FAIL)
+	if (status == FU_WAC_MODULE_STATUS_ERR_HW_ACCESS_FAIL)
 		return "err-hw-access-fail";
-	if (status == FU_WAC_MODLE_STATUS_ERR_FLASH_NO_SUPPORT)
+	if (status == FU_WAC_MODULE_STATUS_ERR_FLASH_NO_SUPPORT)
 		return "err-flash-no-support";
-	if (status == FU_WAC_MODLE_STATUS_ERR_MODE_WRONG)
+	if (status == FU_WAC_MODULE_STATUS_ERR_MODE_WRONG)
 		return "err-mode-wrong";
-	if (status == FU_WAC_MODLE_STATUS_ERR_MPU_NO_SUPPORT)
+	if (status == FU_WAC_MODULE_STATUS_ERR_MPU_NO_SUPPORT)
 		return "err-mpu-no-support";
-	if (status == FU_WAC_MODLE_STATUS_ERR_VERSION_NO_SUPPORT)
+	if (status == FU_WAC_MODULE_STATUS_ERR_VERSION_NO_SUPPORT)
 		return "erro-version-no-support";
-	if (status == FU_WAC_MODLE_STATUS_ERR_ERASE)
+	if (status == FU_WAC_MODULE_STATUS_ERR_ERASE)
 		return "err-erase";
-	if (status == FU_WAC_MODLE_STATUS_ERR_WRITE)
+	if (status == FU_WAC_MODULE_STATUS_ERR_WRITE)
 		return "err-write";
-	if (status == FU_WAC_MODLE_STATUS_ERR_EXIT)
+	if (status == FU_WAC_MODULE_STATUS_ERR_EXIT)
 		return "err-exit";
-	if (status == FU_WAC_MODLE_STATUS_ERR)
+	if (status == FU_WAC_MODULE_STATUS_ERR)
 		return "err-err";
-	if (status == FU_WAC_MODLE_STATUS_ERR_INVALID_OP)
+	if (status == FU_WAC_MODULE_STATUS_ERR_INVALID_OP)
 		return "err-invalid-op";
-	if (status == FU_WAC_MODLE_STATUS_ERR_WRONG_IMAGE)
+	if (status == FU_WAC_MODULE_STATUS_ERR_WRONG_IMAGE)
 		return "err-wrong-image";
 	return NULL;
 }
@@ -134,7 +134,8 @@
 
 	/* get from hardware */
 	if (!fu_wac_device_get_feature_report (parent_device, buf, sizeof(buf),
-					       FU_WAC_DEVICE_FEATURE_FLAG_ALLOW_TRUNC,
+					       FU_WAC_DEVICE_FEATURE_FLAG_ALLOW_TRUNC |
+					       FU_WAC_DEVICE_FEATURE_FLAG_NO_DEBUG,
 					       error)) {
 		g_prefix_error (error, "failed to refresh status: ");
 		return FALSE;
@@ -151,13 +152,14 @@
 		return FALSE;
 	}
 
-	/* current phase */
-	priv->command = buf[2];
-	g_debug ("command: %s", fu_wac_module_command_to_string (priv->command));
-
-	/* current status */
-	priv->status = buf[3];
-	g_debug ("status: %s", fu_wac_module_status_to_string (priv->status));
+	/* current phase and status */
+	if (priv->command != buf[2] || priv->status != buf[3]) {
+		priv->command = buf[2];
+		priv->status = buf[3];
+		g_debug ("command: %s, status: %s",
+			 fu_wac_module_command_to_string (priv->command),
+			 fu_wac_module_status_to_string (priv->status));
+	}
 
 	/* success */
 	return TRUE;
@@ -212,7 +214,7 @@
 	}
 
 	/* send to hardware */
-	if (!fu_wac_device_set_feature_report (parent_device, buf, sizeof(buf),
+	if (!fu_wac_device_set_feature_report (parent_device, buf, len + 3,
 					       FU_WAC_DEVICE_FEATURE_FLAG_ALLOW_TRUNC,
 					       error)) {
 		g_prefix_error (error, "failed to set module feature: ");
@@ -228,21 +230,33 @@
 	for (guint i = 0; i < busy_poll_loops; i++) {
 		if (!fu_wac_module_refresh (self, error))
 			return FALSE;
-		if (priv->status == FU_WAC_MODLE_STATUS_BUSY) {
+		if (priv->status == FU_WAC_MODULE_STATUS_BUSY) {
 			g_usleep (10000); /* 10ms */
 			continue;
 		}
-		if (priv->status == FU_WAC_MODLE_STATUS_OK)
-			return TRUE;
+		if (priv->status == FU_WAC_MODULE_STATUS_OK)
+			break;
+		g_set_error (error,
+			     FWUPD_ERROR,
+			     FWUPD_ERROR_INTERNAL,
+			     "Failed to SetFeature: %s",
+			     fu_wac_module_status_to_string (priv->status));
+		return FALSE;
+	}
+
+	/* too many retries */
+	if (priv->status != FU_WAC_MODULE_STATUS_OK) {
+		g_set_error (error,
+			     FWUPD_ERROR,
+			     FWUPD_ERROR_INTERNAL,
+			     "Timed out after %u loops with status %s",
+			     busy_poll_loops,
+			     fu_wac_module_status_to_string (priv->status));
+		return FALSE;
 	}
 
-	/* the hardware never responded */
-	g_set_error (error,
-		     FWUPD_ERROR,
-		     FWUPD_ERROR_INTERNAL,
-		     "Failed to SetFeature: %s",
-		     fu_wac_module_status_to_string (priv->status));
-	return FALSE;
+	/* success */
+	return TRUE;
 }
 
 static void
@@ -311,7 +325,7 @@
 				 g_usb_device_get_vid (priv->usb_device),
 				 g_usb_device_get_pid (priv->usb_device),
 				 fu_wac_module_fw_type_to_string (priv->fw_type));
-	fu_device_add_guid (FU_DEVICE (self), devid);
+	fu_device_add_instance_id (FU_DEVICE (self), devid);
 
 	G_OBJECT_CLASS (fu_wac_module_parent_class)->constructed (object);
 }
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-module.h fwupd-1.2.5/plugins/wacom-usb/fu-wac-module.h
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-module.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-module.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_MODULE_H
-#define __FU_WAC_MODULE_H
+#pragma once
 
 #include "fu-plugin.h"
 
@@ -35,5 +34,3 @@
 						 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_MODULE_H */
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-module-touch.c fwupd-1.2.5/plugins/wacom-usb/fu-wac-module-touch.c
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-module-touch.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-module-touch.c	2019-02-25 09:42:18.000000000 +0000
@@ -12,6 +12,7 @@
 #include "fu-wac-module-touch.h"
 
 #include "fu-chunk.h"
+#include "dfu-firmware.h"
 
 struct _FuWacModuleTouch
 {
@@ -23,26 +24,53 @@
 static gboolean
 fu_wac_module_touch_write_firmware (FuDevice *device, GBytes *blob, GError **error)
 {
-	FuWacDevice *parent = FU_WAC_DEVICE (fu_device_get_parent (device));
+	DfuElement *element;
+	DfuImage *image;
 	FuWacModule *self = FU_WAC_MODULE (device);
-	const guint8 *data;
 	gsize blocks_total = 0;
-	gsize len = 0;
 	g_autoptr(GPtrArray) chunks = NULL;
+	g_autoptr(DfuFirmware) firmware = dfu_firmware_new ();
 
-	/* build each data packet */
-	data = g_bytes_get_data (blob, &len);
-	if (len % 128 != 0) {
+	/* load .hex file */
+	if (!dfu_firmware_parse_data (firmware, blob, DFU_FIRMWARE_PARSE_FLAG_NONE, error))
+		return FALSE;
+
+	/* check type */
+	if (dfu_firmware_get_format (firmware) != DFU_FIRMWARE_FORMAT_INTEL_HEX) {
+		g_set_error (error,
+			     FWUPD_ERROR,
+			     FWUPD_ERROR_INTERNAL,
+			     "expected firmware format is 'ihex', got '%s'",
+			     dfu_firmware_format_to_string (dfu_firmware_get_format (firmware)));
+		return FALSE;
+	}
+
+	/* use the correct image from the firmware */
+	image = dfu_firmware_get_image (firmware, 0);
+	if (image == NULL) {
+		g_set_error_literal (error,
+				     FWUPD_ERROR,
+				     FWUPD_ERROR_INTERNAL,
+				     "no firmware image");
+		return FALSE;
+	}
+	element = dfu_image_get_element_default (image);
+	if (element == NULL) {
 		g_set_error_literal (error,
 				     FWUPD_ERROR,
 				     FWUPD_ERROR_INTERNAL,
-				     "firmware has to be padded to 128b");
+				     "no firmware element");
 		return FALSE;
 	}
-	chunks = fu_chunk_array_new (data, (guint32) len,
-				     0x0, /* addr_start */
-				     0x0, /* page_sz */
-				     128); /* packet_sz */
+	g_debug ("using element at addr 0x%0x",
+		 (guint) dfu_element_get_address (element));
+	blob = dfu_element_get_contents (element);
+
+	/* build each data packet */
+	chunks = fu_chunk_array_new_from_bytes (blob,
+						dfu_element_get_address (element),
+						0x0, /* page_sz */
+						128); /* packet_sz */
 	blocks_total = chunks->len + 2;
 
 	/* start, which will erase the module */
@@ -57,19 +85,22 @@
 	fu_device_set_status (device, FWUPD_STATUS_DEVICE_WRITE);
 	for (guint i = 0; i < chunks->len; i++) {
 		FuChunk *chk = g_ptr_array_index (chunks, i);
-		guint8 buf[128+7];
+		guint8 buf[128+7] = { 0xff };
 		g_autoptr(GBytes) blob_chunk = NULL;
 
 		/* build G11T data packet */
 		memset (buf, 0xff, sizeof(buf));
 		buf[0] = 0x01; /* writing */
-		fu_common_write_uint32 (&buf[1], chk->address, G_LITTLE_ENDIAN);
-		buf[5] = chk->idx;
-		memcpy (&buf[6], chk->data, chk->data_sz);
+		buf[1] = chk->idx + 1;
+		fu_common_write_uint32 (&buf[2], chk->address, G_LITTLE_ENDIAN);
+		buf[6] = 0x10; /* no idea! */
+		memcpy (&buf[7], chk->data, chk->data_sz);
 		blob_chunk = g_bytes_new (buf, sizeof(buf));
 		if (!fu_wac_module_set_feature (self, FU_WAC_MODULE_COMMAND_DATA,
-						blob_chunk, error))
+						blob_chunk, error)) {
+			g_prefix_error (error, "failed to write block %u: ", chk->idx);
 			return FALSE;
+		}
 
 		/* update progress */
 		fu_device_set_progress_full (device, i + 1, blocks_total);
@@ -81,16 +112,14 @@
 
 	/* update progress */
 	fu_device_set_progress_full (device, blocks_total, blocks_total);
-
-	/* reboot */
-	fu_device_set_status (device, FWUPD_STATUS_DEVICE_RESTART);
-	return fu_wac_device_update_reset (parent, error);
+	return TRUE;
 }
 
 static void
 fu_wac_module_touch_init (FuWacModuleTouch *self)
 {
 	fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
+	fu_device_set_install_duration (FU_DEVICE (self), 30);
 }
 
 static void
diff -Nru fwupd-1.2.4/plugins/wacom-usb/fu-wac-module-touch.h fwupd-1.2.5/plugins/wacom-usb/fu-wac-module-touch.h
--- fwupd-1.2.4/plugins/wacom-usb/fu-wac-module-touch.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/fu-wac-module-touch.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_WAC_MODULE_TOUCH_H
-#define __FU_WAC_MODULE_TOUCH_H
+#pragma once
 
 #include "fu-wac-module.h"
 
@@ -17,5 +16,3 @@
 FuWacModule	*fu_wac_module_touch_new	(GUsbDevice	*usb_device);
 
 G_END_DECLS
-
-#endif /* __FU_WAC_MODULE_TOUCH_H */
diff -Nru fwupd-1.2.4/plugins/wacom-usb/meson.build fwupd-1.2.5/plugins/wacom-usb/meson.build
--- fwupd-1.2.4/plugins/wacom-usb/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/plugins/wacom-usb/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -38,6 +38,7 @@
   cargs += '-DTESTDATADIR="' + testdatadir + '"'
   e = executable(
     'wacom-usb-self-test',
+    fu_hash,
     sources : [
       'fu-self-test.c',
       'fu-wac-common.c',
diff -Nru fwupd-1.2.4/po/ca.po fwupd-1.2.5/po/ca.po
--- fwupd-1.2.4/po/ca.po	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/po/ca.po	2019-02-25 09:42:18.000000000 +0000
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the fwupd package.
 #
 # Translators:
-# Antoni Bella Pérez <antonibella5@yahoo.com>, 2017-2018
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2017-2019
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
 msgid ""
 msgstr ""
@@ -85,6 +85,10 @@
 msgid "An update requires a reboot to complete."
 msgstr "Una actualització requereix un reinici per a completar-se."
 
+#. TRANSLATORS: explain why we want to shutdown
+msgid "An update requires the system to shutdown to complete."
+msgstr "Una actualització requereix que s'aturi el sistema per a finalitzar."
+
 #. TRANSLATORS: command line option
 msgid "Answer yes to all questions"
 msgstr "Respon sí a totes les preguntes"
@@ -813,6 +817,10 @@
 msgid "Show the information of firmware update status"
 msgstr "Mostra la informació sobre l'estat de l'actualització del microprogramari"
 
+#. TRANSLATORS: shutdown to apply the update
+msgid "Shutdown now?"
+msgstr "Aturar-lo ara?"
+
 msgid "Specify Vendor/Product ID(s) of DFU device"
 msgstr "Especifiqueu el proveïdor/ID del producte del dispositiu DFU"
 
@@ -915,6 +923,10 @@
 msgid "Update Version"
 msgstr "Versió de l'actualització"
 
+#. TRANSLATORS: command description
+msgid "Update all devices that match local metadata"
+msgstr "Actualitza tots els dispositius que coincideixin amb les metadades locals"
+
 #. TRANSLATORS: the server sent the user a small message
 msgid "Update failure is a known issue, visit this URL for more information:"
 msgstr "Que falli en actualitzar és un problema conegut, visiteu aquest URL per obtenir més informació:"
diff -Nru fwupd-1.2.4/po/eo.po fwupd-1.2.5/po/eo.po
--- fwupd-1.2.4/po/eo.po	1970-01-01 00:00:00.000000000 +0000
+++ fwupd-1.2.5/po/eo.po	2019-02-25 09:42:18.000000000 +0000
@@ -0,0 +1,94 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the fwupd package.
+#
+# Translators:
+# kristjan <kristjan.schmidt@googlemail.com>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: fwupd\n"
+"Report-Msgid-Bugs-To: \n"
+"Language-Team: Esperanto (http://www.transifex.com/freedesktop/fwupd/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANSLATORS: duration in seconds
+#, c-format
+msgid "%u second"
+msgid_plural "%u seconds"
+msgstr[0] "%u sekundo"
+msgstr[1] "%u sekundoj"
+
+#. TRANSLATORS: this is when a device is hotplugged
+msgid "Added"
+msgstr "Aldonita"
+
+#. TRANSLATORS: this is to abort the interactive prompt
+msgid "Cancel"
+msgstr "Nuligi"
+
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Nuligita"
+
+#. TRANSLATORS: this is when a device is hotplugged
+#. TRANSLATORS: this is when the daemon state changes
+msgid "Changed"
+msgstr "Ŝanĝita"
+
+#. TRANSLATORS: get interactive prompt
+msgid "Choose a device:"
+msgstr "Elektu aparaton:"
+
+#. TRANSLATORS: section header for firmware description
+msgid "Description"
+msgstr "Priskribo"
+
+msgid "Done!"
+msgstr "Farita!"
+
+#. TRANSLATORS: detected a DFU device
+msgid "Found"
+msgstr "Trovita"
+
+#. TRANSLATORS: Appstream ID for the hardware type
+msgid "ID"
+msgstr "ID"
+
+msgid "Mode"
+msgstr "Reĝimo"
+
+#. TRANSLATORS: interface name, e.g. "Flash"
+#. TRANSLATORS: device name, e.g. 'ColorHug2'
+#. TRANSLATORS: section header for the release name
+msgid "Name"
+msgstr "Nomo"
+
+msgid "OK"
+msgstr "Bone"
+
+#. TRANSLATORS: DFU protocol version, e.g. 1.1
+msgid "Protocol"
+msgstr "Protokolo"
+
+#. TRANSLATORS: these are areas of memory on the chip
+msgid "Region"
+msgstr "Regiono"
+
+#. TRANSLATORS: this is when a device is hotplugged
+msgid "Removed"
+msgstr "Forigita"
+
+msgid "Target"
+msgstr "Celo"
+
+#. TRANSLATORS: currect daemon status is unknown
+msgid "Unknown"
+msgstr "Nekonata"
+
+#. TRANSLATORS: section header for release version number
+msgid "Version"
+msgstr "Versio"
diff -Nru fwupd-1.2.4/po/fi.po fwupd-1.2.5/po/fi.po
--- fwupd-1.2.4/po/fi.po	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/po/fi.po	2019-02-25 09:42:18.000000000 +0000
@@ -4,6 +4,7 @@
 #
 # Translators:
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2017-2018
+# Kimmo Kujansuu <mrkujansuu@gmail.com>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: fwupd\n"
@@ -19,11 +20,41 @@
 msgid "Added"
 msgstr "Lisätty"
 
+#. TRANSLATORS: this is a command alias, e.g. 'get-devices'
+#, c-format
+msgid "Alias to %s"
+msgstr "Peitenimi %s"
+
+#. TRANSLATORS: command description
+msgid "Apply a binary patch"
+msgstr "Käytä binääristä korjaustiedostoa"
+
+#. TRANSLATORS: command description
+msgid "Attach DFU capable device back to runtime"
+msgstr "Kiinnitä DFU-kykyinen laite takaisin ajoon"
+
+#. TRANSLATORS: device attributes, i.e. things that
+#. * the device can do
+msgid "Attributes"
+msgstr "Määritteet"
+
 #. TRANSLATORS: waiting for user to authenticate
 msgid "Authenticating…"
 msgstr "Tunnistaudutaan…"
 
 #. TRANSLATORS: this is the PolicyKit modal dialog
+msgid "Authentication is required to downgrade the firmware on a removable device"
+msgstr "Todennus on tarpeen, jotta firmware voidaan alentaa siirrettävällä laitteelta"
+
+#. TRANSLATORS: this is the PolicyKit modal dialog
+msgid "Authentication is required to downgrade the firmware on this machine"
+msgstr "Todennus on tarpeen tämän laitteen firmwaren alentamiseksi"
+
+#. TRANSLATORS: this is the PolicyKit modal dialog
+msgid "Authentication is required to modify a configured remote used for firmware updates"
+msgstr "Todennusta tarvitaan firmware-päivityksiin käytettävän konfiguroidun etä-ohjaimen muokkaamisessa"
+
+#. TRANSLATORS: this is the PolicyKit modal dialog
 msgid "Authentication is required to unlock a device"
 msgstr "Laitteen lukituksen avaaminen vaatii tunnistautumisen"
 
@@ -35,6 +66,10 @@
 msgid "Authentication is required to update the firmware on this machine"
 msgstr "Tämän laitteen firmwaren päivittäminen vaatii tunnistautumisen"
 
+#. TRANSLATORS: this is the PolicyKit modal dialog
+msgid "Authentication is required to update the stored checksums for the device"
+msgstr "Todennus edellyttää laitteen tallennettujen tarkistussummien päivittämistä"
+
 #. TRANSLATORS: this is when a device ctrl+c's a watch
 msgid "Cancelled"
 msgstr "Peruttu"
@@ -49,6 +84,10 @@
 msgid "Checksum"
 msgstr "Tarkistussumma"
 
+#. TRANSLATORS: chip ID, e.g. "0x58200204"
+msgid "Chip ID"
+msgstr "Chip-tunnus"
+
 #. TRANSLATORS: get interactive prompt
 msgid "Choose a device:"
 msgstr "Valitse laite:"
@@ -57,10 +96,29 @@
 msgid "Choose a release:"
 msgstr "Valitse julkaisu:"
 
+#. TRANSLATORS: this is the encryption method used when writing
+msgid "Cipher"
+msgstr "Salaus"
+
 #. TRANSLATORS: error message
 msgid "Command not found"
 msgstr "Komentoa ei löytynyt"
 
+#. TRANSLATORS: command description
+msgid "Convert firmware to DFU format"
+msgstr "Muunna firmware DFU-muotoon"
+
+#. TRANSLATORS: command description
+msgid "Create a binary patch using two files"
+msgstr "Luo binäärinen korjaustiedosto käyttäen kahta tiedostoa"
+
+msgid "DFU"
+msgstr "DFU"
+
+#. TRANSLATORS: DFU stands for device firmware update
+msgid "DFU Utility"
+msgstr "DFU-apuohjelma"
+
 #. TRANSLATORS: for the --verbose arg
 msgid "Debugging Options"
 msgstr "Vianjäljitysvalinnat"
@@ -69,10 +127,18 @@
 msgid "Decompressing…"
 msgstr "Puretaan…"
 
+#. TRANSLATORS: command description
+msgid "Decrypt firmware data"
+msgstr "Pura firmwaren data"
+
 #. TRANSLATORS: section header for firmware description
 msgid "Description"
 msgstr "Kuvaus"
 
+#. TRANSLATORS: command description
+msgid "Detach currently attached DFU capable device"
+msgstr "Irrota tällä hetkellä liitetty DFU-laite"
+
 #. TRANSLATORS: this is when a device is hotplugged
 msgid "Device added:"
 msgstr "Laite lisätty:"
@@ -85,6 +151,10 @@
 msgid "Device removed:"
 msgstr "Laite poistettu:"
 
+#. TRANSLATORS: command line option
+msgid "Display version"
+msgstr "Näytä versio"
+
 msgid "Done!"
 msgstr "Valmis!"
 
@@ -92,6 +162,21 @@
 msgid "Downloading…"
 msgstr "Ladataan…"
 
+#. TRANSLATORS: command description
+msgid "Dump details about a firmware file"
+msgstr "Tyhjennä laiteohjelmiston tiedot"
+
+#. TRANSLATORS: command description
+msgid "Dump information about a binary patch to the screen"
+msgstr "Tulosta tiedot binäärisestä korjaustiedostosta näytölle"
+
+msgid "Enabling this functionality is done at your own risk, which means you have to contact your original equipment manufacturer regarding any problems caused by these updates. Only problems with the update process itself should be filed at $OS_RELEASE:BUG_REPORT_URL$."
+msgstr "Tämän toiminnon käyttöönotto tapahtuu omalla vastuullasi, joten sinun on otettava yhteyttä alkuperäiseen laitevalmistajaan näiden päivitysten aiheuttamista ongelmista. Vain päivitysprosessiin liittyvät ongelmat pitäisi jättää osoitteeseen $OS_RELEASE:BUG_REPORT_URL$."
+
+#. TRANSLATORS: command description
+msgid "Encrypt firmware data"
+msgstr "Salaa firmwaren data"
+
 #. TRANSLATORS: erasing contents of the flash chips
 msgid "Erasing…"
 msgstr "Poistetaan…"
@@ -100,6 +185,14 @@
 msgid "Exit after a small delay"
 msgstr "Poistu pienen viiveen jälkeen"
 
+#. TRANSLATORS: quirks are device-specific workarounds
+msgid "Failed to load quirks"
+msgstr "Quirksin lataaminen epäonnistui"
+
+#. TRANSLATORS: the user didn't read the man page
+msgid "Failed to parse arguments"
+msgstr "Argumenttien jäsentäminen epäonnistui"
+
 #. TRANSLATORS: downloading unknown file
 msgid "Fetching file"
 msgstr "Noudetaan tiedosto"
@@ -124,18 +217,64 @@
 msgid "Firmware Utility"
 msgstr "Firmware-työkalu"
 
+msgid "Force the action ignoring all warnings"
+msgstr "Pakota toimenpide huomioimatta kaikki varoitukset"
+
+#. TRANSLATORS: detected a DFU device
+msgid "Found"
+msgstr "Löydetty"
+
+#. TRANSLATORS: Appstream ID for the hardware type
+msgid "ID"
+msgstr "Henkilöllisyys"
+
 #. TRANSLATORS: daemon is inactive
 msgid "Idle…"
 msgstr "Jouten…"
 
+msgid "Install old version of system firmware"
+msgstr "Asenna vanha firmware versio"
+
+msgid "Install signed device firmware"
+msgstr "Asenna allekirjoitettu laitteen firmware"
+
+msgid "Install signed system firmware"
+msgstr "Asenna allekirjoitettu järjestelmän firmware"
+
+msgid "Install unsigned device firmware"
+msgstr "Asenna allekirjoittamattoman laitteen firmware"
+
+msgid "Install unsigned system firmware"
+msgstr "Asenna allekirjoittamaton järjestelmän firmware"
+
 #. TRANSLATORS: this is shown when updating the firmware after the reboot
 msgid "Installing firmware update…"
 msgstr "Asennetaan firmware-päivitystä…"
 
+msgid "Linux Vendor Firmware Service (stable firmware)"
+msgstr "Linux-toimittajan laiteohjelmisto (vakaa firmware)"
+
+msgid "Linux Vendor Firmware Service (testing firmware)"
+msgstr "Linux-toimittajan laiteohjelmisto (firmware testaus)"
+
+#. TRANSLATORS: command description
+msgid "List currently attached DFU capable devices"
+msgstr "Luettelo tällä hetkellä liitetyistä DFU-laitteista"
+
 #. TRANSLATORS: parsing the firmware information
 msgid "Loading…"
 msgstr "Ladataan…"
 
+#. TRANSLATORS: command description
+msgid "Merge multiple firmware files into one"
+msgstr "Yhdistä useita firmware-tiedostoja yhteen"
+
+msgid "Mode"
+msgstr "Malli"
+
+msgid "Modify a configured remote"
+msgstr "Muokkaa määritettyä etänä"
+
 #. TRANSLATORS: interface name, e.g. "Flash"
 #. TRANSLATORS: device name, e.g. 'ColorHug2'
 #. TRANSLATORS: section header for the release name
@@ -149,26 +288,138 @@
 msgid "Password"
 msgstr "Salasana"
 
+msgid "Permission denied"
+msgstr "Lupa kielletty"
+
+msgid "Print the version number"
+msgstr "Tulosta versionumero"
+
+msgid "Print verbose debug statements"
+msgstr "Tulosta virheelliset virheilmoitukset"
+
+#. TRANSLATORS: DFU protocol version, e.g. 1.1
+msgid "Protocol"
+msgstr "Protokolla"
+
+#. TRANSLATORS: device quirks, i.e. things that
+#. * it does that we have to work around
+msgid "Quirks"
+msgstr "Merkintä"
+
+#. TRANSLATORS: command description
+msgid "Read firmware from device into a file"
+msgstr "Lue firmware laitteesta tiedostoon"
+
+#. TRANSLATORS: command description
+msgid "Read firmware from one partition into a file"
+msgstr "Lue firmware osiolta tiedostoon"
+
 #. TRANSLATORS: reading from the flash chips
 msgid "Reading…"
 msgstr "Luetaan…"
 
+#. TRANSLATORS: these are areas of memory on the chip
+msgid "Region"
+msgstr "Alue"
+
 #. TRANSLATORS: this is when a device is hotplugged
 msgid "Removed"
 msgstr "Poistettu"
 
+#. TRANSLATORS: command description
+msgid "Replace data in an existing firmware file"
+msgstr "Vaihda tiedot olemassa olevaan firmware-tiedostoon"
+
+#. TRANSLATORS: command description
+msgid "Reset a DFU device"
+msgstr "Nollaa DFU-laite"
+
 #. TRANSLATORS: restarting the device to pick up new F/W
 msgid "Restarting device…"
 msgstr "Käynnistetään laite uudelleen…"
 
+msgid "Runtime"
+msgstr "Käyttöaika"
+
 #. TRANSLATORS: scheduing an update to be done on the next boot
 msgid "Scheduling…"
 msgstr "Ajoitetaan…"
 
+#. TRANSLATORS: serial number, e.g. '00012345'
+msgid "Serial"
+msgstr "Sarjanumero"
+
+#. TRANSLATORS: command description
+msgid "Set alternative name on firmware file"
+msgstr "Aseta vaihtoehtoinen nimi firmware-tiedostolle"
+
+#. TRANSLATORS: command description
+msgid "Set alternative number on firmware file"
+msgstr "Aseta vaihtoehtoinen numero firmware-tiedostolle"
+
+#. TRANSLATORS: command description
+msgid "Set element address on firmware file"
+msgstr "Aseta elementin osoite firmware tiedostoon"
+
+#. TRANSLATORS: command description
+msgid "Set product ID on firmware file"
+msgstr "Aseta tuotetunnus firmware tiedostoon"
+
+#. TRANSLATORS: command description
+msgid "Set release version on firmware file"
+msgstr "Aseta julkaisuversio firmware-tiedostosta"
+
+#. TRANSLATORS: command description
+msgid "Set the firmware size for the target"
+msgstr "Määritä firmwaren kohteen koko"
+
+#. TRANSLATORS: command description
+msgid "Set vendor ID on firmware file"
+msgstr "Aseta toimittajan tunnus firmware tiedostoon"
+
+#. TRANSLATORS: command description
+msgid "Sets metadata on a firmware file"
+msgstr "Asetta metatiedot firmware -tiedostoon"
+
 #. TRANSLATORS: for the --verbose arg
 msgid "Show debugging options"
 msgstr "Näytä vianjäljitysvalinnat"
 
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Näytä ylimääräiset virheenkorjaustiedot"
+
+#. TRANSLATORS: command line option
+msgid "Show the debug log from the last attempted update"
+msgstr "Näytä virheenkorjausloki viimeisestä päivitysyrityksestä"
+
+msgid "Specify Vendor/Product ID(s) of DFU device"
+msgstr "Määritä DFU laitteen toimittaja/tuotetunnus(s)"
+
+msgid "Specify the number of bytes per USB transfer"
+msgstr "Määritä tavujen määrä USB-siirtoa kohti"
+
+#. TRANSLATORS: device state, i.e. appIDLE
+msgid "State"
+msgstr "Osavaltio"
+
+#. TRANSLATORS: probably not run as root...
+#. TRANSLATORS: device has failed to report status
+#. TRANSLATORS: device status, e.g. "OK"
+msgid "Status"
+msgstr "Tila"
+
+#. TRANSLATORS: do not translate the variables marked using $
+msgid "The LVFS is a free service that operates as an independent legal entity and has no connection with $OS_RELEASE:NAME$. Your distributor may not have verified any of the firmware updates for compatibility with your system or connected devices. All firmware is provided only by the original equipment manufacturer."
+msgstr "LVFS on ilmainen palvelu, joka toimii itsenäisenä oikeushenkilönä eikä sillä ole yhteyttä $OS_RELEASE:NAME$. Jakelijasi ei ehkä ole tarkistanut mitään laiteohjelmistopäivityksiä, jotka ovat yhteensopivia järjestelmän tai liitettyjen laitteiden kanssa. Kaikki laiteohjelmistot on tarkoitettu vain alkuperäisen laitteen valmistajalle."
+
+msgid "This remote contains firmware which is not embargoed, but is still being tested by the hardware vendor. You should ensure you have a way to manually downgrade the firmware if the firmware update fails."
+msgstr "Tämä sisältää firmwaren, jota ei ole vientikiellossa, mutta jota laitteistotoimittaja testaa edelleen. Varmista, että voit päivittää firmwaren manuaalisesti, jos päivitys epäonnistuu."
+
+#. TRANSLATORS: transfer size in bytes
+msgid "Transfer Size"
+msgstr "Siirron koko"
+
 #. TRANSLATORS: remote type, e.g. remote or local
 msgid "Type"
 msgstr "Tyyppi"
@@ -177,6 +428,12 @@
 msgid "Unknown"
 msgstr "Tuntematon"
 
+msgid "Unlock the device to allow access"
+msgstr "Sallia pääsy laitteeseen"
+
+msgid "Update the stored device verification information"
+msgstr "Päivitä laitteen tallennetut vahvistustiedot"
+
 #. TRANSLATORS: remote filename base
 msgid "Username"
 msgstr "Käyttäjätunnus"
@@ -193,6 +450,18 @@
 msgid "Waiting…"
 msgstr "Odotetaan…"
 
+#. TRANSLATORS: command description
+msgid "Watch DFU devices being hotplugged"
+msgstr "Katso, että DFU-laitteet on kytketty"
+
+#. TRANSLATORS: command description
+msgid "Write firmware from file into device"
+msgstr "Kirjoita firmware tiedostosta laitteeseen"
+
+#. TRANSLATORS: command description
+msgid "Write firmware from file into one partition"
+msgstr "Kirjoita firmware tiedostosta osioon"
+
 #. TRANSLATORS: writing to the flash chips
 msgid "Writing…"
 msgstr "Kirjoitetaan…"
diff -Nru fwupd-1.2.4/po/LINGUAS fwupd-1.2.5/po/LINGUAS
--- fwupd-1.2.4/po/LINGUAS	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/po/LINGUAS	2019-02-25 09:42:18.000000000 +0000
@@ -4,6 +4,7 @@
 cs
 de
 en_GB
+eo
 eu
 fi
 fr
diff -Nru fwupd-1.2.4/po/pt_BR.po fwupd-1.2.5/po/pt_BR.po
--- fwupd-1.2.4/po/pt_BR.po	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/po/pt_BR.po	2019-02-25 09:42:18.000000000 +0000
@@ -7,7 +7,7 @@
 # Derek W. Stavis <dekestavis@gmail.com>, 2016
 # Derek W. Stavis <dekestavis@gmail.com>, 2015-2016
 # Rafael Fontenelle <rafaelff@gnome.org>, 2017-2018
-# Rafael Fontenelle <rffontenelle@gmail.com>, 2015-2018
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2015-2019
 msgid ""
 msgstr ""
 "Project-Id-Version: fwupd\n"
@@ -88,6 +88,10 @@
 msgid "An update requires a reboot to complete."
 msgstr "Uma atualização requer uma reinicialização para completar."
 
+#. TRANSLATORS: explain why we want to shutdown
+msgid "An update requires the system to shutdown to complete."
+msgstr "Uma atualização requer que o sistema seja desligado por completo."
+
 #. TRANSLATORS: command line option
 msgid "Answer yes to all questions"
 msgstr "Responde sim para todas as perguntas"
@@ -816,6 +820,10 @@
 msgid "Show the information of firmware update status"
 msgstr "Mostra as informações do status de atualização de firmware"
 
+#. TRANSLATORS: shutdown to apply the update
+msgid "Shutdown now?"
+msgstr "Desligar agora?"
+
 msgid "Specify Vendor/Product ID(s) of DFU device"
 msgstr "Especifica ID(s) de Fornecedor/Produto de dispositivo DFU"
 
@@ -918,6 +926,10 @@
 msgid "Update Version"
 msgstr "Versão da atualização"
 
+#. TRANSLATORS: command description
+msgid "Update all devices that match local metadata"
+msgstr "Atualiza todos os dispositivos que correspondem aos metadados locais"
+
 #. TRANSLATORS: the server sent the user a small message
 msgid "Update failure is a known issue, visit this URL for more information:"
 msgstr "A falha de atualização é um problema conhecido, visite essa URL para mais informações:"
diff -Nru fwupd-1.2.4/README.md fwupd-1.2.5/README.md
--- fwupd-1.2.4/README.md	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/README.md	2019-02-25 09:42:18.000000000 +0000
@@ -87,7 +87,7 @@
  a new fwupd backend has been implemented in KDE Discover for firmware updates.
  These firmware updates are shown with other system updates.
 
-3. [Wyse Cloud Client Manager (CCM)](http://www.dell.com/us/business/p/wyse-cloud-client-manager/pd)
- A software suite available on Dell IoT gateways with built-in fwupd support.
+3. [Wyse Management Suite](https://www.dell.com/en-us/work/shop/wyse-endpoints-and-software/wyse-management-suite/spd/wyse-wms)
+ A software suite available on Dell IoT gateways and Wyse thin clients with built-in fwupd support.
  The remote administration interface can be used to download and deploy firmware
  updates.
diff -Nru fwupd-1.2.4/RELEASE fwupd-1.2.5/RELEASE
--- fwupd-1.2.4/RELEASE	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/RELEASE	2019-02-25 09:42:18.000000000 +0000
@@ -2,7 +2,7 @@
 
 Write release entries:
 
-git log --format="%s" --cherry-pick --right-only 1.2.3... | grep -i -v trivial | grep -v Merge | sort | uniq
+git log --format="%s" --cherry-pick --right-only 1.2.4... | grep -i -v trivial | grep -v Merge | sort | uniq
 Add any user visible changes into ../data/org.freedesktop.fwupd.metainfo.xml
 appstream-util appdata-to-news ../data/org.freedesktop.fwupd.metainfo.xml > NEWS
 
@@ -17,7 +17,7 @@
 2. Commit changes to git:
 
 # MAKE SURE THIS IS CORRECT
-export release_ver="1.2.4"
+export release_ver="1.2.5"
 
 git commit -a -m "Release fwupd ${release_ver}"
 git tag -s -f -m "Release fwupd ${release_ver}" "${release_ver}"
diff -Nru fwupd-1.2.4/src/fu-archive.h fwupd-1.2.5/src/fu-archive.h
--- fwupd-1.2.4/src/fu-archive.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-archive.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_ARCHIVE_H
-#define __FU_ARCHIVE_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -54,5 +53,3 @@
 						 gpointer		user_data);
 
 G_END_DECLS
-
-#endif /* __FU_ARCHIVE_H */
diff -Nru fwupd-1.2.4/src/fu-chunk.h fwupd-1.2.5/src/fu-chunk.h
--- fwupd-1.2.4/src/fu-chunk.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-chunk.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_CHUNK_H
-#define __FU_CHUNK_H
+#pragma once
 
 #include <glib.h>
 #include <gusb.h>
@@ -39,5 +38,3 @@
 							 guint32	 packet_sz);
 
 G_END_DECLS
-
-#endif /* __FU_CHUNK_H */
diff -Nru fwupd-1.2.4/src/fu-common-cab.c fwupd-1.2.5/src/fu-common-cab.c
--- fwupd-1.2.4/src/fu-common-cab.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-common-cab.c	2019-02-25 09:42:18.000000000 +0000
@@ -33,7 +33,7 @@
 		g_autoptr(GSList) files = gcab_folder_get_files (cabfolder);
 		for (GSList *l = files; l != NULL; l = l->next) {
 			GCabFile *cabfile = GCAB_FILE (l->data);
-			if (g_strcmp0 (gcab_file_get_name (cabfile), basename) == 0)
+			if (g_strcmp0 (gcab_file_get_extract_name (cabfile), basename) == 0)
 				return cabfile;
 		}
 #endif
diff -Nru fwupd-1.2.4/src/fu-common-cab.h fwupd-1.2.5/src/fu-common-cab.h
--- fwupd-1.2.4/src/fu-common-cab.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-common-cab.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_COMMON_CAB_H
-#define __FU_COMMON_CAB_H
+#pragma once
 
 #include <xmlb.h>
 
+G_BEGIN_DECLS
+
 XbSilo		*fu_common_cab_build_silo		(GBytes		*blob,
 							 guint64	 size_max,
 							 GError		**error);
 
-#endif /* __FU_COMMON_CAB_H */
+G_END_DECLS
diff -Nru fwupd-1.2.4/src/fu-common-guid.c fwupd-1.2.5/src/fu-common-guid.c
--- fwupd-1.2.4/src/fu-common-guid.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-common-guid.c	2019-02-25 09:42:18.000000000 +0000
@@ -8,126 +8,28 @@
 
 #include <config.h>
 
-#include <string.h>
-#include <uuid.h>
-
-#include "fwupd-error.h"
-
 #include "fu-common-guid.h"
 
 /**
- * fu_common_guid_from_data:
- * @namespace_id: A namespace ID, e.g. "6ba7b810-9dad-11d1-80b4-00c04fd430c8"
- * @data: data to hash
- * @data_len: length of @data
- * @error: A #GError or %NULL
+ * fu_common_guid_is_plausible:
+ * @buf: a buffer of data
  *
- * Returns a GUID for some data. This uses a hash and so even small
- * differences in the @data will produce radically different return values.
+ * Checks whether a chunk of memory looks like it could be a GUID.
  *
- * The implementation is taken from RFC4122, Section 4.1.3; specifically
- * using a type-5 SHA-1 hash.
+ * Returns: TRUE if it looks like a GUID, FALSE if not
  *
- * Returns: A new GUID, or %NULL if the namespace_id was invalid
- *
- * Since: 1.2.0
- **/
-gchar *
-fu_common_guid_from_data (const gchar *namespace_id,
-			  const guint8 *data,
-			  gsize data_len,
-			  GError **error)
-{
-	gchar guid_new[37]; /* 36 plus NUL */
-	gsize digestlen = 20;
-	guint8 hash[20];
-	gint rc;
-	uuid_t uu_namespace;
-	uuid_t uu_new;
-	g_autoptr(GChecksum) csum = NULL;
-
-	g_return_val_if_fail (namespace_id != NULL, NULL);
-	g_return_val_if_fail (data != NULL, NULL);
-	g_return_val_if_fail (data_len != 0, NULL);
-
-	/* convert the namespace to binary */
-	rc = uuid_parse (namespace_id, uu_namespace);
-	if (rc != 0) {
-		g_set_error (error,
-			     FWUPD_ERROR,
-			     FWUPD_ERROR_NOT_SUPPORTED,
-			     "namespace '%s' is invalid",
-			     namespace_id);
-		return NULL;
-	}
-
-	/* hash the namespace and then the string */
-	csum = g_checksum_new (G_CHECKSUM_SHA1);
-	g_checksum_update (csum, (guchar *) uu_namespace, 16);
-	g_checksum_update (csum, (guchar *) data, (gssize) data_len);
-	g_checksum_get_digest (csum, hash, &digestlen);
-
-	/* copy most parts of the hash 1:1 */
-	memcpy (uu_new, hash, 16);
-
-	/* set specific bits according to Section 4.1.3 */
-	uu_new[6] = (guint8) ((uu_new[6] & 0x0f) | (5 << 4));
-	uu_new[8] = (guint8) ((uu_new[8] & 0x3f) | 0x80);
-
-	/* return as a string */
-	uuid_unparse (uu_new, guid_new);
-	return g_strdup (guid_new);
-}
-
-/**
- * fu_common_guid_is_valid:
- * @guid: string to check
- *
- * Checks the source string is a valid string GUID descriptor.
- *
- * Returns: %TRUE if @guid was a valid GUID, %FALSE otherwise
- *
- * Since: 1.2.0
+ * Since: 1.2.5
  **/
 gboolean
-fu_common_guid_is_valid (const gchar *guid)
+fu_common_guid_is_plausible (const guint8 *buf)
 {
-	gint rc;
-	uuid_t uu;
-	if (guid == NULL)
-		return FALSE;
-	if (strlen (guid) != 36)
+	guint guint_sum = 0;
+
+	for (guint i = 0; i < 16; i++)
+		guint_sum += buf[i];
+	if (guint_sum == 0x00)
 		return FALSE;
-	rc = uuid_parse (guid, uu);
-	if (uuid_is_null (uu))
+	if (guint_sum < 0xff)
 		return FALSE;
-	return rc == 0;
-}
-
-/**
- * fu_common_guid_from_string:
- * @str: A source string to use as a key
- *
- * Returns a GUID for a given string. This uses a hash and so even small
- * differences in the @str will produce radically different return values.
- *
- * The implementation is taken from RFC4122, Section 4.1.3; specifically
- * using a type-5 SHA-1 hash with a DNS namespace.
- * The same result can be obtained with this simple python program:
- *
- *    #!/usr/bin/python
- *    import uuid
- *    print uuid.uuid5(uuid.NAMESPACE_DNS, 'python.org')
- *
- * Returns: A new GUID, or %NULL if the string was invalid
- *
- * Since: 1.2.0
- **/
-gchar *
-fu_common_guid_from_string (const gchar *str)
-{
-	if (str == NULL)
-		return NULL;
-	return fu_common_guid_from_data ("6ba7b810-9dad-11d1-80b4-00c04fd430c8",
-					(const guint8 *) str, strlen (str), NULL);
+	return TRUE;
 }
diff -Nru fwupd-1.2.4/src/fu-common-guid.h fwupd-1.2.5/src/fu-common-guid.h
--- fwupd-1.2.4/src/fu-common-guid.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-common-guid.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,16 +4,12 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_COMMON_GUID_H__
-#define __FU_COMMON_GUID_H__
+#pragma once
 
 #include <gio/gio.h>
 
-gboolean	 fu_common_guid_is_valid	(const gchar	*guid);
-gchar		*fu_common_guid_from_string	(const gchar	*str);
-gchar		*fu_common_guid_from_data	(const gchar	*namespace_id,
-						 const guint8	*data,
-						 gsize		 data_len,
-						 GError		**error);
+G_BEGIN_DECLS
 
-#endif /* __FU_COMMON_GUID_H__ */
+gboolean	 fu_common_guid_is_plausible	(const guint8	*buf);
+
+G_END_DECLS
diff -Nru fwupd-1.2.4/src/fu-common.h fwupd-1.2.5/src/fu-common.h
--- fwupd-1.2.4/src/fu-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_COMMON_H__
-#define __FU_COMMON_H__
+#pragma once
 
 #include <gio/gio.h>
 
+G_BEGIN_DECLS
+
 typedef enum {
 	FU_APP_FLAGS_NONE		= 0,
 	FU_APP_FLAGS_NO_IDLE_SOURCES	= 1 << 0,
@@ -107,4 +108,4 @@
 						 const gchar	*search,
 						 const gchar	*replace);
 
-#endif /* __FU_COMMON_H__ */
+G_END_DECLS
diff -Nru fwupd-1.2.4/src/fu-common-version.h fwupd-1.2.5/src/fu-common-version.h
--- fwupd-1.2.4/src/fu-common-version.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-common-version.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_COMMON_VERSION_H__
-#define __FU_COMMON_VERSION_H__
+#pragma once
 
 #include <gio/gio.h>
 
+G_BEGIN_DECLS
+
 /**
  * FuVersionFormat:
  * @FU_VERSION_FORMAT_UNKNOWN:		Unknown version format
@@ -47,4 +48,4 @@
 gchar		*fu_common_version_parse	(const gchar	*version);
 FuVersionFormat	 fu_common_version_guess_format	(const gchar	*version);
 
-#endif /* __FU_COMMON_VERSION_H__ */
+G_END_DECLS
diff -Nru fwupd-1.2.4/src/fu-config.h fwupd-1.2.5/src/fu-config.h
--- fwupd-1.2.4/src/fu-config.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-config.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,15 +4,14 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_CONFIG_H
-#define __FU_CONFIG_H
-
-G_BEGIN_DECLS
+#pragma once
 
 #include <glib-object.h>
 
 #include "fwupd-remote.h"
 
+G_BEGIN_DECLS
+
 #define FU_TYPE_CONFIG (fu_config_get_type ())
 G_DECLARE_FINAL_TYPE (FuConfig, fu_config, FU, CONFIG, GObject)
 
@@ -29,6 +28,3 @@
 							 const gchar	*remote_id);
 
 G_END_DECLS
-
-#endif /* __FU_CONFIG_H */
-
diff -Nru fwupd-1.2.4/src/fu-debug.h fwupd-1.2.5/src/fu-debug.h
--- fwupd-1.2.4/src/fu-debug.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-debug.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_DEBUG_H__
-#define __FU_DEBUG_H__
+#pragma once
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 GOptionGroup	*fu_debug_get_option_group	(void);
 
-#endif /* __FU_DEBUG_H__ */
+G_END_DECLS
diff -Nru fwupd-1.2.4/src/fu-device.c fwupd-1.2.5/src/fu-device.c
--- fwupd-1.2.4/src/fu-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -13,11 +13,11 @@
 #include <gio/gio.h>
 
 #include "fu-common.h"
-#include "fu-common-guid.h"
 #include "fu-common-version.h"
 #include "fu-device-private.h"
 #include "fu-mutex.h"
 
+#include "fwupd-common.h"
 #include "fwupd-device-private.h"
 
 /**
@@ -63,6 +63,7 @@
 	PROP_PHYSICAL_ID,
 	PROP_LOGICAL_ID,
 	PROP_QUIRKS,
+	PROP_VERSION_FORMAT,
 	PROP_LAST
 };
 
@@ -82,6 +83,9 @@
 	case PROP_PROGRESS:
 		g_value_set_uint (value, priv->progress);
 		break;
+	case PROP_VERSION_FORMAT:
+		g_value_set_uint (value, priv->version_format);
+		break;
 	case PROP_PHYSICAL_ID:
 		g_value_set_string (value, fu_device_get_physical_id (self));
 		break;
@@ -109,6 +113,9 @@
 	case PROP_PROGRESS:
 		fu_device_set_progress (self, g_value_get_uint (value));
 		break;
+	case PROP_VERSION_FORMAT:
+		fu_device_set_version_format (self, g_value_get_uint (value));
+		break;
 	case PROP_PHYSICAL_ID:
 		fu_device_set_physical_id (self, g_value_get_string (value));
 		break;
@@ -537,8 +544,8 @@
 	g_return_if_fail (guid != NULL);
 
 	/* make valid */
-	if (!fu_common_guid_is_valid (guid)) {
-		g_autofree gchar *tmp = fu_common_guid_from_string (guid);
+	if (!fwupd_guid_is_valid (guid)) {
+		g_autofree gchar *tmp = fwupd_guid_hash_string (guid);
 		if (fu_device_has_parent_guid (self, tmp))
 			return;
 		g_debug ("using %s for %s", tmp, guid);
@@ -573,6 +580,7 @@
 		return FALSE;
 	if (!fu_device_probe (child, error))
 		return FALSE;
+	fu_device_convert_instance_ids (child);
 	fu_device_add_child (self, child);
 	return TRUE;
 }
@@ -785,8 +793,8 @@
 fu_device_has_guid (FuDevice *self, const gchar *guid)
 {
 	/* make valid */
-	if (!fu_common_guid_is_valid (guid)) {
-		g_autofree gchar *tmp = fu_common_guid_from_string (guid);
+	if (!fwupd_guid_is_valid (guid)) {
+		g_autofree gchar *tmp = fwupd_guid_hash_string (guid);
 		return fwupd_device_has_guid (FWUPD_DEVICE (self), tmp);
 	}
 
@@ -795,27 +803,50 @@
 }
 
 /**
+ * fu_device_add_instance_id:
+ * @self: A #FuDevice
+ * @instance_id: the InstanceID, e.g. `PCI\VEN_10EC&DEV_525A`
+ *
+ * Adds an instance ID to the device. If the @instance_id argument is already a
+ * valid GUID then fu_device_add_guid() should be used instead.
+ *
+ * Since: 1.2.5
+ **/
+void
+fu_device_add_instance_id (FuDevice *self, const gchar *instance_id)
+{
+	g_autofree gchar *guid = NULL;
+	if (fwupd_guid_is_valid (instance_id)) {
+		g_warning ("use fu_device_add_guid(\"%s\") instead!", instance_id);
+		fu_device_add_guid_safe (self, instance_id);
+		return;
+	}
+	/* it seems odd adding the instance ID and the GUID quirks and not just
+	 * calling fu_device_add_guid_safe() -- but we want the quirks to match
+	 * so the plugin is set, but not the LVFS metadata to match firmware
+	 * until we're sure the device isn't using _NO_AUTO_INSTANCE_IDS */
+	guid = fwupd_guid_hash_string (instance_id);
+	fu_device_add_guid_quirks (self, guid);
+	fwupd_device_add_instance_id (FWUPD_DEVICE (self), instance_id);
+}
+
+/**
  * fu_device_add_guid:
  * @self: A #FuDevice
  * @guid: A GUID, e.g. `2082b5e0-7a64-478a-b1b2-e3404fab6dad`
  *
  * Adds a GUID to the device. If the @guid argument is not a valid GUID then it
- * is converted to a GUID using fu_common_guid_from_string().
+ * is converted to a GUID using fwupd_guid_hash_string().
  *
  * Since: 0.7.2
  **/
 void
 fu_device_add_guid (FuDevice *self, const gchar *guid)
 {
-	/* make valid */
-	if (!fu_common_guid_is_valid (guid)) {
-		g_autofree gchar *tmp = fu_common_guid_from_string (guid);
-		g_debug ("using %s for %s", tmp, guid);
-		fu_device_add_guid_safe (self, tmp);
+	if (!fwupd_guid_is_valid (guid)) {
+		fu_device_add_instance_id (self, guid);
 		return;
 	}
-
-	/* already valid */
 	fu_device_add_guid_safe (self, guid);
 }
 
@@ -825,7 +856,7 @@
  * @guid: A GUID, e.g. `2082b5e0-7a64-478a-b1b2-e3404fab6dad`
  *
  * Adds a GUID to the device. If the @guid argument is not a valid GUID then it
- * is converted to a GUID using fu_common_guid_from_string().
+ * is converted to a GUID using fwupd_guid_hash_string().
  *
  * A counterpart GUID is typically the GUID of the same device in bootloader
  * or runtime mode, if they have a different device PCI or USB ID. Adding this
@@ -837,9 +868,8 @@
 fu_device_add_counterpart_guid (FuDevice *self, const gchar *guid)
 {
 	/* make valid */
-	if (!fu_common_guid_is_valid (guid)) {
-		g_autofree gchar *tmp = fu_common_guid_from_string (guid);
-		g_debug ("using %s for counterpart %s", tmp, guid);
+	if (!fwupd_guid_is_valid (guid)) {
+		g_autofree gchar *tmp = fwupd_guid_hash_string (guid);
 		fwupd_device_add_guid (FWUPD_DEVICE (self), tmp);
 		return;
 	}
@@ -1980,6 +2010,42 @@
 }
 
 /**
+ * fu_device_convert_instance_ids:
+ * @self: A #FuDevice
+ *
+ * Converts all the Device Instance IDs added using fu_device_add_instance_id()
+ * into actual GUIDs, **unless** %FWUPD_DEVICE_FLAG_NO_AUTO_INSTANCE_IDS has
+ * been set.
+ *
+ * Plugins will only need to need to call this manually when adding child
+ * devices, as fu_device_setup() automatically calls this after the
+ * fu_device_probe() and fu_device_setup() virtual functions have been run.
+ *
+ * Since: 1.2.5
+ **/
+void
+fu_device_convert_instance_ids (FuDevice *self)
+{
+	FuDevicePrivate *priv = GET_PRIVATE (self);
+	GPtrArray *instance_ids = fwupd_device_get_instance_ids (FWUPD_DEVICE (self));
+
+	/* OEM specific hardware */
+	if (fu_device_has_flag (self, FWUPD_DEVICE_FLAG_NO_AUTO_INSTANCE_IDS))
+		return;
+	for (guint i = 0; i < instance_ids->len; i++) {
+		const gchar *instance_id = g_ptr_array_index (instance_ids, i);
+		g_autofree gchar *guid = fwupd_guid_hash_string (instance_id);
+		fwupd_device_add_guid (FWUPD_DEVICE (self), guid);
+	}
+
+	/* convert all children too */
+	for (guint i = 0; i < priv->children->len; i++) {
+		FuDevice *devtmp = g_ptr_array_index (priv->children, i);
+		fu_device_convert_instance_ids (devtmp);
+	}
+}
+
+/**
  * fu_device_setup:
  * @self: A #FuDevice
  * @error: A #GError, or %NULL
@@ -2010,6 +2076,10 @@
 		if (!klass->setup (self, error))
 			return FALSE;
 	}
+
+	/* convert the instance IDs to GUIDs */
+	fu_device_convert_instance_ids (self);
+
 	priv->done_setup = TRUE;
 	return TRUE;
 }
@@ -2140,6 +2210,14 @@
 				   G_PARAM_STATIC_NAME);
 	g_object_class_install_property (object_class, PROP_PROGRESS, pspec);
 
+	pspec = g_param_spec_uint ("version-format", NULL, NULL,
+				   FU_VERSION_FORMAT_UNKNOWN,
+				   FU_VERSION_FORMAT_LAST,
+				   FU_VERSION_FORMAT_UNKNOWN,
+				   G_PARAM_READWRITE |
+				   G_PARAM_STATIC_NAME);
+	g_object_class_install_property (object_class, PROP_VERSION_FORMAT, pspec);
+
 	pspec = g_param_spec_object ("quirks", NULL, NULL,
 				     FU_TYPE_QUIRKS,
 				     G_PARAM_READWRITE |
diff -Nru fwupd-1.2.4/src/fu-device.h fwupd-1.2.5/src/fu-device.h
--- fwupd-1.2.4/src/fu-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_DEVICE_H
-#define __FU_DEVICE_H
+#pragma once
 
 #include <glib-object.h>
 #include <fwupd.h>
@@ -79,6 +78,7 @@
 #define fu_device_add_flag(d,v)			fwupd_device_add_flag(FWUPD_DEVICE(d),v)
 #define fu_device_remove_flag(d,v)		fwupd_device_remove_flag(FWUPD_DEVICE(d),v)
 #define fu_device_has_flag(d,v)			fwupd_device_has_flag(FWUPD_DEVICE(d),v)
+#define fu_device_has_instance_id(d,v)		fwupd_device_has_instance_id(FWUPD_DEVICE(d),v)
 #define fu_device_add_checksum(d,v)		fwupd_device_add_checksum(FWUPD_DEVICE(d),v)
 #define fu_device_add_release(d,v)		fwupd_device_add_release(FWUPD_DEVICE(d),v)
 #define fu_device_add_icon(d,v)			fwupd_device_add_icon(FWUPD_DEVICE(d),v)
@@ -131,6 +131,8 @@
 							 const gchar	*guid);
 gboolean	 fu_device_has_guid			(FuDevice	*self,
 							 const gchar	*guid);
+void		 fu_device_add_instance_id		(FuDevice	*self,
+							 const gchar	*instance_id);
 gchar		*fu_device_get_guids_as_str		(FuDevice	*self);
 FuDevice	*fu_device_get_alternate		(FuDevice	*self);
 FuDevice	*fu_device_get_parent			(FuDevice	*self);
@@ -225,6 +227,3 @@
 							 guint		 interval);
 
 G_END_DECLS
-
-#endif /* __FU_DEVICE_H */
-
diff -Nru fwupd-1.2.4/src/fu-device-list.c fwupd-1.2.5/src/fu-device-list.c
--- fwupd-1.2.4/src/fu-device-list.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-device-list.c	2019-02-25 09:42:18.000000000 +0000
@@ -468,6 +468,12 @@
 		fu_device_set_version (device, version);
 	}
 
+	/* allow another plugin to handle the write too */
+	if (fu_device_has_flag (item->device, FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED)) {
+		g_debug ("copying another-write-required to new device");
+		fu_device_add_flag (device, FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED);
+	}
+
 	/* copy the parent if not already set */
 	if (fu_device_get_parent (item->device) != NULL &&
 	    fu_device_get_parent (device) == NULL) {
diff -Nru fwupd-1.2.4/src/fu-device-list.h fwupd-1.2.5/src/fu-device-list.h
--- fwupd-1.2.4/src/fu-device-list.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-device-list.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,15 +4,14 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_DEVICE_LIST_H
-#define __FU_DEVICE_LIST_H
-
-G_BEGIN_DECLS
+#pragma once
 
 #include <glib-object.h>
 
 #include "fu-device.h"
 
+G_BEGIN_DECLS
+
 #define FU_TYPE_DEVICE_LIST (fu_device_list_get_type ())
 G_DECLARE_FINAL_TYPE (FuDeviceList, fu_device_list, FU, DEVICE_LIST, GObject)
 
@@ -36,6 +35,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_DEVICE_LIST_H */
-
diff -Nru fwupd-1.2.4/src/fu-device-locker.h fwupd-1.2.5/src/fu-device-locker.h
--- fwupd-1.2.4/src/fu-device-locker.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-device-locker.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_DEVICE_LOCKER_H
-#define __FU_DEVICE_LOCKER_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -26,5 +25,3 @@
 						 GError			**error);
 
 G_END_DECLS
-
-#endif /* __FU_DEVICE_LOCKER_H */
diff -Nru fwupd-1.2.4/src/fu-device-metadata.h fwupd-1.2.5/src/fu-device-metadata.h
--- fwupd-1.2.4/src/fu-device-metadata.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-device-metadata.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,11 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_DEVICE_METADATA_H__
-#define __FU_DEVICE_METADATA_H__
+#pragma once
+
+#include <glib.h>
+
+G_BEGIN_DECLS
 
 /**
  * SECTION:fu-device-metadata
@@ -42,4 +45,23 @@
  */
 #define FU_DEVICE_METADATA_UEFI_DEVICE_KIND	"UefiDeviceKind"
 
-#endif /* __FU_DEVICE_METADATA_H__ */
+/**
+ * FU_DEVICE_METADATA_UEFI_FW_VERSION:
+ *
+ * The firmware version of the UEFI device specified as a 32 bit unsigned
+ * integer.
+ * Consumed by the uefi plugin when other devices register fake devices that
+ * need to be handled as a capsule update.
+ */
+#define FU_DEVICE_METADATA_UEFI_FW_VERSION	"UefiFwVersion"
+
+/**
+ * FU_DEVICE_METADATA_UEFI_CAPSULE_FLAGS:
+ *
+ * The capsule flags for the UEFI device, e.g. %EFI_CAPSULE_HEADER_FLAGS_PERSIST_ACROSS_RESET
+ * Consumed by the uefi plugin when other devices register fake devices that
+ * need to be handled as a capsule update.
+ */
+#define FU_DEVICE_METADATA_UEFI_CAPSULE_FLAGS	"UefiCapsuleFlags"
+
+G_END_DECLS
diff -Nru fwupd-1.2.4/src/fu-device-private.h fwupd-1.2.5/src/fu-device-private.h
--- fwupd-1.2.4/src/fu-device-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-device-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_DEVICE_PRIVATE_H
-#define __FU_DEVICE_PRIVATE_H
+#pragma once
 
 #include <fu-device.h>
 #include <xmlb.h>
@@ -29,8 +28,6 @@
 							 GError		**error);
 void		 fu_device_incorporate_from_component	(FuDevice	*device,
 							 XbNode		*component);
+void		 fu_device_convert_instance_ids		(FuDevice	*self);
 
 G_END_DECLS
-
-#endif /* __FU_DEVICE_PRIVATE_H */
-
diff -Nru fwupd-1.2.4/src/fu-engine.c fwupd-1.2.5/src/fu-engine.c
--- fwupd-1.2.4/src/fu-engine.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-engine.c	2019-02-25 09:42:18.000000000 +0000
@@ -24,7 +24,6 @@
 #include "fwupd-resources.h"
 
 #include "fu-common-cab.h"
-#include "fu-common-guid.h"
 #include "fu-common.h"
 #include "fu-config.h"
 #include "fu-debug.h"
@@ -938,7 +937,7 @@
 	}
 
 	/* another device */
-	if (fu_common_guid_is_valid (xb_node_get_text (req))) {
+	if (fwupd_guid_is_valid (xb_node_get_text (req))) {
 		const gchar *guid = xb_node_get_text (req);
 		const gchar *version;
 		g_autoptr(FuDevice) device2 = NULL;
@@ -1331,9 +1330,11 @@
 {
 	XbNode *component = fu_install_task_get_component (task);
 	FuDevice *device = fu_install_task_get_device (task);
+	FuPlugin *plugin;
 	GBytes *blob_fw;
 	const gchar *tmp = NULL;
 	g_autofree gchar *release_key = NULL;
+	g_autofree gchar *version_orig = NULL;
 	g_autofree gchar *version_rel = NULL;
 	g_autoptr(GBytes) blob_fw2 = NULL;
 	g_autoptr(GError) error_local = NULL;
@@ -1407,10 +1408,134 @@
 		blob_fw2 = g_bytes_ref (blob_fw);
 	}
 
-	/* install firmware blob */
+	/* get the plugin */
+	plugin = fu_plugin_list_find_by_name (self->plugin_list,
+					      fu_device_get_plugin (device),
+					      error);
+	if (plugin == NULL)
+		return FALSE;
+
+	/* add device to database */
 	version_rel = fu_engine_get_release_version (self, component, rel);
-	return fu_engine_install_blob (self, device, blob_cab, blob_fw2,
-				       version_rel, flags, error);
+	if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0) {
+		g_autoptr(FwupdRelease) release_history = fwupd_release_new ();
+		g_autoptr(GHashTable) metadata_hash = NULL;
+		g_autoptr(GHashTable) os_release = NULL;
+
+		/* add release data from os-release */
+		os_release = fwupd_get_os_release (error);
+		if (os_release == NULL)
+			return FALSE;
+
+		/* build the version metadata */
+		metadata_hash = fu_engine_get_report_metadata (self);
+		fwupd_release_add_metadata (release_history, metadata_hash);
+		fwupd_release_add_metadata (release_history,
+					    fu_plugin_get_report_metadata (plugin));
+		tmp = xb_node_query_text (component,
+					  "releases/release/checksum[@target='container']",
+					  NULL);
+		if (tmp != NULL) {
+			fwupd_release_add_metadata_item (release_history,
+							 "DistroId", tmp);
+		}
+		fwupd_release_add_checksum (release_history, tmp);
+		fwupd_release_set_version (release_history, version_rel);
+		fu_device_set_update_state (device, FWUPD_UPDATE_STATE_FAILED);
+
+		/* add details from os-release as metadata */
+		tmp = g_hash_table_lookup (os_release, "ID");
+		if (tmp != NULL) {
+			fwupd_release_add_metadata_item (release_history,
+							 "DistroId", tmp);
+		}
+		tmp = g_hash_table_lookup (os_release, "VERSION_ID");
+		if (tmp != NULL) {
+			fwupd_release_add_metadata_item (release_history,
+							 "DistroVersion", tmp);
+		}
+		tmp = g_hash_table_lookup (os_release, "VARIANT_ID");
+		if (tmp != NULL) {
+			fwupd_release_add_metadata_item (release_history,
+							 "DistroVariant", tmp);
+		}
+		if (!fu_history_add_device (self->history, device, release_history, error))
+			return FALSE;
+	}
+
+	/* just schedule this for the next reboot  */
+	if (flags & FWUPD_INSTALL_FLAG_OFFLINE) {
+		if (blob_cab == NULL) {
+			g_set_error_literal (error,
+					     FWUPD_ERROR,
+					     FWUPD_ERROR_NOT_SUPPORTED,
+					     "No cabinet archive to schedule");
+			return FALSE;
+		}
+		return fu_plugin_runner_schedule_update (plugin, device, blob_cab, error);
+	}
+
+	/* install firmware blob */
+	version_orig = g_strdup (fu_device_get_version (device));
+	if (!fu_engine_install_blob (self, device, blob_fw2, flags, &error_local)) {
+		fu_device_set_status (device, FWUPD_STATUS_IDLE);
+		fu_device_set_update_state (device, FWUPD_UPDATE_STATE_FAILED);
+		fu_device_set_update_error (device, error_local->message);
+		if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0 &&
+		    !fu_history_modify_device (self->history, device,
+					       FU_HISTORY_FLAGS_MATCH_OLD_VERSION |
+					       FU_HISTORY_FLAGS_MATCH_NEW_VERSION,
+					       error)) {
+			return FALSE;
+		}
+		g_propagate_error (error, g_steal_pointer (&error_local));
+		return FALSE;
+	}
+
+	/* update database */
+	if (fu_device_has_flag (device, FWUPD_DEVICE_FLAG_NEEDS_REBOOT) ||
+	    fu_device_has_flag (device, FWUPD_DEVICE_FLAG_NEEDS_SHUTDOWN)) {
+		fu_device_set_update_state (device, FWUPD_UPDATE_STATE_NEEDS_REBOOT);
+		if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0 &&
+		    !fu_history_modify_device (self->history, device,
+					       FU_HISTORY_FLAGS_MATCH_OLD_VERSION,
+					       error))
+			return FALSE;
+		/* success */
+		return TRUE;
+	}
+
+	/* for online updates, verify the version changed if not a re-install */
+	if (version_rel != NULL &&
+	    g_strcmp0 (version_orig, version_rel) != 0 &&
+	    g_strcmp0 (version_orig, fu_device_get_version (device)) == 0) {
+		fu_device_set_update_state (device, FWUPD_UPDATE_STATE_FAILED);
+		fu_device_set_update_error (device, "device version not updated on success");
+		if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0 &&
+		    !fu_history_modify_device (self->history, device,
+					       FU_HISTORY_FLAGS_MATCH_OLD_VERSION,
+					       error))
+			return FALSE;
+		/* success */
+		return TRUE;
+	}
+
+	/* ensure the new version matched what we expected */
+	if (version_rel != NULL &&
+	    g_strcmp0 (fu_device_get_version (device), version_rel) != 0) {
+		g_warning ("new device version '%s' was is not '%s', fixing up",
+			   fu_device_get_version (device), version_rel);
+		fu_device_set_version (device, version_rel);
+	}
+
+	/* success */
+	fu_device_set_update_state (device, FWUPD_UPDATE_STATE_SUCCESS);
+	if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0 &&
+	    !fu_history_modify_device (self->history, device,
+				       FU_HISTORY_FLAGS_MATCH_NEW_VERSION,
+				       error))
+		return FALSE;
+	return TRUE;
 }
 
 /**
@@ -1462,279 +1587,225 @@
 	return g_steal_pointer (&device2);
 }
 
-gboolean
-fu_engine_install_blob (FuEngine *self,
-			FuDevice *device_orig,
-			GBytes *blob_cab,
-			GBytes *blob_fw2,
-			const gchar *version,
-			FwupdInstallFlags flags,
-			GError **error)
+static gboolean
+fu_engine_update_prepare (FuEngine *self,
+			  FwupdInstallFlags flags,
+			  const gchar *device_id,
+			  GError **error)
 {
-	FuPlugin *plugin;
-	GPtrArray *plugins;
-	g_autofree gchar *device_id_orig = NULL;
-	g_autofree gchar *version_orig = NULL;
-	g_autoptr(FuDevice) device = g_object_ref (device_orig);
-	g_autoptr(FwupdRelease) release_history = fwupd_release_new ();
-	g_autoptr(GError) error_local = NULL;
-	g_autoptr(GHashTable) metadata_hash = NULL;
-	g_autoptr(GHashTable) os_release = NULL;
-	g_autoptr(GTimer) timer = g_timer_new ();
-
-	/* add release data from os-release */
-	os_release = fwupd_get_os_release (error);
-	if (os_release == NULL)
-		return FALSE;
+	GPtrArray *plugins = fu_plugin_list_get_all (self->plugin_list);
+	g_autoptr(FuDevice) device = NULL;
 
-	/* test the firmware is not an empty blob */
-	if (g_bytes_get_size (blob_fw2) == 0) {
-		g_set_error (error,
-			     FWUPD_ERROR,
-			     FWUPD_ERROR_INVALID_FILE,
-			     "Firmware is invalid as has zero size");
+	/* the device and plugin both may have changed */
+	device = fu_engine_get_device_by_id (self, device_id, error);
+	if (device == NULL)
 		return FALSE;
+	for (guint j = 0; j < plugins->len; j++) {
+		FuPlugin *plugin_tmp = g_ptr_array_index (plugins, j);
+		if (!fu_plugin_runner_update_prepare (plugin_tmp, flags, device, error))
+			return FALSE;
 	}
+	return TRUE;
+}
 
-	/* we can only write history if we're providing a version number */
-	if (version == NULL && (flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0) {
-		g_set_error (error,
-			     FWUPD_ERROR,
-			     FWUPD_ERROR_INVALID_FILE,
-			     "Version required if writing history");
-		return FALSE;
-	}
+static gboolean
+fu_engine_update_cleanup (FuEngine *self,
+			  FwupdInstallFlags flags,
+			  const gchar *device_id,
+			  GError **error)
+{
+	GPtrArray *plugins = fu_plugin_list_get_all (self->plugin_list);
+	g_autoptr(FuDevice) device = NULL;
 
-	/* get the plugin */
-	plugin = fu_plugin_list_find_by_name (self->plugin_list,
-					      fu_device_get_plugin (device),
-					      error);
-	if (plugin == NULL)
+	/* the device and plugin both may have changed */
+	device = fu_engine_get_device_by_id (self, device_id, error);
+	if (device == NULL)
 		return FALSE;
-
-	/* compare the versions of what we have installed */
-	version_orig = g_strdup (fu_device_get_version (device));
-
-	/* signal to all the plugins the update is about to happen */
-	plugins = fu_plugin_list_get_all (self->plugin_list);
 	for (guint j = 0; j < plugins->len; j++) {
 		FuPlugin *plugin_tmp = g_ptr_array_index (plugins, j);
-		if (!fu_plugin_runner_update_prepare (plugin_tmp, flags, device, error))
+		if (!fu_plugin_runner_update_cleanup (plugin_tmp, flags, device, error))
 			return FALSE;
 	}
+	return TRUE;
+}
 
-	/* save the chosen device ID in case the device goes away */
-	device_id_orig = g_strdup (fu_device_get_id (device));
+static gboolean
+fu_engine_update_detach (FuEngine *self, const gchar *device_id, GError **error)
+{
+	FuPlugin *plugin;
+	g_autoptr(FuDevice) device = NULL;
 
-	/* in case another device caused us to go into replug before starting */
-	g_clear_object (&device);
-	device = fu_engine_get_device_by_id (self, device_id_orig, error);
+	/* the device and plugin both may have changed */
+	device = fu_engine_get_device_by_id (self, device_id, error);
 	if (device == NULL)
 		return FALSE;
+	plugin = fu_plugin_list_find_by_name (self->plugin_list,
+					      fu_device_get_plugin (device),
+					      error);
+	if (plugin == NULL)
+		return FALSE;
+	if (!fu_plugin_runner_update_detach (plugin, device, error))
+		return FALSE;
+	return TRUE;
+}
 
-	/* mark this as modified even if we actually fail to do the update */
-	fu_device_set_modified (device, (guint64) g_get_real_time () / G_USEC_PER_SEC);
+static gboolean
+fu_engine_update_attach (FuEngine *self, const gchar *device_id, GError **error)
+{
+	FuPlugin *plugin;
+	g_autoptr(FuDevice) device = NULL;
 
-	/* build the version metadata */
-	metadata_hash = fu_engine_get_report_metadata (self);
-	fwupd_release_add_metadata (release_history, metadata_hash);
-	fwupd_release_add_metadata (release_history,
-				    fu_plugin_get_report_metadata (plugin));
+	/* the device and plugin both may have changed */
+	device = fu_engine_get_device_by_id (self, device_id, error);
+	if (device == NULL) {
+		g_prefix_error (error, "failed to get device after update: ");
+		return FALSE;
+	}
+	plugin = fu_plugin_list_find_by_name (self->plugin_list,
+					      fu_device_get_plugin (device),
+					      error);
+	if (plugin == NULL)
+		return FALSE;
+	if (!fu_plugin_runner_update_attach (plugin, device, error))
+		return FALSE;
+	return TRUE;
+}
 
-	/* add device to database */
-	if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0) {
-		const gchar *tmp;
-		g_autofree gchar *checksum = NULL;
-		checksum = g_compute_checksum_for_bytes (G_CHECKSUM_SHA1, blob_cab);
-		fwupd_release_set_version (release_history, version);
-		fwupd_release_add_checksum (release_history, checksum);
-		fu_device_set_update_state (device, FWUPD_UPDATE_STATE_FAILED);
+static gboolean
+fu_engine_update_reload (FuEngine *self, const gchar *device_id, GError **error)
+{
+	FuPlugin *plugin;
+	g_autoptr(FuDevice) device = NULL;
 
-		/* add details from os-release as metadata */
-		tmp = g_hash_table_lookup (os_release, "ID");
-		if (tmp != NULL) {
-			fwupd_release_add_metadata_item (release_history,
-							 "DistroId", tmp);
-		}
-		tmp = g_hash_table_lookup (os_release, "VERSION_ID");
-		if (tmp != NULL) {
-			fwupd_release_add_metadata_item (release_history,
-							 "DistroVersion", tmp);
-		}
-		tmp = g_hash_table_lookup (os_release, "VARIANT_ID");
-		if (tmp != NULL) {
-			fwupd_release_add_metadata_item (release_history,
-							 "DistroVariant", tmp);
-		}
-		if (!fu_history_add_device (self->history, device, release_history, error))
-			return FALSE;
+	/* the device and plugin both may have changed */
+	device = fu_engine_get_device_by_id (self, device_id, error);
+	if (device == NULL) {
+		g_prefix_error (error, "failed to get device after update: ");
+		return FALSE;
 	}
-
-	/* do the update */
-	if (!fu_plugin_runner_update_detach (plugin, device, &error_local)) {
-		fu_device_set_update_state (device, FWUPD_UPDATE_STATE_FAILED);
-		fu_device_set_update_error (device, error_local->message);
-		if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0 &&
-		    !fu_history_modify_device (self->history, device,
-					       FU_HISTORY_FLAGS_MATCH_OLD_VERSION,
-					       error)) {
-			return FALSE;
-		}
-		g_propagate_error (error, g_steal_pointer (&error_local));
+	plugin = fu_plugin_list_find_by_name (self->plugin_list,
+					      fu_device_get_plugin (device),
+					      error);
+	if (plugin == NULL)
+		return FALSE;
+	if (!fu_plugin_runner_update_reload (plugin, device, error)) {
+		g_prefix_error (error, "failed to reload device: ");
 		return FALSE;
 	}
-	g_clear_object (&device);
-	device = fu_engine_get_device_by_id (self, device_id_orig, error);
+	return TRUE;
+}
+
+static gboolean
+fu_engine_update (FuEngine *self,
+		  const gchar *device_id,
+		  GBytes *blob_fw2,
+		  FwupdInstallFlags flags,
+		  GError **error)
+{
+	FuPlugin *plugin;
+	g_autoptr(FuDevice) device = NULL;
+
+	/* the device and plugin both may have changed */
+	device = fu_engine_get_device_by_id (self, device_id, error);
 	if (device == NULL) {
 		g_prefix_error (error, "failed to get device after detach: ");
 		return FALSE;
 	}
-
-	/* get new plugin after detach */
 	plugin = fu_plugin_list_find_by_name (self->plugin_list,
 					      fu_device_get_plugin (device),
 					      error);
 	if (plugin == NULL)
 		return FALSE;
-	if (!fu_plugin_runner_update (plugin,
-				      device,
-				      blob_cab,
-				      blob_fw2,
-				      flags,
-				      &error_local)) {
+	if (!fu_plugin_runner_update (plugin, device, blob_fw2, flags, error)) {
 		g_autoptr(GError) error_attach = NULL;
+		g_autoptr(GError) error_cleanup = NULL;
 
-		/* save to database */
-		fu_device_set_update_state (device, FWUPD_UPDATE_STATE_FAILED);
-		fu_device_set_update_error (device, error_local->message);
-		if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0 &&
-		    !fu_history_modify_device (self->history, device,
-					       FU_HISTORY_FLAGS_MATCH_OLD_VERSION,
-					       error)) {
-			return FALSE;
-		}
-		g_propagate_error (error, g_steal_pointer (&error_local));
-
-		/* attack back into runtime */
+		/* attack back into runtime then cleanup */
 		if (!fu_plugin_runner_update_attach (plugin,
 						     device,
 						     &error_attach)) {
 			g_warning ("failed to attach device after failed update: %s",
 				   error_attach->message);
 		}
-		for (guint j = 0; j < plugins->len; j++) {
-			FuPlugin *plugin_tmp = g_ptr_array_index (plugins, j);
-			g_autoptr(GError) error_cleanup = NULL;
-			if (!fu_plugin_runner_update_cleanup (plugin_tmp,
-							      flags,
-							      device,
-							      &error_cleanup)) {
-				g_warning ("failed to update-cleanup "
-					   "after failed update: %s",
-					   error_cleanup->message);
-			}
+		if (!fu_engine_update_cleanup (self, flags, device_id, &error_cleanup)) {
+			g_warning ("failed to update-cleanup after failed update: %s",
+				   error_cleanup->message);
 		}
-		fu_device_set_status (device, FWUPD_STATUS_IDLE);
 		return FALSE;
 	}
-	g_clear_object (&device);
-	device = fu_engine_get_device_by_id (self, device_id_orig, error);
-	if (device == NULL) {
-		g_prefix_error (error, "failed to get device after update: ");
+	return TRUE;
+}
+
+gboolean
+fu_engine_install_blob (FuEngine *self,
+			FuDevice *device,
+			GBytes *blob_fw,
+			FwupdInstallFlags flags,
+			GError **error)
+{
+	guint retries = 0;
+	g_autofree gchar *device_id = NULL;
+	g_autoptr(GTimer) timer = g_timer_new ();
+
+	/* test the firmware is not an empty blob */
+	if (g_bytes_get_size (blob_fw) == 0) {
+		g_set_error (error,
+			     FWUPD_ERROR,
+			     FWUPD_ERROR_INVALID_FILE,
+			     "Firmware is invalid as has zero size");
 		return FALSE;
 	}
-	if (!fu_plugin_runner_update_attach (plugin, device, &error_local)) {
-		fu_device_set_update_state (device, FWUPD_UPDATE_STATE_FAILED);
-		fu_device_set_update_error (device, error_local->message);
-		if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0 &&
-		    !fu_history_modify_device (self->history, device,
-					       FU_HISTORY_FLAGS_MATCH_OLD_VERSION |
-					       FU_HISTORY_FLAGS_MATCH_NEW_VERSION,
-					       error)) {
+
+	/* mark this as modified even if we actually fail to do the update */
+	fu_device_set_modified (device, (guint64) g_get_real_time () / G_USEC_PER_SEC);
+
+	/* plugins can set FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED to run again, but they
+	 * must return TRUE rather than an error */
+	device_id = g_strdup (fu_device_get_id (device));
+	do {
+		/* check for a loop */
+		if (++retries > 5) {
+			g_set_error_literal (error,
+					     FWUPD_ERROR,
+					     FWUPD_ERROR_INTERNAL,
+					     "aborting device write loop, limit 5");
 			return FALSE;
 		}
-		g_propagate_error (error, g_steal_pointer (&error_local));
-		return FALSE;
-	}
-	g_clear_object (&device);
-	device = fu_engine_get_device_by_id (self, device_id_orig, error);
-	if (device == NULL) {
-		g_prefix_error (error, "failed to get device after attach: ");
-		return FALSE;
-	}
 
-	/* get new plugin after attach */
-	plugin = fu_plugin_list_find_by_name (self->plugin_list,
-					      fu_device_get_plugin (device),
-					      error);
-	if (plugin == NULL)
-		return FALSE;
+		/* don't rely on a plugin clearing this */
+		fu_device_remove_flag (device, FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED);
+
+		/* signal to all the plugins the update is about to happen */
+		if (!fu_engine_update_prepare (self, flags, device_id, error))
+			return FALSE;
+
+		/* detach to bootloader mode */
+		if (!fu_engine_update_detach (self, device_id, error))
+			return FALSE;
+
+		/* install */
+		if (!fu_engine_update (self, device_id, blob_fw, flags, error))
+			return FALSE;
+
+		/* attach into runtime mode */
+		if (!fu_engine_update_attach (self, device_id, error))
+			return FALSE;
+
+	} while (fu_device_has_flag (device, FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED));
 
 	/* get the new version number */
-	if (!fu_plugin_runner_update_reload (plugin, device, error)) {
-		g_prefix_error (error, "failed to reload device: ");
+	if (!fu_engine_update_reload (self, device_id, error))
 		return FALSE;
-	}
 
 	/* signal to all the plugins the update has happened */
-	for (guint j = 0; j < plugins->len; j++) {
-		FuPlugin *plugin_tmp = g_ptr_array_index (plugins, j);
-		g_autoptr(GError) error_cleanup = NULL;
-		if (!fu_plugin_runner_update_cleanup (plugin_tmp, flags, device, &error_cleanup)) {
-			g_warning ("failed to update-cleanup: %s",
-				   error_cleanup->message);
-		}
-	}
+	if (!fu_engine_update_cleanup (self, flags, device_id, error))
+		return FALSE;
 
 	/* make the UI update */
 	fu_engine_set_status (self, FWUPD_STATUS_IDLE);
 	fu_engine_emit_changed (self);
 	g_debug ("Updating %s took %f seconds", fu_device_get_name (device),
 		 g_timer_elapsed (timer, NULL));
-
-	/* update database */
-	if (fu_device_has_flag (device, FWUPD_DEVICE_FLAG_NEEDS_REBOOT) ||
-	    fu_device_has_flag (device, FWUPD_DEVICE_FLAG_NEEDS_SHUTDOWN)) {
-		fu_device_set_update_state (device, FWUPD_UPDATE_STATE_NEEDS_REBOOT);
-		if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0 &&
-		    !fu_history_modify_device (self->history, device,
-					       FU_HISTORY_FLAGS_MATCH_OLD_VERSION,
-					       error))
-			return FALSE;
-		/* success */
-		return TRUE;
-	}
-
-	/* for online updates, verify the version changed if not a re-install */
-	if (version != NULL &&
-	    g_strcmp0 (version_orig, version) != 0 &&
-	    g_strcmp0 (version_orig, fu_device_get_version (device)) == 0) {
-		fu_device_set_update_state (device, FWUPD_UPDATE_STATE_FAILED);
-		fu_device_set_update_error (device, "device version not updated on success");
-		if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0 &&
-		    !fu_history_modify_device (self->history, device,
-					       FU_HISTORY_FLAGS_MATCH_OLD_VERSION,
-					       error))
-			return FALSE;
-		/* success */
-		return TRUE;
-	}
-
-	/* ensure the new version matched what we expected */
-	if (version != NULL &&
-	    g_strcmp0 (fu_device_get_version (device), version) != 0) {
-		g_warning ("new device version '%s' was is not '%s', fixing up",
-			   fu_device_get_version (device), version);
-		fu_device_set_version (device, version);
-	}
-
-	/* success */
-	fu_device_set_update_state (device, FWUPD_UPDATE_STATE_SUCCESS);
-	if ((flags & FWUPD_INSTALL_FLAG_NO_HISTORY) == 0 &&
-	    !fu_history_modify_device (self->history, device,
-				       FU_HISTORY_FLAGS_MATCH_NEW_VERSION,
-				       error))
-		return FALSE;
 	return TRUE;
 }
 
diff -Nru fwupd-1.2.4/src/fu-engine.h fwupd-1.2.5/src/fu-engine.h
--- fwupd-1.2.4/src/fu-engine.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-engine.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,10 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_ENGINE_H
-#define __FU_ENGINE_H
-
-G_BEGIN_DECLS
+#pragma once
 
 #include <xmlb.h>
 #include <glib-object.h>
@@ -19,6 +16,8 @@
 #include "fu-install-task.h"
 #include "fu-plugin.h"
 
+G_BEGIN_DECLS
+
 #define FU_TYPE_ENGINE (fu_engine_get_type ())
 G_DECLARE_FINAL_TYPE (FuEngine, fu_engine, FU, ENGINE, GObject)
 
@@ -101,9 +100,7 @@
 							 GError		**error);
 gboolean	 fu_engine_install_blob			(FuEngine	*self,
 							 FuDevice	*device,
-							 GBytes		*blob_cab,
 							 GBytes		*blob_fw,
-							 const gchar	*version,
 							 FwupdInstallFlags flags,
 							 GError		**error);
 gboolean	 fu_engine_install_tasks		(FuEngine	*self,
@@ -133,6 +130,3 @@
 							 FuDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_ENGINE_H */
-
diff -Nru fwupd-1.2.4/src/fu-hash.py fwupd-1.2.5/src/fu-hash.py
--- fwupd-1.2.4/src/fu-hash.py	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-hash.py	2019-02-25 09:42:18.000000000 +0000
@@ -28,6 +28,5 @@
         buf = f.read()
         csum = hashlib.sha256(buf).hexdigest()
         with open(sys.argv[2], 'w') as f2:
-            f2.write('#ifndef FU_BUILD_HASH\n')
+            f2.write('#pragma once\n')
             f2.write('#define FU_BUILD_HASH "%s"\n' % csum)
-            f2.write('#endif /* FU_BUILD_HASH */\n')
diff -Nru fwupd-1.2.4/src/fu-history.h fwupd-1.2.5/src/fu-history.h
--- fwupd-1.2.4/src/fu-history.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-history.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_HISTORY_H
-#define __FU_HISTORY_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -58,6 +57,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_HISTORY_H */
-
diff -Nru fwupd-1.2.4/src/fu-hwids.c fwupd-1.2.5/src/fu-hwids.c
--- fwupd-1.2.4/src/fu-hwids.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-hwids.c	2019-02-25 09:42:18.000000000 +0000
@@ -13,8 +13,8 @@
 #include <string.h>
 
 #include "fu-common.h"
-#include "fu-common-guid.h"
 #include "fu-hwids.h"
+#include "fwupd-common.h"
 #include "fwupd-error.h"
 
 struct _FuHwids {
@@ -75,7 +75,6 @@
 static gchar *
 fu_hwids_get_guid_for_str (const gchar *str, GError **error)
 {
-	const gchar *namespace_id = "70ffd812-4c7f-4c7d-0000-000000000000";
 	glong items_written = 0;
 	g_autofree gunichar2 *data = NULL;
 
@@ -97,10 +96,8 @@
 		data[i] = GUINT16_TO_LE(data[i]);
 
 	/* convert to a GUID */
-	return fu_common_guid_from_data (namespace_id,
-					 (guint8*) data,
-					 items_written * 2,
-					 error);
+	return fwupd_guid_hash_data ((guint8*) data, items_written * 2,
+				     FWUPD_GUID_FLAG_NAMESPACE_MICROSOFT);
 }
 
 /**
diff -Nru fwupd-1.2.4/src/fu-hwids.h fwupd-1.2.5/src/fu-hwids.h
--- fwupd-1.2.4/src/fu-hwids.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-hwids.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_HWIDS_H
-#define __FU_HWIDS_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -49,5 +48,3 @@
 						 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_HWIDS_H */
diff -Nru fwupd-1.2.4/src/fu-idle.h fwupd-1.2.5/src/fu-idle.h
--- fwupd-1.2.4/src/fu-idle.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-idle.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,16 +4,15 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_IDLE_H
-#define __FU_IDLE_H
-
-G_BEGIN_DECLS
+#pragma once
 
 #include <glib-object.h>
 #include <fwupd.h>
 
 #include "fu-device.h"
 
+G_BEGIN_DECLS
+
 #define FU_TYPE_IDLE (fu_idle_get_type ())
 G_DECLARE_FINAL_TYPE (FuIdle, fu_idle, FU, IDLE, GObject)
 
@@ -39,6 +38,3 @@
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(FuIdleLocker, fu_idle_locker_free)
 
 G_END_DECLS
-
-#endif /* __FU_IDLE_H */
-
diff -Nru fwupd-1.2.4/src/fu-install-task.h fwupd-1.2.5/src/fu-install-task.h
--- fwupd-1.2.4/src/fu-install-task.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-install-task.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_INSTALL_TASK_H
-#define __FU_INSTALL_TASK_H
+#pragma once
 
 #include <glib-object.h>
 #include <xmlb.h>
@@ -31,6 +30,3 @@
 							 FuInstallTask	*task2);
 
 G_END_DECLS
-
-#endif /* __FU_INSTALL_TASK_H */
-
diff -Nru fwupd-1.2.4/src/fu-io-channel.h fwupd-1.2.5/src/fu-io-channel.h
--- fwupd-1.2.4/src/fu-io-channel.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-io-channel.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_IO_CHANNEL_H
-#define __FU_IO_CHANNEL_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -65,5 +64,3 @@
 						 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_IO_CHANNEL_H */
diff -Nru fwupd-1.2.4/src/fu-keyring-gpg.h fwupd-1.2.5/src/fu-keyring-gpg.h
--- fwupd-1.2.4/src/fu-keyring-gpg.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-keyring-gpg.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_KEYRING_GPG_H
-#define __FU_KEYRING_GPG_H
+#pragma once
 
 #include "fu-keyring.h"
 
@@ -18,5 +17,3 @@
 FuKeyring	*fu_keyring_gpg_new		(void);
 
 G_END_DECLS
-
-#endif /* __FU_KEYRING_GPG_H */
diff -Nru fwupd-1.2.4/src/fu-keyring.h fwupd-1.2.5/src/fu-keyring.h
--- fwupd-1.2.4/src/fu-keyring.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-keyring.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_KEYRING_H
-#define __FU_KEYRING_H
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -45,5 +44,3 @@
 							 const gchar	*name);
 
 G_END_DECLS
-
-#endif /* __FU_KEYRING_H */
diff -Nru fwupd-1.2.4/src/fu-keyring-pkcs7.h fwupd-1.2.5/src/fu-keyring-pkcs7.h
--- fwupd-1.2.4/src/fu-keyring-pkcs7.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-keyring-pkcs7.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_KEYRING_PKCS7_H
-#define __FU_KEYRING_PKCS7_H
+#pragma once
 
 #include "fu-keyring.h"
 
@@ -18,5 +17,3 @@
 FuKeyring	*fu_keyring_pkcs7_new		(void);
 
 G_END_DECLS
-
-#endif /* __FU_KEYRING_PKCS7_H */
diff -Nru fwupd-1.2.4/src/fu-keyring-result.h fwupd-1.2.5/src/fu-keyring-result.h
--- fwupd-1.2.4/src/fu-keyring-result.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-keyring-result.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_KEYRING_RESULT_H
-#define __FU_KEYRING_RESULT_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -19,5 +18,3 @@
 const gchar	*fu_keyring_result_get_authority	(FuKeyringResult	*self);
 
 G_END_DECLS
-
-#endif /* __FU_KEYRING_RESULT_H */
diff -Nru fwupd-1.2.4/src/fu-keyring-utils.h fwupd-1.2.5/src/fu-keyring-utils.h
--- fwupd-1.2.4/src/fu-keyring-utils.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-keyring-utils.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,18 +4,19 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_KEYRING_UTILS_H__
-#define __FU_KEYRING_UTILS_H__
+#pragma once
 
 #include <xmlb.h>
 
 #include "fu-keyring.h"
 #include "fwupd-enums.h"
 
+G_BEGIN_DECLS
+
 FuKeyring	*fu_keyring_create_for_kind		(FwupdKeyringKind kind,
 							 GError		**error);
 gboolean	 fu_keyring_get_release_trust_flags	(XbNode		*release,
 							 FwupdTrustFlags *trust_flags,
 							 GError		**error);
 
-#endif /* __FU_KEYRING_UTILS_H__ */
+G_END_DECLS
diff -Nru fwupd-1.2.4/src/fu-mutex.h fwupd-1.2.5/src/fu-mutex.h
--- fwupd-1.2.4/src/fu-mutex.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-mutex.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_MUTEX_H
-#define __FU_MUTEX_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -64,5 +63,3 @@
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(FuMutexLocker, fu_mutex_locker_free)
 
 G_END_DECLS
-
-#endif /* __FU_MUTEX_H */
diff -Nru fwupd-1.2.4/src/fu-plugin.c fwupd-1.2.5/src/fu-plugin.c
--- fwupd-1.2.4/src/fu-plugin.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-plugin.c	2019-02-25 09:42:18.000000000 +0000
@@ -1330,7 +1330,7 @@
 	}
 }
 
-static gboolean
+gboolean
 fu_plugin_runner_schedule_update (FuPlugin *self,
 			     FuDevice *device,
 			     GBytes *blob_cab,
@@ -1472,7 +1472,6 @@
 gboolean
 fu_plugin_runner_update (FuPlugin *self,
 			 FuDevice *device,
-			 GBytes *blob_cab,
 			 GBytes *blob_fw,
 			 FwupdInstallFlags flags,
 			 GError **error)
@@ -1505,21 +1504,6 @@
 		return FALSE;
 	}
 
-	/* just schedule this for the next reboot  */
-	if (flags & FWUPD_INSTALL_FLAG_OFFLINE) {
-		if (blob_cab == NULL) {
-			g_set_error_literal (error,
-					     FWUPD_ERROR,
-					     FWUPD_ERROR_NOT_SUPPORTED,
-					     "No cabinet archive to schedule");
-			return FALSE;
-		}
-		return fu_plugin_runner_schedule_update (self,
-							 device,
-							 blob_cab,
-							 error);
-	}
-
 	/* cancel the pending action */
 	if (!fu_plugin_runner_offline_invalidate (error))
 		return FALSE;
diff -Nru fwupd-1.2.4/src/fu-plugin.h fwupd-1.2.5/src/fu-plugin.h
--- fwupd-1.2.4/src/fu-plugin.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-plugin.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_PLUGIN_H
-#define __FU_PLUGIN_H
+#pragma once
 
 #include <gio/gio.h>
 #include <gusb.h>
@@ -20,6 +19,7 @@
 #include "fu-hwids.h"
 #include "fu-usb-device.h"
 #include "fu-udev-device.h"
+#include "fwupd-common.h"
 
 G_BEGIN_DECLS
 
@@ -153,6 +153,3 @@
 							 const gchar	*version);
 
 G_END_DECLS
-
-#endif /* __FU_PLUGIN_H */
-
diff -Nru fwupd-1.2.4/src/fu-plugin-list.h fwupd-1.2.5/src/fu-plugin-list.h
--- fwupd-1.2.4/src/fu-plugin-list.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-plugin-list.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,15 +4,14 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_PLUGIN_LIST_H
-#define __FU_PLUGIN_LIST_H
-
-G_BEGIN_DECLS
+#pragma once
 
 #include <glib-object.h>
 
 #include "fu-plugin.h"
 
+G_BEGIN_DECLS
+
 #define FU_TYPE_PLUGIN_LIST (fu_plugin_list_get_type ())
 G_DECLARE_FINAL_TYPE (FuPluginList, fu_plugin_list, FU, PLUGIN_LIST, GObject)
 
@@ -27,6 +26,3 @@
 							 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_PLUGIN_LIST_H */
-
diff -Nru fwupd-1.2.4/src/fu-plugin-private.h fwupd-1.2.5/src/fu-plugin-private.h
--- fwupd-1.2.4/src/fu-plugin-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-plugin-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_PLUGIN_PRIVATE_H
-#define __FU_PLUGIN_PRIVATE_H
+#pragma once
 
 #include "fu-quirks.h"
 #include "fu-plugin.h"
@@ -93,7 +92,6 @@
 							 FuDevice	*device);
 gboolean	 fu_plugin_runner_update		(FuPlugin	*self,
 							 FuDevice	*device,
-							 GBytes		*blob_cab,
 							 GBytes		*blob_fw,
 							 FwupdInstallFlags flags,
 							 GError		**error);
@@ -110,6 +108,10 @@
 gboolean	 fu_plugin_runner_get_results		(FuPlugin	*self,
 							 FuDevice	*device,
 							 GError		**error);
+gboolean	 fu_plugin_runner_schedule_update	(FuPlugin	*self,
+							 FuDevice	*device,
+							 GBytes		*blob_cab,
+							 GError		**error);
 gint		 fu_plugin_name_compare			(FuPlugin	*plugin1,
 							 FuPlugin	*plugin2);
 gint		 fu_plugin_order_compare		(FuPlugin	*plugin1,
@@ -119,5 +121,3 @@
 gchar		*fu_plugin_guess_name_from_fn           (const gchar	*filename);
 
 G_END_DECLS
-
-#endif /* __FU_PLUGIN_PRIVATE_H */
diff -Nru fwupd-1.2.4/src/fu-plugin-vfuncs.h fwupd-1.2.5/src/fu-plugin-vfuncs.h
--- fwupd-1.2.4/src/fu-plugin-vfuncs.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-plugin-vfuncs.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_PLUGIN_VFUNCS_H
-#define __FU_PLUGIN_VFUNCS_H
+#pragma once
 
 #include "fu-plugin.h"
 #include "fu-device.h"
@@ -79,5 +78,3 @@
 							 FuDevice	*dev);
 
 G_END_DECLS
-
-#endif /* __FU_PLUGIN_VFUNCS_H */
diff -Nru fwupd-1.2.4/src/fu-progressbar.c fwupd-1.2.5/src/fu-progressbar.c
--- fwupd-1.2.4/src/fu-progressbar.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-progressbar.c	2019-02-25 09:42:18.000000000 +0000
@@ -97,6 +97,8 @@
 static void
 fu_progressbar_erase_line (FuProgressbar *self)
 {
+	if (!self->interactive)
+		return;
 	for (guint i = 0; i < self->to_erase; i++)
 		g_print ("\b");
 	self->to_erase = 0;
@@ -274,7 +276,7 @@
 
 	if (!self->interactive) {
 		if (self->status != status) {
-			g_print ("%s\n", fu_progressbar_status_to_string (status));
+			g_debug ("%s\n", fu_progressbar_status_to_string (status));
 			self->status = status;
 		}
 		return;
diff -Nru fwupd-1.2.4/src/fu-progressbar.h fwupd-1.2.5/src/fu-progressbar.h
--- fwupd-1.2.4/src/fu-progressbar.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-progressbar.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_PROGRESSBAR_H
-#define __FU_PROGRESSBAR_H
+#pragma once
 
 #include <gio/gio.h>
 
@@ -30,6 +29,3 @@
 							 gboolean interactive);
 
 G_END_DECLS
-
-#endif /* __FU_PROGRESSBAR_H */
-
diff -Nru fwupd-1.2.4/src/fu-quirks.c fwupd-1.2.5/src/fu-quirks.c
--- fwupd-1.2.4/src/fu-quirks.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-quirks.c	2019-02-25 09:42:18.000000000 +0000
@@ -13,10 +13,10 @@
 #include <string.h>
 
 #include "fu-common.h"
-#include "fu-common-guid.h"
 #include "fu-mutex.h"
 #include "fu-quirks.h"
 
+#include "fwupd-common.h"
 #include "fwupd-error.h"
 #include "fwupd-remote-private.h"
 
@@ -97,9 +97,9 @@
 	for (guint i = 0; guid_prefixes[i] != NULL; i++) {
 		if (g_str_has_prefix (group, guid_prefixes[i])) {
 			gsize len = strlen (guid_prefixes[i]);
-			if (fu_common_guid_is_valid (group + len))
+			if (fwupd_guid_is_valid (group + len))
 				return g_strdup (group + len);
-			return fu_common_guid_from_string (group + len);
+			return fwupd_guid_hash_string (group + len);
 		}
 	}
 
diff -Nru fwupd-1.2.4/src/fu-quirks.h fwupd-1.2.5/src/fu-quirks.h
--- fwupd-1.2.4/src/fu-quirks.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-quirks.h	2019-02-25 09:42:18.000000000 +0000
@@ -5,13 +5,12 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_QUIRKS_H
-#define __FU_QUIRKS_H
-
-G_BEGIN_DECLS
+#pragma once
 
 #include <glib-object.h>
 
+G_BEGIN_DECLS
+
 #define FU_TYPE_QUIRKS (fu_quirks_get_type ())
 G_DECLARE_FINAL_TYPE (FuQuirks, fu_quirks, FU, QUIRKS, GObject)
 
@@ -49,5 +48,3 @@
 #define	FU_QUIRKS_VERSION_FORMAT		"VersionFormat"
 
 G_END_DECLS
-
-#endif /* __FU_QUIRKS_H */
diff -Nru fwupd-1.2.4/src/fu-self-test.c fwupd-1.2.5/src/fu-self-test.c
--- fwupd-1.2.4/src/fu-self-test.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-self-test.c	2019-02-25 09:42:18.000000000 +0000
@@ -17,7 +17,6 @@
 
 #include "fu-archive.h"
 #include "fu-common-cab.h"
-#include "fu-common-guid.h"
 #include "fu-common-version.h"
 #include "fu-chunk.h"
 #include "fu-config.h"
@@ -406,17 +405,20 @@
 	fu_device_set_id (device1, "id1");
 	fu_device_set_priority (device1, 0);
 	fu_device_set_plugin (device1, "udev");
-	fu_device_add_guid (device1, "GUID1");
+	fu_device_add_instance_id (device1, "GUID1");
+	fu_device_convert_instance_ids (device1);
 	fu_engine_add_device (engine, device1);
 	fu_device_set_id (device2, "id2");
 	fu_device_set_priority (device2, 1);
 	fu_device_set_plugin (device2, "redfish");
-	fu_device_add_guid (device2, "GUID1");
+	fu_device_add_instance_id (device2, "GUID1");
+	fu_device_convert_instance_ids (device2);
 	fu_engine_add_device (engine, device2);
 	fu_device_set_id (device3, "id3");
 	fu_device_set_priority (device3, 0);
 	fu_device_set_plugin (device3, "uefi");
-	fu_device_add_guid (device3, "GUID1");
+	fu_device_add_instance_id (device3, "GUID1");
+	fu_device_convert_instance_ids (device3);
 	fu_engine_add_device (engine, device3);
 
 	/* get the high prio device */
@@ -451,19 +453,22 @@
 
 	/* add child */
 	fu_device_set_id (device1, "child");
-	fu_device_add_guid (device1, "child-GUID-1");
+	fu_device_add_instance_id (device1, "child-GUID-1");
 	fu_device_add_parent_guid (device1, "parent-GUID");
+	fu_device_convert_instance_ids (device1);
 	fu_engine_add_device (engine, device1);
 
 	/* parent */
 	fu_device_set_id (device2, "parent");
-	fu_device_add_guid (device2, "parent-GUID");
+	fu_device_add_instance_id (device2, "parent-GUID");
 	fu_device_set_vendor (device2, "oem");
+	fu_device_convert_instance_ids (device2);
 
 	/* add another child */
 	fu_device_set_id (device3, "child2");
-	fu_device_add_guid (device3, "child-GUID-2");
+	fu_device_add_instance_id (device3, "child-GUID-2");
 	fu_device_add_parent_guid (device3, "parent-GUID");
+	fu_device_convert_instance_ids (device3);
 	fu_device_add_child (device2, device3);
 
 	/* add two together */
@@ -943,6 +948,10 @@
 	g_assert_no_error (error);
 	g_assert_nonnull (component);
 
+	/* set the counter */
+	g_setenv ("FWUPD_PLUGIN_TEST", "another-write-required", TRUE);
+	fu_device_set_metadata_integer (device, "nr-update", 0);
+
 	/* install it */
 	task = fu_install_task_new (device, component);
 	ret = fu_engine_install (engine, task, blob_cab,
@@ -950,6 +959,9 @@
 	g_assert_no_error (error);
 	g_assert (ret);
 
+	/* check the write was done more than once */
+	g_assert_cmpint (fu_device_get_metadata_integer (device, "nr-update"), ==, 2);
+
 	/* check the history database */
 	history = fu_history_new ();
 	device2 = fu_history_get_device_by_id (history, fu_device_get_id (device), &error);
@@ -1142,8 +1154,9 @@
 
 	/* add one device */
 	fu_device_set_id (device1, "device1");
-	fu_device_add_guid (device1, "foobar");
+	fu_device_add_instance_id (device1, "foobar");
 	fu_device_set_remove_delay (device1, 100);
+	fu_device_convert_instance_ids (device1);
 	fu_device_list_add (device_list, device1);
 	g_assert_cmpint (added_cnt, ==, 1);
 	g_assert_cmpint (removed_cnt, ==, 0);
@@ -1268,15 +1281,17 @@
 
 	/* fake devices */
 	fu_device_set_id (device1, "device1");
-	fu_device_add_guid (device1, "foo");
-	fu_device_add_guid (device1, "bar");
+	fu_device_add_instance_id (device1, "foo");
+	fu_device_add_instance_id (device1, "bar");
 	fu_device_set_plugin (device1, "self-test");
 	fu_device_set_remove_delay (device1, FU_DEVICE_REMOVE_DELAY_USER_REPLUG);
+	fu_device_convert_instance_ids (device1);
 	fu_device_set_id (device2, "device2");
-	fu_device_add_guid (device2, "baz");
-	fu_device_add_guid (device2, "bar"); /* matches */
+	fu_device_add_instance_id (device2, "baz");
+	fu_device_add_instance_id (device2, "bar"); /* matches */
 	fu_device_set_plugin (device2, "self-test");
 	fu_device_set_remove_delay (device2, FU_DEVICE_REMOVE_DELAY_USER_REPLUG);
+	fu_device_convert_instance_ids (device2);
 
 	/* not yet added */
 	ret = fu_device_list_wait_for_replug (device_list, device1, &error);
@@ -1332,9 +1347,10 @@
 	fu_device_set_plugin (device1, "plugin-for-runtime");
 	fu_device_set_vendor_id (device1, "USB:0x20A0");
 	fu_device_set_version (device1, "1.2.3");
-	fu_device_add_guid (device1, "foobar");
-	fu_device_add_guid (device1, "bootloader");
+	fu_device_add_instance_id (device1, "foobar");
+	fu_device_add_instance_id (device1, "bootloader");
 	fu_device_set_remove_delay (device1, 100);
+	fu_device_convert_instance_ids (device1);
 	fu_device_list_add (device_list, device1);
 	g_assert_cmpint (added_cnt, ==, 1);
 	g_assert_cmpint (removed_cnt, ==, 0);
@@ -1343,7 +1359,8 @@
 	/* add another device in bootloader mode */
 	fu_device_set_id (device2, "device2");
 	fu_device_set_plugin (device2, "plugin-for-bootloader");
-	fu_device_add_guid (device2, "bootloader");
+	fu_device_add_instance_id (device2, "bootloader");
+	fu_device_convert_instance_ids (device2);
 
 	/* verify only a changed event was generated */
 	added_cnt = removed_cnt = changed_cnt = 0;
@@ -1402,7 +1419,8 @@
 
 	/* add child */
 	fu_device_set_id (device_child, "child");
-	fu_device_add_guid (device_child, "child-GUID-1");
+	fu_device_add_instance_id (device_child, "child-GUID-1");
+	fu_device_convert_instance_ids (device_child);
 	fu_device_list_add (device_list, device_child);
 	g_assert_cmpint (added_cnt, ==, 1);
 	g_assert_cmpint (removed_cnt, ==, 0);
@@ -1410,7 +1428,8 @@
 
 	/* add parent */
 	fu_device_set_id (device_parent, "parent");
-	fu_device_add_guid (device_parent, "parent-GUID-1");
+	fu_device_add_instance_id (device_parent, "parent-GUID-1");
+	fu_device_convert_instance_ids (device_parent);
 	fu_device_add_child (device_parent, device_child);
 	fu_device_list_add (device_list, device_parent);
 	g_assert_cmpint (added_cnt, ==, 2);
@@ -1450,10 +1469,12 @@
 
 	/* add both */
 	fu_device_set_id (device1, "device1");
-	fu_device_add_guid (device1, "foobar");
+	fu_device_add_instance_id (device1, "foobar");
+	fu_device_convert_instance_ids (device1);
 	fu_device_list_add (device_list, device1);
 	fu_device_set_id (device2, "device2");
-	fu_device_add_guid (device2, "baz");
+	fu_device_add_instance_id (device2, "baz");
+	fu_device_convert_instance_ids (device2);
 	fu_device_list_add (device_list, device2);
 	g_assert_cmpint (added_cnt, ==, 2);
 	g_assert_cmpint (removed_cnt, ==, 0);
@@ -1834,7 +1855,8 @@
 	fu_device_set_physical_id (device, "usb:00:05");
 	fu_device_set_quirks (device, quirks);
 	fu_device_add_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE);
-	fu_device_add_guid (device, "USB\\VID_0BDA&PID_1100");
+	fu_device_add_instance_id (device, "USB\\VID_0BDA&PID_1100");
+	fu_device_convert_instance_ids (device);
 	g_assert_cmpstr (fu_device_get_name (device), ==, "Hub");
 
 	/* ensure children are created */
@@ -1933,8 +1955,7 @@
 	g_assert (mapped_file != NULL);
 	blob_cab = g_mapped_file_get_bytes (mapped_file);
 	fwupd_release_set_version (fu_device_get_release_default (device), "1.2.3");
-	ret = fu_plugin_runner_update (plugin, device, blob_cab, NULL,
-				       FWUPD_INSTALL_FLAG_OFFLINE, &error);
+	ret = fu_plugin_runner_schedule_update (plugin, device, blob_cab, &error);
 	g_assert_no_error (error);
 	g_assert (ret);
 	g_assert_cmpint (cnt, ==, 1);
@@ -1955,7 +1976,7 @@
 	pending_cap = g_strdup (fwupd_release_get_filename (release));
 
 	/* lets do this online */
-	ret = fu_plugin_runner_update (plugin, device, blob_cab, NULL,
+	ret = fu_plugin_runner_update (plugin, device, blob_cab,
 				       FWUPD_INSTALL_FLAG_NONE, &error);
 	g_assert_no_error (error);
 	g_assert (ret);
@@ -3155,30 +3176,6 @@
 }
 
 static void
-fu_common_guid_func (void)
-{
-	g_autofree gchar *guid1 = NULL;
-	g_autofree gchar *guid2 = NULL;
-
-	/* invalid */
-	g_assert (!fu_common_guid_is_valid (NULL));
-	g_assert (!fu_common_guid_is_valid (""));
-	g_assert (!fu_common_guid_is_valid ("1ff60ab2-3905-06a1-b476"));
-	g_assert (!fu_common_guid_is_valid ("1ff60ab2-XXXX-XXXX-XXXX-0371f00c9e9b"));
-	g_assert (!fu_common_guid_is_valid (" 1ff60ab2-3905-06a1-b476-0371f00c9e9b"));
-	g_assert (!fu_common_guid_is_valid ("00000000-0000-0000-0000-000000000000"));
-
-	/* valid */
-	g_assert (fu_common_guid_is_valid ("1ff60ab2-3905-06a1-b476-0371f00c9e9b"));
-
-	/* make valid */
-	guid1 = fu_common_guid_from_string ("python.org");
-	g_assert_cmpstr (guid1, ==, "886313e1-3b8a-5372-9b90-0c9aee199e5d");
-	guid2 = fu_common_guid_from_string ("8086:0406");
-	g_assert_cmpstr (guid2, ==, "1fbd1f2c-80f4-5d7c-a6ad-35c7b9bd5486");
-}
-
-static void
 fu_common_version_func (void)
 {
 	guint i;
@@ -3378,7 +3375,6 @@
 	g_test_add_func ("/fwupd/plugin{build-hash}", fu_plugin_hash_func);
 	g_test_add_func ("/fwupd/chunk", fu_chunk_func);
 	g_test_add_func ("/fwupd/common{version-guess-format}", fu_common_version_guess_format_func);
-	g_test_add_func ("/fwupd/common{guid}", fu_common_guid_func);
 	g_test_add_func ("/fwupd/common{version}", fu_common_version_func);
 	g_test_add_func ("/fwupd/common{vercmp}", fu_common_vercmp_func);
 	g_test_add_func ("/fwupd/common{strstrip}", fu_common_strstrip_func);
diff -Nru fwupd-1.2.4/src/fu-smbios.h fwupd-1.2.5/src/fu-smbios.h
--- fwupd-1.2.4/src/fu-smbios.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-smbios.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_SMBIOS_H
-#define __FU_SMBIOS_H
+#pragma once
 
 #include <glib-object.h>
 
@@ -41,5 +40,3 @@
 						 GError		**error);
 
 G_END_DECLS
-
-#endif /* __FU_SMBIOS_H */
diff -Nru fwupd-1.2.4/src/fu-test.h fwupd-1.2.5/src/fu-test.h
--- fwupd-1.2.4/src/fu-test.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-test.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_TEST_H__
-#define __FU_TEST_H__
+#pragma once
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 gchar		*fu_test_get_filename		(const gchar	*testdatadirs,
 						 const gchar	*filename);
 void		 fu_test_loop_run_with_timeout	(guint		 timeout_ms);
@@ -17,4 +18,4 @@
 						 const gchar	*txt2,
 						 GError		**error);
 
-#endif /* __FU_TEST_H__ */
+G_END_DECLS
diff -Nru fwupd-1.2.4/src/fu-tool.c fwupd-1.2.5/src/fu-tool.c
--- fwupd-1.2.4/src/fu-tool.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-tool.c	2019-02-25 09:42:18.000000000 +0000
@@ -49,6 +49,8 @@
 	FuEngine		*engine;
 	FuProgressbar		*progressbar;
 	gboolean		 no_reboot_check;
+	gboolean		 prepare_blob;
+	gboolean		 cleanup_blob;
 	FwupdInstallFlags	 flags;
 	gboolean		 show_all_devices;
 	/* only valid in update and downgrade */
@@ -87,9 +89,11 @@
 	g_autoptr(GError) error_local = NULL;
 
 	/* try to stop any already running daemon */
-	connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, error);
-	if (connection == NULL)
-		return FALSE;
+	connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error_local);
+	if (connection == NULL) {
+		g_debug ("Failed to get bus: %s", error_local->message);
+		return TRUE;
+	}
 	proxy = g_dbus_proxy_new_sync (connection,
 					G_DBUS_PROXY_FLAGS_NONE,
 					NULL,
@@ -682,13 +686,37 @@
 			  G_CALLBACK (fu_util_update_device_changed_cb), priv);
 
 	/* write bare firmware */
-	if (!fu_engine_install_blob (priv->engine, device,
-				     NULL, /* blob_cab */
-				     blob_fw,
-				     NULL, /* version */
-				     priv->flags,
-				     error))
+	if (priv->prepare_blob) {
+		g_autoptr(GPtrArray) devices = NULL;
+		devices = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
+		g_ptr_array_add (devices, g_object_ref (device));
+		if (!fu_engine_composite_prepare (priv->engine, devices, error)) {
+			g_prefix_error (error, "failed to prepare composite action: ");
+			return FALSE;
+		}
+	}
+	if (!fu_engine_install_blob (priv->engine, device, blob_fw, priv->flags, error))
 		return FALSE;
+	if (priv->cleanup_blob) {
+		g_autoptr(FuDevice) device_new = NULL;
+		g_autoptr(GError) error_local = NULL;
+
+		/* get the possibly new device from the old ID */
+		device_new = fu_engine_get_device (priv->engine,
+						   fu_device_get_id (device),
+						   &error_local);
+		if (device_new == NULL) {
+			g_debug ("failed to find new device: %s",
+				 error_local->message);
+		} else {
+			g_autoptr(GPtrArray) devices_new = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
+			g_ptr_array_add (devices_new, g_steal_pointer (&device_new));
+			if (!fu_engine_composite_cleanup (priv->engine, devices_new, error)) {
+				g_prefix_error (error, "failed to cleanup composite action: ");
+				return FALSE;
+			}
+		}
+	}
 
 	fu_util_display_current_message (priv);
 
@@ -876,6 +904,8 @@
 			  G_CALLBACK (fu_util_update_device_changed_cb), priv);
 
 	devices = fu_engine_get_devices (priv->engine, error);
+	if (devices == NULL)
+		return FALSE;
 	for (guint i = 0; i < devices->len; i++) {
 		FwupdDevice *dev = g_ptr_array_index (devices, i);
 		FwupdRelease *rel;
@@ -1193,6 +1223,7 @@
 	gboolean force = FALSE;
 	gboolean ret;
 	gboolean version = FALSE;
+	gboolean interactive = isatty (fileno (stdout)) != 0;
 	g_auto(GStrv) plugin_glob = NULL;
 	g_autoptr(FuUtilPrivate) priv = g_new0 (FuUtilPrivate, 1);
 	g_autoptr(GError) error = NULL;
@@ -1219,6 +1250,13 @@
 		{ "plugin-whitelist", '\0', 0, G_OPTION_ARG_STRING_ARRAY, &plugin_glob,
 			/* TRANSLATORS: command line option */
 			_("Manually whitelist specific plugins"), NULL },
+		{ "prepare", '\0', 0, G_OPTION_ARG_NONE, &priv->prepare_blob,
+			/* TRANSLATORS: command line option */
+			_("Run the plugin composite prepare routine when using install-blob"), NULL },
+		{ "cleanup", '\0', 0, G_OPTION_ARG_NONE, &priv->cleanup_blob,
+			/* TRANSLATORS: command line option */
+			_("Run the plugin composite cleanup routine when using install-blob"), NULL },
+
 		{ NULL}
 	};
 
@@ -1229,7 +1267,7 @@
 	textdomain (GETTEXT_PACKAGE);
 
 	/* ensure root user */
-	if (getuid () != 0 || geteuid () != 0)
+	if (interactive && (getuid () != 0 || geteuid () != 0))
 		/* TRANSLATORS: we're poking around as a power user */
 		g_printerr ("%s\n", _("This program may only work correctly as root"));
 
@@ -1343,7 +1381,7 @@
 			  (GCompareFunc) fu_sort_command_name_cb);
 
 	/* non-TTY consoles cannot answer questions */
-	if (isatty (fileno (stdout)) == 0) {
+	if (!interactive) {
 		priv->no_reboot_check = TRUE;
 		fu_progressbar_set_interactive (priv->progressbar, FALSE);
 	}
diff -Nru fwupd-1.2.4/src/fu-udev-device.c fwupd-1.2.5/src/fu-udev-device.c
--- fwupd-1.2.4/src/fu-udev-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-udev-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -214,18 +214,18 @@
 		devid = g_strdup_printf ("%s\\VEN_%04X&DEV_%04X&REV_%02X",
 					 subsystem, priv->vendor,
 					 priv->model, priv->revision);
-		fu_device_add_guid (device, devid);
+		fu_device_add_instance_id (device, devid);
 	}
 	if (priv->vendor != 0x0000 && priv->model != 0x0000) {
 		g_autofree gchar *devid = NULL;
 		devid = g_strdup_printf ("%s\\VEN_%04X&DEV_%04X",
 					 subsystem, priv->vendor, priv->model);
-		fu_device_add_guid (device, devid);
+		fu_device_add_instance_id (device, devid);
 	}
 	if (priv->vendor != 0x0000) {
 		g_autofree gchar *devid = NULL;
 		devid = g_strdup_printf ("%s\\VEN_%04X", subsystem, priv->vendor);
-		fu_device_add_guid (device, devid);
+		fu_device_add_instance_id (device, devid);
 	}
 
 	/* subclassed */
diff -Nru fwupd-1.2.4/src/fu-udev-device.h fwupd-1.2.5/src/fu-udev-device.h
--- fwupd-1.2.4/src/fu-udev-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-udev-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UDEV_DEVICE_H
-#define __FU_UDEV_DEVICE_H
+#pragma once
 
 #include <glib-object.h>
 #include <gudev/gudev.h>
@@ -40,5 +39,3 @@
 void		 fu_udev_device_dump			(FuUdevDevice	*self);
 
 G_END_DECLS
-
-#endif /* __FU_UDEV_DEVICE_H */
diff -Nru fwupd-1.2.4/src/fu-udev-device-private.h fwupd-1.2.5/src/fu-udev-device-private.h
--- fwupd-1.2.4/src/fu-udev-device-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-udev-device-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UDEV_DEVICE_PRIVATE_H
-#define __FU_UDEV_DEVICE_PRIVATE_H
+#pragma once
 
 #include "fu-udev-device.h"
 
@@ -14,5 +13,3 @@
 void		 fu_udev_device_emit_changed		(FuUdevDevice	*self);
 
 G_END_DECLS
-
-#endif /* __FU_UDEV_DEVICE_PRIVATE_H */
diff -Nru fwupd-1.2.4/src/fu-usb-device.c fwupd-1.2.5/src/fu-usb-device.c
--- fwupd-1.2.4/src/fu-usb-device.c	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-usb-device.c	2019-02-25 09:42:18.000000000 +0000
@@ -247,14 +247,14 @@
 				  g_usb_device_get_vid (priv->usb_device),
 				  g_usb_device_get_pid (priv->usb_device),
 				  release);
-	fu_device_add_guid (device, devid2);
+	fu_device_add_instance_id (device, devid2);
 	devid1 = g_strdup_printf ("USB\\VID_%04X&PID_%04X",
 				  g_usb_device_get_vid (priv->usb_device),
 				  g_usb_device_get_pid (priv->usb_device));
-	fu_device_add_guid (device, devid1);
+	fu_device_add_instance_id (device, devid1);
 	devid0 = g_strdup_printf ("USB\\VID_%04X",
 				  g_usb_device_get_vid (priv->usb_device));
-	fu_device_add_guid (device, devid0);
+	fu_device_add_instance_id (device, devid0);
 
 	/* add the interface GUIDs */
 	intfs = g_usb_device_get_interfaces (priv->usb_device, error);
@@ -269,14 +269,14 @@
 					  g_usb_interface_get_class (intf),
 					  g_usb_interface_get_subclass (intf),
 					  g_usb_interface_get_protocol (intf));
-		fu_device_add_guid (device, intid1);
+		fu_device_add_instance_id (device, intid1);
 		intid2 = g_strdup_printf ("USB\\CLASS_%02X&SUBCLASS_%02X",
 					  g_usb_interface_get_class (intf),
 					  g_usb_interface_get_subclass (intf));
-		fu_device_add_guid (device, intid2);
+		fu_device_add_instance_id (device, intid2);
 		intid3 = g_strdup_printf ("USB\\CLASS_%02X",
 					  g_usb_interface_get_class (intf));
-		fu_device_add_guid (device, intid3);
+		fu_device_add_instance_id (device, intid3);
 	}
 
 	/* subclassed */
diff -Nru fwupd-1.2.4/src/fu-usb-device.h fwupd-1.2.5/src/fu-usb-device.h
--- fwupd-1.2.4/src/fu-usb-device.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-usb-device.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_USB_DEVICE_H
-#define __FU_USB_DEVICE_H
+#pragma once
 
 #include <glib-object.h>
 #include <gusb.h>
@@ -48,5 +47,3 @@
 gboolean	 fu_usb_device_is_open			(FuUsbDevice	*device);
 
 G_END_DECLS
-
-#endif /* __FU_USB_DEVICE_H */
diff -Nru fwupd-1.2.4/src/fu-usb-device-private.h fwupd-1.2.5/src/fu-usb-device-private.h
--- fwupd-1.2.4/src/fu-usb-device-private.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-usb-device-private.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_USB_DEVICE_PRIVATE_H
-#define __FU_USB_DEVICE_PRIVATE_H
+#pragma once
 
 #include "fu-usb-device.h"
 
@@ -14,5 +13,3 @@
 const gchar	*fu_usb_device_get_platform_id		(FuUsbDevice	*self);
 
 G_END_DECLS
-
-#endif /* __FU_USB_DEVICE_PRIVATE_H */
diff -Nru fwupd-1.2.4/src/fu-util-common.h fwupd-1.2.5/src/fu-util-common.h
--- fwupd-1.2.4/src/fu-util-common.h	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/fu-util-common.h	2019-02-25 09:42:18.000000000 +0000
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#ifndef __FU_UTIL_COMMON_H__
-#define __FU_UTIL_COMMON_H__
+#pragma once
 
 #include <glib.h>
 #include <fwupd.h>
 
+G_BEGIN_DECLS
+
 /* this is only valid for tools */
 #define FWUPD_ERROR_INVALID_ARGS        (FWUPD_ERROR_LAST+1)
 
@@ -28,4 +29,4 @@
 						 gboolean prompt,
 						 GError **error);
 
-#endif /* __FU_UTIL_COMMON_H__ */
+G_END_DECLS
diff -Nru fwupd-1.2.4/src/meson.build fwupd-1.2.5/src/meson.build
--- fwupd-1.2.4/src/meson.build	2019-02-01 14:28:36.000000000 +0000
+++ fwupd-1.2.5/src/meson.build	2019-02-25 09:42:18.000000000 +0000
@@ -57,7 +57,6 @@
     libarchive,
     libxmlb,
     valgrind,
-    uuid,
   ],
   link_with : [
     fwupd,
@@ -168,7 +167,6 @@
     sqlite,
     valgrind,
     libarchive,
-    uuid,
   ],
   link_with : [
     fwupd,
@@ -253,7 +251,6 @@
     sqlite,
     valgrind,
     libarchive,
-    uuid,
   ],
   link_with : fwupd,
   c_args : [
@@ -327,7 +324,6 @@
       sqlite,
       valgrind,
       libarchive,
-      uuid,
     ],
     link_with : [
       fwupd,