Hello community,

here is the log from the commit of package fwupdate for openSUSE:Factory 
checked in at 2018-07-24 17:29:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fwupdate (Old)
 and      /work/SRC/openSUSE:Factory/.fwupdate.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "fwupdate"

Tue Jul 24 17:29:28 2018 rev:10 rq:624146 version:12

Changes:
--------
--- /work/SRC/openSUSE:Factory/fwupdate/fwupdate.changes        2018-07-02 
23:28:24.649623844 +0200
+++ /work/SRC/openSUSE:Factory/.fwupdate.new/fwupdate.changes   2018-07-24 
17:29:38.839854368 +0200
@@ -1,0 +2,13 @@
+Thu Jul 19 21:56:34 UTC 2018 - [email protected]
+
+- Update to version 12:
+  + Better CI.
+  + Limit how large our WMI buffer can be.
+  + Add fwup_version() because fwupd wants it.
+  + Fix linking on (some) platforms that need libgcc_eh.a.
+  + abicheck improvements.
+  + Default to creating a UX capsule, whatever it may actually do.
+- Refresh fwupdate-suse-build.patch with quilt.
+- Use url for source tarball and license tag for COPYING.
+
+-------------------------------------------------------------------

Old:
----
  fwupdate-11.tar.bz2

New:
----
  fwupdate-12.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fwupdate.spec ++++++
--- /var/tmp/diff_new_pack.ZbXdQP/_old  2018-07-24 17:29:40.155856034 +0200
+++ /var/tmp/diff_new_pack.ZbXdQP/_new  2018-07-24 17:29:40.159856039 +0200
@@ -26,13 +26,13 @@
 %endif
 
 Name:           fwupdate
-Version:        11
+Version:        12
 Release:        0
 Summary:        Tools to manage UEFI firmware updates
 License:        GPL-2.0-or-later
 Group:          System/Base
 Url:            https://github.com/rhinstaller/fwupdate
-Source:         %{name}-%{version}.tar.bz2
+Source0:        
https://github.com/rhboot/fwupdate/releases/download/%{version}/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-suse-build.patch
 BuildRequires:  efivar-devel >= 34
 BuildRequires:  elfutils
