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

flatpak update

Browse Source
This commit is contained in:
Ertuğrul Erata
2018-05-26 01:20:31 +03:00
parent fd9bff2c7f
commit b88695698c
8 changed files with 1653 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/ostree/files/bsdiff_libglnx_submodule.patch
+164 -159
View File
@@ -1,6 +1,6 @@
diff -Nuar ostree-2018.1.orig/bsdiff/autogen.sh ostree-2018.1/bsdiff/autogen.sh
--- ostree-2018.1.orig/bsdiff/autogen.sh 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/autogen.sh 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,6 @@
+#!/bin/sh
+
@@ -8,9 +8,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/autogen.sh ostree-2018.1/bsdiff/autogen.sh
+cp LICENSE COPYING
+
+autoreconf -fis
diff -Nuar ostree-2018.1.orig/bsdiff/bsdiff.c ostree-2018.1/bsdiff/bsdiff.c
--- ostree-2018.1.orig/bsdiff/bsdiff.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/bsdiff.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,445 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
@@ -457,9 +457,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/bsdiff.c ostree-2018.1/bsdiff/bsdiff.c
+}
+
+#endif
diff -Nuar ostree-2018.1.orig/bsdiff/bsdiff.h ostree-2018.1/bsdiff/bsdiff.h
--- ostree-2018.1.orig/bsdiff/bsdiff.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/bsdiff.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,45 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
@@ -506,9 +506,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/bsdiff.h ostree-2018.1/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.1.orig/bsdiff/bspatch.c ostree-2018.1/bsdiff/bspatch.c
--- ostree-2018.1.orig/bsdiff/bspatch.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/bspatch.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,187 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
@@ -697,9 +697,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/bspatch.c ostree-2018.1/bsdiff/bspatch.c
+}
+
+#endif
diff -Nuar ostree-2018.1.orig/bsdiff/bspatch.h ostree-2018.1/bsdiff/bspatch.h
--- ostree-2018.1.orig/bsdiff/bspatch.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/bspatch.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,42 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
@@ -743,9 +743,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/bspatch.h ostree-2018.1/bsdiff/bspatch.h
+
+#endif
+
diff -Nuar ostree-2018.1.orig/bsdiff/configure.ac ostree-2018.1/bsdiff/configure.ac
--- ostree-2018.1.orig/bsdiff/configure.ac 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/configure.ac 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,30 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
@@ -777,14 +777,14 @@ diff -Nuar ostree-2018.1.orig/bsdiff/configure.ac ostree-2018.1/bsdiff/configure
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -Nuar ostree-2018.1.orig/bsdiff/.git ostree-2018.1/bsdiff/.git
--- ostree-2018.1.orig/bsdiff/.git 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/.git 2018-02-02 23:13:23.000000000 +0300
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
@@ -0,0 +1 @@
+gitdir: ../.git/modules/bsdiff
diff -Nuar ostree-2018.1.orig/bsdiff/.gitignore ostree-2018.1/bsdiff/.gitignore
--- ostree-2018.1.orig/bsdiff/.gitignore 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/.gitignore 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,11 @@
+.deps/*
+.libs/*
@@ -797,9 +797,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/.gitignore ostree-2018.1/bsdiff/.gitignore
+README
+ChangeLog
+COPYING
diff -Nuar ostree-2018.1.orig/bsdiff/LICENSE ostree-2018.1/bsdiff/LICENSE
--- ostree-2018.1.orig/bsdiff/LICENSE 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/LICENSE 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,24 @@
+ Copyright 2003-2005 Colin Percival
+ Copyright 2012 Matthew Endsley
@@ -825,9 +825,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/LICENSE ostree-2018.1/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.1.orig/bsdiff/Makefile.am ostree-2018.1/bsdiff/Makefile.am
--- ostree-2018.1.orig/bsdiff/Makefile.am 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/Makefile.am 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,11 @@
+bin_PROGRAMS = bsdiff bspatch
+
@@ -840,9 +840,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/Makefile.am ostree-2018.1/bsdiff/Makefile.a
+
+EXTRA_DIST = bsdiff.h bspatch.h
+
diff -Nuar ostree-2018.1.orig/bsdiff/Makefile-bsdiff.am ostree-2018.1/bsdiff/Makefile-bsdiff.am
--- ostree-2018.1.orig/bsdiff/Makefile-bsdiff.am 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/Makefile-bsdiff.am 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,32 @@
+# Copyright (C) 2015 Giuseppe Scrivano <gscrivan@redhat.com>
+#
@@ -876,9 +876,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/Makefile-bsdiff.am ostree-2018.1/bsdiff/Mak
+ $(NULL)
+
+libbsdiff_la_CFLAGS = $(AM_CFLAGS)
diff -Nuar ostree-2018.1.orig/bsdiff/README.md ostree-2018.1/bsdiff/README.md
--- ostree-2018.1.orig/bsdiff/README.md 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/bsdiff/README.md 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,129 @@
+bsdiff/bspatch
+==============
@@ -1009,9 +1009,9 @@ diff -Nuar ostree-2018.1.orig/bsdiff/README.md ostree-2018.1/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.1.orig/libglnx/COPYING ostree-2018.1/libglnx/COPYING
--- ostree-2018.1.orig/libglnx/COPYING 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/COPYING 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,502 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
@@ -1515,14 +1515,14 @@ diff -Nuar ostree-2018.1.orig/libglnx/COPYING ostree-2018.1/libglnx/COPYING
+ Ty Coon, President of Vice
+
+That's all there is to it!
diff -Nuar ostree-2018.1.orig/libglnx/.git ostree-2018.1/libglnx/.git
--- ostree-2018.1.orig/libglnx/.git 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/.git 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1 @@
+gitdir: ../.git/modules/libglnx
diff -Nuar ostree-2018.1.orig/libglnx/.gitignore ostree-2018.1/libglnx/.gitignore
--- ostree-2018.1.orig/libglnx/.gitignore 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/.gitignore 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,16 @@
+# A path ostree writes to work around automake bug with
+# subdir-objects
@@ -1540,9 +1540,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/.gitignore ostree-2018.1/libglnx/.gitignor
+*.stamp
+*~
+
diff -Nuar ostree-2018.1.orig/libglnx/glnx-backport-autocleanups.h ostree-2018.1/libglnx/glnx-backport-autocleanups.h
--- ostree-2018.1.orig/libglnx/glnx-backport-autocleanups.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-backport-autocleanups.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,124 @@
+/*
+ * Copyright © 2015 Canonical Limited
@@ -1668,9 +1668,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-backport-autocleanups.h ostree-2018.1
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GString, g_autoptr_cleanup_gstring_free)
+
+#endif
diff -Nuar ostree-2018.1.orig/libglnx/glnx-backport-autoptr.h ostree-2018.1/libglnx/glnx-backport-autoptr.h
--- ostree-2018.1.orig/libglnx/glnx-backport-autoptr.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-backport-autoptr.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,133 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -1805,9 +1805,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-backport-autoptr.h ostree-2018.1/libg
+#endif /* !GLIB_CHECK_VERSION(2, 43, 3) */
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-backports.c ostree-2018.1/libglnx/glnx-backports.c
--- ostree-2018.1.orig/libglnx/glnx-backports.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-backports.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,61 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -1870,9 +1870,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-backports.c ostree-2018.1/libglnx/gln
+ return TRUE;
+}
+#endif
diff -Nuar ostree-2018.1.orig/libglnx/glnx-backports.h ostree-2018.1/libglnx/glnx-backports.h
--- ostree-2018.1.orig/libglnx/glnx-backports.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-backports.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,46 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -1920,9 +1920,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-backports.h ostree-2018.1/libglnx/gln
+#endif /* !GLIB_CHECK_VERSION(2, 44, 0) */
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-console.c
--- ostree-2018.1.orig/libglnx/glnx-console.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-console.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,359 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -1972,8 +1972,8 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-
+static gboolean locked;
+static guint64 last_update_ms; /* monotonic time in millis we last updated */
+
+static gboolean
+stdout_is_tty (void)
+gboolean
+glnx_stdout_is_tty (void)
+{
+ static gsize initialized = 0;
+ static gboolean stdout_is_tty_v;
@@ -2082,7 +2082,7 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-
+ g_return_if_fail (!locked);
+ g_return_if_fail (!console->locked);
+
+ console->is_tty = stdout_is_tty ();
+ console->is_tty = glnx_stdout_is_tty ();
+
+ locked = console->locked = TRUE;
+
@@ -2125,7 +2125,7 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-
+ if (percentage != 100)
+ {
+ const guint64 diff_ms = current_ms - last_update_ms;
+ if (stdout_is_tty ())
+ if (glnx_stdout_is_tty ())
+ {
+ if (diff_ms < (1000/MAX_TTY_UPDATE_HZ))
+ return;
@@ -2150,7 +2150,7 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-
+
+ const guint input_textlen = text ? strlen (text) : 0;
+
+ if (!stdout_is_tty ())
+ if (!glnx_stdout_is_tty ())
+ {
+ if (text)
+ fprintf (stdout, "%s", text);
@@ -2283,10 +2283,10 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.c ostree-2018.1/libglnx/glnx-
+
+ locked = console->locked = FALSE;
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.h ostree-2018.1/libglnx/glnx-console.h
--- ostree-2018.1.orig/libglnx/glnx-console.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-console.h 2018-02-02 23:13:30.000000000 +0300
@@ -0,0 +1,59 @@
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
@@ -0,0 +1,61 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2013,2014,2015 Colin Walters <walters@verbum.org>
@@ -2320,6 +2320,8 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.h ostree-2018.1/libglnx/glnx-
+
+typedef struct GLnxConsoleRef GLnxConsoleRef;
+
+gboolean glnx_stdout_is_tty (void);
+
+void glnx_console_lock (GLnxConsoleRef *ref);
+
+void glnx_console_text (const char *text);
@@ -2346,9 +2348,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-console.h ostree-2018.1/libglnx/glnx-
+G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxConsoleRef, glnx_console_ref_cleanup)
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-dirfd.c ostree-2018.1/libglnx/glnx-dirfd.c
--- ostree-2018.1.orig/libglnx/glnx-dirfd.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-dirfd.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,425 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -2775,9 +2777,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-dirfd.c ostree-2018.1/libglnx/glnx-di
+{
+ (void) _glnx_tmpdir_free (tmpf, FALSE, NULL, NULL);
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-dirfd.h ostree-2018.1/libglnx/glnx-dirfd.h
--- ostree-2018.1.orig/libglnx/glnx-dirfd.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-dirfd.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,137 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -2916,9 +2918,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-dirfd.h ostree-2018.1/libglnx/glnx-di
+ GLnxTmpDir *out_tmpdir, GError **error);
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-errors.c ostree-2018.1/libglnx/glnx-errors.c
--- ostree-2018.1.orig/libglnx/glnx-errors.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-errors.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,131 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -3051,9 +3053,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-errors.c ostree-2018.1/libglnx/glnx-e
+ errno = errsv;
+ return FALSE;
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-errors.h ostree-2018.1/libglnx/glnx-errors.h
--- ostree-2018.1.orig/libglnx/glnx-errors.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-errors.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,134 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -3189,9 +3191,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-errors.h ostree-2018.1/libglnx/glnx-e
+ } while (0);
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-fdio.c ostree-2018.1/libglnx/glnx-fdio.c
--- ostree-2018.1.orig/libglnx/glnx-fdio.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-fdio.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,1106 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -4299,9 +4301,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-fdio.c ostree-2018.1/libglnx/glnx-fdi
+
+ return TRUE;
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-fdio.h ostree-2018.1/libglnx/glnx-fdio.h
--- ostree-2018.1.orig/libglnx/glnx-fdio.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-fdio.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,369 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -4672,9 +4674,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-fdio.h ostree-2018.1/libglnx/glnx-fdi
+}
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-local-alloc.c ostree-2018.1/libglnx/glnx-local-alloc.c
--- ostree-2018.1.orig/libglnx/glnx-local-alloc.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-local-alloc.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,72 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -4748,9 +4750,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-local-alloc.c ostree-2018.1/libglnx/g
+ * </example>
+ *
+ */
diff -Nuar ostree-2018.1.orig/libglnx/glnx-local-alloc.h ostree-2018.1/libglnx/glnx-local-alloc.h
--- ostree-2018.1.orig/libglnx/glnx-local-alloc.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-local-alloc.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,91 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -4843,9 +4845,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-local-alloc.h ostree-2018.1/libglnx/g
+#define glnx_autofd __attribute__((cleanup(glnx_close_fd)))
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-lockfile.c ostree-2018.1/libglnx/glnx-lockfile.c
--- ostree-2018.1.orig/libglnx/glnx-lockfile.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-lockfile.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,179 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
@@ -5026,9 +5028,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-lockfile.c ostree-2018.1/libglnx/glnx
+ f->operation = 0;
+ f->initialized = FALSE;
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-lockfile.h ostree-2018.1/libglnx/glnx-lockfile.h
--- ostree-2018.1.orig/libglnx/glnx-lockfile.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-lockfile.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,40 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
@@ -5070,9 +5072,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-lockfile.h ostree-2018.1/libglnx/glnx
+void glnx_release_lock_file(GLnxLockFile *f);
+
+G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxLockFile, glnx_release_lock_file)
diff -Nuar ostree-2018.1.orig/libglnx/glnx-macros.h ostree-2018.1/libglnx/glnx-macros.h
--- ostree-2018.1.orig/libglnx/glnx-macros.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-macros.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,189 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -5263,9 +5265,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-macros.h ostree-2018.1/libglnx/glnx-m
+#endif /* GI_SCANNER */
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-missing.h ostree-2018.1/libglnx/glnx-missing.h
--- ostree-2018.1.orig/libglnx/glnx-missing.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-missing.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,95 @@
+#pragma once
+
@@ -5362,10 +5364,10 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-missing.h ostree-2018.1/libglnx/glnx-
+#endif
+
+#include "glnx-missing-syscall.h"
diff -Nuar ostree-2018.1.orig/libglnx/glnx-missing-syscall.h ostree-2018.1/libglnx/glnx-missing-syscall.h
--- ostree-2018.1.orig/libglnx/glnx-missing-syscall.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-missing-syscall.h 2018-02-02 23:13:30.000000000 +0300
@@ -0,0 +1,154 @@
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
@@ -0,0 +1,156 @@
+/***
+ This file was originally part of systemd.
+
@@ -5508,10 +5510,10 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-missing-syscall.h ostree-2018.1/libgl
+# endif
+# endif
+
+static inline ssize_t copy_file_range(int fd_in, loff_t *off_in,
+ int fd_out, loff_t *off_out,
+ size_t len,
+ unsigned int flags) {
+static inline ssize_t missing_copy_file_range(int fd_in, loff_t *off_in,
+ int fd_out, loff_t *off_out,
+ size_t len,
+ unsigned int flags) {
+# ifdef __NR_copy_file_range
+ return syscall(__NR_copy_file_range, fd_in, off_in, fd_out, off_out, len, flags);
+# else
@@ -5519,10 +5521,12 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-missing-syscall.h ostree-2018.1/libgl
+ return -1;
+# endif
+}
+
+# define copy_file_range missing_copy_file_range
+#endif
diff -Nuar ostree-2018.1.orig/libglnx/glnx-shutil.c ostree-2018.1/libglnx/glnx-shutil.c
--- ostree-2018.1.orig/libglnx/glnx-shutil.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-shutil.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,260 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -5784,9 +5788,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-shutil.c ostree-2018.1/libglnx/glnx-s
+
+ return glnx_opendirat (dfd, path, TRUE, out_dfd, error);
+}
diff -Nuar ostree-2018.1.orig/libglnx/glnx-shutil.h ostree-2018.1/libglnx/glnx-shutil.h
--- ostree-2018.1.orig/libglnx/glnx-shutil.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-shutil.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,48 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -5836,9 +5840,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-shutil.h ostree-2018.1/libglnx/glnx-s
+ GError **error);
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/glnx-xattrs.c ostree-2018.1/libglnx/glnx-xattrs.c
--- ostree-2018.1.orig/libglnx/glnx-xattrs.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-xattrs.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,444 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -6284,9 +6288,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-xattrs.c ostree-2018.1/libglnx/glnx-x
+ return TRUE;
+}
+
diff -Nuar ostree-2018.1.orig/libglnx/glnx-xattrs.h ostree-2018.1/libglnx/glnx-xattrs.h
--- ostree-2018.1.orig/libglnx/glnx-xattrs.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/glnx-xattrs.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,78 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -6366,9 +6370,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/glnx-xattrs.h ostree-2018.1/libglnx/glnx-x
+ GError **error);
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/libglnx.doap ostree-2018.1/libglnx/libglnx.doap
--- ostree-2018.1.orig/libglnx/libglnx.doap 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/libglnx.doap 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -6401,9 +6405,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/libglnx.doap ostree-2018.1/libglnx/libglnx
+ </maintainer>
+
+</Project>
diff -Nuar ostree-2018.1.orig/libglnx/libglnx.h ostree-2018.1/libglnx/libglnx.h
--- ostree-2018.1.orig/libglnx/libglnx.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/libglnx.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,40 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -6445,10 +6449,10 @@ diff -Nuar ostree-2018.1.orig/libglnx/libglnx.h ostree-2018.1/libglnx/libglnx.h
+#include <glnx-fdio.h>
+
+G_END_DECLS
diff -Nuar ostree-2018.1.orig/libglnx/libglnx.m4 ostree-2018.1/libglnx/libglnx.m4
--- ostree-2018.1.orig/libglnx/libglnx.m4 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/libglnx.m4 2018-02-02 23:13:30.000000000 +0300
@@ -0,0 +1,32 @@
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
@@ -0,0 +1,33 @@
+AC_DEFUN([LIBGLNX_CONFIGURE],
+[
+AC_CHECK_DECLS([
@@ -6463,6 +6467,7 @@ diff -Nuar ostree-2018.1.orig/libglnx/libglnx.m4 ostree-2018.1/libglnx/libglnx.m
+#include <sched.h>
+#include <linux/loop.h>
+#include <linux/random.h>
+#include <sys/mman.h>
+]])
+
+AC_ARG_ENABLE(otmpfile,
@@ -6481,9 +6486,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/libglnx.m4 ostree-2018.1/libglnx/libglnx.m
+
+dnl end LIBGLNX_CONFIGURE
+])
diff -Nuar ostree-2018.1.orig/libglnx/Makefile-libglnx.am ostree-2018.1/libglnx/Makefile-libglnx.am
--- ostree-2018.1.orig/libglnx/Makefile-libglnx.am 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/Makefile-libglnx.am 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,78 @@
+# Copyright (C) 2015 Colin Walters <walters@verbum.org>
+#
@@ -6563,9 +6568,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/Makefile-libglnx.am ostree-2018.1/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.1.orig/libglnx/README.md ostree-2018.1/libglnx/README.md
--- ostree-2018.1.orig/libglnx/README.md 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/README.md 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,52 @@
+libglnx is the successor to libgsystem: https://git.gnome.org/browse/libgsystem
+
@@ -6619,9 +6624,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/README.md ostree-2018.1/libglnx/README.md
+https://github.com/GNOME/libglnx/pulls
+
+Or alternatively, email one of the maintainers directly.
diff -Nuar ostree-2018.1.orig/libglnx/tests/libglnx-testlib.h ostree-2018.1/libglnx/tests/libglnx-testlib.h
--- ostree-2018.1.orig/libglnx/tests/libglnx-testlib.h 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/libglnx-testlib.h 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,34 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -6657,9 +6662,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/tests/libglnx-testlib.h ostree-2018.1/libg
+#define _GLNX_TEST_DECLARE_ERROR(local_error, error) \
+ g_autoptr(_GLnxTestAutoError) local_error = NULL; \
+ GError **error = &local_error
diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-errors.c ostree-2018.1/libglnx/tests/test-libglnx-errors.c
--- ostree-2018.1.orig/libglnx/tests/test-libglnx-errors.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/test-libglnx-errors.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,183 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -6844,9 +6849,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-errors.c ostree-2018.1/
+
+ return ret;
+}
diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-fdio.c ostree-2018.1/libglnx/tests/test-libglnx-fdio.c
--- ostree-2018.1.orig/libglnx/tests/test-libglnx-fdio.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/test-libglnx-fdio.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,254 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -7102,9 +7107,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-fdio.c ostree-2018.1/li
+
+ return ret;
+}
diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-macros.c ostree-2018.1/libglnx/tests/test-libglnx-macros.c
--- ostree-2018.1.orig/libglnx/tests/test-libglnx-macros.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/test-libglnx-macros.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,109 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -7215,9 +7220,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-macros.c ostree-2018.1/
+ g_test_add_func ("/hash_table_foreach", test_hash_table_foreach);
+ return g_test_run();
+}
diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-shutil.c ostree-2018.1/libglnx/tests/test-libglnx-shutil.c
--- ostree-2018.1.orig/libglnx/tests/test-libglnx-shutil.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/test-libglnx-shutil.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,63 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
@@ -7282,9 +7287,9 @@ diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-shutil.c ostree-2018.1/
+
+ return ret;
+}
diff -Nuar ostree-2018.1.orig/libglnx/tests/test-libglnx-xattrs.c ostree-2018.1/libglnx/tests/test-libglnx-xattrs.c
--- ostree-2018.1.orig/libglnx/tests/test-libglnx-xattrs.c 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.1/libglnx/tests/test-libglnx-xattrs.c 2018-02-02 23:13:30.000000000 +0300
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
@@ -0,0 +1,283 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *