From f9cfa66e79a0de3e15dc9d227db9b54e66938626 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 14 Apr 2017 16:25:10 +0200 Subject: [PATCH] bubblewrap: add patch from alpine --- .../patches/realpath-workaround.patch | 19 +++++++++++++++++++ srcpkgs/bubblewrap/template | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch new file mode 100644 index 00000000000..d25b31a5bfc --- /dev/null +++ b/srcpkgs/bubblewrap/patches/realpath-workaround.patch @@ -0,0 +1,19 @@ +Musl realpath() implementation currently depends on /proc which is +not available when setting up pivot root. For the time being just +fallback to given path if realpath() fails. If there was symlinks +that would have required normalizing the following parse_mountinfo() +will fail. + +diff --git bind-mount.c bind-mount.c +index 7d3543f..c33b701 100644 +--- bind-mount.c ++++ bind-mount.c +@@ -397,7 +397,7 @@ bind_mount (int proc_fd, + path, so to find it in the mount table we need to do that too. */ + resolved_dest = realpath (dest, NULL); + if (resolved_dest == NULL) +- return 2; ++ resolved_dest = strdup (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 f7ecd9613b0..884c159fe2b 100644 --- a/srcpkgs/bubblewrap/template +++ b/srcpkgs/bubblewrap/template @@ -1,7 +1,7 @@ # Template file for 'bubblewrap' pkgname=bubblewrap version=0.1.8 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="libcap-devel"