From 3323140092b1016aa1b21c9ad7c77f353cfa8e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Fri, 24 Aug 2018 22:24:02 +0300 Subject: [PATCH] flatpak works continue... ostree has a build problems, flatpak-1.0.0 need >ostree-2018.7 --- .../virtualization/flatpak-builder/pspec.xml | 9 +- .../files/bubblewrap_libglnx_submodule.patch | 420 +++++++++--------- .../files/flatpak-1.0.0-glib_fix.patch | 32 ++ hardware/virtualization/flatpak/pspec.xml | 12 +- hardware/virtualization/ostree/actions.py | 11 +- hardware/virtualization/ostree/pspec.xml | 19 +- 6 files changed, 278 insertions(+), 225 deletions(-) create mode 100644 hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch diff --git a/hardware/virtualization/flatpak-builder/pspec.xml b/hardware/virtualization/flatpak-builder/pspec.xml index 809c0bd646..227de0f8a8 100644 --- a/hardware/virtualization/flatpak-builder/pspec.xml +++ b/hardware/virtualization/flatpak-builder/pspec.xml @@ -12,7 +12,7 @@ app:console Tool to build flatpaks from sources Tool for building flatpaks from sources - https://github.com/flatpak/flatpak-builder/archive/0.10.10.tar.gz + https://github.com/flatpak/flatpak-builder/archive/1.0.0.tar.gz flatpak-devel ostree-devel @@ -51,6 +51,13 @@ + + 2018-08-23 + 1.0.0 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2018-07-08 0.10.10 diff --git a/hardware/virtualization/flatpak/files/bubblewrap_libglnx_submodule.patch b/hardware/virtualization/flatpak/files/bubblewrap_libglnx_submodule.patch index 6112240639..87f9cb25a6 100644 --- a/hardware/virtualization/flatpak/files/bubblewrap_libglnx_submodule.patch +++ b/hardware/virtualization/flatpak/files/bubblewrap_libglnx_submodule.patch @@ -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 @@ +JFIFHHCC  + c6M5G?ory-=:I.l֯v+ܐjJN턐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 +6Tk`)kj}Ҫ tu )Շ Tf,sB,fţy[6(#hMjkE MkE/\alu-X$_\ r_X 5u97sN=X;Y$1w(yB́lWV%@|xа2:Aˢo=—4^d1K 9I"5E6;f3.26 Yv|7B%ڀ꺾xhk3)iPd#,l6\C=RN#x9Ă :3leS`.“2 >4EdPt' +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 @@ + + + + -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 @@ + >> WeVgUTSRQPONMLKJIH*Gg@F@E@D@C@B@A@@@?@>@=@<@;*@: @9@838@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ò @@ -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 + * + * + */ -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 @@ + + + + -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 + +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 +# @@ -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; -*- + * diff --git a/hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch b/hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch new file mode 100644 index 0000000000..77454ba7b7 --- /dev/null +++ b/hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch @@ -0,0 +1,32 @@ +diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c +index db4f3645..ac375694 100644 +--- a/common/flatpak-utils.c ++++ b/common/flatpak-utils.c +@@ -5725,7 +5725,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar *str, + if (str[0] == '\0') + { + g_set_error_literal (error, +- G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_INVALID, ++ G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, + _("Empty string is not a number")); + return FALSE; + } +@@ -5751,7 +5751,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar *str, + *end_ptr != '\0') + { + g_set_error (error, +- G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_INVALID, ++ G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, + _("“%s” is not an unsigned number"), str); + return FALSE; + } +@@ -5761,7 +5761,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar *str, + gchar *max_str = g_strdup_printf ("%" G_GUINT64_FORMAT, max); + + g_set_error (error, +- G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS, ++ G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, + _("Number “%s” is out of bounds [%s, %s]"), + str, min_str, max_str); + g_free (min_str); + diff --git a/hardware/virtualization/flatpak/pspec.xml b/hardware/virtualization/flatpak/pspec.xml index cc655d8c1a..03ec719956 100644 --- a/hardware/virtualization/flatpak/pspec.xml +++ b/hardware/virtualization/flatpak/pspec.xml @@ -11,7 +11,7 @@ LGPLv2 Application distribution framework Linux application sandboxing and distribution framework, formerly xdg-app - https://github.com/flatpak/flatpak/archive/0.11.7.tar.gz + https://github.com/flatpak/flatpak/archive/1.0.0.tar.gz util-linux gtk-doc @@ -22,10 +22,11 @@ dbus-devel json-glib-devel appstream-glib-devel - ostree-devel + ostree-devel bubblewrap_libglnx_submodule.patch + flatpak-1.0.0-glib_fix.patch @@ -93,6 +94,13 @@ + + 2018-08-23 + 1.0.0 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2018-07-08 0.11.7 diff --git a/hardware/virtualization/ostree/actions.py b/hardware/virtualization/ostree/actions.py index 8258ed87ba..b7ca0dc4ea 100644 --- a/hardware/virtualization/ostree/actions.py +++ b/hardware/virtualization/ostree/actions.py @@ -14,13 +14,18 @@ from pisi.actionsapi import get def setup(): shelltools.system("env NOCONFIGURE=1 ./autogen.sh") - autotools.configure("--enable-rust \ - --enable-trivial-httpd-cmdline \ + autotools.configure("--disable-silent-rules \ + --enable-gtk-doc \ + --without-selinux \ + --with-curl \ --with-openssl \ --disable-static \ + --enable-installed-tests=exclusive \ + --enable-trivial-httpd-cmdline \ + --disable-http2 \ --without-dracut \ --without-mkinitcpio") - + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") diff --git a/hardware/virtualization/ostree/pspec.xml b/hardware/virtualization/ostree/pspec.xml index cc36fdd7f3..87e7511255 100644 --- a/hardware/virtualization/ostree/pspec.xml +++ b/hardware/virtualization/ostree/pspec.xml @@ -15,20 +15,21 @@ https://github.com/ostreedev/ostree/archive/v2018.8.tar.gz gtk-doc - rust glib2-devel - gpgme-devel xz-devel zlib-devel - fuse-devel - libarchive-devel - avahi-devel - avahi-glib-devel - libsoup-devel e2fsprogs-devel - libutil-linux-devel - gnutls-devel + curl-devel + libsoup-devel + gpgme-devel openssl-devel + avahi-glib-devel + fuse-devel + libutil-linux-devel + libarchive-devel + bsdiff_libglnx_submodule.patch