From 287965537564cd494316af822ffa7687bfdab157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Ball?= <git@michaelball.name>
Date: Sat, 11 Jun 2022 11:54:26 +0100
Subject: [PATCH] Update bubblewrap to the latest version

---
 .../patches/realpath-workaround.patch         | 25 ++++++++++---------
 srcpkgs/bubblewrap/template                   |  6 ++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
index 45d1fd6231b6..7e052f78185d 100644
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
@@ -30,10 +30,10 @@
 +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 +SUCH DAMAGE.
---- a/bind-mount.c	2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c	2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
- 
+--- a/bind-mount.c	2022-02-13 18:53:18.000000000 +0000 
++++ b/bind-mount.c	2022-06-11 11:28:28.219081568 +0100
+@@ -23,6 +23,198 @@
+
  #include "utils.h"
  #include "bind-mount.h"
 +#include <stdlib.h>
@@ -228,11 +228,11 @@
 +        return NULL;
 +}
 +#endif
- 
+
  static char *
  skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
- 
+@@ -400,9 +592,14 @@
+
    /* The mount operation will resolve any symlinks in the destination
       path, so to find it in the mount table we need to do that too. */
 +#ifdef __GLIBC__
@@ -242,8 +242,9 @@
 +  resolved_dest = realpath_int (dest, NULL);
 +#endif
 +  if (resolved_dest == NULL) {
-     return 2;
-+  }
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
+     return BIND_MOUNT_ERROR_REALPATH_DEST;
++}
+
+   dest_fd = open (resolved_dest, O_PATH | O_CLOEXEC);
+   if (dest_fd < 0)
+
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..f0574be8d370 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,7 +1,7 @@
 # Template file for 'bubblewrap'
 pkgname=bubblewrap
-version=0.4.1
-revision=2
+version=0.6.2
+revision=1
 build_style=gnu-configure
 hostmakedepends="libxslt docbook-xsl pkg-config"
 makedepends="libcap-devel"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/containers/bubblewrap"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
+checksum=8a0ec802d1b3e956c5bb0a40a81c9ce0b055a31bf30a8efa547433603b8af20b
 
 post_install() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then