From 0a778dd7e262435aee97f1137ef4e16549e1db55 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 6 Apr 2018 22:06:07 +0200
Subject: [PATCH] Update to latest bubblewrap (0.2.1)

This has the NFS fix https://github.com/projectatomic/bubblewrap/pull/258
which means flatpak works on NFS.

Closes: #1559
Approved by: alexlarsson
---
 Makefile.am  | 2 +-
 bubblewrap   | 2 +-
 configure.ac | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d379d2bf..b880832d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,7 +102,7 @@ if !WITH_SYSTEM_BWRAP
 bwrap_PROGRAMS = flatpak-bwrap
 flatpak_bwrap_SOURCES = $(bwrap_SOURCES)
 flatpak_bwrap_CFLAGS = $(AM_CFLAGS) $(bwrap_CFLAGS)
-flatpak_bwrap_LDADD = $(AM_LDADD) $(bwrap_LDADD)
+flatpak_bwrap_LDADD = $(AM_LDADD) $(bwrap_LDADD) $(CAP_LIB)
 bwrapdir = $(libexecdir)
 include bubblewrap/Makefile-bwrap.am.inc
 
diff --git a/bubblewrap b/bubblewrap
index 30548332..5f27455a 160000
--- a/bubblewrap
+++ b/bubblewrap
@@ -1 +1 @@
-Subproject commit 30548332a7d04328487906edcd999c3dab67db28
+Subproject commit 5f27455af6e5e36d5f8b06c41214e1a71c054acb
diff --git a/configure.ac b/configure.ac
index 4f078546..30d0c233 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,7 @@ AC_ARG_WITH([system-bubblewrap],
             [AS_HELP_STRING([--with-system-bubblewrap], [Use system bwrap executable [default=check $BWRAP]])],
             [BWRAP="$withval"],
             [BWRAP="${BWRAP:-false}"])
+CAP_LIB=
 AS_CASE([$BWRAP],
         [yes],
             [BWRAP=bwrap],
@@ -155,8 +156,15 @@ if test "x$BWRAP" != xfalse; then
                       [AC_MSG_ERROR([You need at least version $SYSTEM_BWRAP_REQS of bubblewrap to use the system installed version])])
    AM_CONDITIONAL([WITH_SYSTEM_BWRAP], [true])
 else
+   AC_CHECK_LIB(cap, cap_from_text, CAP_LIB=-lcap)
+   if test "$ac_cv_lib_cap_cap_from_text" != "yes"; then
+      AC_MSG_ERROR([*** libcap needed by bubblewrap but not found])
+   fi
+
    AM_CONDITIONAL([WITH_SYSTEM_BWRAP], [false])
 fi
+AC_SUBST([CAP_LIB])
+
 
 AC_CHECK_FUNCS(fdwalk)
 LIBGLNX_CONFIGURE