Merge pull request #5841 from ertugerata/flatpak_update

ostree fix build with new toolchain
2018-10-13 22:06:31 +03:00
parent 0bfc496a5a d52a8c7acf
commit bfd24fb05c
8 changed files with 441 additions and 378 deletions
@@ -12,7 +12,7 @@
        <IsA>app:console</IsA>
        <Summary>Tool to build flatpaks from sources</Summary>
        <Description>Tool for building flatpaks from sources</Description>
-        <Archive sha1sum="340ec0981fc100c5b30eb919ae815665f23a78c2" type="targz">https://github.com/flatpak/flatpak-builder/archive/0.10.10.tar.gz</Archive>
+        <Archive sha1sum="2dbe9a0dee350255856312d286e406e99a4f173d" type="targz">https://github.com/flatpak/flatpak-builder/archive/1.0.0.tar.gz</Archive>
        <BuildDependencies>
            <Dependency versionFrom="0.11.7">flatpak-devel</Dependency>
            <Dependency versionFrom="2018.5">ostree-devel</Dependency>
@@ -51,6 +51,13 @@
    </Package>

    <History>
+        <Update release="4">
+            <Date>2018-08-23</Date>
+            <Version>1.0.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
        <Update release="3">
            <Date>2018-07-08</Date>
            <Version>0.10.10</Version>
@@ -1,6 +1,6 @@
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/autogen.sh flatpak-0.11.7/bubblewrap/autogen.sh
--- flatpak-0.11.7.orig/bubblewrap/autogen.sh	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/autogen.sh	2018-02-03 21:26:06.272233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/autogen.sh flatpak-1.0.0/bubblewrap/autogen.sh
+--- flatpak-1.0.0.orig/bubblewrap/autogen.sh	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/autogen.sh	2018-02-03 21:26:06.272233339 +0300
@@ -0,0 +1,19 @@
 +#!/bin/sh
 +
@@ -21,9 +21,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/autogen.sh flatpak-0.11.7/bubblewrap/a
 +
 +cd $olddir
 +test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/bind-mount.c flatpak-0.11.7/bubblewrap/bind-mount.c
