CVS commit: pkgsrc/pkgtools/mksandbox

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jan 22 11:59:52 UTC 2021

Modified Files:
        pkgsrc/pkgtools/mksandbox: Makefile
        pkgsrc/pkgtools/mksandbox/files: mksandbox

Log Message:
mksandbox: Update to version 1.10.

Change the /dev/shm handling on Linux to account for systemd being a complete
nightmare and changing mount types behind your back automatically.

The previous fixed works fine, until it magically changes from a tmpfs with
1777 permissions to a devtmpfs with 0755 permissions, with obvious failures
resulting when building as non-root.

Tested on el6 and el7, with the latter now reliably able to build Python.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/pkgtools/mksandbox/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/pkgtools/mksandbox/files/mksandbox

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/mksandbox/Makefile
diff -u pkgsrc/pkgtools/mksandbox/Makefile:1.16 pkgsrc/pkgtools/mksandbox/Makefile:1.17
--- pkgsrc/pkgtools/mksandbox/Makefile:1.16     Mon Dec  7 12:35:52 2020
+++ pkgsrc/pkgtools/mksandbox/Makefile  Fri Jan 22 11:59:52 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2020/12/07 12:35:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2021/01/22 11:59:52 jperkin Exp $
 
-PKGNAME=       mksandbox-1.9
+PKGNAME=       mksandbox-1.10
 CATEGORIES=    pkgtools
 
 MAINTAINER=    agc%NetBSD.org@localhost

Index: pkgsrc/pkgtools/mksandbox/files/mksandbox
diff -u pkgsrc/pkgtools/mksandbox/files/mksandbox:1.17 pkgsrc/pkgtools/mksandbox/files/mksandbox:1.18
--- pkgsrc/pkgtools/mksandbox/files/mksandbox:1.17      Mon Dec  7 13:05:12 2020
+++ pkgsrc/pkgtools/mksandbox/files/mksandbox   Fri Jan 22 11:59:52 2021
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.17 2020/12/07 13:05:12 jperkin Exp $
+# $NetBSD: mksandbox,v 1.18 2021/01/22 11:59:52 jperkin Exp $
 
 # Copyright (c) 2002,2012 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -136,7 +136,7 @@ Linux)
        paxprog=""
        sedprog=/bin/sed
        sandboxMountDirs="$sandboxMountDirs /lib64 /usr/lib64 /usr/kerberos"
-       sandboxWriteDirs="$sandboxWriteDirs /dev/shm /proc"
+       sandboxWriteDirs="$sandboxWriteDirs /proc"
        ;;
 NetBSD)
        bmakeprog=make
@@ -289,6 +289,7 @@ SunOS)
        ;;
 Linux)
        $mountprog $mountflags /dev $sandbox/dev
+       $mountprog -t tmpfs tmpfs $sandbox/dev/shm
        ;;
 *)
        $cpprog /dev/MAKEDEV* $sandbox/dev
@@ -438,6 +439,7 @@ xmount)
                ;;
        Linux)
                $mountprog $mountflags /dev \$sandbox/dev
+               $mountprog -t tmpfs tmpfs \$sandbox/dev/shm
                ;;
        SunOS)
                $mountprog -F lofs -r /dev \$sandbox/dev
@@ -455,7 +457,11 @@ xumount)
                umount \$sandbox/\$mntpoint
        done
        case \$opsys in
-       Darwin|DragonFly|FreeBSD|Linux)
+       Linux)
+               umount \$sandbox/dev/shm
+               umount \$sandbox/dev
+               ;;
+       Darwin|DragonFly|FreeBSD)
                umount \$sandbox/dev
                ;;
        SunOS)