@@ -151,7 +151,7 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING
+%license COPYING
 %{_bindir}/fwupdate
 %doc %{_mandir}/man1/*
 %dir %{_datadir}/bash-completion

++++++ fwupdate-11.tar.bz2 -> fwupdate-12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/.travis.yml new/fwupdate-12/.travis.yml
--- old/fwupdate-11/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/fwupdate-12/.travis.yml 2018-06-28 20:00:19.000000000 +0200
@@ -0,0 +1,17 @@
+language: c
+cache: ccache
+branches:
+  except:
+    - travis
+
+matrix:
+ include:
+   - os: linux
+     dist: trusty
+     services: docker
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull 
vathpela/efi-ci-rawhide:v0 ; fi
+
+script:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run 
vathpela/efi-ci-rawhide:v0 /bin/sh -c "cd /root/ && ./build.sh --branch 
\"$TRAVIS_BRANCH\" --commit \"$TRAVIS_COMMIT\" --commit-range 
\"$TRAVIS_COMMIT_RANGE\" --event-type \"$TRAVIS_EVENT_TYPE\" --pull-request 
\"$TRAVIS_PULL_REQUEST\" --pr-branch \"$TRAVIS_PULL_REQUEST_BRANCH\" --pr-sha 
\"$TRAVIS_PULL_REQUEST_SHA\" --remote \"$TRAVIS_PULL_REQUEST_SLUG\" --repo 
\"$TRAVIS_REPO_SLUG\" --test-subject fwupdate" ; fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/Make.defaults 
new/fwupdate-12/Make.defaults
--- old/fwupdate-11/Make.defaults       2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/Make.defaults       2018-06-28 20:00:19.000000000 +0200
@@ -66,7 +66,17 @@
 
 EFIDIR         ?= $(shell x=$$(which --skip-alias --skip-functions git 
2>/dev/null) ; [ -n "$$x" ] && git config --get fwupdate.efidir)
 ifeq ($(EFIDIR),)
-       EFIDIR_ERROR = $(error EFIDIR or .gitconfig fwupdate.efidir must be set 
to this distro's reserved EFI System Partition subdirectory name)
+       ifneq ("$(wildcard /etc/os-release)","")
+               RELEASE := /etc/os-release
+       else ifneq ("$(wildcard /usr/lib/os-release)","")
+               RELEASE := /usr/lib/os-release
+       endif
+       ifneq ($(RELEASE),)
+               EFIDIR = $(shell sed '/^ID=/!d; s/ID=//' $(RELEASE))
+       endif
+       ifeq ($(EFIDIR),)
+               EFIDIR_ERROR = $(error EFIDIR or .gitconfig fwupdate.efidir 
must be set to this distro's reserved EFI System Partition subdirectory name)
+       endif
 endif
 ESPMOUNTPOINT  ?= $(shell x=$$(which --skip-alias --skip-functions git 
2>/dev/null) ; [ -n "$$x" ] && git config --get fwupdate.espmountdir)
 ifeq ($(ESPMOUNTPOINT),)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/Make.rules new/fwupdate-12/Make.rules
--- old/fwupdate-11/Make.rules  2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/Make.rules  2018-06-28 20:00:19.000000000 +0200
@@ -5,6 +5,7 @@
 
 %.abixml : %.so
        $(ABIDW) --headers-dir $(TOP)/linux/include/ --out-file $@ $^
+       @sed -i -s 's,$(TOPDIR)/,,g' $@
 
 %.abicheck : %.so
        $(ABIDIFF) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/Make.version new/fwupdate-12/Make.version
--- old/fwupdate-11/Make.version        2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/Make.version        2018-06-28 20:00:19.000000000 +0200
@@ -1 +1 @@
-VERSION=11
+VERSION=12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/Makefile new/fwupdate-12/Makefile
--- old/fwupdate-11/Makefile    2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/Makefile    2018-06-28 20:00:19.000000000 +0200
@@ -12,7 +12,7 @@
 include $(TOP)/Make.scan-build
 SUBDIRS ?= efi linux docs include
 
-all abidw abicheck clean install : | check_efidir_error
+all abicheck clean install : | check_efidir_error
        @set -e ; for x in $(SUBDIRS) ; do \
                if [ ! -d $${x} ]; then \
                        install -m 0755 -d $${x} ; \
@@ -22,6 +22,10 @@
                        -C $$x/ -f $(TOP)/$$x/Makefile $@ ; \
        done
 
+abiupdate :
+       $(MAKE) clean all
+       $(MAKE) -C linux TOPDIR=$(TOP) abiclean abiupdate
+
 GITTAG = $(shell bash -c "echo $$(($(VERSION) + 1))")
 
 fwupdate.spec : | Makefile
@@ -47,7 +51,7 @@
 tag:
        git tag -s $(GITTAG) refs/heads/master
 
-archive: abicheck abidw bumpver tag fwupdate.spec
+archive: abicheck abiupdate bumpver tag fwupdate.spec
        @rm -rf /tmp/fwupdate-$(GITTAG) /tmp/fwupdate-$(GITTAG)-tmp
        @mkdir -p /tmp/fwupdate-$(GITTAG)-tmp
        @git archive --format=tar $(GITTAG) | ( cd /tmp/fwupdate-$(GITTAG)-tmp/ 
; tar x )
@@ -57,4 +61,4 @@
        @rm -rf /tmp/fwupdate-$(GITTAG)
        @echo "The archive is in fwupdate-$(GITTAG).tar.bz2"
 
-.PHONY: $(SUBDIRS)
+.PHONY: $(SUBDIRS) abiupdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/README.md new/fwupdate-12/README.md
--- old/fwupdate-11/README.md   2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/README.md   2018-06-28 20:00:19.000000000 +0200
@@ -49,7 +49,7 @@
 ```
 # git config fwupdate.efidir $DIRECTORY
 ```
-This usually refers to the OS distributor.  For example on Ubuntu it's set to 
*ubuntu*
+This usually refers to the OS distributor.  If not configured it will default 
to the value defined for `ID` in `/etc/os-release` or `/usr/lib/os-release`.
 
 Run the build command
 ```
@@ -88,6 +88,6 @@
 
 Enable firmware updates on supported Dell systems (if compiled with libsmbios):
 ```
-# fwupate --enable
+# fwupdate --enable
 ```
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/docs/Makefile 
new/fwupdate-12/docs/Makefile
--- old/fwupdate-11/docs/Makefile       2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/docs/Makefile       2018-06-28 20:00:19.000000000 +0200
@@ -38,12 +38,10 @@
 install : | $(foreach x, $(MAN1TARGETS), $(DESTDIR)$(mandir)/man1/$(x))
 install : | $(foreach x, $(MAN3TARGETS), $(DESTDIR)$(mandir)/man3/$(x))
 
-$(DESTDIR)$(mandir)/man1/%.1 : | mandirs
-$(DESTDIR)$(mandir)/man1/%.1 : %.1
+$(DESTDIR)$(mandir)/man1/%.1 : %.1 | mandirs
        $(INSTALL) -m 644 $< $@
 
-$(DESTDIR)$(mandir)/man3/%.3 : | mandirs
-$(DESTDIR)$(mandir)/man3/%.3 : %.3
+$(DESTDIR)$(mandir)/man3/%.3 : %.3 | mandirs
        $(INSTALL) -m 644 $< $@
 
 .PHONY: all clean test install mandirs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/efi/.syntastic_c_config 
new/fwupdate-12/efi/.syntastic_c_config
--- old/fwupdate-11/efi/.syntastic_c_config     2018-04-09 20:44:38.000000000 
+0200
+++ new/fwupdate-12/efi/.syntastic_c_config     1970-01-01 01:00:00.000000000 
+0100
@@ -1,30 +0,0 @@
--Og
--g3
--Werror=format-security
--Wp,-D_FORTIFY_SOURCE=2
--fexceptions
--fstack-protector-strong
---param=ssp-buffer-size=4
--grecord-gcc-switches
--fpic
--Werror
--Wall
--Wextra
--fshort-wchar
--fno-merge-constants
--ffreestanding
--fno-stack-protector
--fno-stack-check
---std=gnu11
--DCONFIG_x86_64
--I/usr/include/efi/
--I/usr/include/efi/x86_64/
--iquote/home/pjones/devel/github.com/fwupdate/ux-capsule/include
--mno-mmx
--mno-sse
--mno-red-zone
--nostdinc
--maccumulate-outgoing-args
--DEFI_FUNCTION_WRAPPER
--DGNU_EFI_USE_MS_ABI
--I/usr/lib/gcc/x86_64-redhat-linux/7/include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/efi/Makefile new/fwupdate-12/efi/Makefile
--- old/fwupdate-11/efi/Makefile        2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/efi/Makefile        2018-06-28 20:00:19.000000000 +0200
@@ -13,6 +13,7 @@
           -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 \
           -grecord-gcc-switches
 BUILDFLAGS     := $(CFLAGS) -fpic -Werror -Wall -Wextra -fshort-wchar \
+       -Wno-error=missing-field-initializers -Wno-missing-field-initializers \
        -fno-merge-constants -ffreestanding \
        -fno-stack-protector -fno-stack-check --std=gnu11 -DCONFIG_$(ARCH) \
        -I/usr/include/efi/ -I/usr/include/efi/$(ARCH)/ \
@@ -23,6 +24,10 @@
        -Wl,--build-id=sha1 -Wl,--hash-style=sysv \
        $(GNUEFIDIR)/crt0-efi-$(ARCH).o
 CLANG_BUGS     = $(if $(findstring gcc,$(CC)),-maccumulate-outgoing-args,)
+LIBGCC=$(shell $(CC) -print-libgcc-file-name)
+ifeq ($(ARCH),arm)
+LIBGCC+=" $(shell $(CC) -print-libgcc-file-name | sed 's/\.a$/_eh.a/')"
+endif
 
 define objcopy_version =
   $(OBJCOPY) --version |
@@ -106,7 +111,7 @@
 
 %.so : %.o
        $(CC) $(CCLDFLAGS) -o $@ $^ -lefi -lgnuefi \
-               $(shell $(CC) -print-libgcc-file-name) \
+               $(LIBGCC) \
                -T elf_$(ARCH)_efi.lds
 
 %.o : %.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/efi/fwupdate.c 
new/fwupdate-12/efi/fwupdate.c
--- old/fwupdate-11/efi/fwupdate.c      2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/efi/fwupdate.c      2018-06-28 20:00:19.000000000 +0200
@@ -11,14 +11,12 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include "hexdump.h"
+#include <stdbool.h>
 
-#ifndef DEBUGDIR
-#define DEBUGDIR L"/usr/lib/debug"
-#endif
+#include "fwup-efi.h"
+#include "hexdump.h"
 
-#define efidp_header EFI_DEVICE_PATH
-#define efi_guid_t EFI_GUID
+#define UNUSED __attribute__((__unused__))
 
 EFI_GUID empty_guid = {0x0,0x0,0x0,{0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}};
 EFI_GUID fwupdate_guid =
@@ -29,7 +27,6 @@
        {0x6dcbd5ed,0xe82d,0x4c44,{0xbd,0xa1,0x71,0x94,0x19,0x9a,0xd9,0x2a}};
 EFI_GUID global_variable_guid = EFI_GLOBAL_VARIABLE;
 
-#include "fwup-efi.h"
 
 typedef struct update_table_s {
        CHAR16 *name;
@@ -51,7 +48,7 @@
 static VOID
 msleep(unsigned long msecs)
 {
-       gBS->Stall(msecs);
+       BS->Stall(msecs);
 }
 
 
@@ -87,7 +84,7 @@
                       EFI_VARIABLE_BOOTSERVICE_ACCESS |
                       EFI_VARIABLE_RUNTIME_ACCESS;
        CHAR16 *name = L"FWUPDATE_DEBUG_LOG";
-       static int once = 1;
+       static bool once = true;
 
        va_start(args0, fmt);
        out0 = VPoolPrint(fmt, args0);
@@ -112,7 +109,7 @@
        }
 
        if (once) {
-               once = 0;
+               once = false;
                delete_variable(name, fwupdate_guid, attrs);
        } else {
                attrs |= EFI_VARIABLE_APPEND_WRITE;
@@ -1199,7 +1196,7 @@
        EFI_STATUS efi_status;
        UINT32 attributes;
        register volatile int x = 0;
-       extern char _text, _data;
+       extern char _text UNUSED, _data UNUSED;
 
        /*
         * If SHIM_DEBUG is set, we're going to assume shim has done whatever
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/include/fwup-efi.h 
new/fwupdate-12/include/fwup-efi.h
--- old/fwupdate-11/include/fwup-efi.h  2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/include/fwup-efi.h  2018-06-28 20:00:19.000000000 +0200
@@ -15,6 +15,11 @@
 
 #define UPDATE_INFO_VERSION    7
 
+#ifdef _EFI_INCLUDE_
+#define efidp_header EFI_DEVICE_PATH
+#define efi_guid_t EFI_GUID
+#endif /* _EFI_INCLUDE_ */
+
 typedef struct {
        uint8_t version;
        uint8_t checksum;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/linux/.syntastic_c_config 
new/fwupdate-12/linux/.syntastic_c_config
--- old/fwupdate-11/linux/.syntastic_c_config   2018-04-09 20:44:38.000000000 
+0200
+++ new/fwupdate-12/linux/.syntastic_c_config   1970-01-01 01:00:00.000000000 
+0100
@@ -1,29 +0,0 @@
--g3
--Og
--Werror=format-security
--Wp,-D_FORTIFY_SOURCE=2
--fexceptions
--fstack-protector-strong
---param=ssp-buffer-size=4
--grecord-gcc-switches
--DFWUPDATE_HAVE_LIBSMBIOS__
--Wall
--Wextra
--Werror
--Wno-error=cpp
--Wno-unused-result
--Wno-unused-function
--Wsign-compare
--Werror=sign-compare
--fshort-wchar
---std=gnu11
--D_GNU_SOURCE
--I
-include
--I
-linux/include/
--iquote
-include/
--I/usr/include/efivar
--fPIC
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/linux/Makefile 
new/fwupdate-12/linux/Makefile
--- old/fwupdate-11/linux/Makefile      2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/linux/Makefile      2018-06-28 20:00:19.000000000 +0200
@@ -34,6 +34,7 @@
 BUILDFLAGS := $(CFLAGS) -Wall -Wextra -Werror -Wno-error=cpp \
        -Wno-unused-result -Wno-unused-function \
        -Wsign-compare -Werror=sign-compare \
+       -Wno-error=missing-field-initializers -Wno-missing-field-initializers \
        -fshort-wchar --std=gnu11 \
        -DLOCALEDIR=\"$(localedir)\" -D_GNU_SOURCE \
        -DFWUP_EFI_DIR_NAME=\"$(EFIDIR)\"  \
@@ -60,15 +61,23 @@
                $(INSTALL) -d -m 755 include ; \
        fi
 
+fwupdate.c : | include/fwup.h
 libfwup.c : | include/fwup.h
 include/fwup.h : | include/fwup-version.h
 include/fwup-version.h : | include-dir
 
-abidw : $(patsubst %.so,%.abixml,$(LIBTARGETS))
-       git add $^
-
+abicheck : | clean $(LIBTARGETS)
 abicheck : $(patsubst %.so,%.abicheck,$(LIBTARGETS))
 
+abiclean :
+       @rm -vf $(patsubst %.so,%.abixml,$(LIBTARGETS))
+
+abixml : | $(LIBTARGETS)
+abixml : $(patsubst %.so,%.abixml,$(LIBTARGETS))
+
+abiupdate : abixml
+       git add $(patsubst %.so,%.abixml,$(LIBTARGETS))
+
 % : %.o
        $(CC) $(BUILDFLAGS) -o $@ $(patsubst lib%.so,-l%,$^) $(BIN_CCLDFLAGS)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/linux/abignore 
new/fwupdate-12/linux/abignore
--- old/fwupdate-11/linux/abignore      2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/linux/abignore      2018-06-28 20:00:19.000000000 +0200
@@ -1,9 +1,9 @@
 [suppress_function]
+  change_kind = added-function
   soname_regexp = ^libfwup\\.so\\.[[:digit:]]+
   symbol_name_regexp = fwup_[[:alnum:]_]+
-  change_kind = added-function
 
 [suppress_variable]
+  change_kind = added-variable
   soname_regexp = ^libfwup\\.so\\.[[:digit:]]+
   symbol_name_regexp = fwup_[[:alnum:]_]+
-  change_kind = added-variable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/linux/fix_coverity.h 
new/fwupdate-12/linux/fix_coverity.h
--- old/fwupdate-11/linux/fix_coverity.h        1970-01-01 01:00:00.000000000 
+0100
+++ new/fwupdate-12/linux/fix_coverity.h        2018-06-28 20:00:19.000000000 
+0200
@@ -0,0 +1,80 @@
+/*
+ * fix_coverity.h
+ * Copyright 2017 Peter Jones <[email protected]>
+ *
+ * Distributed under terms of the GPLv3 license.
+ */
+
+#ifndef FIX_COVERITY_H
+#define FIX_COVERITY_H
+
+#ifndef __COVERITY_GCC_VERSION_AT_LEAST
+#define __COVERITY_GCC_VERSION_AT_LEAST(x, y) 0
+#define FAKE__COVERITY_GCC_VERSION_AT_LEAST__
+#endif /* __COVERITY_GCC_VERSION_AT_LEAST */
+
+/* With gcc 7 on x86_64 (at least), coverity pretends to be GCC but
+ * accidentally doesn't create all of the types GCC would.
+ *
+ * In glibc's headers, bits/floatn.h has:
+ *
+ * #if (defined __x86_64__                                              \
+ *   ? __GNUC_PREREQ (4, 3)                                             \
+ *   : (defined __GNU__ ? __GNUC_PREREQ (4, 5) : __GNUC_PREREQ (4, 4)))
+ * # define __HAVE_FLOAT128 1
+ * #else
+ * # define __HAVE_FLOAT128 0
+ * #endif
+ *
+ * and stdlib.h has:
+ *
+ * #if __HAVE_FLOAT128 && __GLIBC_USE (IEC_60559_TYPES_EXT)
+ * slash* Likewise for the '_Float128' format  *slash
+ * extern _Float128 strtof128 (const char *__restrict __nptr,
+ *                       char **__restrict __endptr)
+ *      __THROW __nonnull ((1));
+ * #endif
+ *
+ * Which then causes cov-emit to lose its shit:
+ *
+ * "/usr/include/stdlib.h", line 133: error #20: identifier "_Float128" is
+ *           undefined
+ *   extern _Float128 strtof128 (const char *__restrict __nptr,
+ *          ^
+ * "/usr/include/stdlib.h", line 190: error #20: identifier "_Float128" is
+ *           undefined
+ *                         _Float128 __f)
+ *                         ^
+ * "/usr/include/stdlib.h", line 236: error #20: identifier "_Float128" is
+ *           undefined
+ *   extern _Float128 strtof128_l (const char *__restrict __nptr,
+ *          ^
+ *
+ * And then you'll notice something like this later on:
+ * [WARNING] Emitted 0 C/C++ compilation units (0%) successfully
+ *
+ * 0 C/C++ compilation units (0%) are ready for analysis
+ *  For more details, please look at:
+ *     /home/pjones/devel/github.com/dbxtool/master/cov-int/build-log.txt
+ *
+ * You would think that if you're writing something that pretends to be
+ * gcc, and you've got a "build a configuration by running shit through gcc
+ * and looking at the output" stage (which they do), you would run "gcc -da
+ * -fdump-tree-all -c -o foo.o foo.c" on an empty file and snarf up all the
+ * types defined in the foo.c.001t.tu output.  Apparently, they do not.
+ *
+ * So if we're in that case, just define the type for the thing.
+ */
+#ifdef __x86_64__
+#if __COVERITY_GCC_VERSION_AT_LEAST(7, 0)
+typedef float _Float128 __attribute__((__vector_size__(128)));
+#endif
+#endif
+
+#ifdef FAKE__COVERITY_GCC_VERSION_AT_LEAST__
+#undef FAKE__COVERITY_GCC_VERSION_AT_LEAST
+#undef __COVERITY_GCC_VERSION_AT_LEAST
+#endif
+
+#endif /* !FIX_COVERITY_H */
+// vim:fenc=utf-8:tw=75
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/linux/fwupdate.c 
new/fwupdate-12/linux/fwupdate.c
--- old/fwupdate-11/linux/fwupdate.c    2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/linux/fwupdate.c    2018-06-28 20:00:19.000000000 +0200
@@ -8,6 +8,8 @@
  * Author: Peter Jones <[email protected]>
  */
 
+#include "fix_coverity.h"
+
 #include <efivar.h>
 #include <err.h>
 #include <inttypes.h>
@@ -117,10 +119,13 @@
                     EFI_VARIABLE_BOOTSERVICE_ACCESS |
                     EFI_VARIABLE_RUNTIME_ACCESS;
 
-       efi_set_variable(fwupdate_guid, name,
-                        (uint8_t *)&set_debug, sizeof(set_debug),
-                        attributes, 0644);
-       printf(_("Enabled fwupdate debugging\n"));
+       rc = efi_set_variable(fwupdate_guid, name,
+                             (uint8_t *)&set_debug, sizeof(set_debug),
+                             attributes, 0644);
+       if (rc < 0)
+               printf(_("Could not enable fwupdate debugging\n"));
+       else
+               printf(_("Enabled fwupdate debugging\n"));
 }
 
 static void
