dhclient-script now works with invalid, RFC violating but sometimes used

  space seperated domain names, #134101 thanks to Jan Spitalnik.
Package-Manager: portage-2.1_rc2

5 files changed, 254 insertions, 20 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index b6162f2ad209..546b71579aa6 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.98 2006/05/23 09:14:12 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.99 2006/05/23 13:03:28 uberlord Exp $
+
+*dhcp-3.0.3-r9 (23 May 2006)
+
+  23 May 2006; Roy Marples <uberlord@gentoo.org>
+  files/dhcp-3.0.3-dhclient-resolvconf.patch, +dhcp-3.0.3-r9.ebuild:
+  dhclient-script now works with invalid, RFC violating but sometimes used
+  space seperated domain names, #134101 thanks to Jan Spitalnik.
 
 *dhcp-3.0.3-r8 (23 May 2006)
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index b143ae336064..017d7f799c13 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -34,10 +34,10 @@ AUX dhcp-3.0.3-dhclient-ntp.patch 5868 RMD160 41522438308fc8b82dc298752192d1c77b
 MD5 3eab8a40f0a84d3b2d9d406fa4b687c0 files/dhcp-3.0.3-dhclient-ntp.patch 5868
 RMD160 41522438308fc8b82dc298752192d1c77b4c26aa files/dhcp-3.0.3-dhclient-ntp.patch 5868
 SHA256 751fdfa0b36eab386f4029284d61c0c2b41b3135878738caa02e512999f2ca65 files/dhcp-3.0.3-dhclient-ntp.patch 5868
-AUX dhcp-3.0.3-dhclient-resolvconf.patch 6637 RMD160 503b6f57d96a35c720f4b06f0805cac759ddbe23 SHA1 e25ee7bf29dbbaca7d0cc7261862c1d77ad24dbf SHA256 f63a89f0954724a5b06785ecd712cfdb45901808c1f9dd8483a00fbb79c01106
-MD5 893c47e09146c07511fc583d4e79db92 files/dhcp-3.0.3-dhclient-resolvconf.patch 6637
-RMD160 503b6f57d96a35c720f4b06f0805cac759ddbe23 files/dhcp-3.0.3-dhclient-resolvconf.patch 6637
-SHA256 f63a89f0954724a5b06785ecd712cfdb45901808c1f9dd8483a00fbb79c01106 files/dhcp-3.0.3-dhclient-resolvconf.patch 6637
+AUX dhcp-3.0.3-dhclient-resolvconf.patch 6671 RMD160 e4a4825df57fb2eed317a44d474f48edbef21fd7 SHA1 aaa15866035759fb4d39a7b00146995115b718ec SHA256 b27c5eeef6efdc8252e68f660424acdfdffaa1a308ec209773cfac78d9faf2a6
+MD5 7193ef2ec3466c4c82aae445e1e5d47d files/dhcp-3.0.3-dhclient-resolvconf.patch 6671
+RMD160 e4a4825df57fb2eed317a44d474f48edbef21fd7 files/dhcp-3.0.3-dhclient-resolvconf.patch 6671
+SHA256 b27c5eeef6efdc8252e68f660424acdfdffaa1a308ec209773cfac78d9faf2a6 files/dhcp-3.0.3-dhclient-resolvconf.patch 6671
 AUX dhcp-3.0.3-dhclient-stdin-conf.patch 1948 RMD160 42f32a5bbfe2a937827c2972ef84cfa78c2c401c SHA1 ac7afd5ecbde5348e9acea532dab1e01e3a58e8b SHA256 e1bfd26b7da10acc4bd718e35aae4235308abcacde78dedf39533b11ab18b3ae
 MD5 d81606fd8cdd2376018c6466fe9cf0ef files/dhcp-3.0.3-dhclient-stdin-conf.patch 1948
 RMD160 42f32a5bbfe2a937827c2972ef84cfa78c2c401c files/dhcp-3.0.3-dhclient-stdin-conf.patch 1948
@@ -100,6 +100,10 @@ EBUILD dhcp-3.0.3-r8.ebuild 6804 RMD160 a605f131412eb10d0d63ab21f8db7e4a3a042a5d
 MD5 792b1e5a4412b68186c953afb8ca672d dhcp-3.0.3-r8.ebuild 6804
 RMD160 a605f131412eb10d0d63ab21f8db7e4a3a042a5d dhcp-3.0.3-r8.ebuild 6804
 SHA256 ffbf698673c7992304cc701bc23cca640b3fbf650cc8cc156595a089c02fafd5 dhcp-3.0.3-r8.ebuild 6804
