 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: postinstall,v 1.165 2014/03/08 16:36:24 martin Exp $
+# $NetBSD: postinstall,v 1.165.2.1 2014/08/10 07:00:04 tls Exp $
+#
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Luke Mewburn.
+#
 # 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
 @@ -48,26 +48,28 @@
 #	  and real failures
 #	- install moduli into usr/share/examples/ssh and use from there?
 #	- differentiate between "needs fix" versus "can't fix" issues
+#
 # This script is executed as part of a cross build.  Allow the build
 # environment to override the locations of some tools.
 : ${AWK:=awk}
 : ${DB:=db}
 : ${GREP:=grep}
 : ${HOST_SH:=sh}
 : ${MAKE:=make}
 : ${PWD_MKDB:=/usr/sbin/pwd_mkdb}
 : ${SED:=sed}
 : ${SORT:=sort}
 : ${STAT:=stat}
+#
 #	helper functions
+#
 err()
+{
 	exitval=$1
 	shift
 	echo 1>&2 "${PROGNAME}: $*"
 	if [ -n "${SCRATCHDIR}" ]; then
 	    /bin/rm -rf "${SCRATCHDIR}"
 @@ -100,42 +102,91 @@ mkdtemp()
 		_serial=$((${_serial} + 1))
 	done
 	echo "${_dir}"
+}
 # Quote args to make them safe in the shell.
 # Usage: quotedlist="$(shell_quote args...)"
+#
 # After building up a quoted list, use it by evaling it inside
 # double quotes, like this:
 #    eval "set -- $quotedlist"
 # or like this:
 #    eval "\$command $quotedlist \$filename"
+#
 shell_quote()
 {(
 	local result=''
-	local arg
+	local arg qarg
 	LC_COLLATE=C ; export LC_COLLATE # so [a-zA-Z0-9] works in ASCII
 	for arg in "$@" ; do
-		# Append a space if necessary
+		case "${arg}" in
-		result="${result}${result:+ }"
+		'')
-		# Convert each embedded ' to '\'',
+			qarg="''"
-		# then insert ' at the beginning of the first line,
+			;;
-		# and append ' at the end of the last line.
+		*[!-./a-zA-Z0-9]*)
-		result="${result}$(printf "%s\n" "$arg" | \
+			# Convert each embedded ' to '\'',
-			sed -e "s/'/'\\\\''/g" -e "1s/^/'/" -e "\$s/\$/'/")"
+			# then insert ' at the beginning of the first line,
 			# and append ' at the end of the last line.
 			# Finally, elide unnecessary '' pairs at the
 			# beginning and end of the result and as part of
 			# '\'''\'' sequences that result from multiple
 			# adjacent quotes in he input.
 			qarg="$(printf "%s\n" "$arg" | \
 			    ${SED:-sed} -e "s/'/'\\\\''/g" \
 				-e "1s/^/'/" -e "\$s/\$/'/" \
 				-e "1s/^''//" -e "\$s/''\$//" \
 				-e "s/'''/'/g"
 				)"
 			;;
 		*)
 			# Arg is not the empty string, and does not contain
 			# any unsafe characters.  Leave it unchanged for
 			# readability.
 			qarg="${arg}"
 			;;
 		esac
 		result="${result}${result:+ }${qarg}"
 	done
 	printf "%s\n" "$result"
 )}
 # Convert arg $1 to a basic regular expression (as in sed)
 # that will match the arg.  This works by inserting backslashes
 # before characters that are special in basic regular expressions.
 # It also inserts backslashes before the extra characters specified
 # in $2 (which defaults to "/,").
 # XXX: Does not handle embedded newlines.
 # Usage: regex="$(bre_quote "${string}")"
 bre_quote()
+{
 	local arg="$1"
 	local extra="${2-/,}"
 	printf "%s\n" "${arg}" | ${SED} -e 's/[][^$.*\\'"${extra}"']/\\&/g'
+}
 # unprefix dir
 #	Remove any dir prefix from a list of paths on stdin,
 #	and write the result to stdout.  Useful for converting
 #	from ${DEST_DIR}/path to /path.
