Index: head/contrib/openresolv/dnsmasq.in
===================================================================
--- head/contrib/openresolv/dnsmasq.in	(revision 225523)
+++ head/contrib/openresolv/dnsmasq.in	(revision 225524)
@@ -1,125 +1,127 @@
 #!/bin/sh
 # Copyright (c) 2007-2009 Roy Marples
 # All rights reserved
 
 # dnsmasq subscriber for resolvconf
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "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 COPYRIGHT
 # OWNER OR CONTRIBUTORS 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.
 
 [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
 . "@SYSCONFDIR@/resolvconf.conf" || exit 1
 [ -z "$dnsmasq_conf" -a -z "$dnsmasq_resolv" ] && exit 0
 [ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
+NL="
+"
 
 : ${dnsmasq_pid:=/var/run/dnsmasq.pid}
 [ -s "$dnsmasq_pid" ] || dnsmasq_pid=/var/run/dnsmasq/dnsmasq.pid
 : ${dnsmasq_service:=dnsmasq}
 : ${dnsmasq_restart:=@RESTARTCMD ${dnsmasq_service}@}
-newconf="# Generated by resolvconf\n"
+newconf="# Generated by resolvconf$NL"
 newresolv="$newconf"
 
 # Using dbus means that we never have to restart the daemon
 # This is important as it means we should not drop DNS queries
 # whilst changing DNS options around. However, dbus support is optional
 # so we need to validate a few things first.
 # Check for DBus support in the binary
 dbus=false
 : ${dbus_pid:=/var/run/dbus/dbus.pid}
 [ -s "$dbus_pid" ] || dbus_pid=/var/run/dbus.pid
 [ -s "$dbus_pid" ] || dbus_pid=/var/run/dbus/pid
 if [ -s "$dbus_pid" -a -s "$dnsmasq_pid" ]; then
 	if dnsmasq --version 2>/dev/null | \
 		grep -q "^Compile time options.*[[:space:]]DBus[[:space:]]"
 	then
 		# Sanity - check that dnsmasq and dbus are running
 		if kill -0 $(cat "$dbus_pid") 2>/dev/null && \
 			kill -0 $(cat "$dnsmasq_pid") 2>/dev/null
 		then
 			dbus=true
-			newconf="$newconf\n# Domain specific servers will"
-			newconf="$newconf be sent over dbus\nenable-dbus\n"
+			newconf="$newconf$NL# Domain specific servers will"
+			newconf="$newconf be sent over dbus${NL}enable-dbus$NL"
 		fi
 	fi
 fi
 
 for n in $NAMESERVERS; do
-	newresolv="${newresolv}nameserver $n\n"
+	newresolv="${newresolv}nameserver $n$NL"
 done
 
 dbusdest=
 for d in $DOMAINS; do
 	dn="${d%%:*}"
 	ns="${d#*:}"
 	while [ -n "$ns" ]; do
 		if $dbus; then
 			SIFS=${IFS-y} OIFS=$IFS
 			IFS=.
 			set -- ${ns%%,*}
-			num="0x$(printf "%02x" $1 $2 $3 $4)"
+			num="0x$(printf %02x $1 $2 $3 $4)"
 			if [ "$SIFS" = yi ]; then
 				unset IFS
 			else
 				IFS=$OIFS
 			fi
-			dbusdest="$dbusdest uint32:$(printf "%u" $num)"
+			dbusdest="$dbusdest uint32:$(printf %u $num)"
 			dbusdest="$dbusdest string:$dn"
 		else
-			newconf="${newconf}server=/$dn/${ns%%,*}\n"
+			newconf="${newconf}server=/$dn/${ns%%,*}$NL"
 		fi
 		[ "$ns" = "${ns#*,}" ] && break
 		ns="${ns#*,}"
 	done
 done
 
 changed=false
 if [ -n "$dnsmasq_conf" ]; then
 	if [ ! -f "$dnsmasq_conf" ] || \
-		[ "$(cat "$dnsmasq_conf")" != "$(printf "$newconf")" ]
+		[ "$(cat "$dnsmasq_conf")" != "$(printf %s "$newconf")" ]
 	then
 		changed=true
-		printf "$newconf" >"$dnsmasq_conf"
+		printf %s "$newconf" >"$dnsmasq_conf"
 	fi
 fi
 if [ -n "$dnsmasq_resolv" ]; then
 	if [ -f "$dnsmasq_resolv" ]; then
-		if [ "$(cat "$dnsmasq_resolv")" != "$(printf "$newresolv")" ]
+		if [ "$(cat "$dnsmasq_resolv")" != "$(printf %s "$newresolv")" ]
 		then
 			changed=true
-			printf "$newresolv" >"$dnsmasq_resolv"
+			printf %s "$newresolv" >"$dnsmasq_resolv"
 		fi
 	else
 		# dnsmasq polls this file so no need to set changed=true
-		printf "$newresolv" >"$dnsmasq_resolv"
+		printf %s "$newresolv" >"$dnsmasq_resolv"
 	fi
 fi
 
 if $changed; then
 	eval $dnsmasq_restart
 fi
 if $dbus; then
 	$changed || kill -HUP $(cat "$dnsmasq_pid")
 	# Send even if empty so old servers are cleared
 	dbus-send --system --dest=uk.org.thekelleys.dnsmasq \
  		/uk/org/thekelleys/dnsmasq uk.org.thekelleys.SetServers \
   		$dbusdest
 fi
Index: head/contrib/openresolv/libc.in
===================================================================
--- head/contrib/openresolv/libc.in	(revision 225523)
+++ head/contrib/openresolv/libc.in	(revision 225524)
@@ -1,168 +1,170 @@
 #!/bin/sh
 # Copyright (c) 2007-2009 Roy Marples
 # All rights reserved
 
 # libc subscriber for resolvconf
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "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 COPYRIGHT
 # OWNER OR CONTRIBUTORS 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.
 
 SYSCONFDIR=@SYSCONFDIR@
 LIBEXECDIR=@LIBEXECDIR@
 VARDIR=@VARDIR@
 IFACEDIR="$VARDIR/interfaces"
+NL="
+"
 
 # sed may not be available, and this is faster on small files
 key_get_value()
 {
 	local key="$1" value= x= line=
 
 	shift
 	if [ $# -eq 0 ]; then
 		while read line; do
 			case "$line" in
 			"$key"*) echo "${line##$key}";;
 			esac
 		done
 	else
 		for x; do
 			while read line; do
 				case "$line" in
 				"$key"*) echo "${line##$key}";;
 				esac
 			done < "$x"
 		done
 	fi
 }
 
 # Support original resolvconf configuration layout
 # as well as the openresolv config file
 if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then
 	. "$SYSCONFDIR"/resolvconf.conf
 elif [ -d "$SYSCONFDIR"/resolvconf ]; then
 	SYSCONFDIR="$SYSCONFDIR/resolvconf/resolv.conf.d"
 	base="$SYSCONFDIR/resolv.conf.d/base"
 	if [ -f "$base" ]; then
 		name_servers="$(key_get_value "nameserver " "$base")"
 		search_domains="$(key_get_value "search " "$base")"
 		if [ -z "$search_domains" ]; then
 			search_domains="$(key_get_value "domain " "$base")"
 		fi
 		resolv_conf_options="$(key_get_value "options " "$base")"
 	fi
 	if [ -f "$SYSCONFDIR"/resolv.conf.d/head ]; then
 		resolv_conf_head="$(cat "${SYSCONFDIR}"/resolv.conf.d/head)"
 	fi
 	if [ -f "$SYSCONFDIR"/resolv.conf.d/tail ]; then
 		resolv_conf_tail="$(cat "$SYSCONFDIR"/resolv.conf.d/tail)"
 	fi
 fi
 : ${resolv_conf:=/etc/resolv.conf}
 : ${libc_service:=nscd}
 : ${libc_restart:=@RESTARTCMD ${libc_service}@}
 : ${list_resolv:=@PREFIX@/sbin/resolvconf -l}
 if [ "${resolv_conf_head-x}" = x -a -f "$SYSCONFDIR"/resolv.conf.head ]; then
 	resolv_conf_head="$(cat "${SYSCONFDIR}"/resolv.conf.head)"
 fi
 if [ "${resolv_conf_tail-x}" = x -a -f "$SYSCONFDIR"/resolv.conf.tail ]; then
 	resolv_conf_tail="$(cat "$SYSCONFDIR"/resolv.conf.tail)"
 fi
 
 uniqify()
 {
 	local result=
 	while [ -n "$1" ]; do
 		case " $result " in
 		*" $1 "*);;
 		*) result="$result $1";;
 		esac
 		shift
 	done
 	echo "${result# *}"
 }
 
 case "${resolv_conf_passthrough:-NO}" in
 [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 	newest=
 	for conf in "$IFACEDIR"/*; do
 		if [ -z "$newest" -o "$conf" -nt "$newest" ]; then
 			newest="$conf"
 		fi
 	done
 	[ -z "$newest" ] && exit 0
-	newconf="$(cat "$newest")\n"
+	newconf="$(cat "$newest")$NL"
 	;;
 *)
 	[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
 	newsearch="$(uniqify $search_domains $SEARCH $search_domains_append)"
 	NS="$LOCALNAMESERVERS $NAMESERVERS"
 	newns="$(uniqify $name_servers $NS $name_servers_append)"
 
 	# Hold our new resolv.conf in a variable to save on temporary files
-	newconf="# Generated by resolvconf\n"
+	newconf="# Generated by resolvconf$NL"
 	if [ -n "$resolv_conf_head" ]; then
-		newconf="$newconf$resolv_conf_head\n"
+		newconf="$newconf$resolv_conf_head$NL"
 	fi
-	[ -n "$newsearch" ] && newconf="${newconf}search $newsearch\n"
+	[ -n "$newsearch" ] && newconf="${newconf}search $newsearch$NL"
 	for n in $newns; do
-		newconf="${newconf}nameserver $n\n"
+		newconf="${newconf}nameserver $n$NL"
 	done
 
 	# Now get any configured options
 	opts="$resolv_conf_options${resolv_conf_options:+ }"
 	opts="$opts$($list_resolv | key_get_value "options ")"
 	if [ -n "$opts" ]; then
 		newconf="${newconf}options"
 		for opt in $(uniqify $opts); do
 			newconf="${newconf} $opt"
 		done
-		newconf="$newconf\n"
+		newconf="$newconf$NL"
 	fi
 
 	if [ -n "$resolv_conf_tail" ]; then
-		newconf="$newconf$resolv_conf_tail\n"
+		newconf="$newconf$resolv_conf_tail$NL"
 	fi
 	;;
 esac
 
 # Check if the file has actually changed or not
 if [ -e "$resolv_conf" ]; then
-	[ "$(cat "$resolv_conf")" = "$(printf "$newconf")" ] && exit 0
+	[ "$(cat "$resolv_conf")" = "$(printf %s "$newconf")" ] && exit 0
 fi
 
 # Create our resolv.conf now
-(umask 022; printf "$newconf" >"$resolv_conf")
+(umask 022; echo "$newconf" >"$resolv_conf")
 eval $libc_restart
 
 retval=0
 # Notify users of the resolver
 for script in "$LIBEXECDIR"/libc.d/*; do
 	if [ -f "$script" ]; then
 		if [ -x "$script" ]; then
 			"$script" "$@"
 		else
 			(. "$script" "$@")
 		fi
 		retval=$(($retval + $?))
 	fi
 done
 exit $retval
Index: head/contrib/openresolv/named.in
===================================================================
--- head/contrib/openresolv/named.in	(revision 225523)
+++ head/contrib/openresolv/named.in	(revision 225524)
@@ -1,94 +1,96 @@
 #!/bin/sh
 # Copyright (c) 2007-2009 Roy Marples
 # All rights reserved
 
 # named subscriber for resolvconf
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "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 COPYRIGHT
 # OWNER OR CONTRIBUTORS 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.
 
 [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
 . "@SYSCONFDIR@/resolvconf.conf" || exit 1
 [ -z "$named_zones" -a -z "$named_options" ] && exit 0
 [ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
+NL="
+"
 
 # Platform specific kludges
 if [ -z "$named_service" -a -z "$named_restart" -a \
 	-d "@RCDIR@" -a ! -x "@RCDIR@"/named ]
 then
 	if [ -x "@RCDIR@"/bind9 ]; then
 		# Debian and derivatives
 		named_service=bind9
 	fi
 fi
 : ${named_service:=named}
 : ${named_restart:=@RESTARTCMD ${named_service}@}
-newoptions="# Generated by resolvconf\n"
+newoptions="# Generated by resolvconf$NL"
 newzones="$newoptions"
 
 forward=
 for n in $NAMESERVERS; do
 	case "$forward" in
-	*"\n\t$n;"*);;
-	*) forward="$forward\n\t$n;";;
+	*"$NL	$n;"*);;
+	*) forward="$forward$NL	$n;";;
 	esac
 done
 if [ -n "$forward" ]; then
-	newoptions="${newoptions}forward first;\nforwarders {$forward\n};\n"
+	newoptions="${newoptions}forward first;${NL}forwarders {$forward${NL}};$NL"
 fi
 
 for d in $DOMAINS; do
-	newzones="${newzones}zone \"${d%%:*}\" {\n"
-	newzones="$newzones\ttype forward;\n"
-	newzones="$newzones\tforward first;\n\tforwarders {\n"
+	newzones="${newzones}zone \"${d%%:*}\" {$NL"
+	newzones="$newzones	type forward;$NL"
+	newzones="$newzones	forward first;$NL	forwarders {$NL"
 	ns="${d#*:}"
 	while [ -n "$ns" ]; do
-		newzones="$newzones\t\t${ns%%,*};\n"
+		newzones="$newzones		${ns%%,*};$NL"
 		[ "$ns" = "${ns#*,}" ] && break
 		ns="${ns#*,}"
 	done
-	newzones="$newzones\t};\n};\n"
+	newzones="$newzones	};$NL};$NL"
 done
 
 # No point in changing files or reloading bind if the end result has not
 # changed
 changed=false
 if [ -n "$named_options" ]; then
 	if [ ! -f "$named_options" ] || \
-		[ "$(cat "$named_options")" != "$(printf "$newoptions")" ]
+		[ "$(cat "$named_options")" != "$(printf %s "$newoptions")" ]
 	then
-		printf "$newoptions" >"$named_options"
+		printf %s "$newoptions" >"$named_options"
 		changed=true
 	fi
 fi
 if [ -n "$named_zones" ]; then
 	if [ ! -f "$named_zones" ] || \
-		[ "$(cat "$named_zones")" != "$(printf "$newzones")" ]
+		[ "$(cat "$named_zones")" != "$(printf %s "$newzones")" ]
 	then
-		printf "$newzones" >"$named_zones"
+		printf %s "$newzones" >"$named_zones"
 		changed=true
 	fi
 fi
 
 if $changed; then
 	eval $named_restart
 fi
Index: head/contrib/openresolv/pdnsd.in
===================================================================
--- head/contrib/openresolv/pdnsd.in	(revision 225523)
+++ head/contrib/openresolv/pdnsd.in	(revision 225524)
@@ -1,153 +1,153 @@
 #!/bin/sh
 # Copyright (c) 2010 Roy Marples
 # All rights reserved
 
 # pdnsd subscriber for resolvconf
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "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 COPYRIGHT
 # OWNER OR CONTRIBUTORS 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.
 
 [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
 . "@SYSCONFDIR@/resolvconf.conf" || exit 1
 [ -z "$pdnsd_conf" -a -z "$pdnsd_resolv" ] && exit 0
 [ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
 
 : ${pdnsd_restart:=pdnsd-ctl config $pdnsd_conf}
 signature="# Generated by resolvconf"
 signature_end="# End of resolvconf"
 
 # We normally use sed to remove markers from a configuration file
 # but sed may not always be available at the time.
 remove_markers()
 {
 	local m1="$1" m2="$2" x= line= in_marker=0
 
 	shift; shift
 	if type sed >/dev/null 2>&1; then
 		sed "/^$m1/,/^$m2/d" $@
 	else
 		for x; do
 			while read line; do
 				case "$line" in
 				"$m1"*) in_marker=1;;
 				"$m2"*) in_marker=0;;
 				*) [ $in_marker = 0 ] && echo "$line";;
 				esac
 			done < "$x"
 		done
 	fi
 }
 
 # Compare two files
 # If different, replace first with second otherwise remove second
 change_file()
 {
 	if [ -e "$1" ]; then
 		if type cmp >/dev/null 2>&1; then
 			cmp -s "$1" "$2"
 		elif type diff >/dev/null 2>&1; then
 			diff -q "$1" "$2" >/dev/null
 		else
 			# Hopefully we're only working on small text files ...
 			[ "$(cat "$1")" = "$(cat "$2")" ]
 		fi
 		if [ $? -eq 0 ]; then
 			rm -f "$2"
 			return 1
 		fi
 	fi
 	cat "$2" > "$1"
 	rm -f "$2"
 	return 0
 }
 
 newresolv="# Generated by resolvconf\n"
 changed=false
 
 if [ -n "$pdnsd_resolv" ]; then
 	for n in $NAMESERVERS; do
 		newresolv="${newresolv}nameserver $n\n"
 	done
 fi
 
 if [ -n "$pdnsd_conf" ]; then
 	cf="$pdnsd_conf.new"
 	newconf=
 
 	if [ -z "$pdnsd_resolv" ]; then
 		newconf="${newconf}server {\n"
 		newconf="${newconf}\tlabel=resolvconf;\n"
 		if [ -n "$NAMESERVERS" ]; then
 			newconf="${newconf}\tip="
 			first=true
 			for n in $NAMESERVERS; do
 				if $first; then
 					first=false
 				else
 					newconf="${newconf},"
 				fi
 				newconf="$newconf$n"
 			done
 			newconf="${newconf};\n"
 		fi
 		newconf="${newconf}}\n"
 	fi
 
 	for d in $DOMAINS; do
 		newconf="${newconf}server {\n"
 		newconf="${newconf}\tinclude=.${d%%:*}.;\n"
 		newconf="${newconf}\tpolicy=excluded;\n"
 		newconf="${newconf}\tip="
 		ns="${d#*:}"
 		while [ -n "$ns" ]; do
 			newconf="${newconf}${ns%%,*}"
 			[ "$ns" = "${ns#*,}" ] && break
 			ns="${ns#*,}"
 			newconf="${newconf},"
 		done
 		newconf="${newconf};\n}\n"
 	done
 
 	rm -f "$cf"
 	remove_markers "$signature" "$signature_end" "$pdnsd_conf" > "$cf"
 	if [ -n "$newconf" ]; then
 		echo "$signature" >> "$cf"
-		printf "$newconf" >> "$cf"
+		printf %s "$newconf" >> "$cf"
 		echo "$signature_end" >> "$cf"
 	fi
 	if change_file "$pdnsd_conf" "$cf"; then
 		changed=true
 	fi	
 fi
 
 if [ -n "$pdnsd_resolv" ]; then
 	if [ ! -f "$pdnsd_resolv" ] || \
-		[ "$(cat "$pdnsd_resolv")" != "$(printf "$newresolv")" ]
+		[ "$(cat "$pdnsd_resolv")" != "$(printf %s "$newresolv")" ]
 	then
 		changed=true
-		printf "$newresolv" >"$pdnsd_resolv"
+		printf %s "$newresolv" >"$pdnsd_resolv"
 	fi
 fi
 
 if $changed; then
 	eval $pdnsd_restart
 fi
Index: head/contrib/openresolv/resolvconf.in
===================================================================
--- head/contrib/openresolv/resolvconf.in	(revision 225523)
+++ head/contrib/openresolv/resolvconf.in	(revision 225524)
@@ -1,421 +1,421 @@
 #!/bin/sh
 # Copyright (c) 2007-2009 Roy Marples
 # All rights reserved
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "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 COPYRIGHT
 # OWNER OR CONTRIBUTORS 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.
 
 RESOLVCONF="$0"
 SYSCONFDIR=@SYSCONFDIR@
 LIBEXECDIR=@LIBEXECDIR@
 VARDIR=@VARDIR@
 # Support original resolvconf configuration layout
 # as well as the openresolv config file
 if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then
 	. "$SYSCONFDIR"/resolvconf.conf
 	[ -n "$state_dir" ] && VARDIR="$state_dir"
 elif [ -d "$SYSCONFDIR/resolvconf" ]; then
 	SYSCONFDIR="$SYSCONFDIR/resolvconf"
 	if [ -f "$SYSCONFDIR"/interface-order ]; then
 		interface_order="$(cat "$SYSCONFDIR"/interface-order)"
 	fi
 fi
 IFACEDIR="$VARDIR/interfaces"
 METRICDIR="$VARDIR/metrics"
 PRIVATEDIR="$VARDIR/private"
 
 : ${dynamic_order:=tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*}
 : ${interface_order:=lo lo[0-9]*}
 
 error_exit()
 {
 	echo "$*" >&2
 	exit 1
 }
 
 usage()
 {
 	cat <<-EOF
 	Usage: ${RESOLVCONF##*/} [options]
 
 	Inform the system about any DNS updates.
 
 	Options:
 	  -a \$INTERFACE    Add DNS information to the specified interface
 	                   (DNS supplied via stdin in resolv.conf format)
 	  -m metric        Give the added DNS information a metric
 	  -p               Mark the interface as private
 	  -d \$INTERFACE    Delete DNS information from the specified interface
 	  -f               Ignore non existant interfaces
 	  -I               Init the state dir
 	  -u               Run updates from our current DNS information
 	  -l [\$PATTERN]    Show DNS information, optionally from interfaces
 	                   that match the specified pattern
 	  -i [\$PATTERN]    Show interfaces that have supplied DNS information
                    optionally from interfaces that match the specified
                    pattern
 	  -v [\$PATTERN]    echo NEWDOMAIN, NEWSEARCH and NEWNS variables to
 	  		   the console
 	  -h               Show this help cruft
 	EOF
 	[ -z "$1" ] && exit 0
 	echo
 	error_exit "$*"
 }
 
 echo_resolv()
 {
 	local line=
 	[ -n "$1" -a -e "$IFACEDIR/$1" ] || return 1
 	echo "# resolv.conf from $1"
 	# Our variable maker works of the fact each resolv.conf per interface
 	# is separated by blank lines.
 	# So we remove them when echoing them.
 	while read line; do
 		[ -n "$line" ] && echo "$line"
 	done < "$IFACEDIR/$1"
 	echo
 }
 
 # Parse resolv.conf's and make variables
 # for domain name servers, search name servers and global nameservers
 parse_resolv()
 {
 	local line= ns= ds= search= d= n= newns=
 	local new=true iface= private=false p=
 
 	echo "DOMAINS="
 	echo "SEARCH=\"$search_domains\""
 	# let our subscribers know about global nameservers
 	for n in $name_servers; do
 		case "$n" in
 		127.*|0.0.0.0|255.255.255.255|::1) :;;
 		*) newns="$newns${newns:+ }$n";;
 		esac
 	done
 	echo "NAMESERVERS=\"$newns\""
 	echo "LOCALNAMESERVERS="
 	newns=
 
 	while read line; do
 		case "$line" in
 		"# resolv.conf from "*)
 			if ${new}; then
 				iface="${line#\# resolv.conf from *}"
 				new=false
 				if [ -e "$PRIVATEDIR/$iface" ]; then
 					private=true
 				else
 					# Allow expansion
 					cd "$IFACEDIR"
 					private=false
 					for p in $private_interfaces; do
 						if [ "$p" = "$iface" ]; then
 							private=true
 							break
 						fi
 					done
 				fi
 			fi
 			;;
 		"nameserver "*)
 			case "${line#* }" in
 			127.*|0.0.0.0|255.255.255.255|::1)
 				echo "LOCALNAMESERVERS=\"\$LOCALNAMESERVERS ${line#* }\""
 				continue
 				;;
 			esac
 			ns="$ns${line#* } "
 			;;
 		"domain "*|"search "*)
 			search="${line#* }"
 			;;
 		*)
 			[ -n "$line" ] && continue
 			if [ -n "$ns" -a -n "$search" ]; then
 				newns=
 				for n in $ns; do
 					newns="$newns${newns:+,}$n"
 				done
 				ds=
 				for d in $search; do
 					ds="$ds${ds:+ }$d:$newns"
 				done
 				echo "DOMAINS=\"\$DOMAINS $ds\""
 			fi
 			echo "SEARCH=\"\$SEARCH $search\""
 			if ! $private; then
 				echo "NAMESERVERS=\"\$NAMESERVERS $ns\""
 			fi
 			ns=
 			search=
 			new=true
 			;;
 		esac
 	done
 }
 
 uniqify()
 {
 	local result=
 	while [ -n "$1" ]; do
 		case " $result " in
 		*" $1 "*);;
 		*) result="$result $1";;
 		esac
 		shift
 	done
 	echo "${result# *}"
 }
 
 list_resolv()
 {
 	[ -d "$IFACEDIR" ] || return 0
 
 	local report=false list= retval=0 cmd="$1"
 	shift
 
 	# If we have an interface ordering list, then use that.
 	# It works by just using pathname expansion in the interface directory.
 	if [ -n "$1" ]; then
 		list="$@"
 		$force || report=true
 	else
 		cd "$IFACEDIR"
 		for i in $interface_order; do
 			[ -e "$i" ] && list="$list $i"
 		done
 		for i in $dynamic_order; do
 			if [ -e "$i" -a ! -e "$METRICDIR/"*" $i" ]; then
 				list="$list $i"
 			fi
 		done
 		if [ -d "$METRICDIR" ]; then
 			cd "$METRICDIR"
 			for i in *; do
 				list="$list ${i#* }"
 			done
 		fi
 		list="$list *"
 	fi
 
 	cd "$IFACEDIR"
 	for i in $(uniqify $list); do
 		# Only list interfaces which we really have
 		if ! [ -e "$i" ]; then
 			if $report; then
 				echo "No resolv.conf for interface $i" >&2
 				retval=$(($retval + 1))
 			fi
 			continue
 		fi
 		
 		if [ "$cmd" = i -o "$cmd" = "-i" ]; then
 			printf "$i "
 		else
 			echo_resolv "$i"
 		fi
 	done
 	[ "$cmd" = i -o "$cmd" = "-i" ] && echo
 	return $retval
 }
 
 make_vars()
 {
 	eval "$(list_resolv -l "$@" | parse_resolv)"
 
 	# Ensure that we only list each domain once
 	newdomains=
 	for d in $DOMAINS; do
 		dn="${d%%:*}"
 		case " $newdomains" in
 		*" ${dn}:"*) continue;;
 		esac
 		newdomains="$newdomains${newdomains:+ }$dn:"
 		newns=
 		for nd in $DOMAINS; do
 			if [ "$dn" = "${nd%%:*}" ]; then
 				ns="${nd#*:}"
 				while [ -n "$ns" ]; do
 					case ",$newns," in
 					*,${ns%%,*},*) ;;
 					*) newns="$newns${newns:+,}${ns%%,*}";;
 					esac
 					[ "$ns" = "${ns#*,}" ] && break
 					ns="${ns#*,}"
 				done
 			fi
 		done
 		newdomains="$newdomains$newns"
 	done
 	echo "DOMAINS='$newdomains'"
 	echo "SEARCH='$(uniqify $SEARCH)'"
 	echo "NAMESERVERS='$(uniqify $NAMESERVERS)'"
 	echo "LOCALNAMESERVERS='$(uniqify $LOCALNAMESERVERS)'"
 }
 
 force=false
 while getopts a:d:fhIilm:puv OPT; do
 	case "$OPT" in
 	f) force=true;;
 	h) usage;;
 	m) IF_METRIC="$OPTARG";;
 	p) IF_PRIVATE=1;;
 	'?') ;;
 	*) cmd="$OPT"; iface="$OPTARG";;
 	esac
 done
 shift $(($OPTIND - 1))
 args="$iface${iface:+ }$@"
 
 # -I inits the state dir
 if [ "$cmd" = I ]; then
 	if [ -d "$VARDIR" ]; then
 		rm -rf "$VARDIR"/*
 	fi
 	exit $?
 fi
 
 # -l lists our resolv files, optionally for a specific interface
 if [ "$cmd" = l -o "$cmd" = i ]; then
 	list_resolv "$cmd" "$args"
 	exit $?
 fi
 
 # Not normally needed, but subscribers should be able to run independently
 if [ "$cmd" = v ]; then
 	make_vars "$iface"
 	exit $?
 fi
 
 # Test that we have valid options
 if [ "$cmd" = a -o "$cmd" = d ]; then
 	if [ -z "$iface" ]; then
 		usage "Interface not specified"
 	fi
 elif [ "$cmd" != u ]; then
 	[ -n "$cmd" -a "$cmd" != h ] && usage "Unknown option $cmd"
 	usage
 fi
 if [ "$cmd" = a ]; then
 	for x in '/' \\ ' ' '*'; do
 		case "$iface" in
 		*[$x]*) error_exit "$x not allowed in interface name";;
 		esac
 	done
 	for x in '.' '-' '~'; do
 		case "$iface" in
 		[$x]*) error_exit \
 			"$x not allowed at start of interface name";;
 		esac
 	done
 	[ "$cmd" = a -a -t 0 ] && error_exit "No file given via stdin"
 fi
 
 if [ ! -d "$IFACEDIR" ]; then
 	if [ ! -d "$VARDIR" ]; then
 		if [ -L "$VARDIR" ]; then
 			dir="$(readlink "$VARDIR")"
 			# link maybe relative
 			cd "${VARDIR%/*}"
 			if ! mkdir -m 0755 -p "$dir"; then
 				error_exit "Failed to create needed" \
 					"directory $dir"
 			fi
 		else
 			if ! mkdir -m 0755 -p "$VARDIR"; then
 				error_exit "Failed to create needed" \
 					"directory $VARDIR"
 			fi
 		fi
 	fi
 	mkdir -m 0755 -p "$IFACEDIR" || \
 		error_exit "Failed to create needed directory $IFACEDIR"
 else
 	# Delete any existing information about the interface
 	if [ "$cmd" = d ]; then
 		cd "$IFACEDIR"
 		for i in $args; do
 			if [ "$cmd" = d -a ! -e "$i" ]; then
 				$force && continue
 				error_exit "No resolv.conf for" \
 					"interface $i"
 			fi
 			rm -f "$i" "$METRICDIR/"*" $i" \
 				"$PRIVATEDIR/$i" || exit $?
 		done
 	fi
 fi
 
 if [ "$cmd" = a ]; then
 	# Read resolv.conf from stdin
-	resolv="$(cat)\n"
+	resolv="$(cat)"
 	# If what we are given matches what we have, then do nothing
 	if [ -e "$IFACEDIR/$iface" ]; then
-		if [ "$(printf "$resolv")" = \
+		if [ "$(echo "$resolv")" = \
 			"$(cat "$IFACEDIR/$iface")" ]
 		then
 			exit 0
 		fi
 		rm "$IFACEDIR/$iface"
 	fi
-	printf "$resolv" >"$IFACEDIR/$iface" || exit $?
+	echo "$resolv" >"$IFACEDIR/$iface" || exit $?
 	[ ! -d "$METRICDIR" ] && mkdir "$METRICDIR"
 	rm -f "$METRICDIR/"*" $iface"
 	if [ -n "$IF_METRIC" ]; then
 		# Pad metric to 6 characters, so 5 is less than 10
 		while [ ${#IF_METRIC} -le 6 ]; do
 			IF_METRIC="0$IF_METRIC"
 		done
 		echo " " >"$METRICDIR/$IF_METRIC $iface"
 	fi
 	case "$IF_PRIVATE" in
 	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 		if [ ! -d "$PRIVATEDIR" ]; then
 			[ -e "$PRIVATEDIR" ] && rm "$PRIVATEDIR"
 			mkdir "$PRIVATEDIR"
 		fi
 		[ -d "$PRIVATEDIR" ] && echo " " >"$PRIVATEDIR/$iface"
 		;;
 	*)
 		if [ -e "$PRIVATEDIR/$iface" ]; then
 			rm -f "$PRIVATEDIR/$iface"
 		fi
 		;;
 	esac
 fi
 
 eval "$(make_vars)"
 export RESOLVCONF DOMAINS SEARCH NAMESERVERS LOCALNAMESERVERS
 : ${list_resolv:=list_resolv -l}
 retval=0
 for script in "$LIBEXECDIR"/*; do
 	if [ -f "$script" ]; then
 		if [ -x "$script" ]; then
 			"$script" "$cmd" "$iface"
 		else
 			(. "$script" "$cmd" "$iface")
 		fi
 		retval=$(($retval + $?))
 	fi
 done
 exit $retval
Index: head/contrib/openresolv/unbound.in
===================================================================
--- head/contrib/openresolv/unbound.in	(revision 225523)
+++ head/contrib/openresolv/unbound.in	(revision 225524)
@@ -1,69 +1,71 @@
 #!/bin/sh
 # Copyright (c) 2009 Roy Marples
 # All rights reserved
 
 # unbound subscriber for resolvconf
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "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 COPYRIGHT
 # OWNER OR CONTRIBUTORS 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.
 
 [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
 . "@SYSCONFDIR@/resolvconf.conf" || exit 1
 [ -z "$unbound_conf" ] && exit 0
 [ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
+NL="
+"
 
 : ${unbound_pid:=/var/run/unbound.pid}
 : ${unbound_service:=unbound}
 : ${unbound_restart:=@RESTARTCMD ${unbound_service}@}
-newconf="# Generated by resolvconf\n"
+newconf="# Generated by resolvconf$NL"
 
 for d in $DOMAINS; do
 	dn="${d%%:*}"
 	ns="${d#*:}"
-	newconf="${newconf}\nforward-zone:\n\tname: \"$dn\"\n"
+	newconf="$newconf${NL}forward-zone:$NL	name: \"$dn\"$NL"
 	while [ -n "$ns" ]; do
-		newconf="${newconf}\tforward-addr: ${ns%%,*}\n"
+		newconf="$newconf	forward-addr: ${ns%%,*}$NL"
 		[ "$ns" = "${ns#*,}" ] && break
 		ns="${ns#*,}"
 	done
 done
 
 if [ -n "$NAMESERVERS" ]; then
-	newconf="${newconf}\nforward-zone:\n\tname: \".\"\n"
+	newconf="$newconf${NL}forward-zone:$NL	name: \".\"$NL"
 	for n in $NAMESERVERS; do
-		newconf="${newconf}\tforward-addr: $n\n"
+		newconf="$newconf	forward-addr: $n$NL"
 	done
 fi
 
 if [ ! -f "$unbound_conf" ] || \
-	[ "$(cat "$unbound_conf")" != "$(printf "$newconf")" ]
+	[ "$(cat "$unbound_conf")" != "$(printf %s "$newconf")" ]
 then
-	printf "$newconf" >"$unbound_conf"
+	printf %s "$newconf" >"$unbound_conf"
 	# If we can't sent a HUP then force a restart
 	if [ -s "$unbound_pid" ]; then
 		if ! kill -HUP $(cat "$unbound_pid") 2>/dev/null; then
 			eval $unbound_restart
 		fi
 	else
 		eval $unbound_restart
 	fi
 fi
Index: head/contrib/openresolv
===================================================================
--- head/contrib/openresolv	(revision 225523)
+++ head/contrib/openresolv	(revision 225524)

Property changes on: head/contrib/openresolv
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,4 ##
   Merged /projects/largeSMP/contrib/openresolv:r221273-222812,222815-223757
   Merged /vendor/resolver/dist/contrib/openresolv:r1540-186085
   Merged /projects/quota64/contrib/openresolv:r184125-207707
   Merged /vendor/openresolv/dist:r219736-225504