Fix the resolvconf script to work properly on FreeBSD.

Package-Manager: portage-2.1.2.7

3 files changed, 18 insertions, 25 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 48f05037725e..6efa119b0feb 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.124 2007/05/09 22:06:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.125 2007/05/23 17:20:54 uberlord Exp $
+
+  23 May 2007; Roy Marples <uberlord@gentoo.org> files/resolvconf.dnsmasq:
+  Fix the resolvconf script to work properly on FreeBSD.
 
   09 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> dnsmasq-2.39.ebuild:
   Stablebump bad, blame chutzpah
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 12e789c291cd..f4b90fc5b568 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359
 MD5 76c037c6372d10106bfaddc92bc6f898 files/dnsmasq-fbsd-config.patch 451
 RMD160 c9103d329ff429cdadea346db59678815fe3317d files/dnsmasq-fbsd-config.patch 451
@@ -13,10 +10,10 @@ AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461
 MD5 5990c2d2cb92209feacf8f3a5a7d0831 files/dnsmasq.confd 140
 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 files/dnsmasq.confd 140
 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746 files/dnsmasq.confd 140
-AUX resolvconf.dnsmasq 4103 RMD160 e875abb38441398d5edcd9e5aa7fbd42d47f2ee0 SHA1 0b4d78656345420430591fef6a15d8e96631d68b SHA256 b1adb0003e173f58402b681ea5ce4c311183a8c0f73cb93741abe9990c2cd408
-MD5 71ca1c3e84693524fa5b28724bfc6023 files/resolvconf.dnsmasq 4103
-RMD160 e875abb38441398d5edcd9e5aa7fbd42d47f2ee0 files/resolvconf.dnsmasq 4103
-SHA256 b1adb0003e173f58402b681ea5ce4c311183a8c0f73cb93741abe9990c2cd408 files/resolvconf.dnsmasq 4103
+AUX resolvconf.dnsmasq 4078 RMD160 eeb586900951e0174d1432f13a14545f10a4d5bb SHA1 55622c72c4290325f0a0a80f387addb3bb3d468c SHA256 b36e95c3a64e8fcc405ed891a366000d97d91e48ff0377d3b41b3b86be09e3f2
+MD5 86f83d3dd7a948fe0112ac73f2a2ac11 files/resolvconf.dnsmasq 4078
+RMD160 eeb586900951e0174d1432f13a14545f10a4d5bb files/resolvconf.dnsmasq 4078
+SHA256 b36e95c3a64e8fcc405ed891a366000d97d91e48ff0377d3b41b3b86be09e3f2 files/resolvconf.dnsmasq 4078
 DIST dnsmasq-2.31.tar.gz 204338 RMD160 7f45c52a76a1edabb868c42069bc4e7710d414e5 SHA1 0dbd561f7e82f3a8a9892347c75d747e816b3b14 SHA256 bb2ec35de2392307587a213bca93fdade6b5d65168b529fc5a95b2edd134edee
 DIST dnsmasq-2.34.tar.gz 255744 RMD160 36061107fa62c433df6a02a5fffdb30acc4bf893 SHA1 81c445433d95725c23a27ad06cd6a51665d14138 SHA256 8b9d6a277abecff19ae835c7f2e66e21cc9a4d37ceb35716aa655fd899287bc0
 DIST dnsmasq-2.38.tar.gz 272953 RMD160 bfa7ca4a5ededa2aedd708991b8177274b1db8b7 SHA1 267ac7b78e9f48b0d8d65f30fc0faa2a6552ae8c SHA256 54f3e9ac2bd9f622b28ab0d5149e9bc13d62d8826be085c32abc929bc30dda6a
@@ -41,10 +38,10 @@ EBUILD dnsmasq-2.39.ebuild 1585 RMD160 9bf7b2255de995be88b46a9160751e23f19dc517
 MD5 14045dcf76dffad5347054b652be67d1 dnsmasq-2.39.ebuild 1585
 RMD160 9bf7b2255de995be88b46a9160751e23f19dc517 dnsmasq-2.39.ebuild 1585
 SHA256 6cef7140841311b0e38e0dee7552cadf98e28a8b5ae7705740b47833248388fe dnsmasq-2.39.ebuild 1585