+#
 unprefix()
+{
 	[ $# -eq 1 ] || err 3 "USAGE: unprefix dir"
 	local prefix="${1%/}"
 	prefix="$(bre_quote "${prefix}")"
 	${SED} -e "s,^${prefix}/,/,"
+}
 # additem item description
 #	Add item to list of supported items to check/fix,
 #	which are checked/fixed by default if no item is requested by user.
+#
 additem()
+{
 	[ $# -eq 2 ] || err 3 "USAGE: additem item description"
 	defaultitems="${defaultitems}${defaultitems:+ }$1"
 	eval desc_$1=\"$2\"
+}
 # adddisableditem item description
 @@ -438,28 +489,28 @@ file_exists_exact()
 	while [ "${_path}" != "/" ] ; do
 		_dirname="$(dirname "${_path}" 2>/dev/null)"
 		_basename="$(basename "${_path}" 2>/dev/null)"
 		ls -fa "${DEST_DIR}${_dirname}" 2> /dev/null \
 			| ${GREP} -F -x "${_basename}" >/dev/null \
 			|| return 1
 		_path="${_dirname}"
 	done
 	return 0
+}
 # obsolete_paths op
 #	Obsolete the list of paths provided on stdin.
-#	Each path is relative to ${DEST_DIR}, and should
+#	Each path should start with '/' or './', and
-#	be an absolute path or start with `./'.
+#	will be interpreted relative to ${DEST_DIR}.
+#
 obsolete_paths()
+{
 	[ -n "$1" ] || err 3 "USAGE: obsolete_paths  fix|check"
 	op="$1"
 	failed=0
 	while read ofile; do
                 if ! file_exists_exact "${ofile}"; then
                     continue
                 fi
 		ofile="${DEST_DIR}${ofile#.}"
 		cmd="rm"
 @@ -551,26 +602,57 @@ function checklib(results, line, regex)
 		checklib(found, $0, "^lib.*\\.so\\.[0-9]+\\.")
+}
 /^lib.*\.so\.[0-9]+$/ {
 	if (AllLibs)
 		checklib(major, $0, "^lib.*\\.so\\.")
+}
 #}'
+	)
+}
 # obsolete_stand dir
 #	Prints the names of all obsolete files and subdirs below the
 #	provided dir.  dir should be something like /stand/${MACHINE}.
 #	The input dir and all output paths are interpreted
 #	relative to ${DEST_DIR}.
+#
 #	Assumes that the numerically largest subdir is current, and all
 #	others are obsolete.
+#
 obsolete_stand()