--- flatpak-0.11.7.orig/bubblewrap/bind-mount.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/bind-mount.c	2018-02-03 21:26:06.272233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/bind-mount.c flatpak-1.0.0/bubblewrap/bind-mount.c
+--- flatpak-1.0.0.orig/bubblewrap/bind-mount.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/bind-mount.c	2018-02-03 21:26:06.272233339 +0300
@@ -0,0 +1,440 @@
 +/* bubblewrap
 + * Copyright (C) 2016 Alexander Larsson
@@ -465,9 +465,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/bind-mount.c flatpak-0.11.7/bubblewrap
 +
 +  return 0;
 +}
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/bind-mount.h flatpak-0.11.7/bubblewrap/bind-mount.h
--- flatpak-0.11.7.orig/bubblewrap/bind-mount.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/bind-mount.h	2018-02-03 21:26:06.272233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/bind-mount.h flatpak-1.0.0/bubblewrap/bind-mount.h
+--- flatpak-1.0.0.orig/bubblewrap/bind-mount.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/bind-mount.h	2018-02-03 21:26:06.272233339 +0300
@@ -0,0 +1,30 @@
 +/* bubblewrap
 + * Copyright (C) 2016 Alexander Larsson
@@ -499,9 +499,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/bind-mount.h flatpak-0.11.7/bubblewrap
 +                const char   *src,
 +                const char   *dest,
 +                bind_option_t options);
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/bubblewrap.c flatpak-0.11.7/bubblewrap/bubblewrap.c
--- flatpak-0.11.7.orig/bubblewrap/bubblewrap.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/bubblewrap.c	2018-02-03 21:26:06.272233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/bubblewrap.c flatpak-1.0.0/bubblewrap/bubblewrap.c
+--- flatpak-1.0.0.orig/bubblewrap/bubblewrap.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/bubblewrap.c	2018-02-03 21:26:06.272233339 +0300
@@ -0,0 +1,2223 @@
 +/* bubblewrap
 + * Copyright (C) 2016 Alexander Larsson
@@ -2726,9 +2726,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/bubblewrap.c flatpak-0.11.7/bubblewrap
 +
 +  return 0;
 +}
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/bubblewrap.jpg flatpak-0.11.7/bubblewrap/bubblewrap.jpg
--- flatpak-0.11.7.orig/bubblewrap/bubblewrap.jpg	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/bubblewrap.jpg	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/bubblewrap.jpg flatpak-1.0.0/bubblewrap/bubblewrap.jpg
+--- flatpak-1.0.0.orig/bubblewrap/bubblewrap.jpg	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/bubblewrap.jpg	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,143 @@
 +ÿØÿàJFIFHHÿÛCÿÛCÿÂ´ðÿÄ	
 +ÿÄÿÚõc6Mø‹5G?¢orŽ¹y-ã=:I.lÖ¯Õv+Ü�jŒÛóJ¾¤ÇÒçNØí„�1%†=õ¬UÉ®ñ·¡P|5q6÷š`:Ýy/M=.qðÀ$ÀÇ	l_‘ŒÓ›g7ù}°	<
@@ -2874,9 +2874,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/bubblewrap.jpg flatpak-0.11.7/bubblewr
 +í6TŒÎkåÚ`)âkìj½‘…}æÒª	tÝu ¬�)Õ‡ÈÆåTfí�î¢Ž,sˆìB,Æç¿f‡—ö¼ÁÅ£×y[6õæ(¶#hM˜jkEüM¤kEý‡/Ñ\±aluï-X$_ã™\ é²ªµrì_�ÂàûðôX¤ø
5u©97sªÆNî=XÄ;Yªß$ö1w(yBÍ�lW„Vì%@|xÐ°2�”:AŠË¢¯o=Â—4ŠÁ™õÚ^¦d€1ÝK�ŒÊ9I²¢"î5E“ä�6Ã;À¬Éf3.Ê26 Yã„v|¢±Ã7¤B%ãÚ€êº¾xh‡kÄ3)iPd£#,à„él6\CåÖäîÔÚø=R‹¶N�#Âx9ÀÄ‚ñ:¡3 ¨l¿eSâ`.Â“Á£¢2 >ìŠ4E‰dÞP�ït'
 +váŽÉ²²]0>�g�+ÿÙ
 \ Dosya sonunda yenisatÄ±r yok.
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/bwrap.xml flatpak-0.11.7/bubblewrap/bwrap.xml
--- flatpak-0.11.7.orig/bubblewrap/bwrap.xml	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/bwrap.xml	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/bwrap.xml flatpak-1.0.0/bubblewrap/bwrap.xml
+--- flatpak-1.0.0.orig/bubblewrap/bwrap.xml	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/bwrap.xml	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,320 @@
 +<?xml version="1.0"?>
 +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
@@ -3198,9 +3198,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/bwrap.xml flatpak-0.11.7/bubblewrap/bw
 +</refsect1>
 +
 +</refentry>
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/ci/redhat-ci.sh flatpak-0.11.7/bubblewrap/ci/redhat-ci.sh
--- flatpak-0.11.7.orig/bubblewrap/ci/redhat-ci.sh	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/ci/redhat-ci.sh	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/ci/redhat-ci.sh flatpak-1.0.0/bubblewrap/ci/redhat-ci.sh
+--- flatpak-1.0.0.orig/bubblewrap/ci/redhat-ci.sh	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/ci/redhat-ci.sh	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,47 @@
 +#!/usr/bin/env bash
 +
@@ -3249,9 +3249,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/ci/redhat-ci.sh flatpak-0.11.7/bubblew
 +else
 +    buildinstall_to_host
 +fi
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/completions/bash/bwrap flatpak-0.11.7/bubblewrap/completions/bash/bwrap
--- flatpak-0.11.7.orig/bubblewrap/completions/bash/bwrap	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/completions/bash/bwrap	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/completions/bash/bwrap flatpak-1.0.0/bubblewrap/completions/bash/bwrap
+--- flatpak-1.0.0.orig/bubblewrap/completions/bash/bwrap	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/completions/bash/bwrap	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,60 @@
 +#!/bin/bash
 +#
@@ -3313,9 +3313,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/completions/bash/bwrap flatpak-0.11.7/
 +	return 0
 +}
 +complete -F _bwrap bwrap
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/configure.ac flatpak-0.11.7/bubblewrap/configure.ac
--- flatpak-0.11.7.orig/bubblewrap/configure.ac	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/configure.ac	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/configure.ac flatpak-1.0.0/bubblewrap/configure.ac
+--- flatpak-1.0.0.orig/bubblewrap/configure.ac	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/configure.ac	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,127 @@
 +AC_PREREQ([2.63])
 +AC_INIT([bubblewrap], [0.1.8], [atomic-devel@projectatomic.io])
@@ -3444,9 +3444,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/configure.ac flatpak-0.11.7/bubblewrap
 +    require default userns:                       $enable_require_userns
 +    mysteriously satisfying to pop:               yes"
 +echo ""
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/COPYING flatpak-0.11.7/bubblewrap/COPYING
--- flatpak-0.11.7.orig/bubblewrap/COPYING	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/COPYING	2018-02-03 21:26:06.271233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/COPYING flatpak-1.0.0/bubblewrap/COPYING
+--- flatpak-1.0.0.orig/bubblewrap/COPYING	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/COPYING	2018-02-03 21:26:06.271233339 +0300
@@ -0,0 +1,481 @@
 +                  GNU LIBRARY GENERAL PUBLIC LICENSE
 +                       Version 2, June 1991
@@ -3929,9 +3929,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/COPYING flatpak-0.11.7/bubblewrap/COPY
 +  Ty Coon, President of Vice
 +
 +That's all there is to it!
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/demos/bubblewrap-shell.sh flatpak-0.11.7/bubblewrap/demos/bubblewrap-shell.sh
--- flatpak-0.11.7.orig/bubblewrap/demos/bubblewrap-shell.sh	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/demos/bubblewrap-shell.sh	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/demos/bubblewrap-shell.sh flatpak-1.0.0/bubblewrap/demos/bubblewrap-shell.sh
+--- flatpak-1.0.0.orig/bubblewrap/demos/bubblewrap-shell.sh	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/demos/bubblewrap-shell.sh	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,33 @@
 +#!/usr/bin/env bash
 +# Use bubblewrap to run /bin/sh reusing the host OS binaries (/usr), but with
@@ -3966,16 +3966,16 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/demos/bubblewrap-shell.sh flatpak-0.11
 +      /bin/sh) \
 +    11< <(getent passwd $UID 65534) \
 +    12< <(getent group $(id -g) 65534)
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/demos/flatpak.bpf flatpak-0.11.7/bubblewrap/demos/flatpak.bpf
--- flatpak-0.11.7.orig/bubblewrap/demos/flatpak.bpf	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/demos/flatpak.bpf	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/demos/flatpak.bpf flatpak-1.0.0/bubblewrap/demos/flatpak.bpf
+--- flatpak-1.0.0.orig/bubblewrap/demos/flatpak.bpf	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/demos/flatpak.bpf	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,2 @@
 + >>À WeVgU†T‡SšR›Q£P¥O³NíMîLïKJIH*Gg@F‡@Eš@D›@C£@B¥@A³@@í@?î@>ï@=@<@;*@:	@9@8ŸØÿÿ38@8 T/2)@ 5*)	-) 5 5$ '  
	@ 3Vg{ƒˆÙ
&6
 +=	Pf ax Tÿ
 \ Dosya sonunda yenisatÄ±r yok.
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/demos/flatpak-run.sh flatpak-0.11.7/bubblewrap/demos/flatpak-run.sh
--- flatpak-0.11.7.orig/bubblewrap/demos/flatpak-run.sh	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/demos/flatpak-run.sh	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/demos/flatpak-run.sh flatpak-1.0.0/bubblewrap/demos/flatpak-run.sh
+--- flatpak-1.0.0.orig/bubblewrap/demos/flatpak-run.sh	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/demos/flatpak-run.sh	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,65 @@
 +#!/bin/bash
 +# For this to work you first have to run these commands:
@@ -4042,14 +4042,14 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/demos/flatpak-run.sh flatpak-0.11.7/bu
 +name=org.gnome.Weather
 +runtime=runtime/org.gnome.Platform/x86_64/master
 +EOF
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/.dir-locals.el flatpak-0.11.7/bubblewrap/.dir-locals.el
--- flatpak-0.11.7.orig/bubblewrap/.dir-locals.el	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/.dir-locals.el	2018-02-03 21:26:06.271233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/.dir-locals.el flatpak-1.0.0/bubblewrap/.dir-locals.el
+--- flatpak-1.0.0.orig/bubblewrap/.dir-locals.el	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/.dir-locals.el	2018-02-03 21:26:06.271233339 +0300
@@ -0,0 +1 @@
 +((c-mode . ((indent-tabs-mode . nil) (c-file-style . "gnu"))))
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/.editorconfig flatpak-0.11.7/bubblewrap/.editorconfig
--- flatpak-0.11.7.orig/bubblewrap/.editorconfig	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/.editorconfig	2018-02-03 21:26:06.271233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/.editorconfig flatpak-1.0.0/bubblewrap/.editorconfig
+--- flatpak-1.0.0.orig/bubblewrap/.editorconfig	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/.editorconfig	2018-02-03 21:26:06.271233339 +0300
@@ -0,0 +1,6 @@
 +[*.[ch]]
 +indent_style = space
@@ -4057,14 +4057,14 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/.editorconfig flatpak-0.11.7/bubblewra
 +trim_trailing_whitespace = true
 +indent_brace_style = gnu
 +
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/.git flatpak-0.11.7/bubblewrap/.git
--- flatpak-0.11.7.orig/bubblewrap/.git	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/.git	2018-02-03 21:25:59.242232860 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/.git flatpak-1.0.0/bubblewrap/.git
+--- flatpak-1.0.0.orig/bubblewrap/.git	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/.git	2018-02-03 21:25:59.242232860 +0300
@@ -0,0 +1 @@
 +gitdir: ../.git/modules/bubblewrap
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/git.mk flatpak-0.11.7/bubblewrap/git.mk
--- flatpak-0.11.7.orig/bubblewrap/git.mk	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/git.mk	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/git.mk flatpak-1.0.0/bubblewrap/git.mk
+--- flatpak-1.0.0.orig/bubblewrap/git.mk	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/git.mk	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,348 @@
 +# git.mk, a small Makefile to autogenerate .gitignore files
 +# for autotools-based projects.
@@ -4414,9 +4414,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/git.mk flatpak-0.11.7/bubblewrap/git.m
 +	-rm -f $(srcdir)/.gitignore
 +
 +.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/LICENSE flatpak-0.11.7/bubblewrap/LICENSE
--- flatpak-0.11.7.orig/bubblewrap/LICENSE	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/LICENSE	2018-02-03 21:26:06.271233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/LICENSE flatpak-1.0.0/bubblewrap/LICENSE
+--- flatpak-1.0.0.orig/bubblewrap/LICENSE	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/LICENSE	2018-02-03 21:26:06.271233339 +0300
@@ -0,0 +1,481 @@
 +                  GNU LIBRARY GENERAL PUBLIC LICENSE
 +                       Version 2, June 1991
@@ -4899,9 +4899,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/LICENSE flatpak-0.11.7/bubblewrap/LICE
 +  Ty Coon, President of Vice
 +
 +That's all there is to it!
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/m4/attributes.m4 flatpak-0.11.7/bubblewrap/m4/attributes.m4
--- flatpak-0.11.7.orig/bubblewrap/m4/attributes.m4	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/m4/attributes.m4	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/m4/attributes.m4 flatpak-1.0.0/bubblewrap/m4/attributes.m4
+--- flatpak-1.0.0.orig/bubblewrap/m4/attributes.m4	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/m4/attributes.m4	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,292 @@
 +dnl Macros to check the presence of generic (non-typed) symbols.
 +dnl Copyright (c) 2006-2008 Diego PettenÃ² <flameeyes@gmail.com>
@@ -5195,9 +5195,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/m4/attributes.m4 flatpak-0.11.7/bubble
 +       [Define the highest alignment supported])
 +  fi
 +])
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/Makefile.am flatpak-0.11.7/bubblewrap/Makefile.am
--- flatpak-0.11.7.orig/bubblewrap/Makefile.am	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/Makefile.am	2018-02-03 21:26:06.271233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/Makefile.am flatpak-1.0.0/bubblewrap/Makefile.am
+--- flatpak-1.0.0.orig/bubblewrap/Makefile.am	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/Makefile.am	2018-02-03 21:26:06.271233339 +0300
@@ -0,0 +1,46 @@
 +AM_CFLAGS = $(WARN_CFLAGS)
 +CLEANFILES =
@@ -5245,9 +5245,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/Makefile.am flatpak-0.11.7/bubblewrap/
 +AM_DISTCHECK_CONFIGURE_FLAGS =		\
 +	--with-bash-completion-dir="\$(datadir)"/bash-completion/ \
 +	$(NULL)
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/Makefile-bwrap.am flatpak-0.11.7/bubblewrap/Makefile-bwrap.am
--- flatpak-0.11.7.orig/bubblewrap/Makefile-bwrap.am	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/Makefile-bwrap.am	2018-02-03 21:26:06.271233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/Makefile-bwrap.am flatpak-1.0.0/bubblewrap/Makefile-bwrap.am
+--- flatpak-1.0.0.orig/bubblewrap/Makefile-bwrap.am	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/Makefile-bwrap.am	2018-02-03 21:26:06.271233339 +0300
@@ -0,0 +1,13 @@
 +
 +bwrap_SOURCES = \
@@ -5262,9 +5262,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/Makefile-bwrap.am flatpak-0.11.7/bubbl
 +
 +bwrap_CFLAGS = $(AM_CFLAGS)
 +bwrap_LDADD = $(SELINUX_LIBS)
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/Makefile-docs.am flatpak-0.11.7/bubblewrap/Makefile-docs.am
--- flatpak-0.11.7.orig/bubblewrap/Makefile-docs.am	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/Makefile-docs.am	2018-02-03 21:26:06.271233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/Makefile-docs.am flatpak-1.0.0/bubblewrap/Makefile-docs.am
+--- flatpak-1.0.0.orig/bubblewrap/Makefile-docs.am	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/Makefile-docs.am	2018-02-03 21:26:06.271233339 +0300
@@ -0,0 +1,18 @@
 +XSLTPROC = xsltproc
 +
@@ -5284,9 +5284,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/Makefile-docs.am flatpak-0.11.7/bubble
 +CLEANFILES += $(man_MANS)
 +endif
 +EXTRA_DIST += bwrap.xml
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/network.c flatpak-0.11.7/bubblewrap/network.c
--- flatpak-0.11.7.orig/bubblewrap/network.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/network.c	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/network.c flatpak-1.0.0/bubblewrap/network.c
+--- flatpak-1.0.0.orig/bubblewrap/network.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/network.c	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,198 @@
 +/* bubblewrap
 + * Copyright (C) 2016 Alexander Larsson
@@ -5486,9 +5486,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/network.c flatpak-0.11.7/bubblewrap/ne
 +  if (rtnl_do_request (rtnl_fd, header) != 0)
 +    die_with_error ("loopback: Failed RTM_NEWLINK");
 +}
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/network.h flatpak-0.11.7/bubblewrap/network.h
--- flatpak-0.11.7.orig/bubblewrap/network.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/network.h	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/network.h flatpak-1.0.0/bubblewrap/network.h
+--- flatpak-1.0.0.orig/bubblewrap/network.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/network.h	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,21 @@
 +/* bubblewrap
 + * Copyright (C) 2016 Alexander Larsson
@@ -5511,9 +5511,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/network.h flatpak-0.11.7/bubblewrap/ne
 +#pragma once
 +
 +void loopback_setup (void);
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/packaging/bubblewrap.spec flatpak-0.11.7/bubblewrap/packaging/bubblewrap.spec
--- flatpak-0.11.7.orig/bubblewrap/packaging/bubblewrap.spec	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/packaging/bubblewrap.spec	2018-02-03 21:26:06.273233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/packaging/bubblewrap.spec flatpak-1.0.0/bubblewrap/packaging/bubblewrap.spec
+--- flatpak-1.0.0.orig/bubblewrap/packaging/bubblewrap.spec	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/packaging/bubblewrap.spec	2018-02-03 21:26:06.273233339 +0300
@@ -0,0 +1,49 @@
 +%global commit0 66d12bb23b04e201c5846e325f0b10930ed802f8
 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
@@ -5564,9 +5564,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/packaging/bubblewrap.spec flatpak-0.11
 +%endif
 +%{_mandir}/man1/*
 +
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/README.md flatpak-0.11.7/bubblewrap/README.md
--- flatpak-0.11.7.orig/bubblewrap/README.md	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/README.md	2018-02-03 21:26:06.272233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/README.md flatpak-1.0.0/bubblewrap/README.md
+--- flatpak-1.0.0.orig/bubblewrap/README.md	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/README.md	2018-02-03 21:26:06.272233339 +0300
@@ -0,0 +1,179 @@
 +Bubblewrap
 +==========
@@ -5747,9 +5747,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/README.md flatpak-0.11.7/bubblewrap/RE
 +![](bubblewrap.jpg)
 +
 +(Bubblewrap cat by [dancing_stupidity](https://www.flickr.com/photos/27549668@N03/))
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/.redhat-ci.yml flatpak-0.11.7/bubblewrap/.redhat-ci.yml
--- flatpak-0.11.7.orig/bubblewrap/.redhat-ci.yml	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/.redhat-ci.yml	2018-02-03 21:26:06.271233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/.redhat-ci.yml flatpak-1.0.0/bubblewrap/.redhat-ci.yml
+--- flatpak-1.0.0.orig/bubblewrap/.redhat-ci.yml	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/.redhat-ci.yml	2018-02-03 21:26:06.271233339 +0300
@@ -0,0 +1,25 @@
 +context: centos7
 +required: true
@@ -5776,9 +5776,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/.redhat-ci.yml flatpak-0.11.7/bubblewr
 +
 +tests:
 +  - env CFLAGS='-g -Og -fsanitize=undefined -fsanitize=address' ./ci/redhat-ci.sh fedora:25
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/tests/test-run.sh flatpak-0.11.7/bubblewrap/tests/test-run.sh
--- flatpak-0.11.7.orig/bubblewrap/tests/test-run.sh	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/tests/test-run.sh	2018-02-03 21:26:06.274233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/tests/test-run.sh flatpak-1.0.0/bubblewrap/tests/test-run.sh
+--- flatpak-1.0.0.orig/bubblewrap/tests/test-run.sh	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/tests/test-run.sh	2018-02-03 21:26:06.274233339 +0300
@@ -0,0 +1,132 @@
 +#!/bin/bash
 +
@@ -5912,9 +5912,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/tests/test-run.sh flatpak-0.11.7/bubbl
 +done
 +
 +echo OK
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/.travis.yml flatpak-0.11.7/bubblewrap/.travis.yml
--- flatpak-0.11.7.orig/bubblewrap/.travis.yml	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/.travis.yml	2018-02-03 21:26:06.271233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/.travis.yml flatpak-1.0.0/bubblewrap/.travis.yml
+--- flatpak-1.0.0.orig/bubblewrap/.travis.yml	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/.travis.yml	2018-02-03 21:26:06.271233339 +0300
@@ -0,0 +1,25 @@
 +language: c
 +dist: trusty
@@ -5941,9 +5941,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/.travis.yml flatpak-0.11.7/bubblewrap/
 +  only:
 +    - auto
 +
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/uncrustify.cfg flatpak-0.11.7/bubblewrap/uncrustify.cfg
--- flatpak-0.11.7.orig/bubblewrap/uncrustify.cfg	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/uncrustify.cfg	2018-02-03 21:26:06.274233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/uncrustify.cfg flatpak-1.0.0/bubblewrap/uncrustify.cfg
+--- flatpak-1.0.0.orig/bubblewrap/uncrustify.cfg	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/uncrustify.cfg	2018-02-03 21:26:06.274233339 +0300
@@ -0,0 +1,136 @@
 +newlines                lf
 +
@@ -6081,15 +6081,15 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/uncrustify.cfg flatpak-0.11.7/bubblewr
 +# positioning
 +pos_bool                        Trail
 +pos_conditional                 Trail
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/uncrustify.sh flatpak-0.11.7/bubblewrap/uncrustify.sh
--- flatpak-0.11.7.orig/bubblewrap/uncrustify.sh	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/uncrustify.sh	2018-02-03 21:26:06.274233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/uncrustify.sh flatpak-1.0.0/bubblewrap/uncrustify.sh
+--- flatpak-1.0.0.orig/bubblewrap/uncrustify.sh	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/uncrustify.sh	2018-02-03 21:26:06.274233339 +0300
@@ -0,0 +1,2 @@
 +#!/bin/sh
 +uncrustify -c uncrustify.cfg --no-backup `git ls-tree --name-only -r HEAD | grep \\\.[ch]$`
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/utils.c flatpak-0.11.7/bubblewrap/utils.c
--- flatpak-0.11.7.orig/bubblewrap/utils.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/utils.c	2018-02-03 21:26:06.274233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/utils.c flatpak-1.0.0/bubblewrap/utils.c
+--- flatpak-1.0.0.orig/bubblewrap/utils.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/utils.c	2018-02-03 21:26:06.274233339 +0300
@@ -0,0 +1,709 @@
 +/* bubblewrap
 + * Copyright (C) 2016 Alexander Larsson
@@ -6800,9 +6800,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/utils.c flatpak-0.11.7/bubblewrap/util
 +#endif
 +  return 0;
 +}
-diff -Nuar flatpak-0.11.7.orig/bubblewrap/utils.h flatpak-0.11.7/bubblewrap/utils.h
--- flatpak-0.11.7.orig/bubblewrap/utils.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/bubblewrap/utils.h	2018-02-03 21:26:06.274233339 +0300
+diff -Nuar flatpak-1.0.0.orig/bubblewrap/utils.h flatpak-1.0.0/bubblewrap/utils.h
+--- flatpak-1.0.0.orig/bubblewrap/utils.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/bubblewrap/utils.h	2018-02-03 21:26:06.274233339 +0300
@@ -0,0 +1,166 @@
 +/* bubblewrap
 + * Copyright (C) 2016 Alexander Larsson
@@ -6970,9 +6970,9 @@ diff -Nuar flatpak-0.11.7.orig/bubblewrap/utils.h flatpak-0.11.7/bubblewrap/util
 +/* type safety */
 +#define steal_pointer(pp) \
 +  (0 ? (*(pp)) : (steal_pointer) (pp))
