 @@ -1,43 +1,44 @@
 #! /bin/sh
-# $NetBSD: mksandbox,v 1.18 2021/01/22 11:59:52 jperkin Exp $
+# $NetBSD: mksandbox,v 1.19 2023/12/05 20:45:27 agc Exp $
 # Copyright (c) 2002,2012 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 # IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.
+#
-# Usage: mksandbox [--mounthost=host] [--rodirs=dir1,...] [--rwdirs=dir1,...]
+# Usage: mksandbox [--mounthost=host] [--pkgsrc=dir]
-#		   [--pkgsrc=dir] [--src=srcdir] [--xsrc=xsrcdir]
+#		   [--rodirs=dir1,...] [--rwdirs=dir1,...]
 #		   [--src=srcdir] [--xsrc=xsrcdir]
 #		   [--without-src] [--without-pkgsrc] [--without-xsrc]
 #		   [--without-x] [--verbose] sandbox-dir
+#
 # A small shell script to set up a sandbox (usually for a pkgsrc bulk
 # build), using null mounts.
 pkgsrc=/usr/pkgsrc
 src=/usr/src
 xsrc=/usr/xsrc
 rodirs=
 rwdirs=
 with_pkgsrc=yes
 with_x=yes
 @@ -408,90 +409,110 @@ if [ -n "$rodirs" ]; then
 		echo "$mounthost$dir $dir ro \\" >> $sandbox_script
 	done
 fi
 if [ -n "$rwdirs" ]; then
 	for dir in `echo $rwdirs | $sedprog -e 's/,/ /g'`; do
 		echo "Mount $dir from $sandbox"
 		$mkdirprog $sandbox$dir
 		$mountprog $mountflags $mounthost$dir $sandbox$dir
 		echo "$mounthost$dir $dir rw \\" >> $sandbox_script
 	done
 fi
 date > $sandbox/.sandbox_mounted
 cat >> $sandbox_script <<EOS
+"
 case x\$1 in
 xmount)
 	if [ -s \$sandbox/.sandbox_mounted ]; then
 		echo \$sandbox already mounted && exit 1
 	fi
 	set dummy \$fses
 	shift
 	while [ \$# -ge 3 ]; do
 		fs=\$1; shift
 		mntpoint=\$1; shift
 		rwro=\$1; shift
 		case \$rwro in
 			ro) $mountprog $mountflags -r \$fs \$sandbox/\$mntpoint || exit 1 ;;
 			rw) $mountprog $mountflags \$fs \$sandbox/\$mntpoint || exit 1 ;;
 		esac
 	done
 	case \$opsys in
 	Darwin|DragonFly|FreeBSD)
 		$mountprog -t devfs devfs \$sandbox/dev
 		;;
 	Linux)
 		$mountprog $mountflags /dev \$sandbox/dev
 		$mountprog -t tmpfs tmpfs \$sandbox/dev/shm
 		;;
 	SunOS)
 		$mountprog -F lofs -r /dev \$sandbox/dev
 		$mountprog -F fd fd \$sandbox/dev/fd
 		;;
 	esac
 	date > \$sandbox/.sandbox_mounted
 	;;
 xumount)
 	if [ ! -s \$sandbox/.sandbox_mounted ]; then
 		echo \$sandbox not mounted && exit 1
 	fi
 	set dummy \`r3 \$fses\`
 	shift
 	while [ \$# -ge 3 ]; do
 		fs=\$1; shift
 		mntpoint=\$1; shift
 		dummy=\$1; shift
 		umount \$sandbox/\$mntpoint
 	done
 	case \$opsys in
 	Linux)
 		umount \$sandbox/dev/shm
 		umount \$sandbox/dev
 		;;
 	Darwin|DragonFly|FreeBSD)
 		umount \$sandbox/dev
 		;;
 	SunOS)
 		umount \$sandbox/dev/fd
 		umount \$sandbox/dev
 		;;
 	esac
 	rm -f \$sandbox/.sandbox_mounted
 	;;
 xchroot)
 	if [ ! -s \$sandbox/.sandbox_mounted ]; then
 		echo \$sandbox not mounted && exit 1
 	fi
 	case x\$2 in
 	x)	rootshell=/bin/ksh ;;
 	*)	rootshell="\$2" ;;
 	esac
 	script="\$sandbox/tmp/script.\$\$"
 	echo "#!/bin/sh" > \$script
 	echo "ENV=/etc/shrc \$rootshell" >> \$script
 	chmod +x \$script
 	ENV=/etc/shrc chroot \$sandbox /tmp/\`basename \$script\`
 	rm -f \$script
 	;;
 xismounted)
 	if [ -s \$sandbox/.sandbox_mounted ]; then
 		echo \$sandbox is mounted && exit 0
 	else
 		echo \$sandbox is not mounted && exit 1
 	fi
 	;;
 *)
 	if [ \$# -eq 0 ]; then
 		set dummy /bin/sh
 		shift
 	fi
 	chroot \$sandbox "\$@"
 	;;
 esac
 EOS
 chmod +x $sandbox_script
 case $opsys in

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.18 2023/08/31 20:14:35 triaxx Exp $
+# $NetBSD: Makefile,v 1.19 2023/12/05 20:45:27 agc Exp $
-PKGNAME=	mksandbox-1.10
+PKGNAME=	mksandbox-1.11
 CATEGORIES=	pkgtools
 MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	https://www.NetBSD.org/docs/pkgsrc/bulk.html#setting-up-a-sandbox
 COMMENT=	Tool for creating sandboxes
 LICENSE=	2-clause-bsd
 NOT_FOR_PLATFORM=	Darwin-*-*
 WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 NO_CHECKSUM=		yes
 USE_LANGUAGES=		# none