Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flatpak works continue...

Browse Source 
ostree has a build problems, flatpak-1.0.0 need >ostree-2018.7
This commit is contained in:
Ertuğrul Erata
2018-08-24 22:24:02 +03:00
parent dfe4c48d0d
commit 3323140092
6 changed files with 278 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/flatpak/files/bubblewrap_libglnx_submodule.patch
+210 -210
View File
@@ -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; -*-
+ *