-diff -Nuar flatpak-0.11.7.orig/libglnx/COPYING flatpak-0.11.7/libglnx/COPYING
--- flatpak-0.11.7.orig/libglnx/COPYING	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/COPYING	2018-02-03 21:26:06.307233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/COPYING flatpak-1.0.0/libglnx/COPYING
+--- flatpak-1.0.0.orig/libglnx/COPYING	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/COPYING	2018-02-03 21:26:06.307233341 +0300
@@ -0,0 +1,502 @@
 +                  GNU LESSER GENERAL PUBLIC LICENSE
 +                       Version 2.1, February 1999
@@ -7476,14 +7476,14 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/COPYING flatpak-0.11.7/libglnx/COPYING
 +  Ty Coon, President of Vice
 +
 +That's all there is to it!
-diff -Nuar flatpak-0.11.7.orig/libglnx/.git flatpak-0.11.7/libglnx/.git
--- flatpak-0.11.7.orig/libglnx/.git	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/.git	2018-02-03 21:26:06.241233337 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/.git flatpak-1.0.0/libglnx/.git
+--- flatpak-1.0.0.orig/libglnx/.git	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/.git	2018-02-03 21:26:06.241233337 +0300
@@ -0,0 +1 @@
 +gitdir: ../.git/modules/libglnx
-diff -Nuar flatpak-0.11.7.orig/libglnx/.gitignore flatpak-0.11.7/libglnx/.gitignore
--- flatpak-0.11.7.orig/libglnx/.gitignore	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/.gitignore	2018-02-03 21:26:06.307233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/.gitignore flatpak-1.0.0/libglnx/.gitignore
+--- flatpak-1.0.0.orig/libglnx/.gitignore	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/.gitignore	2018-02-03 21:26:06.307233341 +0300
@@ -0,0 +1,16 @@
 +# A path ostree writes to work around automake bug with
 +# subdir-objects
