[pkgsrc/trunk]: pkgsrc/pkgtools/mksandbox mksandbox-1.1:

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86ec6c1b401a
branches:  trunk
changeset: 621827:86ec6c1b401a
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Jul 18 16:07:22 2013 +0000

description:
mksandbox-1.1:

  * Add /lib64 and /usr/lib64 on Linux.
  * Ensure that read-only --bind mounts on Linux are actually read-only.

diffstat:

 pkgtools/mksandbox/Makefile        |  4 ++--
 pkgtools/mksandbox/files/mksandbox |  7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 4552829a7535 -r 86ec6c1b401a pkgtools/mksandbox/Makefile
--- a/pkgtools/mksandbox/Makefile       Thu Jul 18 14:59:04 2013 +0000
+++ b/pkgtools/mksandbox/Makefile       Thu Jul 18 16:07:22 2013 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2013/05/29 15:57:09 agc Exp $
+# $NetBSD: Makefile,v 1.5 2013/07/18 16:07:22 jperkin Exp $
 
-DISTNAME=      mksandbox-1.0
+DISTNAME=      mksandbox-1.1
 CATEGORIES=    pkgtools
 MASTER_SITES=  # none
 DISTFILES=     # none
diff -r 4552829a7535 -r 86ec6c1b401a pkgtools/mksandbox/files/mksandbox
--- a/pkgtools/mksandbox/files/mksandbox        Thu Jul 18 14:59:04 2013 +0000
+++ b/pkgtools/mksandbox/files/mksandbox        Thu Jul 18 16:07:22 2013 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.3 2013/05/29 15:09:49 wiz Exp $
+# $NetBSD: mksandbox,v 1.4 2013/07/18 16:07:22 jperkin Exp $
 
 # Copyright (c) 2002,2012 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -112,7 +112,7 @@
        fi
        paxprog=""
        sedprog=/bin/sed
-       sandboxMountDirs="$sandboxMountDirs /proc /usr/kerberos"
+       sandboxMountDirs="$sandboxMountDirs /proc /lib64 /usr/lib64 /usr/kerberos"
        ;;
 NetBSD)
        bmakeprog=make
@@ -288,6 +288,9 @@
        esac
        $mkdirprog $sandbox$d;
        $mountprog $mountflags -r $mounthost$d $sandbox$d;
+       case "$opsys" in
+       Linux)  $mountprog $mountflags -o remount,bind,ro $mounthost$d $sandbox$d ;;
+       esac
        echo "$mounthost$d $d ro \\" >> $sandbox_script
 done
 for d in $sandboxWriteDirs; do