+EBUILD dhcp-3.0.3-r9.ebuild 6804 RMD160 4d6861c1051ab2de04ffb28034500d1e9c665200 SHA1 415f778b1cfaa17876b801daeaa97101462908f5 SHA256 e8b73b1a0efba6790e391ee7abf26092ab828ced610c4686bed5101372d10bfd
+MD5 508bffdc4bd6251094f6de3ca28b13cd dhcp-3.0.3-r9.ebuild 6804
+RMD160 4d6861c1051ab2de04ffb28034500d1e9c665200 dhcp-3.0.3-r9.ebuild 6804
+SHA256 e8b73b1a0efba6790e391ee7abf26092ab828ced610c4686bed5101372d10bfd dhcp-3.0.3-r9.ebuild 6804
 EBUILD dhcp-3.0.4-r1.ebuild 6731 RMD160 2479e6c57f8f979357d341e3bcab07ff9dfda80f SHA1 cc14f9d851d4cd4971491c38b39470917cb7661a SHA256 2e849d07ba7a4de47750e209bab5e4e46b9d661eb4a58f08f1375404a8c630c3
 MD5 457ed83ee767022057c8b34ff843749e dhcp-3.0.4-r1.ebuild 6731
 RMD160 2479e6c57f8f979357d341e3bcab07ff9dfda80f dhcp-3.0.4-r1.ebuild 6731
@@ -108,10 +112,10 @@ EBUILD dhcp-3.0.4.ebuild 6728 RMD160 474958f105901448503494b90762f26206f087bf SH
 MD5 659d30979078da7726375d8a45b9093d dhcp-3.0.4.ebuild 6728
 RMD160 474958f105901448503494b90762f26206f087bf dhcp-3.0.4.ebuild 6728
 SHA256 f1d51b5edd52fac3260d34c5df7b0892c52060c01a88948aaf40411d7ce788a1 dhcp-3.0.4.ebuild 6728
-MISC ChangeLog 17526 RMD160 2ec16870af2160e809b723c96ddb8378df00512d SHA1 a6f89358a344c486bad50b3ecfe048fb11b957dd SHA256 23f6e79fbdf3505e3d0ba14dd3e36f3f3f62b771c5e22e1d56ee8dc537f6a79e
-MD5 b76d1d54ad222174cb1f9413a03dc438 ChangeLog 17526
-RMD160 2ec16870af2160e809b723c96ddb8378df00512d ChangeLog 17526
-SHA256 23f6e79fbdf3505e3d0ba14dd3e36f3f3f62b771c5e22e1d56ee8dc537f6a79e ChangeLog 17526
+MISC ChangeLog 17815 RMD160 e1882e490c6aed2bc6a3348c9303c5fdc118b721 SHA1 de9430ac7237f730fb8e9d08e972d4587e8cccc4 SHA256 8c93ed9ba750c872f8f69b8096c093e7aefdacff79400b34f80e68126f05d4a1
+MD5 c99c55591b59c9b26d0c8b9d347ad16a ChangeLog 17815
+RMD160 e1882e490c6aed2bc6a3348c9303c5fdc118b721 ChangeLog 17815
+SHA256 8c93ed9ba750c872f8f69b8096c093e7aefdacff79400b34f80e68126f05d4a1 ChangeLog 17815
 MISC metadata.xml 330 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe SHA1 d00a77cf9fff7ed1570a77ff306fdb03081e9e48 SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af
 MD5 436163172942ee1a0bcfb47534a71cce metadata.xml 330
 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe metadata.xml 330
@@ -125,6 +129,9 @@ SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/di
 MD5 414325430622f5011079cd7fd5517485 files/digest-dhcp-3.0.3-r8 232
 RMD160 a8cec86f840528ab049182c2d0f0768d7eaa03dc files/digest-dhcp-3.0.3-r8 232
 SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/digest-dhcp-3.0.3-r8 232
+MD5 414325430622f5011079cd7fd5517485 files/digest-dhcp-3.0.3-r9 232
+RMD160 a8cec86f840528ab049182c2d0f0768d7eaa03dc files/digest-dhcp-3.0.3-r9 232
+SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/digest-dhcp-3.0.3-r9 232
 MD5 3ac42f4c7431bc78613c2e61b0a79075 files/digest-dhcp-3.0.4 232
 RMD160 d5e0c33365d8dc2d37caf86a277a0dbfe0b98565 files/digest-dhcp-3.0.4 232
 SHA256 fbea6a9170dda5da61af6c7c6f629d33b642ca3fbfa7f64537bd783e283be420 files/digest-dhcp-3.0.4 232