@@ -7501,9 +7501,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/.gitignore flatpak-0.11.7/libglnx/.gitign
 +*.stamp
 +*~
 +
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-backport-autocleanups.h flatpak-0.11.7/libglnx/glnx-backport-autocleanups.h
--- flatpak-0.11.7.orig/libglnx/glnx-backport-autocleanups.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-backport-autocleanups.h	2018-02-03 21:26:06.307233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-backport-autocleanups.h flatpak-1.0.0/libglnx/glnx-backport-autocleanups.h
+--- flatpak-1.0.0.orig/libglnx/glnx-backport-autocleanups.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-backport-autocleanups.h	2018-02-03 21:26:06.307233341 +0300
@@ -0,0 +1,124 @@
 +/*
 + * Copyright Â© 2015 Canonical Limited
@@ -7629,9 +7629,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-backport-autocleanups.h flatpak-0.11
 +G_DEFINE_AUTOPTR_CLEANUP_FUNC(GString, g_autoptr_cleanup_gstring_free)
 +
 +#endif
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-backport-autoptr.h flatpak-0.11.7/libglnx/glnx-backport-autoptr.h
--- flatpak-0.11.7.orig/libglnx/glnx-backport-autoptr.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-backport-autoptr.h	2018-02-03 21:26:06.308233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-backport-autoptr.h flatpak-1.0.0/libglnx/glnx-backport-autoptr.h
+--- flatpak-1.0.0.orig/libglnx/glnx-backport-autoptr.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-backport-autoptr.h	2018-02-03 21:26:06.308233341 +0300
@@ -0,0 +1,133 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -7766,9 +7766,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-backport-autoptr.h flatpak-0.11.7/li
 +#endif /* !GLIB_CHECK_VERSION(2, 43, 3) */
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-backports.c flatpak-0.11.7/libglnx/glnx-backports.c
--- flatpak-0.11.7.orig/libglnx/glnx-backports.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-backports.c	2018-02-03 21:26:06.308233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-backports.c flatpak-1.0.0/libglnx/glnx-backports.c
+--- flatpak-1.0.0.orig/libglnx/glnx-backports.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-backports.c	2018-02-03 21:26:06.308233341 +0300
@@ -0,0 +1,61 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -7831,9 +7831,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-backports.c flatpak-0.11.7/libglnx/g
 +  return TRUE;
 +}
 +#endif
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-backports.h flatpak-0.11.7/libglnx/glnx-backports.h
--- flatpak-0.11.7.orig/libglnx/glnx-backports.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-backports.h	2018-02-03 21:26:06.308233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-backports.h flatpak-1.0.0/libglnx/glnx-backports.h
+--- flatpak-1.0.0.orig/libglnx/glnx-backports.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-backports.h	2018-02-03 21:26:06.308233341 +0300
@@ -0,0 +1,46 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -7881,9 +7881,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-backports.h flatpak-0.11.7/libglnx/g
 +#endif /* !GLIB_CHECK_VERSION(2, 44, 0) */
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-console.c flatpak-0.11.7/libglnx/glnx-console.c
--- flatpak-0.11.7.orig/libglnx/glnx-console.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-console.c	2018-05-26 00:50:25.433037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-console.c flatpak-1.0.0/libglnx/glnx-console.c
+--- flatpak-1.0.0.orig/libglnx/glnx-console.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-console.c	2018-05-26 00:50:25.433037228 +0300
@@ -0,0 +1,359 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -8244,9 +8244,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-console.c flatpak-0.11.7/libglnx/gln
 +      
 +  locked = console->locked = FALSE;
 +}
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-console.h flatpak-0.11.7/libglnx/glnx-console.h
--- flatpak-0.11.7.orig/libglnx/glnx-console.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-console.h	2018-05-26 00:50:25.433037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-console.h flatpak-1.0.0/libglnx/glnx-console.h
+--- flatpak-1.0.0.orig/libglnx/glnx-console.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-console.h	2018-05-26 00:50:25.433037228 +0300
@@ -0,0 +1,61 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -8309,9 +8309,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-console.h flatpak-0.11.7/libglnx/gln
 +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxConsoleRef, glnx_console_ref_cleanup)
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-dirfd.c flatpak-0.11.7/libglnx/glnx-dirfd.c
--- flatpak-0.11.7.orig/libglnx/glnx-dirfd.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-dirfd.c	2018-05-26 00:50:25.433037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-dirfd.c flatpak-1.0.0/libglnx/glnx-dirfd.c
+--- flatpak-1.0.0.orig/libglnx/glnx-dirfd.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-dirfd.c	2018-05-26 00:50:25.433037228 +0300
@@ -0,0 +1,425 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -8738,9 +8738,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-dirfd.c flatpak-0.11.7/libglnx/glnx-
 +{
 +  (void) _glnx_tmpdir_free (tmpf, FALSE, NULL, NULL);
 +}
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-dirfd.h flatpak-0.11.7/libglnx/glnx-dirfd.h
--- flatpak-0.11.7.orig/libglnx/glnx-dirfd.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-dirfd.h	2018-02-03 21:26:06.308233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-dirfd.h flatpak-1.0.0/libglnx/glnx-dirfd.h
+--- flatpak-1.0.0.orig/libglnx/glnx-dirfd.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-dirfd.h	2018-02-03 21:26:06.308233341 +0300
@@ -0,0 +1,137 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -8879,9 +8879,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-dirfd.h flatpak-0.11.7/libglnx/glnx-
 +                       GLnxTmpDir *out_tmpdir, GError **error);
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-errors.c flatpak-0.11.7/libglnx/glnx-errors.c
--- flatpak-0.11.7.orig/libglnx/glnx-errors.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-errors.c	2018-05-26 00:50:25.433037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-errors.c flatpak-1.0.0/libglnx/glnx-errors.c
+--- flatpak-1.0.0.orig/libglnx/glnx-errors.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-errors.c	2018-05-26 00:50:25.433037228 +0300
@@ -0,0 +1,131 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -9014,9 +9014,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-errors.c flatpak-0.11.7/libglnx/glnx
 +  errno = errsv;
 +  return FALSE;
 +}
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-errors.h flatpak-0.11.7/libglnx/glnx-errors.h
--- flatpak-0.11.7.orig/libglnx/glnx-errors.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-errors.h	2018-05-26 00:50:25.433037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-errors.h flatpak-1.0.0/libglnx/glnx-errors.h
+--- flatpak-1.0.0.orig/libglnx/glnx-errors.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-errors.h	2018-05-26 00:50:25.433037228 +0300
@@ -0,0 +1,134 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -9152,9 +9152,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-errors.h flatpak-0.11.7/libglnx/glnx
 +  } while (0);
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-fdio.c flatpak-0.11.7/libglnx/glnx-fdio.c
--- flatpak-0.11.7.orig/libglnx/glnx-fdio.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-fdio.c	2018-05-26 00:50:25.434037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-fdio.c flatpak-1.0.0/libglnx/glnx-fdio.c
+--- flatpak-1.0.0.orig/libglnx/glnx-fdio.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-fdio.c	2018-05-26 00:50:25.434037228 +0300
@@ -0,0 +1,1106 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -10262,9 +10262,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-fdio.c flatpak-0.11.7/libglnx/glnx-f
 +
 +  return TRUE;
 +}
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-fdio.h flatpak-0.11.7/libglnx/glnx-fdio.h
--- flatpak-0.11.7.orig/libglnx/glnx-fdio.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-fdio.h	2018-05-26 00:50:25.434037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-fdio.h flatpak-1.0.0/libglnx/glnx-fdio.h
+--- flatpak-1.0.0.orig/libglnx/glnx-fdio.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-fdio.h	2018-05-26 00:50:25.434037228 +0300
@@ -0,0 +1,369 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -10635,9 +10635,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-fdio.h flatpak-0.11.7/libglnx/glnx-f
 +}
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-local-alloc.c flatpak-0.11.7/libglnx/glnx-local-alloc.c
--- flatpak-0.11.7.orig/libglnx/glnx-local-alloc.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-local-alloc.c	2018-02-03 21:26:06.308233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-local-alloc.c flatpak-1.0.0/libglnx/glnx-local-alloc.c
+--- flatpak-1.0.0.orig/libglnx/glnx-local-alloc.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-local-alloc.c	2018-02-03 21:26:06.308233341 +0300
@@ -0,0 +1,72 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -10711,9 +10711,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-local-alloc.c flatpak-0.11.7/libglnx
 + * </example>
 + *
 + */
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-local-alloc.h flatpak-0.11.7/libglnx/glnx-local-alloc.h
--- flatpak-0.11.7.orig/libglnx/glnx-local-alloc.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-local-alloc.h	2018-02-03 21:26:06.308233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-local-alloc.h flatpak-1.0.0/libglnx/glnx-local-alloc.h
+--- flatpak-1.0.0.orig/libglnx/glnx-local-alloc.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-local-alloc.h	2018-02-03 21:26:06.308233341 +0300
@@ -0,0 +1,91 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -10806,9 +10806,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-local-alloc.h flatpak-0.11.7/libglnx
 +#define glnx_autofd __attribute__((cleanup(glnx_close_fd)))
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-lockfile.c flatpak-0.11.7/libglnx/glnx-lockfile.c
--- flatpak-0.11.7.orig/libglnx/glnx-lockfile.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-lockfile.c	2018-05-26 00:50:25.434037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-lockfile.c flatpak-1.0.0/libglnx/glnx-lockfile.c
+--- flatpak-1.0.0.orig/libglnx/glnx-lockfile.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-lockfile.c	2018-05-26 00:50:25.434037228 +0300
@@ -0,0 +1,179 @@
 +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 +
@@ -10989,9 +10989,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-lockfile.c flatpak-0.11.7/libglnx/gl
 +        f->operation = 0;
 +        f->initialized = FALSE;
 +}
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-lockfile.h flatpak-0.11.7/libglnx/glnx-lockfile.h
--- flatpak-0.11.7.orig/libglnx/glnx-lockfile.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-lockfile.h	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-lockfile.h flatpak-1.0.0/libglnx/glnx-lockfile.h
+--- flatpak-1.0.0.orig/libglnx/glnx-lockfile.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-lockfile.h	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,40 @@
 +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 +
@@ -11033,9 +11033,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-lockfile.h flatpak-0.11.7/libglnx/gl
 +void glnx_release_lock_file(GLnxLockFile *f);
 +
 +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxLockFile, glnx_release_lock_file)
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-macros.h flatpak-0.11.7/libglnx/glnx-macros.h
--- flatpak-0.11.7.orig/libglnx/glnx-macros.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-macros.h	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-macros.h flatpak-1.0.0/libglnx/glnx-macros.h
+--- flatpak-1.0.0.orig/libglnx/glnx-macros.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-macros.h	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,189 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -11226,9 +11226,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-macros.h flatpak-0.11.7/libglnx/glnx
 +#endif /* GI_SCANNER */
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-missing.h flatpak-0.11.7/libglnx/glnx-missing.h
--- flatpak-0.11.7.orig/libglnx/glnx-missing.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-missing.h	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-missing.h flatpak-1.0.0/libglnx/glnx-missing.h
+--- flatpak-1.0.0.orig/libglnx/glnx-missing.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-missing.h	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,95 @@
 +#pragma once
 +
