Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] bubblewrap: update to 0.6.2
@ 2022-06-20 22:53 oreo639
  2022-06-22 21:16 ` paper42
  0 siblings, 1 reply; 2+ messages in thread
From: oreo639 @ 2022-06-20 22:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages bubblewrap
https://github.com/void-linux/void-packages/pull/37628

bubblewrap: update to 0.6.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37628.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bubblewrap-37628.patch --]
[-- Type: text/x-diff, Size: 2272 bytes --]

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 <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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: bubblewrap: update to 0.6.2
  2022-06-20 22:53 [PR PATCH] bubblewrap: update to 0.6.2 oreo639
@ 2022-06-22 21:16 ` paper42
  0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2022-06-22 21:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/37628#issuecomment-1163607702

Comment:
We should probably instead import the realpath patch to musl like it was done in #33372 before it was closed.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-06-22 21:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-20 22:53 [PR PATCH] bubblewrap: update to 0.6.2 oreo639
2022-06-22 21:16 ` paper42

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).