diff --git a/net-misc/dhcp/dhcp-3.0.3-r9.ebuild b/net-misc/dhcp/dhcp-3.0.3-r9.ebuild
new file mode 100644
index 000000000000..43c383aeaf61
--- /dev/null
+++ b/net-misc/dhcp/dhcp-3.0.3-r9.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.3-r9.ebuild,v 1.1 2006/05/23 13:03:28 uberlord Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
+
+LICENSE="isc-dhcp"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-dhcp )
+	kernel_linux? ( sys-apps/net-tools )"
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+	>=sys-apps/sed-4"
+
+PROVIDE="virtual/dhcpc"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Gentoo patches - these will probably never be accepted upstream
+	# Enable chroot support
+	epatch "${FILESDIR}/${PN}-3.0-paranoia.patch"
+	# Fix some permission issues
+	epatch "${FILESDIR}/${PN}-3.0-fix-perms.patch"
+	# Enable dhclient to equery NTP servers
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-ntp.patch"
+	# resolvconf support in dhclient-script
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-resolvconf.patch"
+	# Fix setting hostnames on Linux
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-hostname.patch"
+	# Allow mtu settings
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-mtu.patch"
+	# Allow dhclient to use IF_METRIC to set route metrics
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-metric.patch"
+	# Stop downing the interface on Linux as that breaks link dameons
+	# such as wpa_supplicant and netplug
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-no-down.patch"
+	# Quiet the isc blurb
+	epatch "${FILESDIR}/${PN}-3.0.3-no_isc_blurb.patch"
+	# Enable dhclient to get extra configuration from stdin
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-stdin-conf.patch"
+
+	# General fixes which will probably be accepted upstream eventually
+	# Fix token ring compiling, #102473
+	epatch "${FILESDIR}/${P}-tr.patch"
+	# Install libdst, #75544
+	epatch "${FILESDIR}/${PN}-3.0.3-libdst.patch"
+	# Fix building on Gentoo/FreeBSD
+	epatch "${FILESDIR}/${PN}-3.0.2-gmake.patch"
+
+	# NetworkManager support patches
+	# If they fail to apply to future versions they will be dropped
+	# Enable eXtended options
+	epatch "${FILESDIR}/${PN}-3.0.3-x-option.patch"
+	# Add dbus support to dhclient
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-dbus.patch"
+
+	# Brand the version with Gentoo
+	# include revision if >0
+	local newver="${MY_PV}-Gentoo"
+	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
+	sed -i -e '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
+		includes/version.h
+
+	# Change the hook script locations of the scripts
+	sed -i -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/*
+
+	# Remove these options from the sample config
+	sed -i -e "/\(script\|host-name\|domain-name\) / d" client/dhclient.conf
+
+	# Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
+	local x=
+	for x in Makefile.dist $(ls */Makefile.dist) ; do
+		sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}"
+	done
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client
+			cp doc/ja_JP.eucJP/dhcp* common
+		fi
+	fi
+
+	# Now remove the non-english docs so there are no errors later
+	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
+}
+
+src_compile() {
+	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
+	[[ ${ARCH} == "sparc" ]] && filter-flags -O3 -O2 -O
+
+	use static && append-ldflags -static
+
+	cat <<-END >> includes/site.h
+	#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
+	#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
+	#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
+	#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
+	#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
+	#define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
+	#define DHCPD_LOG_FACILITY LOG_LOCAL1
+	END
+
+	cat <<-END > site.conf
+	CC = $(tc-getCC)
+	LFLAGS = ${LDFLAGS}
+	LIBDIR = /usr/$(get_libdir)
+	INCDIR = /usr/include
+	ETC = /etc/dhcp
+	VARDB = /var/lib/dhcp
+	VARRUN = /var/run/dhcp
+	ADMMANDIR = /usr/share/man/man8
+	ADMMANEXT = .8
+	FFMANDIR = /usr/share/man/man5
+	FFMANEXT = .5
+	LIBMANDIR = /usr/share/man/man3
+	LIBMANEXT = .3
+	USRMANDIR = /usr/share/man/man1
+	USRMANEXT = .1
+	MANCAT = man
+	END
+
+	./configure --copts "-DPARANOIA -DEARLY_CHROOT -DEXTENDED_NEW_OPTION_INFO \
+		${CFLAGS}" || die "configure failed"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+
+	insinto /etc/dhcp
+	newins server/dhcpd.conf dhcpd.conf.sample
+	newins client/dhclient.conf dhclient.conf.sample
+
+	dodoc README RELNOTES doc/*
+	newdoc client/dhclient.conf dhclient.conf.sample
+	newdoc client/scripts/linux dhclient-script.sample
+	newdoc server/dhcpd.conf dhcpd.conf.sample
+
+	newinitd "${FILESDIR}/dhcpd.init" dhcpd
+	newinitd "${FILESDIR}/dhcrelay.init" dhcrelay
+	insinto /etc/conf.d
+	newins "${FILESDIR}/dhcpd.conf" dhcpd
+	newins "${FILESDIR}/dhcrelay.conf" dhcrelay
+
+	keepdir /var/{lib,run}/dhcp
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+}
+
+pkg_postinst() {
+	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
+
+	if [[ -e "${ROOT}/etc/init.d/dhcp" ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+
+	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
+	einfo
+	einfo "If you would like to run dhcpd in a chroot, simply configure the"
+	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
+	einfo "  emerge --config =${PF}"
+}
+
+pkg_config() {
+	local CHROOT="$(
+		sed -n 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \
+		/etc/conf.d/dhcpd
+	)"
+
+	if [[ -z ${CHROOT} ]]; then
+		eerror "CHROOT not defined in /etc/conf.d/dhcpd"
+		return 1
+	fi
+
+	if [[ -d ${CHROOT} ]] ; then
+		ewarn "${CHROOT} already exists - aborting"
+		return 0
+	fi
+
+	ebegin "Setting up the chroot directory"
+	mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
+	cp /etc/{localtime,resolv.conf} "${CHROOT}/etc"
+	cp -R /etc/dhcp "${CHROOT}/etc/"
+	cp -R /var/lib/dhcp "${CHROOT}/var/lib"
+	chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
+	eend
+
+	local logger="$(best_version virtual/logger)"
+	einfo "To enable logging from the dhcpd server, configure your"
+	einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
+}
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch
index 466697cf63aa..fac6b26a9723 100644
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch
@@ -10,9 +10,9 @@
 -      echo nameserver $nameserver >>/etc/resolv.conf
 -    done
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
-+    if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then
++    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      conf="# Generated by dhclient for interface $interface\n"
-+      if [ x$new_domain_name != x ]; then
++      if [ "x$new_domain_name" != x ]; then
 +        conf="${conf}search $new_domain_name\n"
 +      fi
 +      for nameserver in $new_domain_name_servers; do
@@ -46,9 +46,9 @@
 -	( touch /etc/resolv.conf )
 -	exit_status=$?
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
-+    if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then
++    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      conf="# Generated by dhclient for interface $interface\n"
-+      if [ x$new_domain_name != x ]; then
++      if [ "x$new_domain_name" != x ]; then
 +        conf="${conf}search $new_domain_name\n"
        fi
 -    fi
@@ -81,9 +81,9 @@
 -      echo nameserver $nameserver >>/etc/resolv.conf
 -    done
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
-+    if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then
++    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      conf="# Generated by dhclient for interface $interface\n"
-+      if [ x$new_domain_name != x ]; then
++      if [ "x$new_domain_name" != x ]; then
 +        conf="${conf}search $new_domain_name\n"
 +      fi
 +      for nameserver in $new_domain_name_servers; do
@@ -111,9 +111,9 @@
 -      echo nameserver $nameserver >>/etc/resolv.conf
 -    done
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
-+    if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then
++    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      conf="# Generated by dhclient for interface $interface\n"
-+      if [ x$new_domain_name != x ]; then
++      if [ "x$new_domain_name" != x ]; then
 +        conf="${conf}search $new_domain_name\n"
 +      fi
 +      for nameserver in $new_domain_name_servers; do
@@ -141,7 +141,7 @@
 -      echo nameserver $nameserver >>/etc/resolv.conf
 -    done
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
-+    if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then
++    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      conf="# Generated by dhclient for interface $interface\n"
 +      if [ x$new_domain_name != x ]; then
 +        conf="${conf}search $new_domain_name\n"
@@ -171,9 +171,9 @@
 -      echo nameserver $nameserver >>/etc/resolv.conf
 -    done
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
-+    if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then
++    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      conf="# Generated by dhclient for interface $interface\n"
-+      if [ x$new_domain_name != x ]; then
++      if [ "x$new_domain_name" != x ]; then
 +        conf="${conf}search $new_domain_name\n"
 +      fi
 +      for nameserver in $new_domain_name_servers; do
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.3-r9 b/net-misc/dhcp/files/digest-dhcp-3.0.3-r9
new file mode 100644
index 000000000000..bfdf4cb56303
--- /dev/null
+++ b/net-misc/dhcp/files/digest-dhcp-3.0.3-r9
@@ -0,0 +1,3 @@
+MD5 f91416a0b8ed3fd0601688cf0b7df58f dhcp-3.0.3.tar.gz 870240
+RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 dhcp-3.0.3.tar.gz 870240
+SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe dhcp-3.0.3.tar.gz 870240