@@ -11325,9 +11325,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-missing.h flatpak-0.11.7/libglnx/gln
 +#endif
 +
 +#include "glnx-missing-syscall.h"
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-missing-syscall.h flatpak-0.11.7/libglnx/glnx-missing-syscall.h
--- flatpak-0.11.7.orig/libglnx/glnx-missing-syscall.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-missing-syscall.h	2018-05-26 00:50:25.434037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-missing-syscall.h flatpak-1.0.0/libglnx/glnx-missing-syscall.h
+--- flatpak-1.0.0.orig/libglnx/glnx-missing-syscall.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-missing-syscall.h	2018-05-26 00:50:25.434037228 +0300
@@ -0,0 +1,154 @@
 +/***
 +  This file was originally part of systemd.
@@ -11483,9 +11483,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-missing-syscall.h flatpak-0.11.7/lib
 +#  endif
 +}
 +#endif
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-shutil.c flatpak-0.11.7/libglnx/glnx-shutil.c
--- flatpak-0.11.7.orig/libglnx/glnx-shutil.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-shutil.c	2018-05-26 00:50:25.434037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-shutil.c flatpak-1.0.0/libglnx/glnx-shutil.c
+--- flatpak-1.0.0.orig/libglnx/glnx-shutil.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-shutil.c	2018-05-26 00:50:25.434037228 +0300
@@ -0,0 +1,260 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -11747,9 +11747,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-shutil.c flatpak-0.11.7/libglnx/glnx
 +
 +  return glnx_opendirat (dfd, path, TRUE, out_dfd, error);
 +}
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-shutil.h flatpak-0.11.7/libglnx/glnx-shutil.h
--- flatpak-0.11.7.orig/libglnx/glnx-shutil.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-shutil.h	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-shutil.h flatpak-1.0.0/libglnx/glnx-shutil.h
+--- flatpak-1.0.0.orig/libglnx/glnx-shutil.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-shutil.h	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,48 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -11799,9 +11799,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-shutil.h flatpak-0.11.7/libglnx/glnx
 +                             GError       **error);
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-xattrs.c flatpak-0.11.7/libglnx/glnx-xattrs.c
--- flatpak-0.11.7.orig/libglnx/glnx-xattrs.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-xattrs.c	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-xattrs.c flatpak-1.0.0/libglnx/glnx-xattrs.c
+--- flatpak-1.0.0.orig/libglnx/glnx-xattrs.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-xattrs.c	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,444 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -12247,9 +12247,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-xattrs.c flatpak-0.11.7/libglnx/glnx
 +  return TRUE;
 +}
 +
-diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-xattrs.h flatpak-0.11.7/libglnx/glnx-xattrs.h
--- flatpak-0.11.7.orig/libglnx/glnx-xattrs.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/glnx-xattrs.h	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/glnx-xattrs.h flatpak-1.0.0/libglnx/glnx-xattrs.h
+--- flatpak-1.0.0.orig/libglnx/glnx-xattrs.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/glnx-xattrs.h	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,78 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -12329,9 +12329,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/glnx-xattrs.h flatpak-0.11.7/libglnx/glnx
 +                  GError       **error);
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/libglnx.doap flatpak-0.11.7/libglnx/libglnx.doap
--- flatpak-0.11.7.orig/libglnx/libglnx.doap	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/libglnx.doap	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/libglnx.doap flatpak-1.0.0/libglnx/libglnx.doap
+--- flatpak-1.0.0.orig/libglnx/libglnx.doap	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/libglnx.doap	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,31 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -12364,9 +12364,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/libglnx.doap flatpak-0.11.7/libglnx/libgl
 +  </maintainer>
 +
 +</Project>
-diff -Nuar flatpak-0.11.7.orig/libglnx/libglnx.h flatpak-0.11.7/libglnx/libglnx.h
--- flatpak-0.11.7.orig/libglnx/libglnx.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/libglnx.h	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/libglnx.h flatpak-1.0.0/libglnx/libglnx.h
+--- flatpak-1.0.0.orig/libglnx/libglnx.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/libglnx.h	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,40 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -12408,9 +12408,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/libglnx.h flatpak-0.11.7/libglnx/libglnx.
 +#include <glnx-fdio.h>
 +
 +G_END_DECLS
-diff -Nuar flatpak-0.11.7.orig/libglnx/libglnx.m4 flatpak-0.11.7/libglnx/libglnx.m4
--- flatpak-0.11.7.orig/libglnx/libglnx.m4	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/libglnx.m4	2018-05-26 00:50:25.434037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/libglnx.m4 flatpak-1.0.0/libglnx/libglnx.m4
+--- flatpak-1.0.0.orig/libglnx/libglnx.m4	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/libglnx.m4	2018-05-26 00:50:25.434037228 +0300
@@ -0,0 +1,33 @@
 +AC_DEFUN([LIBGLNX_CONFIGURE],
 +[
@@ -12445,9 +12445,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/libglnx.m4 flatpak-0.11.7/libglnx/libglnx
 +
 +dnl end LIBGLNX_CONFIGURE
 +])
-diff -Nuar flatpak-0.11.7.orig/libglnx/Makefile-libglnx.am flatpak-0.11.7/libglnx/Makefile-libglnx.am
--- flatpak-0.11.7.orig/libglnx/Makefile-libglnx.am	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/Makefile-libglnx.am	2018-02-03 21:26:06.307233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/Makefile-libglnx.am flatpak-1.0.0/libglnx/Makefile-libglnx.am
+--- flatpak-1.0.0.orig/libglnx/Makefile-libglnx.am	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/Makefile-libglnx.am	2018-02-03 21:26:06.307233341 +0300
@@ -0,0 +1,78 @@
 +# Copyright (C) 2015 Colin Walters <walters@verbum.org>
 +#
@@ -12527,9 +12527,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/Makefile-libglnx.am flatpak-0.11.7/libgln
 +test_libglnx_shutil_SOURCES = $(libglnx_srcpath)/tests/test-libglnx-shutil.c
 +test_libglnx_shutil_CFLAGS = $(AM_CFLAGS) $(libglnx_cflags)
 +test_libglnx_shutil_LDADD = $(libglnx_libs) libglnx.la
-diff -Nuar flatpak-0.11.7.orig/libglnx/README.md flatpak-0.11.7/libglnx/README.md
--- flatpak-0.11.7.orig/libglnx/README.md	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/README.md	2018-05-26 00:50:25.433037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/README.md flatpak-1.0.0/libglnx/README.md
+--- flatpak-1.0.0.orig/libglnx/README.md	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/README.md	2018-05-26 00:50:25.433037228 +0300
@@ -0,0 +1,52 @@
 +libglnx is the successor to libgsystem: https://git.gnome.org/browse/libgsystem
 +
@@ -12583,9 +12583,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/README.md flatpak-0.11.7/libglnx/README.m
 +https://github.com/GNOME/libglnx/pulls
 +
 +Or alternatively, email one of the maintainers directly.
-diff -Nuar flatpak-0.11.7.orig/libglnx/tests/libglnx-testlib.h flatpak-0.11.7/libglnx/tests/libglnx-testlib.h
--- flatpak-0.11.7.orig/libglnx/tests/libglnx-testlib.h	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/tests/libglnx-testlib.h	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/tests/libglnx-testlib.h flatpak-1.0.0/libglnx/tests/libglnx-testlib.h
+--- flatpak-1.0.0.orig/libglnx/tests/libglnx-testlib.h	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/tests/libglnx-testlib.h	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,34 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -12621,9 +12621,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/tests/libglnx-testlib.h flatpak-0.11.7/li
 +#define _GLNX_TEST_DECLARE_ERROR(local_error, error)      \
 +  g_autoptr(_GLnxTestAutoError) local_error = NULL; \
 +  GError **error = &local_error
-diff -Nuar flatpak-0.11.7.orig/libglnx/tests/test-libglnx-errors.c flatpak-0.11.7/libglnx/tests/test-libglnx-errors.c
--- flatpak-0.11.7.orig/libglnx/tests/test-libglnx-errors.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/tests/test-libglnx-errors.c	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/tests/test-libglnx-errors.c flatpak-1.0.0/libglnx/tests/test-libglnx-errors.c
+--- flatpak-1.0.0.orig/libglnx/tests/test-libglnx-errors.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/tests/test-libglnx-errors.c	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,183 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -12808,9 +12808,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/tests/test-libglnx-errors.c flatpak-0.11.
 +
 +  return ret;
 +}
-diff -Nuar flatpak-0.11.7.orig/libglnx/tests/test-libglnx-fdio.c flatpak-0.11.7/libglnx/tests/test-libglnx-fdio.c
--- flatpak-0.11.7.orig/libglnx/tests/test-libglnx-fdio.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/tests/test-libglnx-fdio.c	2018-05-26 00:50:25.435037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/tests/test-libglnx-fdio.c flatpak-1.0.0/libglnx/tests/test-libglnx-fdio.c
+--- flatpak-1.0.0.orig/libglnx/tests/test-libglnx-fdio.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/tests/test-libglnx-fdio.c	2018-05-26 00:50:25.435037228 +0300
@@ -0,0 +1,254 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -13066,9 +13066,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/tests/test-libglnx-fdio.c flatpak-0.11.7/
 +
 +  return ret;
 +}
-diff -Nuar flatpak-0.11.7.orig/libglnx/tests/test-libglnx-macros.c flatpak-0.11.7/libglnx/tests/test-libglnx-macros.c
--- flatpak-0.11.7.orig/libglnx/tests/test-libglnx-macros.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/tests/test-libglnx-macros.c	2018-02-03 21:26:06.309233341 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/tests/test-libglnx-macros.c flatpak-1.0.0/libglnx/tests/test-libglnx-macros.c
+--- flatpak-1.0.0.orig/libglnx/tests/test-libglnx-macros.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/tests/test-libglnx-macros.c	2018-02-03 21:26:06.309233341 +0300
@@ -0,0 +1,109 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -13179,9 +13179,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/tests/test-libglnx-macros.c flatpak-0.11.
 +  g_test_add_func ("/hash_table_foreach", test_hash_table_foreach);
 +  return g_test_run();
 +}
-diff -Nuar flatpak-0.11.7.orig/libglnx/tests/test-libglnx-shutil.c flatpak-0.11.7/libglnx/tests/test-libglnx-shutil.c
--- flatpak-0.11.7.orig/libglnx/tests/test-libglnx-shutil.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/tests/test-libglnx-shutil.c	2018-05-26 00:50:25.435037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/tests/test-libglnx-shutil.c flatpak-1.0.0/libglnx/tests/test-libglnx-shutil.c
+--- flatpak-1.0.0.orig/libglnx/tests/test-libglnx-shutil.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/tests/test-libglnx-shutil.c	2018-05-26 00:50:25.435037228 +0300
@@ -0,0 +1,63 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -13246,9 +13246,9 @@ diff -Nuar flatpak-0.11.7.orig/libglnx/tests/test-libglnx-shutil.c flatpak-0.11.
 +
 +  return ret;
 +}
-diff -Nuar flatpak-0.11.7.orig/libglnx/tests/test-libglnx-xattrs.c flatpak-0.11.7/libglnx/tests/test-libglnx-xattrs.c
--- flatpak-0.11.7.orig/libglnx/tests/test-libglnx-xattrs.c	1970-01-01 02:00:00.000000000 +0200
-+++ flatpak-0.11.7/libglnx/tests/test-libglnx-xattrs.c	2018-05-26 00:50:25.435037228 +0300
+diff -Nuar flatpak-1.0.0.orig/libglnx/tests/test-libglnx-xattrs.c flatpak-1.0.0/libglnx/tests/test-libglnx-xattrs.c
+--- flatpak-1.0.0.orig/libglnx/tests/test-libglnx-xattrs.c	1970-01-01 02:00:00.000000000 +0200
+++ flatpak-1.0.0/libglnx/tests/test-libglnx-xattrs.c	2018-05-26 00:50:25.435037228 +0300
@@ -0,0 +1,283 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -0,0 +1,32 @@
+diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
+index db4f3645..ac375694 100644
+--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
+@@ -5725,7 +5725,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar  *str,
+   if (str[0] == '\0')
+     {
+       g_set_error_literal (error,
+-                           G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_INVALID,
+                           G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
+                            _("Empty string is not a number"));
+       return FALSE;
+     }
+@@ -5751,7 +5751,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar  *str,
+       *end_ptr != '\0')
+     {
+       g_set_error (error,
+-                   G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_INVALID,
+                   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
+                    _("“%s” is not an unsigned number"), str);
+       return FALSE;
+     }
+@@ -5761,7 +5761,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar  *str,
+       gchar *max_str = g_strdup_printf ("%" G_GUINT64_FORMAT, max);
+ 
+       g_set_error (error,
+-                   G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS,
+                   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
+                    _("Number “%s” is out of bounds [%s, %s]"),
+                    str, min_str, max_str);
+       g_free (min_str);
+
@@ -11,7 +11,7 @@
        <License>LGPLv2</License>
        <Summary>Application distribution framework</Summary>
        <Description>Linux application sandboxing and distribution framework, formerly xdg-app</Description>
-        <Archive sha1sum="6ae180dffc72b81081b1d1fbeacb69b2e3b9325d" type="targz">https://github.com/flatpak/flatpak/archive/0.11.7.tar.gz</Archive>
+        <Archive sha1sum="f09a3f1378695654e8a51506f7d7e5dc1d62af2e" type="targz">https://github.com/flatpak/flatpak/archive/1.0.0.tar.gz</Archive>
        <BuildDependencies>
            <Dependency>util-linux</Dependency>
            <Dependency>gtk-doc</Dependency>
@@ -22,10 +22,11 @@
            <Dependency>dbus-devel</Dependency>
            <Dependency>json-glib-devel</Dependency>
            <Dependency>appstream-glib-devel</Dependency>
-            <Dependency versionFrom="2018.5">ostree-devel</Dependency>
+            <Dependency versionFrom="2018.8">ostree-devel</Dependency>
        </BuildDependencies>
        <Patches>
            <Patch level="1">bubblewrap_libglnx_submodule.patch</Patch>
+            <Patch>flatpak-1.0.0-glib_fix.patch</Patch>
        </Patches>
    </Source>

@@ -93,6 +94,13 @@
    </Package>

    <History>
+        <Update release="4">
+            <Date>2018-08-23</Date>
+            <Version>1.0.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
        <Update release="3">
            <Date>2018-07-08</Date>
            <Version>0.11.7</Version>
@@ -14,15 +14,17 @@ from pisi.actionsapi import get
 def setup():
    shelltools.system("env NOCONFIGURE=1 ./autogen.sh")
    
-    autotools.configure("--enable-rust \
-                         --enable-trivial-httpd-cmdline \
+    autotools.configure("--disable-silent-rules \
+                         --without-selinux \
+                         --with-curl \
                         --with-openssl \
                         --disable-static \
+                         --enable-trivial-httpd-cmdline \
+                         --disable-http2 \
                         --without-dracut \
                         --without-mkinitcpio")
-    
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")

+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")

 def build():
    autotools.make()
@@ -1,6 +1,6 @@
-diff -Nuar ostree-2018.5.orig/bsdiff/autogen.sh ostree-2018.5/bsdiff/autogen.sh
--- ostree-2018.5.orig/bsdiff/autogen.sh	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/autogen.sh	2018-05-26 00:37:31.985018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/autogen.sh ostree-2018.8/bsdiff/autogen.sh
+--- ostree-2018.8.orig/bsdiff/autogen.sh	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/autogen.sh	2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,6 @@
 +#!/bin/sh
 +
@@ -8,9 +8,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/autogen.sh ostree-2018.5/bsdiff/autogen.sh
 +cp LICENSE COPYING
 +
 +autoreconf -fis
-diff -Nuar ostree-2018.5.orig/bsdiff/bsdiff.c ostree-2018.5/bsdiff/bsdiff.c
--- ostree-2018.5.orig/bsdiff/bsdiff.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/bsdiff.c	2018-05-26 00:37:31.985018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/bsdiff.c ostree-2018.8/bsdiff/bsdiff.c
+--- ostree-2018.8.orig/bsdiff/bsdiff.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/bsdiff.c	2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,445 @@
 +/*-
 + * Copyright 2003-2005 Colin Percival
@@ -457,9 +457,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/bsdiff.c ostree-2018.5/bsdiff/bsdiff.c
 +}
 +
 +#endif
-diff -Nuar ostree-2018.5.orig/bsdiff/bsdiff.h ostree-2018.5/bsdiff/bsdiff.h
--- ostree-2018.5.orig/bsdiff/bsdiff.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/bsdiff.h	2018-05-26 00:37:31.985018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/bsdiff.h ostree-2018.8/bsdiff/bsdiff.h
+--- ostree-2018.8.orig/bsdiff/bsdiff.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/bsdiff.h	2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,45 @@
 +/*-
 + * Copyright 2003-2005 Colin Percival
@@ -506,9 +506,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/bsdiff.h ostree-2018.5/bsdiff/bsdiff.h
 +int bsdiff(const uint8_t* old, int64_t oldsize, const uint8_t* new, int64_t newsize, struct bsdiff_stream* stream);
 +
 +#endif
-diff -Nuar ostree-2018.5.orig/bsdiff/bspatch.c ostree-2018.5/bsdiff/bspatch.c
--- ostree-2018.5.orig/bsdiff/bspatch.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/bspatch.c	2018-05-26 00:37:31.985018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/bspatch.c ostree-2018.8/bsdiff/bspatch.c
+--- ostree-2018.8.orig/bsdiff/bspatch.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/bspatch.c	2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,187 @@
 +/*-
 + * Copyright 2003-2005 Colin Percival
@@ -697,9 +697,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/bspatch.c ostree-2018.5/bsdiff/bspatch.c
 +}
 +
 +#endif
-diff -Nuar ostree-2018.5.orig/bsdiff/bspatch.h ostree-2018.5/bsdiff/bspatch.h
--- ostree-2018.5.orig/bsdiff/bspatch.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/bspatch.h	2018-05-26 00:37:31.985018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/bspatch.h ostree-2018.8/bsdiff/bspatch.h
+--- ostree-2018.8.orig/bsdiff/bspatch.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/bspatch.h	2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,42 @@
 +/*-
 + * Copyright 2003-2005 Colin Percival
@@ -743,9 +743,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/bspatch.h ostree-2018.5/bsdiff/bspatch.h
 +
 +#endif
 +
-diff -Nuar ostree-2018.5.orig/bsdiff/configure.ac ostree-2018.5/bsdiff/configure.ac
--- ostree-2018.5.orig/bsdiff/configure.ac	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/configure.ac	2018-05-26 00:37:31.985018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/configure.ac ostree-2018.8/bsdiff/configure.ac
+--- ostree-2018.8.orig/bsdiff/configure.ac	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/configure.ac	2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,30 @@
 +#                                               -*- Autoconf -*-
 +# Process this file with autoconf to produce a configure script.
@@ -777,14 +777,14 @@ diff -Nuar ostree-2018.5.orig/bsdiff/configure.ac ostree-2018.5/bsdiff/configure
 +
 +AC_CONFIG_FILES([Makefile])
 +AC_OUTPUT
-diff -Nuar ostree-2018.5.orig/bsdiff/.git ostree-2018.5/bsdiff/.git
--- ostree-2018.5.orig/bsdiff/.git	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/.git	2018-05-26 00:37:14.345018427 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/.git ostree-2018.8/bsdiff/.git
+--- ostree-2018.8.orig/bsdiff/.git	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/.git	2018-05-26 00:37:14.345018427 +0300
@@ -0,0 +1 @@
 +gitdir: ../.git/modules/bsdiff
-diff -Nuar ostree-2018.5.orig/bsdiff/.gitignore ostree-2018.5/bsdiff/.gitignore
--- ostree-2018.5.orig/bsdiff/.gitignore	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/.gitignore	2018-05-26 00:37:31.984018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/.gitignore ostree-2018.8/bsdiff/.gitignore
+--- ostree-2018.8.orig/bsdiff/.gitignore	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/.gitignore	2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,11 @@
 +.deps/*
 +.libs/*
@@ -797,9 +797,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/.gitignore ostree-2018.5/bsdiff/.gitignore
 +README
 +ChangeLog
 +COPYING
-diff -Nuar ostree-2018.5.orig/bsdiff/LICENSE ostree-2018.5/bsdiff/LICENSE
--- ostree-2018.5.orig/bsdiff/LICENSE	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/LICENSE	2018-05-26 00:37:31.984018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/LICENSE ostree-2018.8/bsdiff/LICENSE
+--- ostree-2018.8.orig/bsdiff/LICENSE	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/LICENSE	2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,24 @@
 + Copyright 2003-2005 Colin Percival
 + Copyright 2012 Matthew Endsley
@@ -825,9 +825,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/LICENSE ostree-2018.5/bsdiff/LICENSE
 + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 + POSSIBILITY OF SUCH DAMAGE.
-diff -Nuar ostree-2018.5.orig/bsdiff/Makefile.am ostree-2018.5/bsdiff/Makefile.am
--- ostree-2018.5.orig/bsdiff/Makefile.am	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/Makefile.am	2018-05-26 00:37:31.984018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/Makefile.am ostree-2018.8/bsdiff/Makefile.am
+--- ostree-2018.8.orig/bsdiff/Makefile.am	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/Makefile.am	2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,11 @@
 +bin_PROGRAMS = bsdiff bspatch
 +
@@ -840,9 +840,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/Makefile.am ostree-2018.5/bsdiff/Makefile.a
 +
 +EXTRA_DIST = bsdiff.h bspatch.h
 +
-diff -Nuar ostree-2018.5.orig/bsdiff/Makefile-bsdiff.am ostree-2018.5/bsdiff/Makefile-bsdiff.am
--- ostree-2018.5.orig/bsdiff/Makefile-bsdiff.am	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/Makefile-bsdiff.am	2018-05-26 00:37:31.984018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/Makefile-bsdiff.am ostree-2018.8/bsdiff/Makefile-bsdiff.am
+--- ostree-2018.8.orig/bsdiff/Makefile-bsdiff.am	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/Makefile-bsdiff.am	2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,32 @@
 +# Copyright (C) 2015 Giuseppe Scrivano <gscrivan@redhat.com>
 +#
@@ -876,9 +876,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/Makefile-bsdiff.am ostree-2018.5/bsdiff/Mak
 +	$(NULL)
 +
 +libbsdiff_la_CFLAGS = $(AM_CFLAGS)
-diff -Nuar ostree-2018.5.orig/bsdiff/README.md ostree-2018.5/bsdiff/README.md
--- ostree-2018.5.orig/bsdiff/README.md	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/bsdiff/README.md	2018-05-26 00:37:31.985018846 +0300
+diff -Nuar ostree-2018.8.orig/bsdiff/README.md ostree-2018.8/bsdiff/README.md
+--- ostree-2018.8.orig/bsdiff/README.md	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/bsdiff/README.md	2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,129 @@
 +bsdiff/bspatch
 +==============
@@ -1009,9 +1009,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/README.md ostree-2018.5/bsdiff/README.md
 +
 +`bspatch` returns `0` on success and `-1` on failure. On success, `new` contains
 +the data for the patched file.
-diff -Nuar ostree-2018.5.orig/libglnx/COPYING ostree-2018.5/libglnx/COPYING
--- ostree-2018.5.orig/libglnx/COPYING	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/COPYING	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/COPYING ostree-2018.8/libglnx/COPYING
+--- ostree-2018.8.orig/libglnx/COPYING	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/COPYING	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,502 @@
 +                  GNU LESSER GENERAL PUBLIC LICENSE
 +                       Version 2.1, February 1999
@@ -1515,14 +1515,14 @@ diff -Nuar ostree-2018.5.orig/libglnx/COPYING ostree-2018.5/libglnx/COPYING
 +  Ty Coon, President of Vice
 +
 +That's all there is to it!
-diff -Nuar ostree-2018.5.orig/libglnx/.git ostree-2018.5/libglnx/.git
--- ostree-2018.5.orig/libglnx/.git	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/.git	2018-05-26 00:37:31.964018845 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/.git ostree-2018.8/libglnx/.git
+--- ostree-2018.8.orig/libglnx/.git	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/.git	2018-05-26 00:37:31.964018845 +0300
@@ -0,0 +1 @@
 +gitdir: ../.git/modules/libglnx
-diff -Nuar ostree-2018.5.orig/libglnx/.gitignore ostree-2018.5/libglnx/.gitignore
--- ostree-2018.5.orig/libglnx/.gitignore	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/.gitignore	2018-05-26 00:37:32.005018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/.gitignore ostree-2018.8/libglnx/.gitignore
+--- ostree-2018.8.orig/libglnx/.gitignore	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/.gitignore	2018-05-26 00:37:32.005018846 +0300
@@ -0,0 +1,16 @@
 +# A path ostree writes to work around automake bug with
 +# subdir-objects
@@ -1540,9 +1540,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/.gitignore ostree-2018.5/libglnx/.gitignor
 +*.stamp
 +*~
 +
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-backport-autocleanups.h ostree-2018.5/libglnx/glnx-backport-autocleanups.h
--- ostree-2018.5.orig/libglnx/glnx-backport-autocleanups.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-backport-autocleanups.h	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-backport-autocleanups.h ostree-2018.8/libglnx/glnx-backport-autocleanups.h
+--- ostree-2018.8.orig/libglnx/glnx-backport-autocleanups.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-backport-autocleanups.h	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,124 @@
 +/*
 + * Copyright © 2015 Canonical Limited
@@ -1668,9 +1668,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-backport-autocleanups.h ostree-2018.5
 +G_DEFINE_AUTOPTR_CLEANUP_FUNC(GString, g_autoptr_cleanup_gstring_free)
 +
 +#endif
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-backport-autoptr.h ostree-2018.5/libglnx/glnx-backport-autoptr.h
--- ostree-2018.5.orig/libglnx/glnx-backport-autoptr.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-backport-autoptr.h	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-backport-autoptr.h ostree-2018.8/libglnx/glnx-backport-autoptr.h
+--- ostree-2018.8.orig/libglnx/glnx-backport-autoptr.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-backport-autoptr.h	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,133 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -1805,9 +1805,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-backport-autoptr.h ostree-2018.5/libg
 +#endif /* !GLIB_CHECK_VERSION(2, 43, 3) */
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-backports.c ostree-2018.5/libglnx/glnx-backports.c
--- ostree-2018.5.orig/libglnx/glnx-backports.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-backports.c	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-backports.c ostree-2018.8/libglnx/glnx-backports.c
+--- ostree-2018.8.orig/libglnx/glnx-backports.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-backports.c	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,61 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -1870,9 +1870,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-backports.c ostree-2018.5/libglnx/gln
 +  return TRUE;
 +}
 +#endif
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-backports.h ostree-2018.5/libglnx/glnx-backports.h
--- ostree-2018.5.orig/libglnx/glnx-backports.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-backports.h	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-backports.h ostree-2018.8/libglnx/glnx-backports.h
+--- ostree-2018.8.orig/libglnx/glnx-backports.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-backports.h	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,46 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -1920,9 +1920,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-backports.h ostree-2018.5/libglnx/gln
 +#endif /* !GLIB_CHECK_VERSION(2, 44, 0) */
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-console.c ostree-2018.5/libglnx/glnx-console.c
--- ostree-2018.5.orig/libglnx/glnx-console.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-console.c	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-console.c ostree-2018.8/libglnx/glnx-console.c
+--- ostree-2018.8.orig/libglnx/glnx-console.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-console.c	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,359 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -2283,9 +2283,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-console.c ostree-2018.5/libglnx/glnx-
 +      
 +  locked = console->locked = FALSE;
 +}
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-console.h ostree-2018.5/libglnx/glnx-console.h
--- ostree-2018.5.orig/libglnx/glnx-console.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-console.h	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-console.h ostree-2018.8/libglnx/glnx-console.h
+--- ostree-2018.8.orig/libglnx/glnx-console.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-console.h	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,61 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -2348,9 +2348,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-console.h ostree-2018.5/libglnx/glnx-
 +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxConsoleRef, glnx_console_ref_cleanup)
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-dirfd.c ostree-2018.5/libglnx/glnx-dirfd.c
--- ostree-2018.5.orig/libglnx/glnx-dirfd.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-dirfd.c	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-dirfd.c ostree-2018.8/libglnx/glnx-dirfd.c
+--- ostree-2018.8.orig/libglnx/glnx-dirfd.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-dirfd.c	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,425 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -2777,9 +2777,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-dirfd.c ostree-2018.5/libglnx/glnx-di
 +{
 +  (void) _glnx_tmpdir_free (tmpf, FALSE, NULL, NULL);
 +}
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-dirfd.h ostree-2018.5/libglnx/glnx-dirfd.h
--- ostree-2018.5.orig/libglnx/glnx-dirfd.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-dirfd.h	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-dirfd.h ostree-2018.8/libglnx/glnx-dirfd.h
+--- ostree-2018.8.orig/libglnx/glnx-dirfd.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-dirfd.h	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,137 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -2918,9 +2918,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-dirfd.h ostree-2018.5/libglnx/glnx-di
 +                       GLnxTmpDir *out_tmpdir, GError **error);
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-errors.c ostree-2018.5/libglnx/glnx-errors.c
--- ostree-2018.5.orig/libglnx/glnx-errors.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-errors.c	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-errors.c ostree-2018.8/libglnx/glnx-errors.c
+--- ostree-2018.8.orig/libglnx/glnx-errors.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-errors.c	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,131 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -3053,9 +3053,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-errors.c ostree-2018.5/libglnx/glnx-e
 +  errno = errsv;
 +  return FALSE;
 +}
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-errors.h ostree-2018.5/libglnx/glnx-errors.h
--- ostree-2018.5.orig/libglnx/glnx-errors.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-errors.h	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-errors.h ostree-2018.8/libglnx/glnx-errors.h
+--- ostree-2018.8.orig/libglnx/glnx-errors.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-errors.h	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,134 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -3191,9 +3191,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-errors.h ostree-2018.5/libglnx/glnx-e
 +  } while (0);
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-fdio.c ostree-2018.5/libglnx/glnx-fdio.c
--- ostree-2018.5.orig/libglnx/glnx-fdio.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-fdio.c	2018-05-26 00:37:32.007018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-fdio.c ostree-2018.8/libglnx/glnx-fdio.c
+--- ostree-2018.8.orig/libglnx/glnx-fdio.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-fdio.c	2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,1106 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -4301,9 +4301,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-fdio.c ostree-2018.5/libglnx/glnx-fdi
 +
 +  return TRUE;
 +}
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-fdio.h ostree-2018.5/libglnx/glnx-fdio.h
--- ostree-2018.5.orig/libglnx/glnx-fdio.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-fdio.h	2018-05-26 00:37:32.007018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-fdio.h ostree-2018.8/libglnx/glnx-fdio.h
+--- ostree-2018.8.orig/libglnx/glnx-fdio.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-fdio.h	2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,369 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -4674,9 +4674,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-fdio.h ostree-2018.5/libglnx/glnx-fdi
 +}
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-local-alloc.c ostree-2018.5/libglnx/glnx-local-alloc.c
--- ostree-2018.5.orig/libglnx/glnx-local-alloc.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-local-alloc.c	2018-05-26 00:37:32.007018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-local-alloc.c ostree-2018.8/libglnx/glnx-local-alloc.c
+--- ostree-2018.8.orig/libglnx/glnx-local-alloc.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-local-alloc.c	2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,72 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -4750,9 +4750,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-local-alloc.c ostree-2018.5/libglnx/g
 + * </example>
 + *
 + */
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-local-alloc.h ostree-2018.5/libglnx/glnx-local-alloc.h
--- ostree-2018.5.orig/libglnx/glnx-local-alloc.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-local-alloc.h	2018-05-26 00:37:32.007018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-local-alloc.h ostree-2018.8/libglnx/glnx-local-alloc.h
+--- ostree-2018.8.orig/libglnx/glnx-local-alloc.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-local-alloc.h	2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,91 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -4845,9 +4845,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-local-alloc.h ostree-2018.5/libglnx/g
 +#define glnx_autofd __attribute__((cleanup(glnx_close_fd)))
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-lockfile.c ostree-2018.5/libglnx/glnx-lockfile.c
--- ostree-2018.5.orig/libglnx/glnx-lockfile.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-lockfile.c	2018-05-26 00:37:32.007018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-lockfile.c ostree-2018.8/libglnx/glnx-lockfile.c
+--- ostree-2018.8.orig/libglnx/glnx-lockfile.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-lockfile.c	2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,179 @@
 +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 +
