From: michael-ball <michael-ball@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Update bubblewrap to the latest version
Date: Sat, 11 Jun 2022 13:05:07 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37509@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 632 bytes --]
There is a new pull request by michael-ball against master on the void-packages repository
https://github.com/michael-ball/void-packages bubblewrap-update
https://github.com/void-linux/void-packages/pull/37509
Update bubblewrap to the latest version
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly** (I could not test on a musl system)
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/37509.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bubblewrap-update-37509.patch --]
[-- Type: text/x-diff, Size: 2772 bytes --]
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
next reply other threads:[~2022-06-11 11:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-11 11:05 michael-ball [this message]
2022-06-11 11:12 ` paper42
2022-06-14 7:47 ` michael-ball
2022-06-14 7:47 ` [PR PATCH] [Closed]: " michael-ball
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37509@inbox.vuxu.org \
--to=michael-ball@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).