+{
 	[ $# -eq 1 ] || err 3 "USAGE: obsolete_stand dir"
 	local dir="$1"
 	local subdir
 	if ! [ -d "${DEST_DIR}/${dir}" ]; then
 		msg "${DEST_DIR}${dir} doesn't exist; can't check for obsolete files"
 		return 1
 	fi
 	( cd "${DEST_DIR}${dir}" && ls -1d [0-9]*[0-9]/. ) \
 	| ${GREP} -v '[^0-9./]' \
 	| sort -t. -r -k1n -k2n -k3n \
 	| tail -n +2 \
 	| while read subdir ; do
 		subdir="${subdir%/.}"
 		find "${DEST_DIR}/${dir#/}/${subdir}" -depth -print
 	done \
 	| unprefix "${DEST_DIR}"
+}
 # modify_file op srcfile scratchfile awkprog
 #	Apply awkprog to srcfile sending output to scratchfile, and
 #	if appropriate replace srcfile with scratchfile.
+#
 modify_file()
+{
 	[ $# -eq 4 ] || err 3 "USAGE: modify_file op file scratch awkprog"
 	_mfop="$1"
 	_mffile="$2"
 	_mfscratch="$3"
 	_mfprog="$4"
 	_mffailed=0
 @@ -708,29 +790,29 @@ do_ddbonpanic()
 	[ -n "$1" ] || err 3 "USAGE: do_ddbonpanic  fix|check"
 	if ${GREP} -E '^#*[[:space:]]*ddb\.onpanic[[:space:]]*\??=[[:space:]]*[[:digit:]]+' \
 		"${DEST_DIR}/etc/sysctl.conf" >/dev/null 2>&1
 	then
 		result=0
 	else
 		if [ "$1" = check ]; then
 			msg \
     "The ddb.onpanic behaviour is not explicitly specified in /etc/sysctl.conf"
 			result=1
 		else
 			echo >> "${DEST_DIR}/etc/sysctl.conf"
-			sed < "${SRC_DIR}/etc/sysctl.conf" \
+			${SED} < "${SRC_DIR}/etc/sysctl.conf" \
 			   -e '/^ddb\.onpanic/q' | \
-			       sed -e '1,/^$/d' >> \
+			       ${SED} -e '1,/^$/d' >> \
 			    "${DEST_DIR}/etc/sysctl.conf"
 			result=$?
 		fi
 	fi
 	return ${result}
+}
+#
 #	defaults
+#
 additem defaults "/etc/defaults/ being up to date"
 do_defaults()
+{
 @@ -1026,39 +1108,39 @@ do_makedev()
+#
 additem motd "contents of motd"
 do_motd()
+{
 	[ -n "$1" ] || err 3 "USAGE: do_motd  fix|check"
 	if ${GREP} -i 'http://www.NetBSD.org/Misc/send-pr.html' \
 		"${DEST_DIR}/etc/motd" >/dev/null 2>&1 \
 	    || ${GREP} -i 'http://www.NetBSD.org/support/send-pr.html' \
 		"${DEST_DIR}/etc/motd" >/dev/null 2>&1
 	then
 		tmp1="$(mktemp /tmp/postinstall.motd.XXXXXXXX)"
 		tmp2="$(mktemp /tmp/postinstall.motd.XXXXXXXX)"
-		sed '1,2d' <"${SRC_DIR}/etc/motd" >"${tmp1}"
+		${SED} '1,2d' <"${SRC_DIR}/etc/motd" >"${tmp1}"
-		sed '1,2d' <"${DEST_DIR}/etc/motd" >"${tmp2}"
+		${SED} '1,2d' <"${DEST_DIR}/etc/motd" >"${tmp2}"
 		if [ "$1" = check ]; then
 			cmp -s "${tmp1}" "${tmp2}"
 			result=$?
 			if [ "${result}" -ne 0 ]; then
 				msg \
     "Bug reporting messages do not seem to match the installed release"
 			fi
 		else
 			head -n 2 "${DEST_DIR}/etc/motd" >"${tmp1}"
-			sed '1,2d' <"${SRC_DIR}/etc/motd" >>"${tmp1}"
+			${SED} '1,2d' <"${SRC_DIR}/etc/motd" >>"${tmp1}"
 			cp "${tmp1}" "${DEST_DIR}/etc/motd"
 			result=0
 		fi
 		rm -f "${tmp1}" "${tmp2}"
 	else
 		result=0
 	fi
 	return ${result}
+}
+#
 @@ -1248,27 +1330,27 @@ do_rc()
 		rtsold rwho \
 		savecore screenblank securelevel sshd \
 		staticroute swap1 swap2 sysctl sysdb syslogd \
 		timed tpctl ttys \
 		veriexec virecover wdogctl wpa_supplicant wscons wsmoused \
 		ypbind yppasswdd ypserv \
 		${extra_scripts}
 	failed=$(( ${failed} + $? ))
 	if $SOURCEMODE && [ -n "${generated_scripts}" ]; then
 		# generate scripts
 		mkdir "${SCRATCHDIR}/rc"
 		for f in ${generated_scripts}; do
-			sed -e "s,@X11ROOTDIR@,${X11ROOTDIR},g" \
+			${SED} -e "s,@X11ROOTDIR@,${X11ROOTDIR},g" \
 			    < "${SRC_DIR}/etc/rc.d/${f}.in" \
 			    > "${SCRATCHDIR}/rc/${f}"
 		done
 		compare_dir "${op}" "${SCRATCHDIR}/rc" \
 		    "${DEST_DIR}/etc/rc.d" 555 \
 		    ${generated_scripts}
 		failed=$(( ${failed} + $? ))
 	fi
 		# check for obsolete rc.d files
 	for f in NETWORK btattach btconfig btcontrol btdevctl bthcid btuartd \
 	    fsck.sh kerberos nfsiod sdpd servers \
 	    systemfs daemon gated login poffd portmap sunndd xntpd; do
 @@ -1307,31 +1389,33 @@ do_sendmail()
 	[ -n "$1" ] || err 3 "USAGE: do_sendmail  fix|check"
 	op="$1"
 	failed=0
 	# Don't complain if the "sendmail" package is installed because the
 	# files might still be in use.
 	if /usr/sbin/pkg_info -qe sendmail >/dev/null 2>&1; then
 		return 0
 	fi
 	for f in /etc/mail/helpfile /etc/mail/local-host-names \
 	    /etc/mail/sendmail.cf /etc/mail/submit.cf /etc/rc.d/sendmail \
 	    /etc/rc.d/smmsp /usr/share/misc/sendmail.hf \
-	    $(find "${DEST_DIR}/usr/share/sendmail" -type f) \
+	    $( ( find "${DEST_DIR}/usr/share/sendmail" -type f ; \
-	    $(find "${DEST_DIR}/usr/share/sendmail" -type d) \
+	         find "${DEST_DIR}/usr/share/sendmail" -type d \
-	    "${DEST_DIR}/var/log/sendmail.st" \
+	       ) | unprefix "${DEST_DIR}" ) \
-	    "${DEST_DIR}/var/spool/clientmqueue" \
+	    /var/log/sendmail.st \
-	    "${DEST_DIR}/var/spool/mqueue"; do
+	    /var/spool/clientmqueue \
 	    /var/spool/mqueue
 	do
 		[ -e "${DEST_DIR}${f}" ] && echo "${f}"
 	done | obsolete_paths "${op}"
 	failed=$(( ${failed} + $? ))
 	return ${failed}
+}
+#
 #	mailerconf
+#
 adddisableditem mailerconf "update /etc/mailer.conf after sendmail removal"
 do_mailerconf()
+{
 @@ -1560,27 +1644,27 @@ ${pcpath} was a directory, should be a f
 	_notfixed=""
 	if [ "${op}" = "fix" ]; then
 		_notfixed="${NOT_FIXED}"
 	fi
 	if [ ! -d "${DEST_DIR}${pcpath}" ]; then
 		return 0
 	fi
 	# Delete obsolete files in the directory, and the directory
 	# itself.  If the directory contains unexpected extra files
 	# then it will not be deleted.
 	( [ -f "${DEST_DIR}"/var/db/obsolete/xbase ] \
-	    &&  sort -ru "${DEST_DIR}"/var/db/obsolete/xbase \
+	    &&  ${SORT} -ru "${DEST_DIR}"/var/db/obsolete/xbase \
 	    | ${GREP} -E "^\\.?${pcpath}/" ;
 	    echo "${pcpath}" ) \
 	| obsolete_paths "${op}"
 	failed=$(( ${failed} + $? ))
 	# If the directory was removed above, then try to replace it with
 	# a file.
 	if [ -d "${DEST_DIR}${pcpath}" ]; then
 		msg "${filemsg}${_notfixed}"
 		failed=$(( ${failed} + 1 ))
 	else
 		if ! find_file_in_dirlist pc "${pcpath}" \
 			"${pcsrcdir}" "${SRC_DIR}${pcpath%/*}"
 @@ -1687,27 +1771,27 @@ do_atf()
 	return ${failed}
+}
 handle_atf_user()
+{
 	local op="$1"
 	local failed=0
 	local conf="${DEST_DIR}/etc/atf/common.conf"
 	if grep '[^#]*unprivileged-user[ \t]*=.*_atf' "${conf}" >/dev/null
 	then
 		if [ "$1" = "fix" ]; then
-			sed -e \
+			${SED} -e \
 			    "/[^#]*unprivileged-user[\ t]*=/s/_atf/_tests/" \
 			    "${conf}" >"${conf}.new"
 			failed=$(( ${failed} + $? ))
 			mv "${conf}.new" "${conf}"
 			failed=$(( ${failed} + $? ))
 			msg "Set unprivileged-user=_tests in ${conf}"
 		else
 			msg "unprivileged-user=_atf in ${conf} should be" \
 			    "unprivileged-user=_tests"
 			failed=1
 		fi
 	fi
 @@ -1780,26 +1864,31 @@ do_catpages()
 additem ptyfsoldnodes "remove legacy device nodes when using ptyfs"
 do_ptyfsoldnodes()
+{
 	[ -n "$1" ] || err 3 "USAGE: do_ptyfsoldnodes  fix|check"
 	_ptyfs_op="$1"
 	# Check whether ptyfs is in use
 	failed=0;
 	if ! ${GREP} -E "^ptyfs" "${DEST_DIR}/etc/fstab" > /dev/null; then
 		msg "ptyfs is not in use"
 		return 0
 	fi
 	if [ ! -e "${DEST_DIR}/dev/pts" ]; then
 		msg "ptyfs is not properly configured: missing /dev/pts"
 		return 1
 	fi
 	# Find the device major numbers for the pty master and slave
 	# devices, by parsing the output from "MAKEDEV -s pty0".
+	#
 	# Output from MAKEDEV looks like this:
 	# ./ttyp0 type=char device=netbsd,5,0 mode=666 gid=0 uid=0
 	# ./ptyp0 type=char device=netbsd,6,0 mode=666 gid=0 uid=0
+	#
 	# Output from awk, used in the eval statement, looks like this:
 	# maj_ptym=6; maj_ptys=5;
+	#
 	eval "$(
 	    ${HOST_SH} "${DEST_DIR}/dev/MAKEDEV" -s pty0 2>/dev/null \
 	    | ${AWK} '\
 @@ -1878,39 +1967,54 @@ do_varshm()
 			failed=1
 			msg "No /var/shm mount found in ${DEST_DIR}/etc/fstab"
 		elif [ "${op}" = "fix" ]; then
 			printf '\ntmpfs\t/var/shm\ttmpfs\trw,-m1777,-sram%%25\n' \
 				>> "${DEST_DIR}/etc/fstab"
 			msg "Added tmpfs with 25% ram limit as /var/shm"
 		fi
 	fi
 	return ${failed}
+}
+#
 #	obsolete_stand
+#
 adddisableditem obsolete_stand "remove obsolete files from /stand"
 do_obsolete_stand()
+{
 	[ -n "$1" ] || err 3 "USAGE: do_obsolete_stnd  fix|check"
 	op="$1"
 	failed=0
 	obsolete_stand "/stand/${MACHINE}" | obsolete_paths "${op}"
 	failed=$(( ${failed} + $? ))
 	return ${failed}
+}
+#
 #	obsolete
 #	(this item is last to allow other items to move obsolete files)
+#
 additem obsolete "remove obsolete file sets and minor libraries"
 do_obsolete()
+{
 	[ -n "$1" ] || err 3 "USAGE: do_obsolete  fix|check"
 	op="$1"
 	failed=0
-	sort -ru "${DEST_DIR}"/var/db/obsolete/* | obsolete_paths "${op}"
+	${SORT} -ru "${DEST_DIR}"/var/db/obsolete/* | obsolete_paths "${op}"
 	failed=$(( ${failed} + $? ))
+	(
 		obsolete_libs /lib
 		obsolete_libs /usr/lib
 		obsolete_libs /usr/lib/i18n
 		obsolete_libs /usr/X11R6/lib
 		obsolete_libs /usr/X11R7/lib
 		[ "$MACHINE" = "amd64" ] && obsolete_libs /usr/lib/i386
 		[ "$MACHINE" = "sparc64" ] && obsolete_libs /usr/lib/sparc
 	) | obsolete_paths "${op}"
 	failed=$(( ${failed} + $? ))