@@ -5028,9 +5028,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-lockfile.c ostree-2018.5/libglnx/glnx
 +        f->operation = 0;
 +        f->initialized = FALSE;
 +}
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-lockfile.h ostree-2018.5/libglnx/glnx-lockfile.h
--- ostree-2018.5.orig/libglnx/glnx-lockfile.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-lockfile.h	2018-05-26 00:37:32.007018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-lockfile.h ostree-2018.8/libglnx/glnx-lockfile.h
+--- ostree-2018.8.orig/libglnx/glnx-lockfile.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-lockfile.h	2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,40 @@
 +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 +
@@ -5072,9 +5072,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-lockfile.h ostree-2018.5/libglnx/glnx
 +void glnx_release_lock_file(GLnxLockFile *f);
 +
 +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxLockFile, glnx_release_lock_file)
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-macros.h ostree-2018.5/libglnx/glnx-macros.h
--- ostree-2018.5.orig/libglnx/glnx-macros.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-macros.h	2018-05-26 00:37:32.007018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-macros.h ostree-2018.8/libglnx/glnx-macros.h
+--- ostree-2018.8.orig/libglnx/glnx-macros.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-macros.h	2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,189 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -5265,9 +5265,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-macros.h ostree-2018.5/libglnx/glnx-m
 +#endif /* GI_SCANNER */
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-missing.h ostree-2018.5/libglnx/glnx-missing.h
--- ostree-2018.5.orig/libglnx/glnx-missing.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-missing.h	2018-05-26 00:37:32.007018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-missing.h ostree-2018.8/libglnx/glnx-missing.h
+--- ostree-2018.8.orig/libglnx/glnx-missing.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-missing.h	2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,95 @@
 +#pragma once
 +
