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

ostree

Browse Source 
build failed!
This commit is contained in:
Ertuğrul Erata
2018-08-24 16:18:18 +03:00
parent c00e7a9953
commit dfe4c48d0d
2 changed files with 155 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/ostree/files/bsdiff_libglnx_submodule.patch
+147 -147
View File
@@ -1,6 +1,6 @@
diff -Nuar ostree-2018.5.orig/bsdiff/autogen.sh ostree-2018.5/bsdiff/autogen.sh diff -Nuar ostree-2018.8.orig/bsdiff/autogen.sh ostree-2018.8/bsdiff/autogen.sh
--- ostree-2018.5.orig/bsdiff/autogen.sh 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/bsdiff/autogen.sh 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+#!/bin/sh +#!/bin/sh
+ +
@@ -8,9 +8,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/autogen.sh ostree-2018.5/bsdiff/autogen.sh
+cp LICENSE COPYING +cp LICENSE COPYING
+ +
+autoreconf -fis +autoreconf -fis
diff -Nuar ostree-2018.5.orig/bsdiff/bsdiff.c ostree-2018.5/bsdiff/bsdiff.c diff -Nuar ostree-2018.8.orig/bsdiff/bsdiff.c ostree-2018.8/bsdiff/bsdiff.c
--- ostree-2018.5.orig/bsdiff/bsdiff.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/bsdiff/bsdiff.c 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,445 @@ @@ -0,0 +1,445 @@
+/*- +/*-
+ * Copyright 2003-2005 Colin Percival + * 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 +#endif
diff -Nuar ostree-2018.5.orig/bsdiff/bsdiff.h ostree-2018.5/bsdiff/bsdiff.h diff -Nuar ostree-2018.8.orig/bsdiff/bsdiff.h ostree-2018.8/bsdiff/bsdiff.h
--- ostree-2018.5.orig/bsdiff/bsdiff.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/bsdiff/bsdiff.h 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
+/*- +/*-
+ * Copyright 2003-2005 Colin Percival + * 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); +int bsdiff(const uint8_t* old, int64_t oldsize, const uint8_t* new, int64_t newsize, struct bsdiff_stream* stream);
+ +
+#endif +#endif
diff -Nuar ostree-2018.5.orig/bsdiff/bspatch.c ostree-2018.5/bsdiff/bspatch.c diff -Nuar ostree-2018.8.orig/bsdiff/bspatch.c ostree-2018.8/bsdiff/bspatch.c
--- ostree-2018.5.orig/bsdiff/bspatch.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/bsdiff/bspatch.c 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,187 @@ @@ -0,0 +1,187 @@
+/*- +/*-
+ * Copyright 2003-2005 Colin Percival + * 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 +#endif
diff -Nuar ostree-2018.5.orig/bsdiff/bspatch.h ostree-2018.5/bsdiff/bspatch.h diff -Nuar ostree-2018.8.orig/bsdiff/bspatch.h ostree-2018.8/bsdiff/bspatch.h
--- ostree-2018.5.orig/bsdiff/bspatch.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/bsdiff/bspatch.h 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,42 @@ @@ -0,0 +1,42 @@
+/*- +/*-
+ * Copyright 2003-2005 Colin Percival + * 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 +#endif
+ +
diff -Nuar ostree-2018.5.orig/bsdiff/configure.ac ostree-2018.5/bsdiff/configure.ac diff -Nuar ostree-2018.8.orig/bsdiff/configure.ac ostree-2018.8/bsdiff/configure.ac
--- ostree-2018.5.orig/bsdiff/configure.ac 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/bsdiff/configure.ac 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+# -*- Autoconf -*- +# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script. +# 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_CONFIG_FILES([Makefile])
+AC_OUTPUT +AC_OUTPUT
diff -Nuar ostree-2018.5.orig/bsdiff/.git ostree-2018.5/bsdiff/.git diff -Nuar ostree-2018.8.orig/bsdiff/.git ostree-2018.8/bsdiff/.git
--- ostree-2018.5.orig/bsdiff/.git 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.orig/bsdiff/.git 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/.git 2018-05-26 00:37:14.345018427 +0300 +++ ostree-2018.8/bsdiff/.git 2018-05-26 00:37:14.345018427 +0300
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+gitdir: ../.git/modules/bsdiff +gitdir: ../.git/modules/bsdiff
diff -Nuar ostree-2018.5.orig/bsdiff/.gitignore ostree-2018.5/bsdiff/.gitignore diff -Nuar ostree-2018.8.orig/bsdiff/.gitignore ostree-2018.8/bsdiff/.gitignore
--- ostree-2018.5.orig/bsdiff/.gitignore 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.orig/bsdiff/.gitignore 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/.gitignore 2018-05-26 00:37:31.984018846 +0300 +++ ostree-2018.8/bsdiff/.gitignore 2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+.deps/* +.deps/*
+.libs/* +.libs/*
@@ -797,9 +797,9 @@ diff -Nuar ostree-2018.5.orig/bsdiff/.gitignore ostree-2018.5/bsdiff/.gitignore
+README +README
+ChangeLog +ChangeLog
+COPYING +COPYING
diff -Nuar ostree-2018.5.orig/bsdiff/LICENSE ostree-2018.5/bsdiff/LICENSE diff -Nuar ostree-2018.8.orig/bsdiff/LICENSE ostree-2018.8/bsdiff/LICENSE
--- ostree-2018.5.orig/bsdiff/LICENSE 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.orig/bsdiff/LICENSE 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/bsdiff/LICENSE 2018-05-26 00:37:31.984018846 +0300 +++ ostree-2018.8/bsdiff/LICENSE 2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+ Copyright 2003-2005 Colin Percival + Copyright 2003-2005 Colin Percival
+ Copyright 2012 Matthew Endsley + 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 + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE. + POSSIBILITY OF SUCH DAMAGE.
diff -Nuar ostree-2018.5.orig/bsdiff/Makefile.am ostree-2018.5/bsdiff/Makefile.am diff -Nuar ostree-2018.8.orig/bsdiff/Makefile.am ostree-2018.8/bsdiff/Makefile.am
--- ostree-2018.5.orig/bsdiff/Makefile.am 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/bsdiff/Makefile.am 2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+bin_PROGRAMS = bsdiff bspatch +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 +EXTRA_DIST = bsdiff.h bspatch.h
+ +
diff -Nuar ostree-2018.5.orig/bsdiff/Makefile-bsdiff.am ostree-2018.5/bsdiff/Makefile-bsdiff.am diff -Nuar ostree-2018.8.orig/bsdiff/Makefile-bsdiff.am ostree-2018.8/bsdiff/Makefile-bsdiff.am
--- ostree-2018.5.orig/bsdiff/Makefile-bsdiff.am 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/bsdiff/Makefile-bsdiff.am 2018-05-26 00:37:31.984018846 +0300
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+# Copyright (C) 2015 Giuseppe Scrivano <gscrivan@redhat.com> +# 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) + $(NULL)
+ +
+libbsdiff_la_CFLAGS = $(AM_CFLAGS) +libbsdiff_la_CFLAGS = $(AM_CFLAGS)
diff -Nuar ostree-2018.5.orig/bsdiff/README.md ostree-2018.5/bsdiff/README.md diff -Nuar ostree-2018.8.orig/bsdiff/README.md ostree-2018.8/bsdiff/README.md
--- ostree-2018.5.orig/bsdiff/README.md 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/bsdiff/README.md 2018-05-26 00:37:31.985018846 +0300
@@ -0,0 +1,129 @@ @@ -0,0 +1,129 @@
+bsdiff/bspatch +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 +`bspatch` returns `0` on success and `-1` on failure. On success, `new` contains
+the data for the patched file. +the data for the patched file.
diff -Nuar ostree-2018.5.orig/libglnx/COPYING ostree-2018.5/libglnx/COPYING diff -Nuar ostree-2018.8.orig/libglnx/COPYING ostree-2018.8/libglnx/COPYING
--- ostree-2018.5.orig/libglnx/COPYING 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.orig/libglnx/COPYING 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/COPYING 2018-05-26 00:37:32.006018846 +0300 +++ ostree-2018.8/libglnx/COPYING 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,502 @@ @@ -0,0 +1,502 @@
+ GNU LESSER GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999 + 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 + Ty Coon, President of Vice
+ +
+That's all there is to it! +That's all there is to it!
diff -Nuar ostree-2018.5.orig/libglnx/.git ostree-2018.5/libglnx/.git diff -Nuar ostree-2018.8.orig/libglnx/.git ostree-2018.8/libglnx/.git
--- ostree-2018.5.orig/libglnx/.git 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.orig/libglnx/.git 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/.git 2018-05-26 00:37:31.964018845 +0300 +++ ostree-2018.8/libglnx/.git 2018-05-26 00:37:31.964018845 +0300
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+gitdir: ../.git/modules/libglnx +gitdir: ../.git/modules/libglnx
diff -Nuar ostree-2018.5.orig/libglnx/.gitignore ostree-2018.5/libglnx/.gitignore diff -Nuar ostree-2018.8.orig/libglnx/.gitignore ostree-2018.8/libglnx/.gitignore
--- ostree-2018.5.orig/libglnx/.gitignore 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.orig/libglnx/.gitignore 1970-01-01 02:00:00.000000000 +0200
+++ ostree-2018.5/libglnx/.gitignore 2018-05-26 00:37:32.005018846 +0300 +++ ostree-2018.8/libglnx/.gitignore 2018-05-26 00:37:32.005018846 +0300
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
+# A path ostree writes to work around automake bug with +# A path ostree writes to work around automake bug with
+# subdir-objects +# subdir-objects
@@ -1540,9 +1540,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/.gitignore ostree-2018.5/libglnx/.gitignor
+*.stamp +*.stamp
+*~ +*~
+ +
diff -Nuar ostree-2018.5.orig/libglnx/glnx-backport-autocleanups.h ostree-2018.5/libglnx/glnx-backport-autocleanups.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-backport-autocleanups.h ostree-2018.8/libglnx/glnx-backport-autocleanups.h
--- ostree-2018.5.orig/libglnx/glnx-backport-autocleanups.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-backport-autocleanups.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,124 @@ @@ -0,0 +1,124 @@
+/* +/*
+ * Copyright © 2015 Canonical Limited + * 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) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(GString, g_autoptr_cleanup_gstring_free)
+ +
+#endif +#endif
diff -Nuar ostree-2018.5.orig/libglnx/glnx-backport-autoptr.h ostree-2018.5/libglnx/glnx-backport-autoptr.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-backport-autoptr.h ostree-2018.8/libglnx/glnx-backport-autoptr.h
--- ostree-2018.5.orig/libglnx/glnx-backport-autoptr.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-backport-autoptr.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,133 @@ @@ -0,0 +1,133 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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) */ +#endif /* !GLIB_CHECK_VERSION(2, 43, 3) */
+ +
+G_END_DECLS +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/glnx-backports.c ostree-2018.5/libglnx/glnx-backports.c diff -Nuar ostree-2018.8.orig/libglnx/glnx-backports.c ostree-2018.8/libglnx/glnx-backports.c
--- ostree-2018.5.orig/libglnx/glnx-backports.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-backports.c 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,61 @@ @@ -0,0 +1,61 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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; + return TRUE;
+} +}
+#endif +#endif
diff -Nuar ostree-2018.5.orig/libglnx/glnx-backports.h ostree-2018.5/libglnx/glnx-backports.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-backports.h ostree-2018.8/libglnx/glnx-backports.h
--- ostree-2018.5.orig/libglnx/glnx-backports.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-backports.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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) */ +#endif /* !GLIB_CHECK_VERSION(2, 44, 0) */
+ +
+G_END_DECLS +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/glnx-console.c ostree-2018.5/libglnx/glnx-console.c diff -Nuar ostree-2018.8.orig/libglnx/glnx-console.c ostree-2018.8/libglnx/glnx-console.c
--- ostree-2018.5.orig/libglnx/glnx-console.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-console.c 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,359 @@ @@ -0,0 +1,359 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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; + locked = console->locked = FALSE;
+} +}
diff -Nuar ostree-2018.5.orig/libglnx/glnx-console.h ostree-2018.5/libglnx/glnx-console.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-console.h ostree-2018.8/libglnx/glnx-console.h
--- ostree-2018.5.orig/libglnx/glnx-console.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-console.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,61 @@ @@ -0,0 +1,61 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxConsoleRef, glnx_console_ref_cleanup)
+ +
+G_END_DECLS +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/glnx-dirfd.c ostree-2018.5/libglnx/glnx-dirfd.c diff -Nuar ostree-2018.8.orig/libglnx/glnx-dirfd.c ostree-2018.8/libglnx/glnx-dirfd.c
--- ostree-2018.5.orig/libglnx/glnx-dirfd.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-dirfd.c 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,425 @@ @@ -0,0 +1,425 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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); + (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 diff -Nuar ostree-2018.8.orig/libglnx/glnx-dirfd.h ostree-2018.8/libglnx/glnx-dirfd.h
--- ostree-2018.5.orig/libglnx/glnx-dirfd.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-dirfd.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,137 @@ @@ -0,0 +1,137 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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); + GLnxTmpDir *out_tmpdir, GError **error);
+ +
+G_END_DECLS +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/glnx-errors.c ostree-2018.5/libglnx/glnx-errors.c diff -Nuar ostree-2018.8.orig/libglnx/glnx-errors.c ostree-2018.8/libglnx/glnx-errors.c
--- ostree-2018.5.orig/libglnx/glnx-errors.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-errors.c 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,131 @@ @@ -0,0 +1,131 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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; + errno = errsv;
+ return FALSE; + return FALSE;
+} +}
diff -Nuar ostree-2018.5.orig/libglnx/glnx-errors.h ostree-2018.5/libglnx/glnx-errors.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-errors.h ostree-2018.8/libglnx/glnx-errors.h
--- ostree-2018.5.orig/libglnx/glnx-errors.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-errors.h 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,134 @@ @@ -0,0 +1,134 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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); + } while (0);
+ +
+G_END_DECLS +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/glnx-fdio.c ostree-2018.5/libglnx/glnx-fdio.c diff -Nuar ostree-2018.8.orig/libglnx/glnx-fdio.c ostree-2018.8/libglnx/glnx-fdio.c
--- ostree-2018.5.orig/libglnx/glnx-fdio.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-fdio.c 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,1106 @@ @@ -0,0 +1,1106 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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; + return TRUE;
+} +}
diff -Nuar ostree-2018.5.orig/libglnx/glnx-fdio.h ostree-2018.5/libglnx/glnx-fdio.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-fdio.h ostree-2018.8/libglnx/glnx-fdio.h
--- ostree-2018.5.orig/libglnx/glnx-fdio.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-fdio.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,369 @@ @@ -0,0 +1,369 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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 +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/glnx-local-alloc.c ostree-2018.5/libglnx/glnx-local-alloc.c diff -Nuar ostree-2018.8.orig/libglnx/glnx-local-alloc.c ostree-2018.8/libglnx/glnx-local-alloc.c
--- ostree-2018.5.orig/libglnx/glnx-local-alloc.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-local-alloc.c 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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> + * </example>
+ * + *
+ */ + */
diff -Nuar ostree-2018.5.orig/libglnx/glnx-local-alloc.h ostree-2018.5/libglnx/glnx-local-alloc.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-local-alloc.h ostree-2018.8/libglnx/glnx-local-alloc.h
--- ostree-2018.5.orig/libglnx/glnx-local-alloc.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-local-alloc.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,91 @@ @@ -0,0 +1,91 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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))) +#define glnx_autofd __attribute__((cleanup(glnx_close_fd)))
+ +
+G_END_DECLS +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/glnx-lockfile.c ostree-2018.5/libglnx/glnx-lockfile.c diff -Nuar ostree-2018.8.orig/libglnx/glnx-lockfile.c ostree-2018.8/libglnx/glnx-lockfile.c
--- ostree-2018.5.orig/libglnx/glnx-lockfile.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-lockfile.c 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,179 @@ @@ -0,0 +1,179 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ +/*-*- 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->operation = 0;
+ f->initialized = FALSE; + f->initialized = FALSE;
+} +}
diff -Nuar ostree-2018.5.orig/libglnx/glnx-lockfile.h ostree-2018.5/libglnx/glnx-lockfile.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-lockfile.h ostree-2018.8/libglnx/glnx-lockfile.h
--- ostree-2018.5.orig/libglnx/glnx-lockfile.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-lockfile.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ +/*-*- 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); +void glnx_release_lock_file(GLnxLockFile *f);
+ +
+G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxLockFile, glnx_release_lock_file) +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 diff -Nuar ostree-2018.8.orig/libglnx/glnx-macros.h ostree-2018.8/libglnx/glnx-macros.h
--- ostree-2018.5.orig/libglnx/glnx-macros.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-macros.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,189 @@ @@ -0,0 +1,189 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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 */ +#endif /* GI_SCANNER */
+ +
+G_END_DECLS +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/glnx-missing.h ostree-2018.5/libglnx/glnx-missing.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-missing.h ostree-2018.8/libglnx/glnx-missing.h
--- ostree-2018.5.orig/libglnx/glnx-missing.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-missing.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
+#pragma once +#pragma once
+ +
@@ -5364,9 +5364,9 @@ diff -Nuar ostree-2018.5.orig/libglnx/glnx-missing.h ostree-2018.5/libglnx/glnx-
+#endif +#endif
+ +
+#include "glnx-missing-syscall.h" +#include "glnx-missing-syscall.h"
diff -Nuar ostree-2018.5.orig/libglnx/glnx-missing-syscall.h ostree-2018.5/libglnx/glnx-missing-syscall.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-missing-syscall.h ostree-2018.8/libglnx/glnx-missing-syscall.h
--- ostree-2018.5.orig/libglnx/glnx-missing-syscall.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-missing-syscall.h 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,156 @@ @@ -0,0 +1,156 @@
+/*** +/***
+ This file was originally part of systemd. + 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 +# define copy_file_range missing_copy_file_range
+#endif +#endif
diff -Nuar ostree-2018.5.orig/libglnx/glnx-shutil.c ostree-2018.5/libglnx/glnx-shutil.c diff -Nuar ostree-2018.8.orig/libglnx/glnx-shutil.c ostree-2018.8/libglnx/glnx-shutil.c
--- ostree-2018.5.orig/libglnx/glnx-shutil.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-shutil.c 2018-05-26 00:37:32.007018846 +0300
@@ -0,0 +1,260 @@ @@ -0,0 +1,260 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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); + 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 diff -Nuar ostree-2018.8.orig/libglnx/glnx-shutil.h ostree-2018.8/libglnx/glnx-shutil.h
--- ostree-2018.5.orig/libglnx/glnx-shutil.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-shutil.h 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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); + GError **error);
+ +
+G_END_DECLS +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/glnx-xattrs.c ostree-2018.5/libglnx/glnx-xattrs.c diff -Nuar ostree-2018.8.orig/libglnx/glnx-xattrs.c ostree-2018.8/libglnx/glnx-xattrs.c
--- ostree-2018.5.orig/libglnx/glnx-xattrs.c 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-xattrs.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,444 @@ @@ -0,0 +1,444 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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; + return TRUE;
+} +}
+ +
diff -Nuar ostree-2018.5.orig/libglnx/glnx-xattrs.h ostree-2018.5/libglnx/glnx-xattrs.h diff -Nuar ostree-2018.8.orig/libglnx/glnx-xattrs.h ostree-2018.8/libglnx/glnx-xattrs.h
--- ostree-2018.5.orig/libglnx/glnx-xattrs.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/glnx-xattrs.h 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,78 @@ @@ -0,0 +1,78 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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); + GError **error);
+ +
+G_END_DECLS +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/libglnx.doap ostree-2018.5/libglnx/libglnx.doap diff -Nuar ostree-2018.8.orig/libglnx/libglnx.doap ostree-2018.8/libglnx/libglnx.doap
--- ostree-2018.5.orig/libglnx/libglnx.doap 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/libglnx.doap 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" +<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> + </maintainer>
+ +
+</Project> +</Project>
diff -Nuar ostree-2018.5.orig/libglnx/libglnx.h ostree-2018.5/libglnx/libglnx.h diff -Nuar ostree-2018.8.orig/libglnx/libglnx.h ostree-2018.8/libglnx/libglnx.h
--- ostree-2018.5.orig/libglnx/libglnx.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/libglnx.h 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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> +#include <glnx-fdio.h>
+ +
+G_END_DECLS +G_END_DECLS
diff -Nuar ostree-2018.5.orig/libglnx/libglnx.m4 ostree-2018.5/libglnx/libglnx.m4 diff -Nuar ostree-2018.8.orig/libglnx/libglnx.m4 ostree-2018.8/libglnx/libglnx.m4
--- ostree-2018.5.orig/libglnx/libglnx.m4 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/libglnx.m4 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
+AC_DEFUN([LIBGLNX_CONFIGURE], +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 +dnl end LIBGLNX_CONFIGURE
+]) +])
diff -Nuar ostree-2018.5.orig/libglnx/Makefile-libglnx.am ostree-2018.5/libglnx/Makefile-libglnx.am diff -Nuar ostree-2018.8.orig/libglnx/Makefile-libglnx.am ostree-2018.8/libglnx/Makefile-libglnx.am
--- ostree-2018.5.orig/libglnx/Makefile-libglnx.am 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/Makefile-libglnx.am 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,78 @@ @@ -0,0 +1,78 @@
+# Copyright (C) 2015 Colin Walters <walters@verbum.org> +# 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_SOURCES = $(libglnx_srcpath)/tests/test-libglnx-shutil.c
+test_libglnx_shutil_CFLAGS = $(AM_CFLAGS) $(libglnx_cflags) +test_libglnx_shutil_CFLAGS = $(AM_CFLAGS) $(libglnx_cflags)
+test_libglnx_shutil_LDADD = $(libglnx_libs) libglnx.la +test_libglnx_shutil_LDADD = $(libglnx_libs) libglnx.la
diff -Nuar ostree-2018.5.orig/libglnx/README.md ostree-2018.5/libglnx/README.md diff -Nuar ostree-2018.8.orig/libglnx/README.md ostree-2018.8/libglnx/README.md
--- ostree-2018.5.orig/libglnx/README.md 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/README.md 2018-05-26 00:37:32.006018846 +0300
@@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
+libglnx is the successor to libgsystem: https://git.gnome.org/browse/libgsystem +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 +https://github.com/GNOME/libglnx/pulls
+ +
+Or alternatively, email one of the maintainers directly. +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 diff -Nuar ostree-2018.8.orig/libglnx/tests/libglnx-testlib.h ostree-2018.8/libglnx/tests/libglnx-testlib.h
--- ostree-2018.5.orig/libglnx/tests/libglnx-testlib.h 1970-01-01 02:00:00.000000000 +0200 --- ostree-2018.8.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 +++ ostree-2018.8/libglnx/tests/libglnx-testlib.h 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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) \ +#define _GLNX_TEST_DECLARE_ERROR(local_error, error) \
+ g_autoptr(_GLnxTestAutoError) local_error = NULL; \ + g_autoptr(_GLnxTestAutoError) local_error = NULL; \
+ GError **error = &local_error + 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 diff -Nuar ostree-2018.8.orig/libglnx/tests/test-libglnx-errors.c ostree-2018.8/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.8.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 +++ ostree-2018.8/libglnx/tests/test-libglnx-errors.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,183 @@ @@ -0,0 +1,183 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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; + return ret;
+} +}
diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-fdio.c ostree-2018.5/libglnx/tests/test-libglnx-fdio.c diff -Nuar ostree-2018.8.orig/libglnx/tests/test-libglnx-fdio.c ostree-2018.8/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.8.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 +++ ostree-2018.8/libglnx/tests/test-libglnx-fdio.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,254 @@ @@ -0,0 +1,254 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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; + return ret;
+} +}
diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-macros.c ostree-2018.5/libglnx/tests/test-libglnx-macros.c diff -Nuar ostree-2018.8.orig/libglnx/tests/test-libglnx-macros.c ostree-2018.8/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.8.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 +++ ostree-2018.8/libglnx/tests/test-libglnx-macros.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,109 @@ @@ -0,0 +1,109 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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); + g_test_add_func ("/hash_table_foreach", test_hash_table_foreach);
+ return g_test_run(); + 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 diff -Nuar ostree-2018.8.orig/libglnx/tests/test-libglnx-shutil.c ostree-2018.8/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.8.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 +++ ostree-2018.8/libglnx/tests/test-libglnx-shutil.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- 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; + return ret;
+} +}
diff -Nuar ostree-2018.5.orig/libglnx/tests/test-libglnx-xattrs.c ostree-2018.5/libglnx/tests/test-libglnx-xattrs.c diff -Nuar ostree-2018.8.orig/libglnx/tests/test-libglnx-xattrs.c ostree-2018.8/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.8.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 +++ ostree-2018.8/libglnx/tests/test-libglnx-xattrs.c 2018-05-26 00:37:32.008018846 +0300
@@ -0,0 +1,283 @@ @@ -0,0 +1,283 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ * + *
hardware/virtualization/ostree/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>Operating system and container binary deployment and upgrades</Summary> <Summary>Operating system and container binary deployment and upgrades</Summary>
<Description>OSTree is a tool for managing bootable, immutable, versioned filesystem trees</Description> <Description>OSTree is a tool for managing bootable, immutable, versioned filesystem trees</Description>
<Archive sha1sum="f6f6f7bb2bf0bd0418bed81ad305dd318956a537" type="targz">https://github.com/ostreedev/ostree/archive/v2018.5.tar.gz</Archive> <Archive sha1sum="3248dda7bf73007f8bae0cf3c6007a425994a307" type="targz">https://github.com/ostreedev/ostree/archive/v2018.8.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>gtk-doc</Dependency> <Dependency>gtk-doc</Dependency>
<Dependency>rust</Dependency> <Dependency>rust</Dependency>
@@ -85,6 +85,13 @@
</Package> </Package>
<History> <History>
<Update release="4">
<Date>2018-08-23</Date>
<Version>2018.8</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="3"> <Update release="3">
<Date>2018-05-24</Date> <Date>2018-05-24</Date>
<Version>2018.5</Version> <Version>2018.5</Version>