[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Thursday, December 3, 2020 @ 15:55:15 Author: foxboron Revision: 769695 upgpkg: slirp4netns 1.1.8-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-12-03 15:53:12 UTC (rev 769694) +++ PKGBUILD2020-12-03 15:55:15 UTC (rev 769695) @@ -3,7 +3,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -11,7 +11,7 @@ depends=(glibc glib2 libcap libseccomp libslirp) makedepends=(git) # TODO: Check if they are going to continue signing the commits -_commit=e62caa08b78f3e662422bd7bfbcd2df3d12dcab1 #refs/tags/v1.1.7^{} +_commit=d361001f495417b880f20329121e3aa431a8f90f #refs/tags/v1.1.8^{} source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Wednesday, November 25, 2020 @ 22:14:13 Author: foxboron Revision: 761307 upgpkg: slirp4netns 1.1.7-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-11-25 22:10:59 UTC (rev 761306) +++ PKGBUILD2020-11-25 22:14:13 UTC (rev 761307) @@ -3,7 +3,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=1.1.6 +pkgver=1.1.7 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -11,7 +11,7 @@ depends=(glibc glib2 libcap libseccomp libslirp) makedepends=(git) # TODO: Check if they are going to continue signing the commits -_commit=a995c1642ee9a59607dccf87758de586b501a800#refs/tags/v1.1.6^ +_commit=e62caa08b78f3e662422bd7bfbcd2df3d12dcab1 #refs/tags/v1.1.7^{} source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Wednesday, November 4, 2020 @ 17:31:29 Author: foxboron Revision: 742442 upgpkg: slirp4netns 1.1.6-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-11-04 17:24:08 UTC (rev 742441) +++ PKGBUILD2020-11-04 17:31:29 UTC (rev 742442) @@ -3,7 +3,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=1.1.4 +pkgver=1.1.6 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -11,7 +11,7 @@ depends=(glibc glib2 libcap libseccomp libslirp) makedepends=(git) # TODO: Check if they are going to continue signing the commits -_commit=b66ffa8e262507e37fca689822d23430f3357fe8 # tags/v1.1.4 +_commit=a995c1642ee9a59607dccf87758de586b501a800#refs/tags/v1.1.6^ source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Tuesday, July 14, 2020 @ 13:28:34 Author: foxboron Revision: 663759 upgpkg: slirp4netns 1.1.4-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-07-14 13:26:22 UTC (rev 663758) +++ PKGBUILD2020-07-14 13:28:34 UTC (rev 663759) @@ -3,7 +3,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -11,7 +11,7 @@ depends=(glibc glib2 libcap libseccomp libslirp) makedepends=(git) # TODO: Check if they are going to continue signing the commits -_commit=b6a004dfc2170c1ea16ed7934c3326100f0e32f9 # tags/v1.1.3 +_commit=b66ffa8e262507e37fca689822d23430f3357fe8 # tags/v1.1.4 source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Sunday, July 12, 2020 @ 20:46:12 Author: foxboron Revision: 663359 upgpkg: slirp4netns 1.1.3-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-07-12 20:44:22 UTC (rev 663358) +++ PKGBUILD2020-07-12 20:46:12 UTC (rev 663359) @@ -3,7 +3,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -11,7 +11,7 @@ depends=(glibc glib2 libcap libseccomp libslirp) makedepends=(git) # TODO: Check if they are going to continue signing the commits -_commit=0806e04b1f786070cc1695d7f9b6abd43862bb5a # tags/v1.1.2 +_commit=b6a004dfc2170c1ea16ed7934c3326100f0e32f9 # tags/v1.1.3 source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Monday, July 6, 2020 @ 11:20:41 Author: foxboron Revision: 657978 upgpkg: slirp4netns 1.1.2-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-07-06 10:54:45 UTC (rev 657977) +++ PKGBUILD2020-07-06 11:20:41 UTC (rev 657978) @@ -3,7 +3,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -11,7 +11,7 @@ depends=(glibc glib2 libcap libseccomp libslirp) makedepends=(git) # TODO: Check if they are going to continue signing the commits -_commit=bbf27c5acd4356edb97fa639b4e15e0cd56a39d5 # tags/v1.1.1 +_commit=0806e04b1f786070cc1695d7f9b6abd43862bb5a # tags/v1.1.2 source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Saturday, June 6, 2020 @ 09:30:49 Author: foxboron Revision: 639359 upgpkg: slirp4netns 1.1.1-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-06-06 09:29:06 UTC (rev 639358) +++ PKGBUILD2020-06-06 09:30:49 UTC (rev 639359) @@ -3,7 +3,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -10,7 +10,8 @@ license=(GPL2) depends=(glibc glib2 libcap libseccomp libslirp) makedepends=(git) -_commit=ee9b3db719f7587250a638f4e52bf64195edb9c4 # tags/v1.1.0 +# TODO: Check if they are going to continue signing the commits +_commit=bbf27c5acd4356edb97fa639b4e15e0cd56a39d5 # tags/v1.1.1 source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Thursday, June 4, 2020 @ 16:34:25 Author: foxboron Revision: 638966 upgpkg: slirp4netns 1.1.0-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-06-04 16:34:20 UTC (rev 638965) +++ PKGBUILD2020-06-04 16:34:25 UTC (rev 638966) @@ -3,7 +3,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=1.0.1 +pkgver=1.1.0 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -10,7 +10,7 @@ license=(GPL2) depends=(glibc glib2 libcap libseccomp libslirp) makedepends=(git) -_commit=6a7b16babc95b6a3056b33fb45b74a6f62262dd4 # tags/v1.0.1 +_commit=ee9b3db719f7587250a638f4e52bf64195edb9c4 # tags/v1.1.0 source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Saturday, April 25, 2020 @ 11:04:40 Author: foxboron Revision: 620640 upgpkg: slirp4netns 1.0.1-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-25 10:59:31 UTC (rev 620639) +++ PKGBUILD2020-04-25 11:04:40 UTC (rev 620640) @@ -3,7 +3,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -10,7 +10,7 @@ license=(GPL2) depends=(glibc glib2 libcap libseccomp libslirp) makedepends=(git) -_commit=a3be729152a33e692cd28b52f664defbf2e7810a # tags/v1.0.0 +_commit=6a7b16babc95b6a3056b33fb45b74a6f62262dd4 # tags/v1.0.1 source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Wednesday, April 1, 2020 @ 21:21:02 Author: foxboron Revision: 609255 upgpkg: slirp4netns 1.0.0-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-01 21:20:33 UTC (rev 609254) +++ PKGBUILD2020-04-01 21:21:02 UTC (rev 609255) @@ -3,14 +3,14 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=0.4.4 +pkgver=1.0.0 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; license=(GPL2) -depends=(glibc glib2 libcap libseccomp) +depends=(glibc glib2 libcap libseccomp libslirp) makedepends=(git) -_commit=d6d5ddec4d898c5592b273412c800bb384c9ac88 # tags/v0.4.4 +_commit=a3be729152a33e692cd28b52f664defbf2e7810a # tags/v1.0.0 source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Saturday, March 21, 2020 @ 13:29:09 Author: foxboron Revision: 602595 upgpkg: slirp4netns 0.4.4-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-03-21 13:28:34 UTC (rev 602594) +++ PKGBUILD2020-03-21 13:29:09 UTC (rev 602595) @@ -1,8 +1,9 @@ # Maintainer: Bartłomiej Piotrowski +# Maintainer: Morten Linderud pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=0.4.3 +pkgver=0.4.4 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -9,7 +10,7 @@ license=(GPL2) depends=(glibc glib2 libcap libseccomp) makedepends=(git) -_commit=2244b9b6461afeccad1678fac3d6e478c28b4ad6 # tags/v0.4.3 +_commit=d6d5ddec4d898c5592b273412c800bb384c9ac88 # tags/v0.4.4 source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Wednesday, January 15, 2020 @ 14:09:23 Author: bpiotrowski Revision: 552627 0.4.3-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-01-15 14:08:01 UTC (rev 552626) +++ PKGBUILD2020-01-15 14:09:23 UTC (rev 552627) @@ -2,7 +2,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=0.4.2 +pkgver=0.4.3 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/slirp4netns; @@ -9,7 +9,7 @@ license=(GPL2) depends=(glibc glib2 libcap libseccomp) makedepends=(git) -_commit=69153b0d1cb82216d6782179ff7c3c5e91c731a1 # tags/v0.4.2 +_commit=2244b9b6461afeccad1678fac3d6e478c28b4ad6 # tags/v0.4.3 source=("git+$url#commit=$_commit") sha256sums=('SKIP')
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD pr153.patch)
Date: Wednesday, October 30, 2019 @ 13:10:24 Author: bpiotrowski Revision: 520981 0.4.2-1 Modified: slirp4netns/trunk/PKGBUILD Deleted: slirp4netns/trunk/pr153.patch -+ PKGBUILD| 26 +++-- pr153.patch | 114 -- 2 files changed, 15 insertions(+), 125 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-10-30 13:06:34 UTC (rev 520980) +++ PKGBUILD2019-10-30 13:10:24 UTC (rev 520981) @@ -2,30 +2,34 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=0.4.1 -pkgrel=2 +pkgver=0.4.2 +pkgrel=1 arch=(x86_64) -url="https://github.com/rootless-containers/$pkgname; +url="https://github.com/rootless-containers/slirp4netns; license=(GPL2) depends=(glibc glib2 libcap libseccomp) -source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz -pr153.patch) -sha256sums=('75d2a7411cc2b3e341d8530228750bb1db06077b349d10fbdddbb582c27f8cfc' -'7ce56f88cdd941d786117c388a31669018b6c37fd27f3afe97f2c4369cd92fac') +makedepends=(git) +_commit=69153b0d1cb82216d6782179ff7c3c5e91c731a1 # tags/v0.4.2 +source=("git+$url#commit=$_commit") +sha256sums=('SKIP') +pkgver() { + cd $pkgname + git describe --tags | sed 's/^v//;s/-/+/g' +} + prepare() { - cd $pkgname-$pkgver - patch -p1 -i "$srcdir/pr153.patch" + cd $pkgname autoreconf -fi } build() { - cd $pkgname-$pkgver + cd $pkgname ./configure --prefix=/usr make } package() { - cd $pkgname-$pkgver + cd $pkgname make DESTDIR="$pkgdir" install } Deleted: pr153.patch === --- pr153.patch 2019-10-30 13:06:34 UTC (rev 520980) +++ pr153.patch 2019-10-30 13:10:24 UTC (rev 520981) @@ -1,114 +0,0 @@ -From a9c57a90817c10b256389d425ec715d311cceb76 Mon Sep 17 00:00:00 2001 -From: Giuseppe Scrivano -Date: Mon, 30 Sep 2019 21:11:09 +0200 -Subject: [PATCH 1/2] sandbox: do not propagate mounts to the parent ns - -when creating the sandbox, make sure the mounts are marked with -MS_SLAVE so that events are not propagated to other mount namespaces. - -Closes: https://github.com/containers/libpod/issues/4113 - -Signed-off-by: Giuseppe Scrivano - sandbox.c | 10 ++ - 1 file changed, 10 insertions(+) - -diff --git a/sandbox.c b/sandbox.c -index 05d29e8..256bf04 100644 a/sandbox.c -+++ b/sandbox.c -@@ -16,6 +16,11 @@ static int add_mount(const char *from, const char *to) - { - int ret; - -+ret = mount("", from, "", MS_SLAVE | MS_REC, NULL); -+if (ret < 0 && errno != EINVAL) { -+fprintf(stderr, "cannot make mount propagation slave %s\n", from); -+return ret; -+} - ret = mount(from, to, "", - MS_BIND | MS_REC | MS_SLAVE | MS_NOSUID | MS_NODEV | MS_NOEXEC, - NULL); -@@ -23,6 +28,11 @@ static int add_mount(const char *from, const char *to) - fprintf(stderr, "cannot bind mount %s to %s\n", from, to); - return ret; - } -+ret = mount("", to, "", MS_SLAVE | MS_REC, NULL); -+if (ret < 0) { -+fprintf(stderr, "cannot make mount propagation slave %s\n", to); -+return ret; -+} - ret = mount(from, to, "", - MS_REMOUNT | MS_BIND | MS_RDONLY | MS_NOSUID | MS_NODEV | - MS_NOEXEC, - -From 4c2e8c68205f5cacd96d49287584e647e483c6f9 Mon Sep 17 00:00:00 2001 -From: Giuseppe Scrivano -Date: Tue, 1 Oct 2019 09:29:47 +0200 -Subject: [PATCH 2/2] tests: --create-sandbox doesn't umount under /run - -Signed-off-by: Giuseppe Scrivano - Makefile.am | 1 + - tests/slirp4netns-no-unmount.sh | 29 + - tests/test-slirp4netns.sh | 2 ++ - 3 files changed, 32 insertions(+) - create mode 100755 tests/slirp4netns-no-unmount.sh - -diff --git a/Makefile.am b/Makefile.am -index 1298d38..7708820 100644 a/Makefile.am -+++ b/Makefile.am -@@ -16,6 +16,7 @@ EXTRA_DIST = \ - api.h \ - sandbox.h \ - seccompfilter.h \ -+ tests/slirp4netns-no-unmount.sh \ - vendor/libslirp/COPYRIGHT \ - vendor/libslirp/README.md \ - vendor/libslirp/src/bootp.h \ -diff --git a/tests/slirp4netns-no-unmount.sh b/tests/slirp4netns-no-unmount.sh -new file mode 100755 -index 000..6e8ed15 /dev/null -+++ b/tests/slirp4netns-no-unmount.sh -@@ -0,0 +1,29 @@ -+#!/bin/bash -+set -xeuo pipefail -+ -+. $(dirname $0)/common.sh -+ -+# it is a part of test-slirp4netns.sh -+# must run in a new mount namespace -+ -+mount -t tmpfs tmpfs /run -+mkdir /run/foo -+mount -t tmpfs tmpfs /run/foo -+mount --make-rshared /run -+ -+unshare -n sleep infinity & -+child=$! -+ -+wait_for_network_namespace $child -+ -+./slirp4netns --enable-sandbox --netns-type=path /proc/$child/ns/net tun11 & -+slirp_pid=$! -+ -+function cleanup { -+kill -9 $child $slirp_pid -+} -+trap cleanup EXIT -+
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD pr153.patch)
Date: Friday, October 4, 2019 @ 12:40:52 Author: bpiotrowski Revision: 512724 0.4.1-2: backport "sandbox: do not propagate mounts to the parent ns" Added: slirp4netns/trunk/pr153.patch Modified: slirp4netns/trunk/PKGBUILD -+ PKGBUILD|9 +++- pr153.patch | 114 ++ 2 files changed, 120 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-10-04 12:39:43 UTC (rev 512723) +++ PKGBUILD2019-10-04 12:40:52 UTC (rev 512724) @@ -3,16 +3,19 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' pkgver=0.4.1 -pkgrel=1 +pkgrel=2 arch=(x86_64) url="https://github.com/rootless-containers/$pkgname; license=(GPL2) depends=(glibc glib2 libcap libseccomp) -source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz) -sha256sums=('75d2a7411cc2b3e341d8530228750bb1db06077b349d10fbdddbb582c27f8cfc') +source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz +pr153.patch) +sha256sums=('75d2a7411cc2b3e341d8530228750bb1db06077b349d10fbdddbb582c27f8cfc' +'7ce56f88cdd941d786117c388a31669018b6c37fd27f3afe97f2c4369cd92fac') prepare() { cd $pkgname-$pkgver + patch -p1 -i "$srcdir/pr153.patch" autoreconf -fi } Added: pr153.patch === --- pr153.patch (rev 0) +++ pr153.patch 2019-10-04 12:40:52 UTC (rev 512724) @@ -0,0 +1,114 @@ +From a9c57a90817c10b256389d425ec715d311cceb76 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano +Date: Mon, 30 Sep 2019 21:11:09 +0200 +Subject: [PATCH 1/2] sandbox: do not propagate mounts to the parent ns + +when creating the sandbox, make sure the mounts are marked with +MS_SLAVE so that events are not propagated to other mount namespaces. + +Closes: https://github.com/containers/libpod/issues/4113 + +Signed-off-by: Giuseppe Scrivano +--- + sandbox.c | 10 ++ + 1 file changed, 10 insertions(+) + +diff --git a/sandbox.c b/sandbox.c +index 05d29e8..256bf04 100644 +--- a/sandbox.c b/sandbox.c +@@ -16,6 +16,11 @@ static int add_mount(const char *from, const char *to) + { + int ret; + ++ret = mount("", from, "", MS_SLAVE | MS_REC, NULL); ++if (ret < 0 && errno != EINVAL) { ++fprintf(stderr, "cannot make mount propagation slave %s\n", from); ++return ret; ++} + ret = mount(from, to, "", + MS_BIND | MS_REC | MS_SLAVE | MS_NOSUID | MS_NODEV | MS_NOEXEC, + NULL); +@@ -23,6 +28,11 @@ static int add_mount(const char *from, const char *to) + fprintf(stderr, "cannot bind mount %s to %s\n", from, to); + return ret; + } ++ret = mount("", to, "", MS_SLAVE | MS_REC, NULL); ++if (ret < 0) { ++fprintf(stderr, "cannot make mount propagation slave %s\n", to); ++return ret; ++} + ret = mount(from, to, "", + MS_REMOUNT | MS_BIND | MS_RDONLY | MS_NOSUID | MS_NODEV | + MS_NOEXEC, + +From 4c2e8c68205f5cacd96d49287584e647e483c6f9 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano +Date: Tue, 1 Oct 2019 09:29:47 +0200 +Subject: [PATCH 2/2] tests: --create-sandbox doesn't umount under /run + +Signed-off-by: Giuseppe Scrivano +--- + Makefile.am | 1 + + tests/slirp4netns-no-unmount.sh | 29 + + tests/test-slirp4netns.sh | 2 ++ + 3 files changed, 32 insertions(+) + create mode 100755 tests/slirp4netns-no-unmount.sh + +diff --git a/Makefile.am b/Makefile.am +index 1298d38..7708820 100644 +--- a/Makefile.am b/Makefile.am +@@ -16,6 +16,7 @@ EXTRA_DIST = \ + api.h \ + sandbox.h \ + seccompfilter.h \ ++ tests/slirp4netns-no-unmount.sh \ + vendor/libslirp/COPYRIGHT \ + vendor/libslirp/README.md \ + vendor/libslirp/src/bootp.h \ +diff --git a/tests/slirp4netns-no-unmount.sh b/tests/slirp4netns-no-unmount.sh +new file mode 100755 +index 000..6e8ed15 +--- /dev/null b/tests/slirp4netns-no-unmount.sh +@@ -0,0 +1,29 @@ ++#!/bin/bash ++set -xeuo pipefail ++ ++. $(dirname $0)/common.sh ++ ++# it is a part of test-slirp4netns.sh ++# must run in a new mount namespace ++ ++mount -t tmpfs tmpfs /run ++mkdir /run/foo ++mount -t tmpfs tmpfs /run/foo ++mount --make-rshared /run ++ ++unshare -n sleep infinity & ++child=$! ++ ++wait_for_network_namespace $child ++ ++./slirp4netns --enable-sandbox --netns-type=path /proc/$child/ns/net tun11 & ++slirp_pid=$! ++ ++function cleanup { ++kill -9 $child $slirp_pid ++} ++trap cleanup EXIT ++ ++wait_for_network_device $child tun11 ++ ++findmnt /run/foo +diff --git a/tests/test-slirp4netns.sh b/tests/test-slirp4netns.sh +index 2586e7d..5ed0217 100755 +--- a/tests/test-slirp4netns.sh b/tests/test-slirp4netns.sh +@@ -67,3 +67,5 @@ wait_for_network_device $child tun11 + + nsenter
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Sunday, September 1, 2019 @ 19:50:08 Author: bpiotrowski Revision: 506351 0.4.1-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-09-01 19:48:33 UTC (rev 506350) +++ PKGBUILD2019-09-01 19:50:08 UTC (rev 506351) @@ -2,7 +2,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/$pkgname; @@ -9,7 +9,7 @@ license=(GPL2) depends=(glibc glib2 libcap libseccomp) source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz) -sha256sums=('37b27e737ea21c64c9296fc3045229fd8100cfa632eff2e47ec19188556e6cee') +sha256sums=('75d2a7411cc2b3e341d8530228750bb1db06077b349d10fbdddbb582c27f8cfc') prepare() { cd $pkgname-$pkgver
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Friday, August 30, 2019 @ 05:32:25 Author: bpiotrowski Revision: 505158 0.4.0-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-08-30 05:02:18 UTC (rev 505157) +++ PKGBUILD2019-08-30 05:32:25 UTC (rev 505158) @@ -2,14 +2,14 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=0.3.1 +pkgver=0.4.0 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/$pkgname; license=(GPL2) -depends=(glibc glib2) +depends=(glibc glib2 libcap libseccomp) source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz) -sha256sums=('28f74ab20b09c18085d2364945011bc22c1cdc832e581cd64c298eb860cbd8ec') +sha256sums=('37b27e737ea21c64c9296fc3045229fd8100cfa632eff2e47ec19188556e6cee') prepare() { cd $pkgname-$pkgver
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Wednesday, July 31, 2019 @ 09:12:13 Author: bpiotrowski Revision: 495483 0.3.1-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-07-31 08:27:41 UTC (rev 495482) +++ PKGBUILD2019-07-31 09:12:13 UTC (rev 495483) @@ -2,7 +2,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/$pkgname; @@ -9,7 +9,7 @@ license=(GPL2) depends=(glibc glib2) source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz) -sha256sums=('a222c6da9d2658f5c957d5ce494fa7e2f9f52150cd7aae40d1a782653daabf27') +sha256sums=('28f74ab20b09c18085d2364945011bc22c1cdc832e581cd64c298eb860cbd8ec') prepare() { cd $pkgname-$pkgver
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Friday, March 29, 2019 @ 06:51:37 Author: bpiotrowski Revision: 445962 0.3.0-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-03-29 06:24:12 UTC (rev 445961) +++ PKGBUILD2019-03-29 06:51:37 UTC (rev 445962) @@ -2,14 +2,14 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=0.2.1 +pkgver=0.3.0 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/$pkgname; license=(GPL2) -depends=(glibc) +depends=(glibc glib2) source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz) -sha256sums=('1a9681d5926365e8d60bd804c71733c05f8b44fd20393bf2f2b2d1ee1ea8517c') +sha256sums=('a222c6da9d2658f5c957d5ce494fa7e2f9f52150cd7aae40d1a782653daabf27') prepare() { cd $pkgname-$pkgver
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Saturday, January 26, 2019 @ 14:57:48 Author: bpiotrowski Revision: 428115 0.2.1-1 Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-01-26 14:14:29 UTC (rev 428114) +++ PKGBUILD2019-01-26 14:57:48 UTC (rev 428115) @@ -2,7 +2,7 @@ pkgname=slirp4netns pkgdesc='User-mode networking for unprivileged network namespaces' -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 arch=(x86_64) url="https://github.com/rootless-containers/$pkgname; @@ -9,7 +9,7 @@ license=(GPL2) depends=(glibc) source=($pkgname-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz) -sha256sums=('12e52a05d96d92539df05607f85e47ff701540d8c0dbbdf32a47c3cf2e98da92') +sha256sums=('1a9681d5926365e8d60bd804c71733c05f8b44fd20393bf2f2b2d1ee1ea8517c') prepare() { cd $pkgname-$pkgver
[arch-commits] Commit in slirp4netns/trunk (PKGBUILD)
Date: Wednesday, January 23, 2019 @ 19:40:49 Author: bpiotrowski Revision: 427329 fix indentation Modified: slirp4netns/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-01-23 19:39:33 UTC (rev 427328) +++ PKGBUILD2019-01-23 19:40:49 UTC (rev 427329) @@ -18,8 +18,8 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr - make + ./configure --prefix=/usr + make } package() {