From 91472f4d4c69e714d6b161db8afe779f5642902f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Mon, 20 Jun 2022 15:49:33 -0700 Subject: [PATCH] bubblewrap: update to 0.6.2 --- srcpkgs/bubblewrap/patches/realpath-workaround.patch | 11 ++++------- srcpkgs/bubblewrap/template | 8 ++++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch index 45d1fd6231b6..a4ba530e2199 100644 --- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch +++ b/srcpkgs/bubblewrap/patches/realpath-workaround.patch @@ -231,19 +231,16 @@ static char * skip_token (char *line, bool eat_whitespace) -@@ -395,9 +587,14 @@ +@@ -400,7 +400,11 @@ /* 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__ resolved_dest = realpath (dest, NULL); -- if (resolved_dest == NULL) +#else + resolved_dest = realpath_int (dest, NULL); +#endif -+ if (resolved_dest == NULL) { - return 2; -+ } + if (resolved_dest == NULL) + return BIND_MOUNT_ERROR_REALPATH_DEST; - mount_tab = parse_mountinfo (proc_fd, resolved_dest); - if (mount_tab[0].mountpoint == NULL) + diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template index 4df1dac59395..b9408d8ae44c 100644 --- a/srcpkgs/bubblewrap/template +++ b/srcpkgs/bubblewrap/template @@ -1,8 +1,8 @@ # Template file for 'bubblewrap' pkgname=bubblewrap -version=0.4.1 -revision=2 -build_style=gnu-configure +version=0.6.2 +revision=1 +build_style=meson hostmakedepends="libxslt docbook-xsl pkg-config" makedepends="libcap-devel" short_desc="Unprivileged sandboxing tool" @@ -10,7 +10,7 @@ maintainer="Duncaen " 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