 @@ -1,16 +1,16 @@
 #! /bin/sh
-# $NetBSD: bootstrap,v 1.262 2019/04/10 08:24:03 adam Exp $
+# $NetBSD: bootstrap,v 1.263 2019/05/01 18:29:20 rillig Exp $
+#
 # Copyright (c) 2001-2011 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.
+#
 @@ -334,37 +334,66 @@ copy_src()
 	if [ -f $wrkdir/$_dst/config.guess ]; then
 		$cpprog $pkgsrcdir/mk/gnu-config/config.guess $wrkdir/$_dst/
 	fi
 	if [ -f $wrkdir/$_dst/config.sub ]; then
 		$cpprog $pkgsrcdir/mk/gnu-config/config.sub $wrkdir/$_dst/
 	fi
+}
 get_optarg()
+{
 	expr "x$1" : "x[^=]*=\\(.*\\)"
+}
-checkarg_sane_absolute_path() {
+checkarg_sane_absolute_path()
+{
 	case "$1" in
 	"")	;; # the default value will be used.
 	*[!-A-Za-z0-9_./]*)
 		die "ERROR: Invalid characters in path $1 (from $2)." ;;
 	*/)	die "ERROR: The argument to $2 must not end in /." ;;
-	/*)	;;
+	*//* | */. | */./* | */.. | */../*)
 		die "ERROR: The path $1 (from $2) must be canonical." ;;
 	/*)	checkarg_no_symlink_path "$1" "$2" ;;
 	*)	die "ERROR: The argument to $2 must be an absolute path." ;;
 	esac
+}
 checkarg_no_symlink_path()
+{
 	_dir=$1
 	while [ ! -d "$_dir" ]; do
 		_dir=${_dir%/*}
 	done
 	_realdir=`cd "$_dir" && exec pwd`
 	[ "$_realdir" = "$_dir" ] && return
 	die "ERROR: The path $1 (from $2) must not contain symlinks.
 	Given path   : $1
 	Resolved path: $_realdir${1##${_dir}}
 	Several packages assume that the given path of $2 stays the same when
 	symlinks are resolved. When that assumption fails, they will:
 	* not find some include files or libraries during the build phase
 	  since the files from dependencies are not installed in
 	  \${WRKDIR}/.buildlink.
 	* install their files into the wrong path inside \${WRKDIR}/.destdir,
 	  which will fail the PLIST check during the install phase."
+}
 checkarg_sane_relative_path() {
 	case "$1" in
 	"")	;; # the default value will be used.
 	*[!-A-Za-z0-9_./]*)
 		die "ERROR: Invalid characters in path $1 (from $2)." ;;
 	/*)	die "ERROR: The argument to $2 must be a relative path." ;;
 	*)	;;
 	esac
+}
 bootstrap_sh=${SH-/bin/sh}
 bootstrap_sh_set=${SH+set}
 @@ -459,33 +488,33 @@ while [ $# -gt 0 ]; do
 			binary_macpkg="$2"; shift ;;
 	--make-jobs=*)	make_jobs=`get_optarg "$1"` ;;
 	--make-jobs)	make_jobs="$2"; shift ;;
 	--full)		full=yes ;;
 	--quiet)	quiet=yes ;;
 	--help)		echo "$usage"; exit ;;
 	-h)		echo "$usage"; exit ;;
 	-*)		echo "${0##*/}: unknown option \"$1\"" 1>&2
 			echo "$usage" 1>&2; exit 1 ;;
 	esac
 	shift
 done
 checkarg_sane_absolute_path "$wrkdir" "--workdir"
 checkarg_sane_absolute_path "$prefix" "--prefix"
 checkarg_sane_absolute_path "$pkgdbdir" "--pkgdbdir"
 checkarg_sane_absolute_path "$sysconfdir" "--sysconfdir"
 checkarg_sane_absolute_path "$varbase" "--varbase"
 checkarg_sane_relative_path "$pkginfodir" "--pkginfodir"
 checkarg_sane_relative_path "$pkgmandir" "--pkgmandir"
 checkarg_sane_absolute_path "$wrkdir" "--workdir"
 # set defaults for system locations if not already set by the user
 wrkobjdir=${wrkdir}/pkgsrc
 if [ "$unprivileged" = "yes" ]; then
 	[ -z "$prefix" ] && prefix=${HOME}/pkg
 elif [ -z "$prefix" -o "$prefix" = "/usr/pkg" ]; then
 	prefix=/usr/pkg
 	[ -z "$varbase" ] && varbase=/var
 fi
 [ -z "$varbase" ] && varbase=${prefix}/var
 [ -z "$pkgdbdir" ] && pkgdbdir=${prefix}/pkgdb