-MISC ChangeLog 15554 RMD160 ffaea10d7482e0ecb84f1ef1ec3ce7b6859195ef SHA1 e5b951b0eba11de836e5b01cd6c542691652772d SHA256 ced665ee708fc38eb951d8293b4bee4714a159c839c846c4fe9049b5bec29fd4
-MD5 7177153e229a8ea8df8735eac7da8050 ChangeLog 15554
-RMD160 ffaea10d7482e0ecb84f1ef1ec3ce7b6859195ef ChangeLog 15554
-SHA256 ced665ee708fc38eb951d8293b4bee4714a159c839c846c4fe9049b5bec29fd4 ChangeLog 15554
+MISC ChangeLog 15687 RMD160 8e98db5121131f4f983c10284a8395c1b8b1b5cb SHA1 9a7506fae63808f8ceb09b8e8df1785f2f9ab662 SHA256 3f99dd80894d9d191c6fef35de0ae17424b5feecf25565c6f644c011a55ba1f7
+MD5 b259c7470b0e1a41bde460597ce2e6a2 ChangeLog 15687
+RMD160 8e98db5121131f4f983c10284a8395c1b8b1b5cb ChangeLog 15687
+SHA256 3f99dd80894d9d191c6fef35de0ae17424b5feecf25565c6f644c011a55ba1f7 ChangeLog 15687
 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b
 MD5 f115572f9475ea98b22ceeb627ba07f0 metadata.xml 251
 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 metadata.xml 251
@@ -64,10 +61,3 @@ SHA256 a43f4ec7f3aae182582955b664e8bbf1b567ac8a79dd643573fcd50b7df408a2 files/di
 MD5 eec1d9db1c32759ab9c56b964a4960f0 files/digest-dnsmasq-2.39 238
 RMD160 97ff68a8b2864742489407d7ce093e87b3a86f46 files/digest-dnsmasq-2.39 238
 SHA256 a961e471d55d7fa6c32fd71d72530a576c641f2e146794518df14610d8f8d626 files/digest-dnsmasq-2.39 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFGQkX/KRy60XGEcJIRAuCTAJ4vp+xgmVSQ0GNy1M2j/02AAaaF6gCcD7Pm
-TPh3IYBk0SyxkXgUsO8+Ayw=
-=TjwV
------END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/files/resolvconf.dnsmasq b/net-dns/dnsmasq/files/resolvconf.dnsmasq
index 62fc73f4118f..ed9e01019847 100644
--- a/net-dns/dnsmasq/files/resolvconf.dnsmasq
+++ b/net-dns/dnsmasq/files/resolvconf.dnsmasq
@@ -33,7 +33,7 @@ DNSMASQRESOLV="/etc/dnsmasq-resolv.conf"
 DNSMASQCONF="/etc/dnsmasq-resolvconf.conf"
 
 NEWCONF="# Generated by resolvconf"
-NEWRESOLV="${NEWCONF}\nsearch"
+NEWRESOLV="${NEWCONF}\n"
 
 # Using DBUS means that we never have to restart the daemon
 # This is important as it means we should not drop DNS queries
@@ -48,7 +48,7 @@ grep -q "^Compile time options.*[[:space:]]DBus[[:space:]]" \
 	if [ -x /etc/init.d/dbus -a -x /etc/init.d/dnsmasq ] ; then
 		if /etc/init.d/dbus --quiet status && /etc/init.d/dnsmasq --quiet status ; then
 			DBUS=yes
-			NEWCONF="${NEWCONF}\n# Domain specific servers will be sent over dbus\n\nenable-dbus"
+			NEWCONF="${NEWCONF}\n# Domain specific servers will be sent over dbus\n\nenable-dbus\n"
 		fi
 	fi
 fi
@@ -75,16 +75,16 @@ for N in ${NEWSEARCH} ; do
 	esac
 	case "\n${NEWRESOLV}\n" in
 		*"\nnameserver ${N#*,}\n"*) ;;
-		*) NEWRESOLV="${NEWRESOLV}\nnameserver ${N#*,}" ;;
+		*) NEWRESOLV="${NEWRESOLV}nameserver ${N#*,}\n" ;;
 	esac
 done
 for N in ${NEWNS} ; do
 	case "\n${NEWRESOLV}\n" in
 		*"\nnameserver ${N}\n") ;;
-		*) NEWRESOLV="${NEWRESOLV}\nnameserver ${N}" ;;
+		*) NEWRESOLV="${NEWRESOLV}nameserver ${N}\n" ;;
 	esac
 done
-NEWRESOLV="$(echo "${NEWRESOLV}" | sed -e "s/^search/${NEWSL:+search${NEWSL}}/g")"
+[ -n "${NEWSL}" ] && NEWRESOLV="${NEWRESOLV}search${NEWSL}\n"
 
 DBUSDEST=
 for DN in $(uniqify ${NEWDOMAIN}) ; do
@@ -101,7 +101,7 @@ for DN in $(uniqify ${NEWDOMAIN}) ; do
 		fi
 		DBUSDEST="${DBUSDEST} uint32:$(printf "%d" ${NUM}) string:${DN%,*}"
 	else
-		NEWCONF="${NEWCONF}\nserver=/${DN%,*}/${DN#*,}"
+		NEWCONF="${NEWCONF}server=/${DN%,*}/${DN#*,}\n"
 	fi
 done