@@ -132,7 +137,7 @@
 
        rc = fwup_get_debug_log(&utf8, &size);
        if (rc < 0) {
-               if (rc == ENOENT) {
+               if (errno == ENOENT) {
                        printf(_("No debug log found\n"));
                        return;
                }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/linux/include/fwup.h 
new/fwupdate-12/linux/include/fwup.h
--- old/fwupdate-11/linux/include/fwup.h        2018-04-09 20:44:38.000000000 
+0200
+++ new/fwupdate-12/linux/include/fwup.h        2018-06-28 20:00:19.000000000 
+0200
@@ -23,6 +23,7 @@
 extern int fwup_supported(void);
 extern int fwup_esrt_disabled(void);
 extern int fwup_enable_esrt(void);
+extern int fwup_version(void);
 
 #define FWUP_SUPPORTED_STATUS_UNSUPPORTED                      0
 #define FWUP_SUPPORTED_STATUS_UNLOCKED                         1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/linux/libfwup.abixml 
new/fwupdate-12/linux/libfwup.abixml
--- old/fwupdate-11/linux/libfwup.abixml        2018-04-09 20:44:38.000000000 
+0200
+++ new/fwupdate-12/linux/libfwup.abixml        2018-06-28 20:00:19.000000000 
+0200
@@ -33,71 +33,71 @@
     <elf-symbol name='fwup_supported' version='libfwup.so.1' 
is-default-version='yes' type='func-type' binding='global-binding' 
visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='fwup_use_existing_media_path' version='libfwup.so.1' 
is-default-version='yes' type='func-type' binding='global-binding' 
visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='libfwup.c' 
comp-dir-path='/home/pjones/devel/github.com/fwupdate/master/linux' 
language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libfwup.c' 
comp-dir-path='linux' language='LANG_C99'>
     <type-decl name='int' size-in-bits='32' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
     <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-4'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-5'/>
-    <typedef-decl name='size_t' type-id='type-id-5' 
filepath='/usr/lib/gcc/x86_64-redhat-linux/7/include/stddef.h' line='216' 
column='1' id='type-id-6'/>
+    <typedef-decl name='size_t' type-id='type-id-5' 
filepath='/usr/lib/gcc/x86_64-redhat-linux/8/include/stddef.h' line='216' 
column='1' id='type-id-6'/>
     <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-7'/>
-    <function-decl name='fwup_get_debug_log' mangled-name='fwup_get_debug_log' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='2222' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_debug_log@@libfwup.so.1'>
-      <parameter type-id='type-id-4' name='utf8' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='2222' column='1'/>
-      <parameter type-id='type-id-7' name='size' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='2222' column='1'/>
+    <function-decl name='fwup_get_debug_log' mangled-name='fwup_get_debug_log' 
filepath='linux/libfwup.c' line='2242' column='1' visibility='default' 
binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_debug_log@@libfwup.so.1'>
+      <parameter type-id='type-id-4' name='utf8' filepath='linux/libfwup.c' 
line='2242' column='1'/>
+      <parameter type-id='type-id-7' name='size' filepath='linux/libfwup.c' 
line='2242' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-8'/>
     <typedef-decl name='__uint32_t' type-id='type-id-8' 
filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-9'/>
     <typedef-decl name='uint32_t' type-id='type-id-9' 
filepath='/usr/include/bits/stdint-uintn.h' line='26' column='1' 
id='type-id-10'/>
     <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-11'/>
-    <function-decl name='fwup_get_ux_capsule_info' 
mangled-name='fwup_get_ux_capsule_info' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='2179' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_ux_capsule_info@@libfwup.so.1'>
-      <parameter type-id='type-id-11' name='screen_x_size' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='2179' column='1'/>
-      <parameter type-id='type-id-11' name='screen_y_size' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='2179' column='1'/>
+    <function-decl name='fwup_get_ux_capsule_info' 
mangled-name='fwup_get_ux_capsule_info' filepath='linux/libfwup.c' line='2199' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_ux_capsule_info@@libfwup.so.1'>
+      <parameter type-id='type-id-11' name='screen_x_size' 
filepath='linux/libfwup.c' line='2199' column='1'/>
+      <parameter type-id='type-id-11' name='screen_y_size' 
filepath='linux/libfwup.c' line='2199' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_print_update_info' 
mangled-name='fwup_print_update_info' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='2057' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_print_update_info@@libfwup.so.1'>
+    <function-decl name='fwup_print_update_info' 
mangled-name='fwup_print_update_info' filepath='linux/libfwup.c' line='2077' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_print_update_info@@libfwup.so.1'>
       <return type-id='type-id-1'/>
     </function-decl>
     <qualified-type-def type-id='type-id-2' const='yes' id='type-id-12'/>
     <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-13'/>
     <typedef-decl name='__uint64_t' type-id='type-id-5' 
filepath='/usr/include/bits/types.h' line='44' column='1' id='type-id-14'/>
     <typedef-decl name='uint64_t' type-id='type-id-14' 
filepath='/usr/include/bits/stdint-uintn.h' line='27' column='1' 
id='type-id-15'/>
-    <function-decl name='fwup_last_attempt_status_to_string' 
mangled-name='fwup_last_attempt_status_to_string' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='2027' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_last_attempt_status_to_string@@libfwup.so.1'>
-      <parameter type-id='type-id-15' name='status' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='2027' column='1'/>
+    <function-decl name='fwup_last_attempt_status_to_string' 
mangled-name='fwup_last_attempt_status_to_string' filepath='linux/libfwup.c' 
line='2047' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_last_attempt_status_to_string@@libfwup.so.1'>
+      <parameter type-id='type-id-15' name='status' filepath='linux/libfwup.c' 
line='2047' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
-    <class-decl name='fwup_resource_s' size-in-bits='448' is-struct='yes' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='631' column='1' id='type-id-16'>
+    <class-decl name='fwup_resource_s' size-in-bits='448' is-struct='yes' 
visibility='default' filepath='linux/libfwup.c' line='646' column='1' 
id='type-id-16'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='esre' type-id='type-id-17' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='633' column='1'/>
+        <var-decl name='esre' type-id='type-id-17' visibility='default' 
filepath='linux/libfwup.c' line='648' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='allocated' type-id='type-id-18' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='634' column='1'/>
+        <var-decl name='allocated' type-id='type-id-18' visibility='default' 
filepath='linux/libfwup.c' line='649' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='info' type-id='type-id-19' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='635' column='1'/>
+        <var-decl name='info' type-id='type-id-19' visibility='default' 
filepath='linux/libfwup.c' line='650' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='esre_s' size-in-bits='320' is-struct='yes' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='431' column='1' id='type-id-20'>
+    <class-decl name='esre_s' size-in-bits='320' is-struct='yes' 
visibility='default' filepath='linux/libfwup.c' line='446' column='1' 
id='type-id-20'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='guid' type-id='type-id-21' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='432' column='1'/>
+        <var-decl name='guid' type-id='type-id-21' visibility='default' 
filepath='linux/libfwup.c' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='fw_type' type-id='type-id-10' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='433' column='1'/>
+        <var-decl name='fw_type' type-id='type-id-10' visibility='default' 
filepath='linux/libfwup.c' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='fw_version' type-id='type-id-10' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='434' column='1'/>
+        <var-decl name='fw_version' type-id='type-id-10' visibility='default' 
filepath='linux/libfwup.c' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='lowest_supported_fw_version' type-id='type-id-10' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='435' column='1'/>
+        <var-decl name='lowest_supported_fw_version' type-id='type-id-10' 
visibility='default' filepath='linux/libfwup.c' line='450' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='capsule_flags' type-id='type-id-10' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='436' column='1'/>
+        <var-decl name='capsule_flags' type-id='type-id-10' 
visibility='default' filepath='linux/libfwup.c' line='451' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='last_attempt_version' type-id='type-id-10' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='437' column='1'/>
+        <var-decl name='last_attempt_version' type-id='type-id-10' 
visibility='default' filepath='linux/libfwup.c' line='452' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='last_attempt_status' type-id='type-id-10' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='438' column='1'/>
+        <var-decl name='last_attempt_status' type-id='type-id-10' 
visibility='default' filepath='linux/libfwup.c' line='453' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' 
is-anonymous='yes' naming-typedef-id='type-id-21' visibility='default' 
filepath='/usr/include/efivar/efivar.h' line='33' column='1' id='type-id-22'>
@@ -123,83 +123,85 @@
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-27'/>
     <typedef-decl name='__uint8_t' type-id='type-id-27' 
filepath='/usr/include/bits/types.h' line='37' column='1' id='type-id-28'/>
     <typedef-decl name='uint8_t' type-id='type-id-28' 
filepath='/usr/include/bits/stdint-uintn.h' line='24' column='1' 
id='type-id-29'/>
+
     <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='48' 
id='type-id-24'>
-      <subrange length='6'/>
+      <subrange length='6' type-id='type-id-5' id='type-id-30'/>
+
     </array-type-def>
     <typedef-decl name='efi_guid_t' type-id='type-id-22' 
filepath='/usr/include/efivar/efivar.h' line='39' column='1' id='type-id-21'/>
-    <typedef-decl name='esre' type-id='type-id-20' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='439' column='1' id='type-id-17'/>
+    <typedef-decl name='esre' type-id='type-id-20' filepath='linux/libfwup.c' 
line='454' column='1' id='type-id-17'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-18'/>
-    <class-decl name='update_info_s' size-in-bits='480' is-struct='yes' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='28' column='1' id='type-id-30'>
+    <class-decl name='update_info_s' size-in-bits='480' is-struct='yes' 
visibility='default' filepath='include/fwup-efi.h' line='33' column='1' 
id='type-id-31'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='update_info_version' type-id='type-id-10' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='29' column='1'/>
+        <var-decl name='update_info_version' type-id='type-id-10' 
visibility='default' filepath='include/fwup-efi.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='guid' type-id='type-id-21' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='32' column='1'/>
+        <var-decl name='guid' type-id='type-id-21' visibility='default' 
filepath='include/fwup-efi.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='capsule_flags' type-id='type-id-10' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='33' column='1'/>
+        <var-decl name='capsule_flags' type-id='type-id-10' 
visibility='default' filepath='include/fwup-efi.h' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='hw_inst' type-id='type-id-15' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='34' column='1'/>
+        <var-decl name='hw_inst' type-id='type-id-15' visibility='default' 
filepath='include/fwup-efi.h' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='time_attempted' type-id='type-id-31' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='36' column='1'/>
+        <var-decl name='time_attempted' type-id='type-id-32' 
visibility='default' filepath='include/fwup-efi.h' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='status' type-id='type-id-10' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='39' column='1'/>
+        <var-decl name='status' type-id='type-id-10' visibility='default' 
filepath='include/fwup-efi.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='' type-id='type-id-32' visibility='default'/>
+        <var-decl name='' type-id='type-id-33' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' 
is-anonymous='yes' naming-typedef-id='type-id-31' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='335' column='1' id='type-id-33'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' 
is-anonymous='yes' naming-typedef-id='type-id-32' visibility='default' 
filepath='linux/util.h' line='323' column='1' id='type-id-34'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='year' type-id='type-id-23' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='336' column='1'/>
+        <var-decl name='year' type-id='type-id-23' visibility='default' 
filepath='linux/util.h' line='324' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='month' type-id='type-id-29' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='337' column='1'/>
+        <var-decl name='month' type-id='type-id-29' visibility='default' 
filepath='linux/util.h' line='325' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='day' type-id='type-id-29' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='338' column='1'/>
+        <var-decl name='day' type-id='type-id-29' visibility='default' 
filepath='linux/util.h' line='326' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='hour' type-id='type-id-29' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='339' column='1'/>
+        <var-decl name='hour' type-id='type-id-29' visibility='default' 
filepath='linux/util.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='40'>
-        <var-decl name='minute' type-id='type-id-29' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='340' column='1'/>
+        <var-decl name='minute' type-id='type-id-29' visibility='default' 
filepath='linux/util.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='second' type-id='type-id-29' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='341' column='1'/>
+        <var-decl name='second' type-id='type-id-29' visibility='default' 
filepath='linux/util.h' line='329' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='56'>
-        <var-decl name='pad1' type-id='type-id-29' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='342' column='1'/>
+        <var-decl name='pad1' type-id='type-id-29' visibility='default' 
filepath='linux/util.h' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='nanosecond' type-id='type-id-10' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='343' column='1'/>
+        <var-decl name='nanosecond' type-id='type-id-10' visibility='default' 
filepath='linux/util.h' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='timezone' type-id='type-id-23' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='344' column='1'/>
+        <var-decl name='timezone' type-id='type-id-23' visibility='default' 
filepath='linux/util.h' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='112'>
-        <var-decl name='daylight' type-id='type-id-29' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='345' column='1'/>
+        <var-decl name='daylight' type-id='type-id-29' visibility='default' 
filepath='linux/util.h' line='333' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='120'>
-        <var-decl name='pad2' type-id='type-id-29' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='346' column='1'/>
+        <var-decl name='pad2' type-id='type-id-29' visibility='default' 
filepath='linux/util.h' line='334' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efi_time_t' type-id='type-id-33' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/util.h' 
line='347' column='1' id='type-id-31'/>
-    <union-decl name='__anonymous_union__' size-in-bits='64' 
is-anonymous='yes' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='42' column='1' id='type-id-32'>
+    <typedef-decl name='efi_time_t' type-id='type-id-34' 
filepath='linux/util.h' line='335' column='1' id='type-id-32'/>
+    <union-decl name='__anonymous_union__' size-in-bits='64' 
is-anonymous='yes' visibility='default' filepath='include/fwup-efi.h' line='47' 
column='1' id='type-id-33'>
       <data-member access='private'>
-        <var-decl name='dp_ptr' type-id='type-id-34' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='43' column='1'/>
+        <var-decl name='dp_ptr' type-id='type-id-35' visibility='default' 
filepath='include/fwup-efi.h' line='48' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='dp' type-id='type-id-35' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='44' column='1'/>
+        <var-decl name='dp' type-id='type-id-36' visibility='default' 
filepath='include/fwup-efi.h' line='49' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='dp_buf' type-id='type-id-36' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='45' column='1'/>
+        <var-decl name='dp_buf' type-id='type-id-37' visibility='default' 
filepath='include/fwup-efi.h' line='50' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' 
is-anonymous='yes' naming-typedef-id='type-id-35' visibility='default' 
filepath='/usr/include/efivar/efivar-dp.h' line='36' column='1' id='type-id-37'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' 
is-anonymous='yes' naming-typedef-id='type-id-36' visibility='default' 
filepath='/usr/include/efivar/efivar-dp.h' line='36' column='1' id='type-id-38'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-29' visibility='default' 
filepath='/usr/include/efivar/efivar-dp.h' line='37' column='1'/>
       </data-member>
@@ -210,364 +212,368 @@
         <var-decl name='length' type-id='type-id-23' visibility='default' 
filepath='/usr/include/efivar/efivar-dp.h' line='39' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='efidp_header' type-id='type-id-37' 
filepath='/usr/include/efivar/efivar-dp.h' line='40' column='1' 
id='type-id-35'/>
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-34'/>
-    <array-type-def dimensions='0' type-id='type-id-29' 
size-in-bits='infinite' id='type-id-36'/>
-    <typedef-decl name='update_info' type-id='type-id-30' 
filepath='/home/pjones/devel/github.com/fwupdate/master/include/fwup-efi.h' 
line='47' column='1' id='type-id-38'/>
-    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-19'/>
-    <typedef-decl name='fwup_resource' type-id='type-id-16' 
filepath='include/fwup.h' line='49' column='1' id='type-id-39'/>
-    <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-40'/>
-    <type-decl name='void' id='type-id-41'/>
+    <typedef-decl name='efidp_header' type-id='type-id-38' 
filepath='/usr/include/efivar/efivar-dp.h' line='40' column='1' 
id='type-id-36'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-35'/>
+
+    <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='8' 
id='type-id-37'>
+      <subrange length='1' type-id='type-id-5' id='type-id-39'/>
+
+    </array-type-def>
+    <typedef-decl name='update_info' type-id='type-id-31' 
filepath='include/fwup-efi.h' line='52' column='1' id='type-id-40'/>
+    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-19'/>
+    <typedef-decl name='fwup_resource' type-id='type-id-16' 
filepath='include/fwup.h' line='50' column='1' id='type-id-41'/>
     <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-42'/>
-    <function-decl name='fwup_set_up_update_with_buf' 
mangled-name='fwup_set_up_update_with_buf' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1925' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_set_up_update_with_buf@@libfwup.so.1'>
-      <parameter type-id='type-id-40' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1925' column='1'/>
-      <parameter type-id='type-id-15' name='hw_inst' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1926' column='1'/>
-      <parameter type-id='type-id-42' name='buf' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1927' column='1'/>
-      <parameter type-id='type-id-6' name='sz' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1927' column='1'/>
-      <return type-id='type-id-1'/>
-    </function-decl>
-    <function-decl name='fwup_set_up_update' mangled-name='fwup_set_up_update' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1809' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_set_up_update@@libfwup.so.1'>
-      <parameter type-id='type-id-40' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1809' column='1'/>
-      <parameter type-id='type-id-15' name='hw_inst' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1810' column='1'/>
-      <parameter type-id='type-id-1' name='infd' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1811' column='1'/>
-      <return type-id='type-id-1'/>
-    </function-decl>
-    <function-decl name='fwup_use_existing_media_path' 
mangled-name='fwup_use_existing_media_path' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1503' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_use_existing_media_path@@libfwup.so.1'>
-      <parameter type-id='type-id-1' name='use_existing_media_path_' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='1503' column='1'/>
-      <return type-id='type-id-41'/>
-    </function-decl>
-    <type-decl name='long int' size-in-bits='64' id='type-id-43'/>
-    <typedef-decl name='__time_t' type-id='type-id-43' 
filepath='/usr/include/bits/types.h' line='148' column='1' id='type-id-44'/>
-    <typedef-decl name='time_t' type-id='type-id-44' 
filepath='/usr/include/bits/types/time_t.h' line='7' column='1' 
id='type-id-45'/>
-    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-46'/>
-    <function-decl name='fwup_get_last_attempt_info' 
mangled-name='fwup_get_last_attempt_info' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='975' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_last_attempt_info@@libfwup.so.1'>
-      <parameter type-id='type-id-40' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='975' column='1'/>
-      <parameter type-id='type-id-11' name='version' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='975' column='1'/>
-      <parameter type-id='type-id-11' name='status' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='976' column='1'/>
-      <parameter type-id='type-id-46' name='when' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='976' column='1'/>
+    <type-decl name='void' id='type-id-43'/>
+    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-44'/>
+    <function-decl name='fwup_set_up_update_with_buf' 
mangled-name='fwup_set_up_update_with_buf' filepath='linux/libfwup.c' 
line='1945' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_set_up_update_with_buf@@libfwup.so.1'>
+      <parameter type-id='type-id-42' name='re' filepath='linux/libfwup.c' 
line='1945' column='1'/>
+      <parameter type-id='type-id-15' name='hw_inst' 
filepath='linux/libfwup.c' line='1946' column='1'/>
+      <parameter type-id='type-id-44' name='buf' filepath='linux/libfwup.c' 
line='1947' column='1'/>
+      <parameter type-id='type-id-6' name='sz' filepath='linux/libfwup.c' 
line='1947' column='1'/>
+      <return type-id='type-id-1'/>
+    </function-decl>
+    <function-decl name='fwup_set_up_update' mangled-name='fwup_set_up_update' 
filepath='linux/libfwup.c' line='1829' column='1' visibility='default' 
binding='global' size-in-bits='64' 
elf-symbol-id='fwup_set_up_update@@libfwup.so.1'>
+      <parameter type-id='type-id-42' name='re' filepath='linux/libfwup.c' 
line='1829' column='1'/>
+      <parameter type-id='type-id-15' name='hw_inst' 
filepath='linux/libfwup.c' line='1830' column='1'/>
+      <parameter type-id='type-id-1' name='infd' filepath='linux/libfwup.c' 
line='1831' column='1'/>
+      <return type-id='type-id-1'/>
+    </function-decl>
+    <function-decl name='fwup_use_existing_media_path' 
mangled-name='fwup_use_existing_media_path' filepath='linux/libfwup.c' 
line='1523' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_use_existing_media_path@@libfwup.so.1'>
+      <parameter type-id='type-id-1' name='use_existing_media_path_' 
filepath='linux/libfwup.c' line='1523' column='1'/>
+      <return type-id='type-id-43'/>
+    </function-decl>
+    <type-decl name='long int' size-in-bits='64' id='type-id-45'/>
+    <typedef-decl name='__time_t' type-id='type-id-45' 
filepath='/usr/include/bits/types.h' line='148' column='1' id='type-id-46'/>
+    <typedef-decl name='time_t' type-id='type-id-46' 
filepath='/usr/include/bits/types/time_t.h' line='7' column='1' 
id='type-id-47'/>
+    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-48'/>
+    <function-decl name='fwup_get_last_attempt_info' 
mangled-name='fwup_get_last_attempt_info' filepath='linux/libfwup.c' line='995' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_last_attempt_info@@libfwup.so.1'>
+      <parameter type-id='type-id-42' name='re' filepath='linux/libfwup.c' 
line='995' column='1'/>
+      <parameter type-id='type-id-11' name='version' 
filepath='linux/libfwup.c' line='995' column='1'/>
+      <parameter type-id='type-id-11' name='status' filepath='linux/libfwup.c' 
line='996' column='1'/>
+      <parameter type-id='type-id-48' name='when' filepath='linux/libfwup.c' 
line='996' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_get_attempt_status' 
mangled-name='fwup_get_attempt_status' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='961' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_attempt_status@@libfwup.so.1'>
-      <parameter type-id='type-id-40' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='961' column='1'/>
-      <parameter type-id='type-id-11' name='status' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='961' column='1'/>
+    <function-decl name='fwup_get_attempt_status' 
mangled-name='fwup_get_attempt_status' filepath='linux/libfwup.c' line='981' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_attempt_status@@libfwup.so.1'>
+      <parameter type-id='type-id-42' name='re' filepath='linux/libfwup.c' 
line='981' column='1'/>
+      <parameter type-id='type-id-11' name='status' filepath='linux/libfwup.c' 
line='981' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_get_lowest_supported_fw_version' 
mangled-name='fwup_get_lowest_supported_fw_version' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='948' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_lowest_supported_fw_version@@libfwup.so.1'>
-      <parameter type-id='type-id-40' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='961' column='1'/>
-      <parameter type-id='type-id-11' name='status' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='961' column='1'/>
+    <function-decl name='fwup_get_lowest_supported_fw_version' 
mangled-name='fwup_get_lowest_supported_fw_version' filepath='linux/libfwup.c' 
line='968' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_lowest_supported_fw_version@@libfwup.so.1'>
+      <parameter type-id='type-id-42' name='re' filepath='linux/libfwup.c' 
line='981' column='1'/>
+      <parameter type-id='type-id-11' name='status' filepath='linux/libfwup.c' 
line='981' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_get_fw_type' mangled-name='fwup_get_fw_type' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='935' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_fw_type@@libfwup.so.1'>
-      <parameter type-id='type-id-40' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='961' column='1'/>
-      <parameter type-id='type-id-11' name='status' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='961' column='1'/>
+    <function-decl name='fwup_get_fw_type' mangled-name='fwup_get_fw_type' 
filepath='linux/libfwup.c' line='955' column='1' visibility='default' 
binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_fw_type@@libfwup.so.1'>
+      <parameter type-id='type-id-42' name='re' filepath='linux/libfwup.c' 
line='981' column='1'/>
+      <parameter type-id='type-id-11' name='status' filepath='linux/libfwup.c' 
line='981' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_get_fw_version' 
mangled-name='fwup_get_fw_version' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='922' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_fw_version@@libfwup.so.1'>
-      <parameter type-id='type-id-40' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='961' column='1'/>
-      <parameter type-id='type-id-11' name='status' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='961' column='1'/>
+    <function-decl name='fwup_get_fw_version' 
mangled-name='fwup_get_fw_version' filepath='linux/libfwup.c' line='942' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_fw_version@@libfwup.so.1'>
+      <parameter type-id='type-id-42' name='re' filepath='linux/libfwup.c' 
line='981' column='1'/>
+      <parameter type-id='type-id-11' name='status' filepath='linux/libfwup.c' 
line='981' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-47'/>
-    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-48'/>
-    <function-decl name='fwup_get_guid' mangled-name='fwup_get_guid' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='909' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_guid@@libfwup.so.1'>
-      <parameter type-id='type-id-40' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='909' column='1'/>
-      <parameter type-id='type-id-48' name='guid' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='909' column='1'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-49'/>
+    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-50'/>
+    <function-decl name='fwup_get_guid' mangled-name='fwup_get_guid' 
filepath='linux/libfwup.c' line='929' column='1' visibility='default' 
binding='global' size-in-bits='64' elf-symbol-id='fwup_get_guid@@libfwup.so.1'>
+      <parameter type-id='type-id-42' name='re' filepath='linux/libfwup.c' 
line='929' column='1'/>
+      <parameter type-id='type-id-50' name='guid' filepath='linux/libfwup.c' 
line='929' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_clear_status' mangled-name='fwup_clear_status' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='890' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_clear_status@@libfwup.so.1'>
-      <parameter type-id='type-id-40' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='890' column='1'/>
+    <function-decl name='fwup_clear_status' mangled-name='fwup_clear_status' 
filepath='linux/libfwup.c' line='910' column='1' visibility='default' 
binding='global' size-in-bits='64' 
elf-symbol-id='fwup_clear_status@@libfwup.so.1'>
+      <parameter type-id='type-id-42' name='re' filepath='linux/libfwup.c' 
line='910' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='fwup_resource_iter_s' size-in-bits='576' is-struct='yes' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='638' column='1' id='type-id-49'>
+    <class-decl name='fwup_resource_iter_s' size-in-bits='576' is-struct='yes' 
visibility='default' filepath='linux/libfwup.c' line='653' column='1' 
id='type-id-51'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dir' type-id='type-id-50' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='639' column='1'/>
+        <var-decl name='dir' type-id='type-id-52' visibility='default' 
filepath='linux/libfwup.c' line='654' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='dirfd' type-id='type-id-1' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='640' column='1'/>
+        <var-decl name='dirfd' type-id='type-id-1' visibility='default' 
filepath='linux/libfwup.c' line='655' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='add_ux_capsule' type-id='type-id-1' 
visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='641' column='1'/>
+        <var-decl name='add_ux_capsule' type-id='type-id-1' 
visibility='default' filepath='linux/libfwup.c' line='656' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='re' type-id='type-id-39' visibility='default' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='642' column='1'/>
+        <var-decl name='re' type-id='type-id-41' visibility='default' 
filepath='linux/libfwup.c' line='657' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' 
is-declaration-only='yes' id='type-id-51'/>
-    <typedef-decl name='DIR' type-id='type-id-51' 
filepath='/usr/include/dirent.h' line='127' column='1' id='type-id-52'/>
-    <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-50'/>
-    <typedef-decl name='fwup_resource_iter' type-id='type-id-49' 
filepath='include/fwup.h' line='50' column='1' id='type-id-53'/>
-    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-54'/>
-    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-55'/>
-    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-56'/>
-    <pointer-type-def type-id='type-id-56' size-in-bits='64' id='type-id-57'/>
-    <function-decl name='fwup_set_guid' mangled-name='fwup_set_guid' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='883' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_set_guid@@libfwup.so.1'>
-      <parameter type-id='type-id-54' name='iter' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='883' column='1'/>
-      <parameter type-id='type-id-55' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='883' column='1'/>
-      <parameter type-id='type-id-57' name='guid' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='884' column='1'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' 
is-declaration-only='yes' id='type-id-53'/>
+    <typedef-decl name='DIR' type-id='type-id-53' 
filepath='/usr/include/dirent.h' line='127' column='1' id='type-id-54'/>
+    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-52'/>
+    <typedef-decl name='fwup_resource_iter' type-id='type-id-51' 
filepath='include/fwup.h' line='51' column='1' id='type-id-55'/>
+    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-56'/>
+    <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-57'/>
+    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-58'/>
+    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-59'/>
+    <function-decl name='fwup_set_guid' mangled-name='fwup_set_guid' 
filepath='linux/libfwup.c' line='903' column='1' visibility='default' 
binding='global' size-in-bits='64' elf-symbol-id='fwup_set_guid@@libfwup.so.1'>
+      <parameter type-id='type-id-56' name='iter' filepath='linux/libfwup.c' 
line='903' column='1'/>
+      <parameter type-id='type-id-57' name='re' filepath='linux/libfwup.c' 
line='903' column='1'/>
+      <parameter type-id='type-id-59' name='guid' filepath='linux/libfwup.c' 
line='904' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_set_guid_forced' 
mangled-name='fwup_set_guid_forced' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='849' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_set_guid_forced@@LIBFWUP_1.11'>
-      <parameter type-id='type-id-54' name='iter' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='849' column='1'/>
-      <parameter type-id='type-id-55' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='849' column='1'/>
-      <parameter type-id='type-id-57' name='guid' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='850' column='1'/>
-      <parameter type-id='type-id-18' name='force' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='850' column='1'/>
+    <function-decl name='fwup_set_guid_forced' 
mangled-name='fwup_set_guid_forced' filepath='linux/libfwup.c' line='864' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_set_guid_forced@@LIBFWUP_1.11'>
+      <parameter type-id='type-id-56' name='iter' filepath='linux/libfwup.c' 
line='864' column='1'/>
+      <parameter type-id='type-id-57' name='re' filepath='linux/libfwup.c' 
line='864' column='1'/>
+      <parameter type-id='type-id-59' name='guid' filepath='linux/libfwup.c' 
line='865' column='1'/>
+      <parameter type-id='type-id-18' name='force' filepath='linux/libfwup.c' 
line='865' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_resource_iter_next' 
mangled-name='fwup_resource_iter_next' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='777' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_resource_iter_next@@libfwup.so.1'>
-      <parameter type-id='type-id-54' name='iter' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='777' column='1'/>
-      <parameter type-id='type-id-55' name='re' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='777' column='1'/>
+    <function-decl name='fwup_resource_iter_next' 
mangled-name='fwup_resource_iter_next' filepath='linux/libfwup.c' line='792' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_resource_iter_next@@libfwup.so.1'>
+      <parameter type-id='type-id-56' name='iter' filepath='linux/libfwup.c' 
line='792' column='1'/>
+      <parameter type-id='type-id-57' name='re' filepath='linux/libfwup.c' 
line='792' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-58'/>
-    <function-decl name='fwup_resource_iter_destroy' 
mangled-name='fwup_resource_iter_destroy' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='730' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_resource_iter_destroy@@libfwup.so.1'>
-      <parameter type-id='type-id-58' name='iterp' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='730' column='1'/>
+    <pointer-type-def type-id='type-id-56' size-in-bits='64' id='type-id-60'/>
+    <function-decl name='fwup_resource_iter_destroy' 
mangled-name='fwup_resource_iter_destroy' filepath='linux/libfwup.c' line='745' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_resource_iter_destroy@@libfwup.so.1'>
+      <parameter type-id='type-id-60' name='iterp' filepath='linux/libfwup.c' 
line='745' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_resource_free' mangled-name='fwup_resource_free' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='717' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_resource_free@@LIBFWUP_1.11'>
-      <parameter type-id='type-id-40' name='res' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='717' column='1'/>
-      <return type-id='type-id-41'/>
+    <function-decl name='fwup_resource_free' mangled-name='fwup_resource_free' 
filepath='linux/libfwup.c' line='732' column='1' visibility='default' 
binding='global' size-in-bits='64' 
elf-symbol-id='fwup_resource_free@@LIBFWUP_1.11'>
+      <parameter type-id='type-id-42' name='res' filepath='linux/libfwup.c' 
line='732' column='1'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='fwup_resource_iter_create' 
mangled-name='fwup_resource_iter_create' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='646' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_resource_iter_create@@libfwup.so.1'>
-      <parameter type-id='type-id-58' name='iter' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='646' column='1'/>
+    <function-decl name='fwup_resource_iter_create' 
mangled-name='fwup_resource_iter_create' filepath='linux/libfwup.c' line='661' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_resource_iter_create@@libfwup.so.1'>
+      <parameter type-id='type-id-60' name='iter' filepath='linux/libfwup.c' 
line='661' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_supported' mangled-name='fwup_supported' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='409' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_supported@@libfwup.so.1'>
+    <function-decl name='fwup_supported' mangled-name='fwup_supported' 
filepath='linux/libfwup.c' line='424' column='1' visibility='default' 
binding='global' size-in-bits='64' elf-symbol-id='fwup_supported@@libfwup.so.1'>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_enable_esrt' mangled-name='fwup_enable_esrt' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='375' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_enable_esrt@@libfwup.so.1'>
+    <function-decl name='fwup_enable_esrt' mangled-name='fwup_enable_esrt' 
filepath='linux/libfwup.c' line='390' column='1' visibility='default' 
binding='global' size-in-bits='64' 
elf-symbol-id='fwup_enable_esrt@@libfwup.so.1'>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_esrt_disabled' mangled-name='fwup_esrt_disabled' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='350' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_esrt_disabled@@libfwup.so.1'>
+    <function-decl name='fwup_esrt_disabled' mangled-name='fwup_esrt_disabled' 
filepath='linux/libfwup.c' line='365' column='1' visibility='default' 
binding='global' size-in-bits='64' 
elf-symbol-id='fwup_esrt_disabled@@libfwup.so.1'>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fwup_get_esp_mountpoint' 
mangled-name='fwup_get_esp_mountpoint' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='102' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_esp_mountpoint@@libfwup.so.1'>
+    <function-decl name='fwup_get_esp_mountpoint' 
mangled-name='fwup_get_esp_mountpoint' filepath='linux/libfwup.c' line='104' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_get_esp_mountpoint@@libfwup.so.1'>
       <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='fwup_set_esp_mountpoint' 
mangled-name='fwup_set_esp_mountpoint' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='89' column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_set_esp_mountpoint@@libfwup.so.1'>
-      <parameter type-id='type-id-3' name='path' 
filepath='/home/pjones/devel/github.com/fwupdate/master/linux/libfwup.c' 
line='89' column='1'/>
-      <return type-id='type-id-41'/>
+    <function-decl name='fwup_set_esp_mountpoint' 
mangled-name='fwup_set_esp_mountpoint' filepath='linux/libfwup.c' line='91' 
column='1' visibility='default' binding='global' size-in-bits='64' 
elf-symbol-id='fwup_set_esp_mountpoint@@libfwup.so.1'>
+      <parameter type-id='type-id-3' name='path' filepath='linux/libfwup.c' 
line='91' column='1'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_get_variable' mangled-name='efi_get_variable' 
filepath='/usr/include/efivar/efivar.h' line='93' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__errno_location' mangled-name='__errno_location' 
filepath='/usr/include/errno.h' line='37' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='free' mangled-name='free' 
filepath='/usr/include/stdlib.h' line='448' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='free' mangled-name='free' 
filepath='/usr/include/stdlib.h' line='563' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__stack_chk_fail' mangled-name='__stack_chk_fail' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='opendir' mangled-name='opendir' 
filepath='/usr/include/dirent.h' line='134' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='dirfd' mangled-name='dirfd' 
filepath='/usr/include/dirent.h' line='224' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='closedir' mangled-name='closedir' 
filepath='/usr/include/dirent.h' line='149' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__printf_chk' mangled-name='__printf_chk' 
filepath='/usr/include/bits/stdio2.h' line='87' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__builtin_puts' mangled-name='puts' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='mktime' mangled-name='mktime' 
filepath='/usr/include/time.h' line='82' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='asctime' mangled-name='asctime' 
filepath='/usr/include/time.h' line='139' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_guid_to_id_guid' 
mangled-name='efi_guid_to_id_guid' filepath='/usr/include/efivar/efivar.h' 
line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='efidp_format_device_path' 
mangled-name='efidp_format_device_path' 
filepath='/usr/include/efivar/efivar-dp.h' line='1239' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='efidp_format_device_path' 
mangled-name='efidp_format_device_path' 
filepath='/usr/include/efivar/efivar-dp.h' line='1240' column='1' 
visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='malloc' mangled-name='malloc' 
filepath='/usr/include/stdlib.h' line='424' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='malloc' mangled-name='malloc' 
filepath='/usr/include/stdlib.h' line='539' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='dcgettext' mangled-name='dcgettext' 
filepath='/usr/include/libintl.h' line='51' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_error_set' mangled-name='efi_error_set' 
filepath='/usr/include/efivar/efivar.h' line='180' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fclose' mangled-name='fclose' 
filepath='/usr/include/stdio.h' line='199' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fmemopen' mangled-name='fmemopen' 
filepath='/usr/include/stdio.h' line='278' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fdopen' mangled-name='fdopen' 
filepath='/usr/include/stdio.h' line='265' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_guid_cmp' mangled-name='efi_guid_cmp' 
filepath='/usr/include/efivar/efivar.h' line='130' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='close' mangled-name='close' 
filepath='/usr/include/unistd.h' line='356' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='close' mangled-name='close' 
filepath='/usr/include/unistd.h' line='353' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='lseek' mangled-name='lseek' 
filepath='/usr/include/unistd.h' line='337' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='lseek' mangled-name='lseek' 
filepath='/usr/include/unistd.h' line='334' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fflush' mangled-name='fflush' 
filepath='/usr/include/stdio.h' line='204' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='fsync' mangled-name='fsync' 
filepath='/usr/include/unistd.h' line='957' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='fsync' mangled-name='fsync' 
filepath='/usr/include/unistd.h' line='954' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__fread_alias' mangled-name='fread' 
filepath='/usr/include/bits/stdio2.h' line='268' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='ftell' mangled-name='ftell' 
filepath='/usr/include/stdio.h' line='689' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fseek' mangled-name='fseek' 
filepath='/usr/include/stdio.h' line='684' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fwrite' mangled-name='fwrite' 
filepath='/usr/include/stdio.h' line='652' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='memcmp' mangled-name='memcmp' 
filepath='/usr/include/string.h' line='63' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_generate_file_device_path' 
mangled-name='efi_generate_file_device_path' 
filepath='/usr/include/efivar/efiboot-creator.h' line='32' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='calloc' mangled-name='calloc' 
filepath='/usr/include/stdlib.h' line='426' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='calloc' mangled-name='calloc' 
filepath='/usr/include/stdlib.h' line='541' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__open_alias' mangled-name='open' 
filepath='/usr/include/bits/fcntl2.h' line='27' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__asprintf_chk' mangled-name='__asprintf_chk' 
filepath='/usr/include/bits/stdio2.h' line='158' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='mkdir' mangled-name='mkdir' 
filepath='/usr/include/sys/stat.h' line='317' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='mkostemps' mangled-name='mkostemps' 
filepath='/usr/include/stdlib.h' line='644' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='mkostemps' mangled-name='mkostemps' 
filepath='/usr/include/stdlib.h' line='759' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_error_clear' mangled-name='efi_error_clear' 
filepath='/usr/include/efivar/efivar.h' line='188' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__builtin_memcpy' mangled-name='memcpy' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='sscanf' mangled-name='sscanf' 
filepath='/usr/include/stdio.h' line='385' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_loadopt_is_valid' 
mangled-name='efi_loadopt_is_valid' 
filepath='/usr/include/efivar/efiboot-loadopt.h' line='72' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_loadopt_pathlen' 
mangled-name='efi_loadopt_pathlen' 
filepath='/usr/include/efivar/efiboot-loadopt.h' line='48' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_loadopt_path' mangled-name='efi_loadopt_path' 
filepath='/usr/include/efivar/efiboot-loadopt.h' line='33' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__builtin___sprintf_chk' mangled-name='__sprintf_chk' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_set_variable' mangled-name='efi_set_variable' 
filepath='/usr/include/efivar/efivar.h' line='98' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_loadopt_create' mangled-name='efi_loadopt_create' 
filepath='/usr/include/efivar/efiboot-loadopt.h' line='26' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__builtin_memset' mangled-name='memset' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_get_next_variable_name' 
mangled-name='efi_get_next_variable_name' 
filepath='/usr/include/efivar/efivar.h' line='106' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_loadopt_attr_set' 
mangled-name='efi_loadopt_attr_set' 
filepath='/usr/include/efivar/efiboot-loadopt.h' line='42' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_get_variable_size' 
mangled-name='efi_get_variable_size' filepath='/usr/include/efivar/efivar.h' 
line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__xstat' mangled-name='__xstat' 
filepath='/usr/include/sys/stat.h' line='397' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='strdup' mangled-name='strdup' 
filepath='/usr/include/string.h' line='166' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='strnlen' mangled-name='strnlen' 
filepath='/usr/include/string.h' line='390' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__openat_alias' mangled-name='openat' 
filepath='/usr/include/bits/fcntl2.h' line='100' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__read_alias' mangled-name='read' 
filepath='/usr/include/bits/unistd.h' line='25' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='realloc' mangled-name='realloc' 
filepath='/usr/include/stdlib.h' line='434' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='realloc' mangled-name='realloc' 
filepath='/usr/include/stdlib.h' line='549' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='readdir' mangled-name='readdir' 
filepath='/usr/include/dirent.h' line='162' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_str_to_guid' mangled-name='efi_str_to_guid' 
filepath='/usr/include/efivar/efivar.h' line='111' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='__builtin_strcpy' mangled-name='strcpy' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='getenv' mangled-name='getenv' 
filepath='/usr/include/stdlib.h' line='516' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='getenv' mangled-name='getenv' 
filepath='/usr/include/stdlib.h' line='631' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_guid_to_str' mangled-name='efi_guid_to_str' 
filepath='/usr/include/efivar/efivar.h' line='113' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='sysconf' mangled-name='sysconf' 
filepath='/usr/include/unistd.h' line='622' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='sysconf' mangled-name='sysconf' 
filepath='/usr/include/unistd.h' line='619' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='efidp_make_generic' mangled-name='efidp_make_generic' 
filepath='/usr/include/efivar/efivar-dp.h' line='1244' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='efidp_make_generic' mangled-name='efidp_make_generic' 
filepath='/usr/include/efivar/efivar-dp.h' line='1245' column='1' 
visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='efi_del_variable' mangled-name='efi_del_variable' 
filepath='/usr/include/efivar/efivar.h' line='96' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='dell_simple_ci_smi' mangled-name='dell_simple_ci_smi' 
filepath='/usr/include/smbios_c/smi.h' line='40' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='token_activate' mangled-name='token_activate' 
filepath='/usr/include/smbios_c/token.h' line='58' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='token_is_active' mangled-name='token_is_active' 
filepath='/usr/include/smbios_c/token.h' line='53' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='token_is_bool' mangled-name='token_is_bool' 
filepath='/usr/include/smbios_c/token.h' line='48' column='1' 
visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fopen' mangled-name='fopen' 
filepath='/usr/include/stdio.h' line='232' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='ioctl' mangled-name='ioctl' 
filepath='/usr/include/sys/ioctl.h' line='41' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='access' mangled-name='access' 
filepath='/usr/include/unistd.h' line='290' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='access' mangled-name='access' 
filepath='/usr/include/unistd.h' line='287' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
-    <function-decl name='strtoull' mangled-name='strtoull' 
filepath='/usr/include/stdlib.h' line='168' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+    <function-decl name='strtoull' mangled-name='strtoull' 
filepath='/usr/include/stdlib.h' line='205' column='1' visibility='default' 
binding='global' size-in-bits='64'>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fgetc' mangled-name='fgetc' 
filepath='/usr/include/stdio.h' line='477' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fputc' mangled-name='fputc' 
filepath='/usr/include/stdio.h' line='517' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='feof' mangled-name='feof' 
filepath='/usr/include/stdio.h' line='759' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='ferror' mangled-name='ferror' 
filepath='/usr/include/stdio.h' line='761' column='1' visibility='default' 
binding='global' size-in-bits='64'>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/linux/libfwup.c 
new/fwupdate-12/linux/libfwup.c
--- old/fwupdate-11/linux/libfwup.c     2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/linux/libfwup.c     2018-06-28 20:00:19.000000000 +0200
@@ -8,6 +8,8 @@
  * Author: Peter Jones <[email protected]>
  */
 
+#include "fix_coverity.h"
+
 #include <dirent.h>
 #include <efivar/efiboot.h>
 #include <efivar/efivar.h>
@@ -145,12 +147,18 @@
 wmi_read_buffer_size(uint64_t *buffer_size)
 {
        FILE *f;
+       size_t read;
+       int error;
 
        f = fopen(DELL_WMI_CHAR, "rb");
        if (!f)
                return -1;
-       fread(buffer_size, sizeof(uint64_t), 1, f);
+       read = fread(buffer_size, sizeof(uint64_t), 1, f);
+       error = errno;
        fclose(f);
+       errno = error;
+       if (read != 1)
+               return -1;
        return 0;
 }
 
@@ -179,8 +187,10 @@
        uint64_t buffer_size = 0;
        int ret;
        va_list ap;
+       /* the biggest known value provided by any system today */
+       uint64_t limit = 32768;
 
-       if (count > 4) {
+       if (count > 4 || !buffer) {
                errno = EINVAL;
                return -errno;
        }
@@ -191,8 +201,13 @@
                return -errno;
        }
 
+       if (buffer_size > limit) {
+               errno = EINVAL;
+               return -errno;
+       }
+
        *buffer = malloc(buffer_size);
-       if (!buffer) {
+       if (!*buffer) {
                errno = ENOMEM;
                return -errno;
        }
@@ -680,10 +695,10 @@
                goto err;
        }
 
-       new->add_ux_capsule = false;
+       new->add_ux_capsule = true;
        env = getenv("LIBFWUP_ADD_UX_CAPSULE");
-       if (env && !strcmp(env, "1") && fwup_get_ux_capsule_info(&x, &y) >= 0)
-               new->add_ux_capsule = true;
+       if (env && !strcmp(env, "0") && fwup_get_ux_capsule_info(&x, &y) >= 0)
+               new->add_ux_capsule = false;
 
        *iter = new;
        return 0;
@@ -852,7 +867,12 @@
        fwup_resource *res;
 
        errno = 0;
-       if (!iter && (!re && !force)) {
+       if (!re) {
+               efi_error("invalid argument 're'");
+               errno = EINVAL;
+               return -1;
+       }
+       if (!iter && (!*re && !force)) {
                efi_error("invalid argument '%s'", iter ? "iter" : "re");
                errno = EINVAL;
                return -1;
@@ -1195,9 +1215,9 @@
        uint32_t attributes = LOAD_OPTION_ACTIVE;
 
        rc = get_paths(&shim_fs_path, &fwup_fs_path, &fwup_esp_path);
-       if (rc < 0) {
+       if (rc < 0 || (!shim_fs_path && (!fwup_fs_path || !fwup_esp_path))) {
                efi_error("could not find paths for shim and fwup");
-               return -1;
+                goto out;
        }
 
        if (!shim_fs_path)
@@ -1222,9 +1242,17 @@
 
        if (!use_fwup_path) {
                loader_str = utf8_to_ucs2((uint8_t *)fwup_esp_path, -1);
+                if (loader_str == NULL) {
+                        efi_error("utf8_to_ucs2() failed");
+                        goto out;
+                }
                loader_sz = ucs2len(loader_str, -1) * 2;
-               if (loader_sz)
-                       loader_sz += 2;
+                if (loader_sz < 2) {
+                        efi_error("ucs2len(fwup_esp_path) returned %zu",
+                                  loader_sz);
+                        goto out;
+                }
+               loader_sz += 2;
                loader_str = onstack(loader_str, loader_sz);
        }
 
@@ -2252,3 +2280,18 @@
        *size = vsize >> 1;
        return 0;
 }
+
+/**
+ * fwup_version
+ *
+ * Returns the installed runtime version of libfwupdate
+ *
+ * Returns: integer version
+ *
+ * Since: 12
+ */
+int
+fwup_version(void)
+{
+       return LIBFWUP_VERSION;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/linux/libfwup.map.in 
new/fwupdate-12/linux/libfwup.map.in
--- old/fwupdate-11/linux/libfwup.map.in        2018-04-09 20:44:38.000000000 
+0200
+++ new/fwupdate-12/linux/libfwup.map.in        2018-06-28 20:00:19.000000000 
+0200
@@ -30,3 +30,7 @@
        global: fwup_set_guid_forced;
                fwup_resource_free;
 } libfwup.so.1;
+
+LIBFWUP_1.12 {
+       global: fwup_version;
+} LIBFWUP_1.11;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/fwupdate-11/linux/util.h new/fwupdate-12/linux/util.h
--- old/fwupdate-11/linux/util.h        2018-04-09 20:44:38.000000000 +0200
+++ new/fwupdate-12/linux/util.h        2018-06-28 20:00:19.000000000 +0200
@@ -10,10 +10,6 @@
 #ifndef LIBFW_UTIL_H
 #define LIBFW_UTIL_H
 
-#ifndef LOCALEDIR
-#define LOCALEDIR "/usr/share/locale"
-#endif
-
 #include <errno.h>
 #include <fcntl.h>
 #include <libintl.h>
@@ -28,14 +24,6 @@
 #define NC_(Context, String) (String)
 #define EMPTY ""
 
-#ifndef FWUP_ESP_MOUNTPOINT
-#define FWUP_ESP_MOUNTPOINT "/boot/efi"
-#endif
-
-#ifndef FWUP_EFI_DIR_NAME
-#define FWUP_EFI_DIR_NAME "fixme"
-#endif
-
 extern int quiet;
 
 #define qprintf(fmt, args...) ({                                       \
@@ -350,4 +338,6 @@
 #define CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE   0x00020000
 #define CAPSULE_FLAGS_INITIATE_RESET          0x00040000
 
+#define align(val, align) (((val) + (align) -1 ) & (- (align)))
+
 #endif /* LIBFW_UTIL_H */

++++++ fwupdate-suse-build.patch ++++++
--- /var/tmp/diff_new_pack.ZbXdQP/_old  2018-07-24 17:29:40.259856166 +0200
+++ /var/tmp/diff_new_pack.ZbXdQP/_new  2018-07-24 17:29:40.259856166 +0200
@@ -1,7 +1,8 @@
-diff -ur fwupdate-11.orig/efi/Makefile fwupdate-11/efi/Makefile
---- fwupdate-11.orig/efi/Makefile      2018-06-20 14:44:16.195981682 +0200
-+++ fwupdate-11/efi/Makefile   2018-06-20 14:44:49.487981555 +0200
-@@ -123,9 +123,6 @@
+Index: fwupdate-12/efi/Makefile
+===================================================================
+--- fwupdate-12.orig/efi/Makefile      2018-06-28 20:00:19.000000000 +0200
++++ fwupdate-12/efi/Makefile   2018-07-20 00:03:26.235908973 +0200
+@@ -128,9 +128,6 @@ define inst =
   $(INSTALL) -m 755 $(1) $(DESTDIR)$(TARGETDIR)/$(1)
   $(INSTALL) -d -m 755 $(DESTDIR)$(DEBUGINFO)$(TARGETDIR)/
   $(INSTALL) -m 755 $(1).debug $(DESTDIR)$(DEBUGINFO)$(TARGETDIR)/$(1).debug
@@ -11,10 +12,11 @@
  endef
  
  install : | check_efidir_error
-diff -ur fwupdate-11.orig/linux/Makefile fwupdate-11/linux/Makefile
---- fwupdate-11.orig/linux/Makefile    2018-06-20 14:44:16.191981682 +0200
-+++ fwupdate-11/linux/Makefile 2018-06-20 14:44:49.487981555 +0200
-@@ -124,8 +124,6 @@
+Index: fwupdate-12/linux/Makefile
+===================================================================
+--- fwupdate-12.orig/linux/Makefile    2018-06-28 20:00:19.000000000 +0200
++++ fwupdate-12/linux/Makefile 2018-07-20 00:03:26.235908973 +0200
+@@ -133,8 +133,6 @@ install : check_efidir_error all
        $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(pcdir) ;)
        $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/
        $(INSTALL) -m 644 $(INCTARGETS) $(DESTDIR)$(includedir)/


Reply via email to