@@ -5364,9 +5364,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-missing.h ostree-2018.5/libglnx/glnx-
 +#endif
 +
 +#include "glnx-missing-syscall.h"
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-missing-syscall.h ostree-2018.5/libglnx/glnx-missing-syscall.h
--- ostree-2018.5.orig/libglnx/glnx-missing-syscall.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-missing-syscall.h	2018-05-26 00:37:32.007018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-missing-syscall.h ostree-2018.8/libglnx/glnx-missing-syscall.h
+--- ostree-2018.8.orig/libglnx/glnx-missing-syscall.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-missing-syscall.h	2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,156 @@
 +/***
 +  This file was originally part of systemd.
@@ -5524,9 +5524,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-missing-syscall.h ostree-2018.5/libgl
 +
 +#  define copy_file_range missing_copy_file_range
 +#endif
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-shutil.c ostree-2018.5/libglnx/glnx-shutil.c
--- ostree-2018.5.orig/libglnx/glnx-shutil.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-shutil.c	2018-05-26 00:37:32.007018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-shutil.c ostree-2018.8/libglnx/glnx-shutil.c
+--- ostree-2018.8.orig/libglnx/glnx-shutil.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-shutil.c	2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,260 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -5788,9 +5788,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-shutil.c ostree-2018.5/libglnx/glnx-s
 +
 +  return glnx_opendirat (dfd, path, TRUE, out_dfd, error);
 +}
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-shutil.h ostree-2018.5/libglnx/glnx-shutil.h
--- ostree-2018.5.orig/libglnx/glnx-shutil.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-shutil.h	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-shutil.h ostree-2018.8/libglnx/glnx-shutil.h
+--- ostree-2018.8.orig/libglnx/glnx-shutil.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-shutil.h	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,48 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -5840,9 +5840,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-shutil.h ostree-2018.5/libglnx/glnx-s
 +                             GError       **error);
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-xattrs.c ostree-2018.5/libglnx/glnx-xattrs.c
--- ostree-2018.5.orig/libglnx/glnx-xattrs.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-xattrs.c	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-xattrs.c ostree-2018.8/libglnx/glnx-xattrs.c
+--- ostree-2018.8.orig/libglnx/glnx-xattrs.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-xattrs.c	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,444 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -6288,9 +6288,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-xattrs.c ostree-2018.5/libglnx/glnx-x
 +  return TRUE;
 +}
 +
-diff -Nuar ostree-2018.5.orig/libglnx/glnx-xattrs.h ostree-2018.5/libglnx/glnx-xattrs.h
--- ostree-2018.5.orig/libglnx/glnx-xattrs.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/glnx-xattrs.h	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/glnx-xattrs.h ostree-2018.8/libglnx/glnx-xattrs.h
+--- ostree-2018.8.orig/libglnx/glnx-xattrs.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/glnx-xattrs.h	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,78 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -6370,9 +6370,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-xattrs.h ostree-2018.5/libglnx/glnx-x
 +                  GError       **error);
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/libglnx.doap ostree-2018.5/libglnx/libglnx.doap
--- ostree-2018.5.orig/libglnx/libglnx.doap	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/libglnx.doap	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/libglnx.doap ostree-2018.8/libglnx/libglnx.doap
+--- ostree-2018.8.orig/libglnx/libglnx.doap	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/libglnx.doap	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,31 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -6405,9 +6405,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/libglnx.doap ostree-2018.5/libglnx/libglnx
 +  </maintainer>
 +
 +</Project>
-diff -Nuar ostree-2018.5.orig/libglnx/libglnx.h ostree-2018.5/libglnx/libglnx.h
--- ostree-2018.5.orig/libglnx/libglnx.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/libglnx.h	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/libglnx.h ostree-2018.8/libglnx/libglnx.h
+--- ostree-2018.8.orig/libglnx/libglnx.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/libglnx.h	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,40 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -6449,9 +6449,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/libglnx.h ostree-2018.5/libglnx/libglnx.h
 +#include <glnx-fdio.h>
 +
 +G_END_DECLS
-diff -Nuar ostree-2018.5.orig/libglnx/libglnx.m4 ostree-2018.5/libglnx/libglnx.m4
--- ostree-2018.5.orig/libglnx/libglnx.m4	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/libglnx.m4	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/libglnx.m4 ostree-2018.8/libglnx/libglnx.m4
+--- ostree-2018.8.orig/libglnx/libglnx.m4	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/libglnx.m4	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,33 @@
 +AC_DEFUN([LIBGLNX_CONFIGURE],
 +[
@@ -6486,9 +6486,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/libglnx.m4 ostree-2018.5/libglnx/libglnx.m
 +
 +dnl end LIBGLNX_CONFIGURE
 +])
-diff -Nuar ostree-2018.5.orig/libglnx/Makefile-libglnx.am ostree-2018.5/libglnx/Makefile-libglnx.am
--- ostree-2018.5.orig/libglnx/Makefile-libglnx.am	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/Makefile-libglnx.am	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/Makefile-libglnx.am ostree-2018.8/libglnx/Makefile-libglnx.am
+--- ostree-2018.8.orig/libglnx/Makefile-libglnx.am	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/Makefile-libglnx.am	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,78 @@
 +# Copyright (C) 2015 Colin Walters <walters@verbum.org>
 +#
@@ -6568,9 +6568,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/Makefile-libglnx.am ostree-2018.5/libglnx/
 +test_libglnx_shutil_SOURCES = $(libglnx_srcpath)/tests/test-libglnx-shutil.c
 +test_libglnx_shutil_CFLAGS = $(AM_CFLAGS) $(libglnx_cflags)
 +test_libglnx_shutil_LDADD = $(libglnx_libs) libglnx.la
-diff -Nuar ostree-2018.5.orig/libglnx/README.md ostree-2018.5/libglnx/README.md
--- ostree-2018.5.orig/libglnx/README.md	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/README.md	2018-05-26 00:37:32.006018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/README.md ostree-2018.8/libglnx/README.md
+--- ostree-2018.8.orig/libglnx/README.md	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/README.md	2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,52 @@
 +libglnx is the successor to libgsystem: https://git.gnome.org/browse/libgsystem
 +
@@ -6624,9 +6624,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/README.md ostree-2018.5/libglnx/README.md
 +https://github.com/GNOME/libglnx/pulls
 +
 +Or alternatively, email one of the maintainers directly.
-diff -Nuar ostree-2018.5.orig/libglnx/tests/libglnx-testlib.h ostree-2018.5/libglnx/tests/libglnx-testlib.h
--- ostree-2018.5.orig/libglnx/tests/libglnx-testlib.h	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/tests/libglnx-testlib.h	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/tests/libglnx-testlib.h ostree-2018.8/libglnx/tests/libglnx-testlib.h
+--- ostree-2018.8.orig/libglnx/tests/libglnx-testlib.h	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/tests/libglnx-testlib.h	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,34 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -6662,9 +6662,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/tests/libglnx-testlib.h ostree-2018.5/libg
 +#define _GLNX_TEST_DECLARE_ERROR(local_error, error)      \
 +  g_autoptr(_GLnxTestAutoError) local_error = NULL; \
 +  GError **error = &local_error
-diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-errors.c ostree-2018.5/libglnx/tests/test-libglnx-errors.c
--- ostree-2018.5.orig/libglnx/tests/test-libglnx-errors.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/tests/test-libglnx-errors.c	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/tests/test-libglnx-errors.c ostree-2018.8/libglnx/tests/test-libglnx-errors.c
+--- ostree-2018.8.orig/libglnx/tests/test-libglnx-errors.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/tests/test-libglnx-errors.c	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,183 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -6849,9 +6849,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-errors.c ostree-2018.5/
 +
 +  return ret;
 +}
-diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-fdio.c ostree-2018.5/libglnx/tests/test-libglnx-fdio.c
--- ostree-2018.5.orig/libglnx/tests/test-libglnx-fdio.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/tests/test-libglnx-fdio.c	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/tests/test-libglnx-fdio.c ostree-2018.8/libglnx/tests/test-libglnx-fdio.c
+--- ostree-2018.8.orig/libglnx/tests/test-libglnx-fdio.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/tests/test-libglnx-fdio.c	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,254 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -7107,9 +7107,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-fdio.c ostree-2018.5/li
 +
 +  return ret;
 +}
-diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-macros.c ostree-2018.5/libglnx/tests/test-libglnx-macros.c
--- ostree-2018.5.orig/libglnx/tests/test-libglnx-macros.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/tests/test-libglnx-macros.c	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/tests/test-libglnx-macros.c ostree-2018.8/libglnx/tests/test-libglnx-macros.c
+--- ostree-2018.8.orig/libglnx/tests/test-libglnx-macros.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/tests/test-libglnx-macros.c	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,109 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -7220,9 +7220,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-macros.c ostree-2018.5/
 +  g_test_add_func ("/hash_table_foreach", test_hash_table_foreach);
 +  return g_test_run();
 +}
-diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-shutil.c ostree-2018.5/libglnx/tests/test-libglnx-shutil.c
--- ostree-2018.5.orig/libglnx/tests/test-libglnx-shutil.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/tests/test-libglnx-shutil.c	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/tests/test-libglnx-shutil.c ostree-2018.8/libglnx/tests/test-libglnx-shutil.c
+--- ostree-2018.8.orig/libglnx/tests/test-libglnx-shutil.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/tests/test-libglnx-shutil.c	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,63 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -7287,9 +7287,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-shutil.c ostree-2018.5/
 +
 +  return ret;
 +}
-diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-xattrs.c ostree-2018.5/libglnx/tests/test-libglnx-xattrs.c
--- ostree-2018.5.orig/libglnx/tests/test-libglnx-xattrs.c	1970-01-01 02:00:00.000000000 +0200
-+++ ostree-2018.5/libglnx/tests/test-libglnx-xattrs.c	2018-05-26 00:37:32.008018846 +0300
+diff -Nuar ostree-2018.8.orig/libglnx/tests/test-libglnx-xattrs.c ostree-2018.8/libglnx/tests/test-libglnx-xattrs.c
+--- ostree-2018.8.orig/libglnx/tests/test-libglnx-xattrs.c	1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.8/libglnx/tests/test-libglnx-xattrs.c	2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,283 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
 + *
@@ -0,0 +1,11 @@
+diff -Nuar libostree-2018.8.orig/configure.ac libostree-2018.8/configure.ac
+--- libostree-2018.8.orig/configure.ac	2018-08-22 16:53:53.000000000 +0300
+++ libostree-2018.8/configure.ac	2018-10-13 21:50:43.341668859 +0300
+@@ -35,7 +35,6 @@
+   -Werror=empty-body \
+   -Werror=strict-prototypes \
+   -Werror=missing-prototypes \
+-  -Werror=implicit-function-declaration \
+   "-Werror=format=2 -Werror=format-security -Werror=format-nonliteral" \
+   -Werror=pointer-arith -Werror=init-self \
+   -Werror=missing-declarations \
@@ -12,26 +12,26 @@
        <IsA>app:console</IsA>
        <Summary>Operating system and container binary deployment and upgrades</Summary>
        <Description>OSTree is a tool for managing bootable, immutable, versioned filesystem trees</Description>
-        <Archive sha1sum="3248dda7bf73007f8bae0cf3c6007a425994a307" type="targz">https://github.com/ostreedev/ostree/archive/v2018.8.tar.gz</Archive>
+        <Archive sha1sum="c8dabfe09e987a15d99e4723be23f23da9f7bbb3" type="tarxz">https://github.com/ostreedev/ostree/releases/download/v2018.8/libostree-2018.8.tar.xz</Archive>
        <BuildDependencies>
-            <Dependency>gtk-doc</Dependency>
-            <Dependency>rust</Dependency>
            <Dependency>glib2-devel</Dependency>
-            <Dependency>gpgme-devel</Dependency>
            <Dependency>xz-devel</Dependency>
            <Dependency>zlib-devel</Dependency>
-            <Dependency>fuse-devel</Dependency>
-            <Dependency>libarchive-devel</Dependency>
-            <Dependency>avahi-devel</Dependency>
-            <Dependency>avahi-glib-devel</Dependency>
-            <Dependency>libsoup-devel</Dependency>
            <Dependency>e2fsprogs-devel</Dependency>
-            <Dependency>libutil-linux-devel</Dependency>
-            <Dependency>gnutls-devel</Dependency>
+            <Dependency>curl-devel</Dependency>
+            <Dependency>libsoup-devel</Dependency>
+            <Dependency>gpgme-devel</Dependency>
            <Dependency>openssl-devel</Dependency>
+            <Dependency>avahi-glib-devel</Dependency>
+            <Dependency>fuse-devel</Dependency>
+            <Dependency>libutil-linux-devel</Dependency>
+            <Dependency>libarchive-devel</Dependency>            
+            <!--Dependency>rust</Dependency>
+            <Dependency>avahi-devel</Dependency>
+            <Dependency>gnutls-devel</Dependency-->
        </BuildDependencies>
        <Patches>
-            <Patch level="1">bsdiff_libglnx_submodule.patch</Patch>
+            <Patch level="1">disable_werror_implicit_funtion_declaraction.patch</Patch>
        </Patches>
    </Source>

@@ -39,6 +39,9 @@
        <Name>ostree</Name>
        <RuntimeDependencies>
            <Dependency>xz</Dependency>
+            <Dependency>curl</Dependency>
+            <Dependency>avahi-glib</Dependency>
+            <Dependency>avahi-libs</Dependency>
            <Dependency>zlib</Dependency>
            <Dependency>fuse</Dependency>
            <Dependency>glib2</Dependency>
@@ -47,8 +50,7 @@
            <Dependency>libarchive</Dependency>
            <Dependency>libgpg-error</Dependency>
            <Dependency>libutil-linux</Dependency>
-            <Dependency>openssl</Dependency>
-            <Dependency>libgcc</Dependency>            
+            <Dependency>openssl</Dependency>         
        </RuntimeDependencies>
        <Files>
            <Path fileType="executable">/usr/bin</Path>
@@ -69,6 +71,7 @@
        <RuntimeDependencies>
            <Dependency release="current">ostree</Dependency>
            <Dependency>xz-devel</Dependency>
+            <Dependency>curl-devel</Dependency>
            <Dependency>zlib-devel</Dependency>
            <Dependency>fuse-devel</Dependency>
            <Dependency>glib2-devel</Dependency>