[infiniband] Add ib support for dhcp

34 files changed, 4293 insertions, 0 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
new file mode 100644
index 000000000..e2ac256f9
--- /dev/null
+++ b/net-misc/dhcp/Manifest
@@ -0,0 +1,34 @@
+AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018
+AUX dhcp-3.0-paranoia.patch 5366 RMD160 7c64e3dac5b07ff3859fcaa7a8b0e52a0c50446c SHA1 a30103c138e480766f84644fffb1d0897709c27d SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae
+AUX dhcp-3.0.2-gmake.patch 1872 RMD160 d2d41c0a7e002103d68605d2492bfe716bb2889e SHA1 f60c89233f06ca8554cd5cc9ed0301b597a724f7 SHA256 b2bbfc1d1f5b4d03ff3f53b3974ec32731e5f626de8f8d127328591e4c721215
+AUX dhcp-3.0.3-dhclient-dbus.patch 2774 RMD160 250582d89894a58a297786c4a6884b54219c4b6f SHA1 74760ca00712ff529e6b97457408515098563f88 SHA256 d70292c5b61648ba5970ab436429ced33e807bd6f68ba06dcd2b9d4073b02ea4
+AUX dhcp-3.0.3-dhclient-hostname.patch 523 RMD160 38c20bcc417822ae858626eb5d0eaf7e669c1ca0 SHA1 5d2c3a1da74a1d151c9fbf08e01e4545e989078c SHA256 57c09edd2bf48cd65745e3b14499f7f3c26d529f60fd2ab122887ae968e26bbd
+AUX dhcp-3.0.3-dhclient-metric.patch 7270 RMD160 04187868f66e03a62dafd31b4cdcdd2029283ce5 SHA1 1d726d1526ae97adbdf1b259bb55e05145060375 SHA256 7e5ace014ed55d7d4e90a6cdac7dec4842ea9d178bb19bf6cdccf295eba9da7d
+AUX dhcp-3.0.3-dhclient-mtu.patch 6413 RMD160 2517c7fe58d7dca95bdbdc80e96b6260cc205e56 SHA1 da342800bafee86726570aa0a5e4e3c8bd5f1371 SHA256 0a4bff3c4c44252125f66a3a4423f677465592b84a8f7f500bad9ba4e3b5cb06
+AUX dhcp-3.0.3-dhclient-no-down.patch 2332 RMD160 26d0c88534b71070e81c86c12b76a2b4ec7c9c2c SHA1 b2a00d46754414e937dc6c3d63a28b63b3b57ac9 SHA256 a5a67de79f6435d9bc4eeea416aff7a904ab567e5e8d75ecf34495bc9f2c5a44
+AUX dhcp-3.0.3-dhclient-ntp.patch 5862 RMD160 73d001b7b2df36cf84aba9db76a1753c8d423a7d SHA1 cc3db6430f07f956c2ad25ed00e47d468eef2600 SHA256 80ab30eee75fb03c099416c25f031d03744011a582e8940c73077d5ee587c1ee
+AUX dhcp-3.0.3-libdst.patch 322 RMD160 5216c754a912cfcfc65683afcf44dbe1a7871212 SHA1 804bab67ae06269336c51183d5ff1e8ba45c20b5 SHA256 68e9a081739736980c0ad834dfa6197f940982f53d4d16054715c0346b5b9eca
+AUX dhcp-3.0.3-no_isc_blurb.patch 3002 RMD160 d70f89e1763bfeb23ce8f09399426983df01f7c8 SHA1 99a9fe69988226d29ccc6c2dc745ffab9b66817c SHA256 09c451cd9667fc8effcecd640f4cbe8629d41f6abacf9d1f2f923aab1f6e0bbb
+AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae SHA1 c10c35dcf4a94f45f4bc98147a70e9dcf3f01dd5 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f
+AUX dhcp-3.0.5-bpf-nofallback.patch 1473 RMD160 1a5ece77cb481416935b0d2eea53e85dc4c4ee93 SHA1 d4cad638075a98606e07c633551c8a1d2f78f2e7 SHA256 b215c5ff4a282b475f28168250c05bbbc85e7c37e7af92616571d499b8c14da6
+AUX dhcp-3.1.0a1-dhclient-resolvconf.patch 10316 RMD160 183bedd1660bf5a5f9dc7d002199e76aec12341c SHA1 1e0332ea31cfdbe92f3053405587f08117de8f8b SHA256 112b2ed44aab92592eb3810c61ada7f30d9d01fe43b647667326972a37b412a1
+AUX dhcp-3.1.2_p1-CVE-2009-1892.patch 427 RMD160 fe7daa6834faa0f6078ef125525f6a2db0c05f37 SHA1 eb6dcedecef536f743e97e7d0b5eea0a08f5e55a SHA256 55bb136138b76d6fa9c9165b348fb2c6975b935b3bba72ea551fc8bcae4fcc9b
+AUX dhcp-3.1.3-dhclient-no-down.patch 2762 RMD160 bea58f58f745cbcee5d2d43f0dbabe54a1eaaafa SHA1 6ceb33afe42734b21b5ea91076b06c4fb4e9b81f SHA256 94c9dbe45063c6c600976ffab4c1fc9ac6f52f4e8077b5074f5142816ea626c4
+AUX dhcp-4.0-dhclient-ntp.patch 7966 RMD160 d6dd1c3363f06712a82231eae1eb559f5a45bbb5 SHA1 3c1b373c6649c1ccb44f205fbee116c134514f4e SHA256 e93bda7f2baae9163f96ab0408bfbe885caa96a8698f9e566b8a9dc04de9359b
+AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 RMD160 2c3dd3994f0a7f15f3fe51972dd04a2e6055613a SHA1 f4a9d51126ea489f75fcf29053ab432b68e5055d SHA256 0b25bc74ae258656dd1f0e6f4ffd6b4ef8b4ad56956624c0b6070941a180e57c
+AUX dhcp-4.2.0-errwarn-message.patch 1508 RMD160 604c680c22b620ae11e4c1ab83902a0c3dacaa62 SHA1 8d645f2510dac8c68d6114cb3f3c0077d832f8c0 SHA256 e2baa7b6097a6ca20b66afcd7b0e399840a8b0f251b3750a49a03f0d5b714231
+AUX dhcp-4.2.0-improved-xid.patch 5135 RMD160 396725be4f0e179730652c516e3b926021370b72 SHA1 bad02db8b7d5eb316aee08c25b1bf231d919e26c SHA256 2b770ba1ec8108c6e6c6c89cab066307f3653d859f1563286ac8846f9d8efdff
+AUX dhcp-4.2.0-lpf-ib.patch 17023 RMD160 5ce926287739144a9ca3130e5b75fa91340d205c SHA1 ac73c6cfbd914f07b612a7874eb123526d1114b1 SHA256 39b6835dadd156f4070ef4c4b43a4fdcaf4f61c1d763a37211ad493ce9933bdc
+AUX dhcp-4.2.0-options.patch 14611 RMD160 456569e5228779869a5e823cb4b5eaa1de9d836c SHA1 376fbe71cb39481cefbe209a74ecc984434f690e SHA256 8555cc3ada3894de53c93127bfe15a8a161515137d8f0a9cc6844acca7637e2e
+AUX dhcp-4.2.0-xen-checksum.patch 8710 RMD160 1f16ae824b60c56c05063ad29196ca570b1eafca SHA1 6a6509a031bfb39cda38205c99609ac4c4b8924a SHA256 d6dfbea187e943c09b350d156c570be6f3cbb648ac96ba838ad707280a63b3e9
+AUX dhcp-4.2.1-dhclient-resolvconf.patch 13742 RMD160 e226e793ab4d1302dbaf288c3077f3f6c8758b97 SHA1 d4ea97c3383c7f7769ab36c8d36674a3297dc1f9 SHA256 ddc284623b421098702d3e0cc1849b37c015e78dc510aa7efdd2e5fc9b6a849c
+AUX dhcp-4.2.1-nogateway.patch 1648 RMD160 820956e072e4a84ffabdee6714377ae23827b7bf SHA1 5c6c8118ee6b4b8524451827756aab052766ca09 SHA256 694caca5fbcf900cef2223307a43fb21a66fd672728cebfd873313730029acc4
+AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
+AUX dhcpd.init2 2421 RMD160 baa01ae97b227edba7653cd51735613be2dac652 SHA1 f2068ceb2d79d7992f46b31e6a6e3277a0167dce SHA256 fef93e5a7264780044a977ade27e9cc70de824063791bcd07d3db81c11c16df5
+AUX dhcpd.init3 2525 RMD160 d56c77e6f2e3981c78c3fefad04347615e9d9d60 SHA1 c04f470d0cc3b262cf87cc766ceee5a35aec8b43 SHA256 69f5e6bee391a9a03554bead07c9dd5775e1fbb2a0ae515b7930cec328a8959c
+AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730
+AUX dhcrelay.init 736 RMD160 04566b87bd6dbb8bb754b26409ca30b878ef3ca3 SHA1 72742b308314b2e1476b27e94212fbf4d179adc4 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c
+AUX dhcrelay.init2 712 RMD160 2baeaf7c0fb8a5796792b5721f32104907243798 SHA1 ced20da5625b6517fa6044ce179e1c5d9a17297e SHA256 6cca726147474c600662b0c2e49eb5aa148a7a9af1358dbc56f16b1d08255ae3
+DIST dhcp-4.2.1-P1.tar.gz 8797289 RMD160 e3607828ea12eb718c0877430f9607d336d78c36 SHA1 7767019313b4128357054a1eb053c66799831dd6 SHA256 6cd5e06512c53ad43d71400f39071ce0bd07f074e416c727d5bc7e5949ec55ec
+EBUILD dhcp-4.2.1_p1-r1.ebuild 6858 RMD160 2c97c187d6a99e187bd06d3129ecc37e4d9ea613 SHA1 8e2ffeac1348a7e42572cbdc57210ed3ba9b97d1 SHA256 38c94ddfc0aa893ca2692ec9dde0cd725a9d403107109c2693705a3e42819b70
+MISC metadata.xml 554 RMD160 ac08c7c5b22114e29e6ffc655e212a8ecc94e0dd SHA1 74fa379734a39bafdbaa33056660b3917df0237b SHA256 4a72acea3d0a3fecbcd79681a699256cdc182c11dd1f2bd94340a60cc041e525
diff --git a/net-misc/dhcp/dhcp-4.2.1_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.2.1_p1-r1.ebuild
new file mode 100644
index 000000000..7d99d95f1
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.2.1_p1-r1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.1_p1.ebuild,v 1.2 2011/04/15 21:40:50 ulm Exp $
+
+EAPI="2"
+
+inherit eutils
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
+
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax infiniband"
+
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+	kernel_linux? ( sys-apps/net-tools )
+	vim-syntax? ( app-vim/dhcpd-syntax )
+	ldap? (
+		net-nds/openldap
+		ssl? ( dev-libs/openssl )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
+	# Enable dhclient to equery NTP servers
+	epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
+	# resolvconf support in dhclient-script
+	epatch "${FILESDIR}"/${PN}-4.2.1-dhclient-resolvconf.patch
+	# Stop downing the interface on Linux as that breaks link daemons
+	# such as wpa_supplicant and netplug
+	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
+	epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
+	# Enable dhclient to get extra configuration from stdin
+	epatch "${FILESDIR}"/${PN}-4.0.1-dhclient-stdin-conf.patch
+	epatch "${FILESDIR}"/${PN}-4.2.1-nogateway.patch #265531
+
+	# NetworkManager support patches
+	# If they fail to apply to future versions they will be dropped
+	# Add dbus support to dhclient
+	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch
+
+	# Infiniband stuff
+	if use infiniband; then
+		epatch "${FILESDIR}/${PN}-4.2.0-improved-xid.patch"
+		epatch "${FILESDIR}/${PN}-lpf-ib.patch"
+		epatch "${FILESDIR}/${PN}-options.patch"
+		epatch "${FILESDIR}/${PN}-xen-checksum.patch"
+	fi
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# 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/* || die
+
+	# No need for the linux script to force bash, #158540.
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i \
+		-e "/\(script\|host-name\|domain-name\) / d" \
+		client/dhclient.conf || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# 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
+	rm -rf doc/ja_JP.eucJP
+}
+
+src_configure() {
+	econf \
+		--enable-paranoia \
+		--sysconfdir=/etc/dhcp \
+		--with-cli-pid-file=/var/run/dhcp/dhclient.pid \
+		--with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
+		--with-cli6-pid-file=/var/run/dhcp/dhclient6.pid \
+		--with-cli6-lease-file=/var/lib/dhcp/dhclient6.leases \
+		--with-srv-pid-file=/var/run/dhcp/dhcpd.pid \
+		--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+		--with-srv6-pid-file=/var/run/dhcp/dhcpd6.pid \
+		--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
+		--with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \
+		$(use_enable ipv6 dhcpv6) \
+		$(use_with ldap) \
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	dohtml doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# move the client to /
+		dodir /sbin
+		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script || die
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script || die
+		fi
+
+		insinto /etc/dhcp
+		doins client/dhclient.conf || die
+
+		keepdir /var/lib/dhclient
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.* || die
+			dosbin contrib/ldap/dhcpd-conf-to-ldap || die
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init3 dhcpd
+		newinitd "${FILESDIR}"/dhcrelay.init2 dhcrelay
+		newconfd "${FILESDIR}"/dhcpd.conf dhcpd
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+
+		insinto /etc/dhcp
+		doins server/dhcpd.conf || die
+
+		keepdir /var/{lib,run}/dhcp
+	fi
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+	# Keep the user files over the sample ones
+	local f
+	for f in dhclient dhcpd ; do
+		f="/etc/dhcp/${f}.conf"
+		if [ -e "${ROOT}"${f} ] ; then
+			cp -p "${ROOT}"${f} "${D}"${f}
+		fi
+	done
+}
+
+pkg_postinst() {
+	chown -R 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 -e 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \
+		"${ROOT}"/etc/conf.d/dhcpd
+	)"
+
+	if [[ -z ${CHROOT} ]]; then
+		eerror "CHROOT not defined in /etc/conf.d/dhcpd"
+		return 1
+	fi
+
+	CHROOT="${ROOT}/${CHROOT}"
+
+	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
+	ln -s ../../var/lib/dhcp "${CHROOT}"/etc/dhcp/lib
+	chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
+	eend 0
+
+	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-fix-perms.patch b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
new file mode 100644
index 000000000..13debb20e
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
@@ -0,0 +1,15 @@
+--- server/dhcpd.c	2003-11-05 14:08:09.000000000 -0800
++++ server/dhcpd.c	2003-11-05 14:15:32.000000000 -0800
+@@ -602,6 +602,12 @@
+ 	if (lftest)
+ 		exit (0);
+ 
++#if defined (PARANOIA)
++	/* Set proper permissions... */
++	if (lchown (path_dhcpd_db, set_uid, set_gid))
++		log_fatal ("lchown(%s, %d, %d): %m", path_dhcpd_db, (int) set_uid, (int) set_gid);
++#endif /* PARANOIA */
++
+ 	/* Discover all the network interfaces and initialize them. */
+ 	discover_interfaces (DISCOVER_SERVER);
+ 
diff --git a/net-misc/dhcp/files/dhcp-3.0-paranoia.patch b/net-misc/dhcp/files/dhcp-3.0-paranoia.patch
new file mode 100644
index 000000000..886f5cb5f
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0-paranoia.patch
@@ -0,0 +1,207 @@
+
+paranoia (non-root/chroot) patch for ISC dhcp 3.0
+file to patch: dhcp-3.0/server/dhcpd.c
+
+update from paranoia patch for ISC dhcp 2.0
+
+Adds 3 options:
+
+	-user <user>
+	-group <group>
+	-chroot <chroot_dir>
+
+Notes:
+	-DPARANOIA must be passed as an argument to the --copts option
+	of configure.  Otherwise, the paranoia code will not be compiled
+	in.  Example:  ./configure --copts -DPARANOIA
+
+	The chroot() call has been delayed in order to allow /dev/log to
+	be reopened after the configuration file has been read.  This is
+	beneficial for systems on which /dev/log is a unix domain socket.
+	The main side effect is that dhcpd.conf should be placed in /etc,
+	instead of <chroot_dir>/etc.
+
+	If dhcpd is to be run on a sysV-style architecture (or, more
+	generally, if /dev/log is a character device), one may opt to
+	create the <chroot_dir>/dev/log character device and add
+	-DEARLY_CHROOT to the --copts option of configure (in addition to
+	-DPARANOIA).  This will perform the chroot() call at the earliest
+	convenience (before reading the configuration file).
+
+	If the -user option is used, the lease and pid file directories
+	should be writable to the server process after it drops
+	privileges.
+
+
+ari edelkind (12/10/2001)
+last modified 12/10/2001
+
+
+--- dhcp-3.0/server/dhcpd.c	Thu Jun 21 22:12:58 2001
++++ dhcp-3.0+paranoia/server/dhcpd.c	Wed Oct 17 08:23:00 2001
+@@ -56,6 +56,16 @@
+ #include "version.h"
+ #include <omapip/omapip_p.h>
+ 
++#if defined (PARANOIA)
++#  include <sys/types.h>
++#  include <unistd.h>
++#  include <pwd.h>
++/* get around the ISC declaration of group */
++#  define group real_group 
++#    include <grp.h>
++#  undef group
++#endif /* PARANOIA */
++
+ static void usage PROTO ((void));
+ 
+ TIME cur_time;
+@@ -204,6 +214,22 @@
+ 	omapi_object_dereference (&listener, MDL);
+ }
+ 
++#if defined (PARANOIA)
++/* to be used in one of two possible scenarios */
++static void setup_chroot (char *chroot_dir) {
++	if (geteuid())
++		log_fatal ("you must be root to use chroot");
++
++	if (chroot(chroot_dir)) {
++		log_fatal ("chroot(\"%s\"): %m", chroot_dir);
++	}
++	if (chdir ("/")) {
++		/* probably permission denied */
++		log_fatal ("chdir(\"/\"): %m");
++	}
++}
++#endif /* PARANOIA */
++
+ int main (argc, argv, envp)
+ 	int argc;
+ 	char **argv, **envp;
+@@ -236,6 +262,14 @@
+ 	char *traceinfile = (char *)0;
+ 	char *traceoutfile = (char *)0;
+ #endif
++#if defined (PARANOIA)
++	char *set_user   = 0;
++	char *set_group  = 0;
++	char *set_chroot = 0;
++
++	uid_t set_uid = 0;
++	gid_t set_gid = 0;
++#endif /* PARANOIA */
+ 
+ 	/* Make sure we have stdin, stdout and stderr. */
+ 	status = open ("/dev/null", O_RDWR);
+@@ -298,6 +332,20 @@
+ 			if (++i == argc)
+ 				usage ();
+ 			server = argv [i];
++#if defined (PARANOIA)
++		} else if (!strcmp (argv [i], "-user")) {
++			if (++i == argc)
++				usage ();
++			set_user = argv [i];
++		} else if (!strcmp (argv [i], "-group")) {
++			if (++i == argc)
++				usage ();
++			set_group = argv [i];
++		} else if (!strcmp (argv [i], "-chroot")) {
++			if (++i == argc)
++				usage ();
++			set_chroot = argv [i];
++#endif /* PARANOIA */
+ 		} else if (!strcmp (argv [i], "-cf")) {
+ 			if (++i == argc)
+ 				usage ();
+@@ -397,6 +445,44 @@
+ 					     trace_seed_stop, MDL);
+ #endif
+ 
++#if defined (PARANOIA)
++	/* get user and group info if those options were given */
++	if (set_user) {
++		struct passwd *tmp_pwd;
++
++		if (geteuid())
++			log_fatal ("you must be root to set user");
++
++		if (!(tmp_pwd = getpwnam(set_user)))
++			log_fatal ("no such user: %s", set_user);
++
++		set_uid = tmp_pwd->pw_uid;
++
++		/* use the user's group as the default gid */
++		if (!set_group)
++			set_gid = tmp_pwd->pw_gid;
++	}
++
++	if (set_group) {
++/* get around the ISC declaration of group */
++#define group real_group
++		struct group *tmp_grp;
++
++		if (geteuid())
++			log_fatal ("you must be root to set group");
++
++		if (!(tmp_grp = getgrnam(set_group)))
++			log_fatal ("no such group: %s", set_group);
++
++		set_gid = tmp_grp->gr_gid;
++#undef group
++	}
++
++#  if defined (EARLY_CHROOT)
++	if (set_chroot) setup_chroot (set_chroot);
++#  endif /* EARLY_CHROOT */
++#endif /* PARANOIA */
++
+ 	/* Default to the DHCP/BOOTP port. */
+ 	if (!local_port)
+ 	{
+@@ -500,6 +586,10 @@
+ 
+ 	postconf_initialization (quiet);
+ 
++#if defined (PARANOIA) && !defined (EARLY_CHROOT)
++	if (set_chroot) setup_chroot (set_chroot);
++#endif /* PARANOIA && !EARLY_CHROOT */
++
+         /* test option should cause an early exit */
+  	if (cftest && !lftest) 
+  		exit(0);
+@@ -543,6 +633,22 @@
+ 			exit (0);
+ 	}
+ 
++#if defined (PARANOIA)
++	/* change uid to the specified one */
++
++	if (set_gid) {
++		if (setgroups (0, (void *)0))
++			log_fatal ("setgroups: %m");
++		if (setgid (set_gid))
++			log_fatal ("setgid(%d): %m", (int) set_gid);
++	}	
++
++	if (set_uid) {
++		if (setuid (set_uid))
++			log_fatal ("setuid(%d): %m", (int) set_uid);
++	}
++#endif /* PARANOIA */
++
+ 	/* Read previous pid file. */
+ 	if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
+ 		status = read (i, pbuf, (sizeof pbuf) - 1);
+@@ -888,6 +994,10 @@
+ 
+ 	log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s",
+ 		   "\n             [-cf config-file] [-lf lease-file]",
++#if defined (PARANOIA)
++		   /* meld into the following string */
++		   "\n             [-user user] [-group group] [-chroot dir]"
++#endif /* PARANOIA */
+ #if defined (TRACING)
+ 		   "\n		   [-tf trace-output-file]",
+ 		   "\n		   [-play trace-input-file]",
diff --git a/net-misc/dhcp/files/dhcp-3.0.2-gmake.patch b/net-misc/dhcp/files/dhcp-3.0.2-gmake.patch
new file mode 100644
index 000000000..4ab99a2b7
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.2-gmake.patch
@@ -0,0 +1,66 @@
+Index: dhcp-3.0.2/Makefile
+===================================================================
+--- dhcp-3.0.2.orig/Makefile
++++ dhcp-3.0.2/Makefile
+@@ -33,7 +33,7 @@ all:
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make all); \
++	   (cd work.$$sysname; $(MAKE) all); \
+ 	fi
+ 
+ install:
+@@ -41,7 +41,7 @@ install:
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make install); \
++	   (cd work.$$sysname; $(MAKE) install); \
+ 	fi
+ 
+ depend:
+@@ -49,7 +49,7 @@ depend:
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make depend); \
++	   (cd work.$$sysname; $(MAKE) depend); \
+ 	fi
+ 
+ clean:
+@@ -57,7 +57,7 @@ clean:
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make clean); \
++	   (cd work.$$sysname; $(MAKE) clean); \
+ 	fi
+ 
+ realclean:
+@@ -65,7 +65,7 @@ realclean:
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make realclean); \
++	   (cd work.$$sysname; $(MAKE) realclean); \
+ 	fi
+ 
+ distclean:
+@@ -73,7 +73,7 @@ distclean:
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make distclean); \
++	   (cd work.$$sysname; $(MAKE) distclean); \
+ 	fi
+ 
+ links:
+@@ -81,6 +81,6 @@ links:
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make links); \
++	   (cd work.$$sysname; $(MAKE) links); \
+ 	fi
+ 
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
new file mode 100644
index 000000000..579d72f48
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
@@ -0,0 +1,84 @@
+--- client/scripts/bsdos
++++ client/scripts/bsdos
+@@ -47,6 +47,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
+--- client/scripts/freebsd
++++ client/scripts/freebsd
+@@ -57,6 +57,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -69,6 +69,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
+--- client/scripts/netbsd
++++ client/scripts/netbsd
+@@ -47,6 +47,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
+--- client/scripts/openbsd
++++ client/scripts/openbsd
+@@ -47,6 +47,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
+--- client/scripts/solaris
++++ client/scripts/solaris
+@@ -47,6 +47,11 @@
+     . /etc/dhcp/dhclient-exit-hooks
+   fi
+ # probably should do something with exit status of the local script
++  if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++    dbus-send --system --dest=com.redhat.dhcp \
++      --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++      'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++  fi
+   exit $exit_status
+ }
+ 
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
new file mode 100644
index 000000000..9a6e7b969
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
@@ -0,0 +1,16 @@
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -138,10 +138,12 @@
+    [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
+   current_hostname=`hostname`
+   if [ x$current_hostname = x ] || \
++     [ x$current_hostname = "x(none)" ] || \
++     [ x$current_hostname = xlocalhost ] || \
+      [ x$current_hostname = x$old_host_name ]; then
+     if [ x$current_hostname = x ] || \
+        [ x$new_host_name != x$old_host_name ]; then
+-      hostname $new_host_name
++      hostname "$new_host_name"
+     fi
+   fi
+     
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch
new file mode 100644
index 000000000..040ef779d
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch
@@ -0,0 +1,200 @@
+--- client/scripts/bsdos
++++ client/scripts/bsdos
+@@ -84,6 +84,9 @@
+ if [ x$new_interface_mtu != x ]; then
+   mtu_arg="mtu $new_interface_mtu"
+ fi
++if [ x$IF_METRIC != x ]; then
++  metric_arg="metric $IF_METRIC"
++fi
+ 
+ if [ x$reason = xMEDIUM ]; then
+   eval "ifconfig $interface $medium"
+@@ -141,7 +144,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+     route add $new_ip_address 127.1 >/dev/null 2>&1
+     for router in $new_routers; do
+       route add default $router >/dev/null 2>&1
+@@ -198,7 +201,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+--- client/scripts/freebsd
++++ client/scripts/freebsd
+@@ -94,6 +94,9 @@
+ if [ x$new_interface_mtu != x ]; then
+   mtu_arg="mtu $new_interface_mtu"
+ fi
++if [ x$IF_METRIC != x ]; then
++  metric_arg="metric $IF_METRIC"
++fi
+ 
+ if [ x$reason = xMEDIUM ]; then
+   eval "ifconfig $interface $medium"
+@@ -151,7 +154,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+     $LOGGER "New IP Address ($interface): $new_ip_address"
+     $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
+     $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
+@@ -215,7 +218,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+   $LOGGER "New IP Address ($interface): $new_ip_address"
+   $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
+   $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -83,11 +83,6 @@
+   fi
+ fi
+ 
+-release=`uname -r`
+-release=`expr $release : '\(.*\)\..*'`
+-relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
+-relmajor=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'`
+-
+ if [ x$new_broadcast_address != x ]; then
+   new_broadcast_arg="broadcast $new_broadcast_address"
+ fi
+@@ -106,6 +101,9 @@
+ if [ x$new_interface_mtu != x ]; then
+   mtu_arg="mtu $new_interface_mtu"
+ fi
++if [ x$IF_METRIC != x ]; then
++  metric_arg="metric $IF_METRIC"
++fi
+ 
+ if [ x$reason = xMEDIUM ]; then
+   # Linux doesn't do mediums (ok, ok, media).
+@@ -117,15 +115,7 @@
+     # Bring down alias interface. Its routes will disappear too.
+     ifconfig $interface:0- inet 0
+   fi
+-  if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
+-   then
+-    ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
+-		broadcast 255.255.255.255 up
+-    # Add route to make broadcast work. Do not omit netmask.
+-    route add default dev $interface netmask 0.0.0.0
+-  else
+-    ifconfig $interface 0 up
+-  fi
++  ifconfig $interface 0 up
+ 
+   # We need to give the kernel some time to get the interface up.
+   sleep 1
+@@ -164,12 +154,14 @@
+     ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+     # Add a network route to the computed network address.
+-    if [ $relmajor -lt 2 ] || \
+-		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+-      route add -net $new_network_number $new_subnet_arg dev $interface
++    if [ x$IF_METRIC != x ] && [ x$IF_METRIC != x0 ]; then
++      route del -net $new_network_number $new_subnet_arg \
++        dev $interface
++      route add -net $new_network_number $new_subnet_arg $metric_arg \
++      	dev $interface
+     fi
+     for router in $new_routers; do
+-      route add default gw $router
++      route add default gw $router $metric_arg dev $interface
+     done
+   fi
+   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+@@ -213,12 +205,15 @@
+       ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+       route add -host $alias_ip_address dev $interface:0
+     fi
+-    if [ $relmajor -lt 2 ] || \
+-		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+-      route add -net $new_network_number
++    # Add a network route to the computed network address.
++    if [ x$IF_METRIC != x ] && [ x$IF_METRIC != x0 ]; then
++      route del -net $new_network_number $new_subnet_arg \
++        dev $interface
++      route add -net $new_network_number $new_subnet_arg $metric_arg \
++      	dev $interface
+     fi
+     for router in $new_routers; do
+-      route add default gw $router
++      route add default gw $router $metric_arg dev $interface
+     done
+     make_resolv_conf
+     exit_with_hooks 0
+--- client/scripts/netbsd
++++ client/scripts/netbsd
+@@ -84,6 +84,9 @@
+ if [ x$new_interface_mtu != x ]; then
+   mtu_arg="mtu $new_interface_mtu"
+ fi
++if [ x$IF_METRIC != x ]; then
++  metric_arg="metric $IF_METRIC"
++fi
+ 
+ if [ x$reason = xMEDIUM ]; then
+   eval "ifconfig $interface $medium"
+@@ -141,7 +144,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+     route add $new_ip_address 127.1 >/dev/null 2>&1
+     for router in $new_routers; do
+       route add default $router >/dev/null 2>&1
+@@ -198,7 +201,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+--- client/scripts/solaris
++++ client/scripts/solaris
+@@ -79,6 +79,9 @@
+ if [ x$new_interface_mtu != x ]; then
+   mtu_arg="mtu $new_interface_mtu"
+ fi
++if [ x$IF_METRIC != x ]; then
++  metric_arg="metric $IF_METRIC"
++fi
+ 
+ ifconfig=/sbin/ifconfig
+ 
+@@ -141,7 +144,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "$ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+     route add $new_ip_address 127.1 1 >/dev/null 2>&1
+     for router in $new_routers; do
+       route add default $router 1 >/dev/null 2>&1
+@@ -182,7 +185,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "$ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $mtu_arg $medium"
++			$new_broadcast_arg $mtu_arg $metric_arg $medium"
+   sleep 1
+   set $new_routers
+   if ping -s -n -I 1 $1 64 1; then
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch
new file mode 100644
index 000000000..5ef4442d8
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch
@@ -0,0 +1,180 @@
+--- client/scripts/bsdos
++++ client/scripts/bsdos
+@@ -81,6 +81,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+   alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++  mtu_arg="mtu $new_interface_mtu"
++fi
+ 
+ if [ x$reason = xMEDIUM ]; then
+   eval "ifconfig $interface $medium"
+@@ -138,7 +141,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $medium"
++					$new_broadcast_arg $mtu_arg $medium"
+     route add $new_ip_address 127.1 >/dev/null 2>&1
+     for router in $new_routers; do
+       route add default $router >/dev/null 2>&1
+@@ -195,7 +198,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $medium"
++					$new_broadcast_arg $mtu_arg $medium"
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+--- client/scripts/freebsd
++++ client/scripts/freebsd
+@@ -91,6 +91,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+   alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++  mtu_arg="mtu $new_interface_mtu"
++fi
+ 
+ if [ x$reason = xMEDIUM ]; then
+   eval "ifconfig $interface $medium"
+@@ -148,7 +151,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $medium"
++					$new_broadcast_arg $mtu_arg $medium"
+     $LOGGER "New IP Address ($interface): $new_ip_address"
+     $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
+     $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
+@@ -212,7 +215,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $medium"
++					$new_broadcast_arg $mtu_arg $medium"
+   $LOGGER "New IP Address ($interface): $new_ip_address"
+   $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
+   $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -103,6 +103,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+   alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++  mtu_arg="mtu $new_interface_mtu"
++fi
+ 
+ if [ x$reason = xMEDIUM ]; then
+   # Linux doesn't do mediums (ok, ok, media).
+@@ -159,7 +162,7 @@
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+ 
+     ifconfig $interface inet $new_ip_address $new_subnet_arg \
+-							$new_broadcast_arg
++					$new_broadcast_arg $mtu_arg
+     # Add a network route to the computed network address.
+     if [ $relmajor -lt 2 ] || \
+ 		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+@@ -201,7 +204,7 @@
+     ifconfig $interface:0- inet 0
+   fi
+   ifconfig $interface inet $new_ip_address $new_subnet_arg \
+-					$new_broadcast_arg
++					$new_broadcast_arg $mtu_arg
+   set $new_routers
+   ############## what is -w in ping?
+   if ping -q -c 1 $1; then
+--- client/scripts/netbsd
++++ client/scripts/netbsd
+@@ -81,6 +81,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+   alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++  mtu_arg="mtu $new_interface_mtu"
++fi
+ 
+ if [ x$reason = xMEDIUM ]; then
+   eval "ifconfig $interface $medium"
+@@ -138,7 +141,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $medium"
++					$new_broadcast_arg $mtu_arg $medium"
+     route add $new_ip_address 127.1 >/dev/null 2>&1
+     for router in $new_routers; do
+       route add default $router >/dev/null 2>&1
+@@ -195,7 +198,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $medium"
++					$new_broadcast_arg $mtu_arg $medium"
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+--- client/scripts/openbsd
++++ client/scripts/openbsd
+@@ -81,6 +81,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+   alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++  mtu_arg="mtu $new_interface_mtu"
++fi
+ 
+ if [ x$reason = xMEDIUM ]; then
+   eval "ifconfig $interface $medium"
+@@ -138,7 +141,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $medium"
++					$new_broadcast_arg $mtu_arg $medium"
+     route add $new_ip_address 127.1 >/dev/null 2>&1
+     for router in $new_routers; do
+       route add default $router >/dev/null 2>&1
+@@ -195,7 +198,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $medium"
++					$new_broadcast_arg $mtu_arg $medium"
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+--- client/scripts/solaris
++++ client/scripts/solaris
+@@ -76,6 +76,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+   alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++  mtu_arg="mtu $new_interface_mtu"
++fi
+ 
+ ifconfig=/sbin/ifconfig
+ 
+@@ -138,7 +141,7 @@
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+     eval "$ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $medium"
++					$new_broadcast_arg $mtu_arg $medium"
+     route add $new_ip_address 127.1 1 >/dev/null 2>&1
+     for router in $new_routers; do
+       route add default $router 1 >/dev/null 2>&1
+@@ -179,7 +182,7 @@
+     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+   fi
+   eval "$ifconfig $interface inet $new_ip_address $new_netmask_arg \
+-					$new_broadcast_arg $medium"
++					$new_broadcast_arg $mtu_arg $medium"
+   sleep 1
+   set $new_routers
+   if ping -s -n -I 1 $1 64 1; then
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
new file mode 100644
index 000000000..518efec11
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
@@ -0,0 +1,70 @@
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -118,9 +118,9 @@
+ if [ x$reason = xPREINIT ]; then
+   if [ x$alias_ip_address != x ]; then
+     # Bring down alias interface. Its routes will disappear too.
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+-  ifconfig $interface 0 up
++  ifconfig $interface 0.0.0.0 up
+ 
+   # We need to give the kernel some time to get the interface up.
+   sleep 1
+@@ -145,12 +145,12 @@
+   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+ 		[ x$alias_ip_address != x$old_ip_address ]; then
+     # Possible new alias. Remove old alias.
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+     # IP address changed. Bringing down the interface will delete all routes,
+     # and clear the ARP cache.
+-    ifconfig $interface inet 0 down
++    ifconfig $interface inet 0.0.0.0
+ 
+   fi
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+@@ -171,7 +171,7 @@
+   fi
+   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+    then
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+     ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+     route add -host $alias_ip_address $interface:0
+   fi
+@@ -183,11 +183,11 @@
+    || [ x$reason = xSTOP ]; then
+   if [ x$alias_ip_address != x ]; then
+     # Turn off alias interface.
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+   if [ x$old_ip_address != x ]; then
+     # Shut down interface, which will delete routes and clear arp cache.
+-    ifconfig $interface inet 0 down
++    ifconfig $interface inet 0.0.0.0
+   fi
+   if [ x$alias_ip_address != x ]; then
+     ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+@@ -198,7 +198,7 @@
+ 
+ if [ x$reason = xTIMEOUT ]; then
+   if [ x$alias_ip_address != x ]; then
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+   ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+@@ -223,7 +223,7 @@
+     make_resolv_conf
+     exit_with_hooks 0
+   fi
+-  ifconfig $interface inet 0 down
++  ifconfig $interface inet 0.0.0.0
+   exit_with_hooks 1
+ fi
+ 
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch
new file mode 100644
index 000000000..d84e6f613
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch
@@ -0,0 +1,186 @@
+--- client/clparse.c
++++ client/clparse.c
+@@ -51,6 +51,7 @@
+ 	DHO_DOMAIN_NAME,
+ 	DHO_DOMAIN_NAME_SERVERS,
+ 	DHO_HOST_NAME,
++	DHO_NTP_SERVERS,
+ 	0
+ };
+
+--- client/scripts/bsdos
++++ client/scripts/bsdos
+@@ -7,6 +7,26 @@
+       echo nameserver $nameserver >>/etc/resolv.conf
+     done
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ x$new_ntp_servers != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- client/scripts/freebsd
++++ client/scripts/freebsd
+@@ -32,8 +32,28 @@
+       done
+     fi
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
+ }
+ 
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
++}
++
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+ exit_with_hooks() {
+   exit_status=$1
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -30,6 +30,26 @@
+       echo nameserver $nameserver >>/etc/resolv.conf
+     done
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- client/scripts/netbsd
++++ client/scripts/netbsd
+@@ -7,6 +7,26 @@
+       echo nameserver $nameserver >>/etc/resolv.conf
+     done
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- client/scripts/openbsd
++++ client/scripts/openbsd
+@@ -7,6 +7,26 @@
+       echo nameserver $nameserver >>/etc/resolv.conf
+     done
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+--- client/scripts/solaris
++++ client/scripts/solaris
+@@ -7,6 +7,26 @@
+       echo nameserver $nameserver >>/etc/resolv.conf
+     done
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch b/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch
new file mode 100644
index 000000000..8e93ac95b
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch
@@ -0,0 +1,14 @@
+--- dst/Makefile.dist.old	2004-12-24 13:31:22.986061032 +0000
++++ dst/Makefile.dist	2004-12-24 13:47:19.036913364 +0000
+@@ -31,6 +31,10 @@
+ all:	libdst.a
+ 
+ install:
++	mkdir -p $(DESTDIR)$(LIBDIR)
++	$(INSTALL) libdst.a $(DESTDIR)$(LIBDIR)
++	$(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libdst.a
++
+ 
+ libdst.a:	$(OBJ)
+    rm -f dst.a
+
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-no_isc_blurb.patch b/net-misc/dhcp/files/dhcp-3.0.3-no_isc_blurb.patch
new file mode 100644
index 000000000..38f7713f5
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-no_isc_blurb.patch
@@ -0,0 +1,105 @@
+Patch nobbled from RedHat, and adapted to work with dhclient and dhrelay
+by Roy Marples <uberlord@gentoo.org>
+
+--- dhcp-3.0.3/omapip/errwarn.c.no_isc_blurb	2004-09-30 16:38:32.000000000 -0400
++++ dhcp-3.0.3/omapip/errwarn.c	2005-04-18 13:45:49.037158000 -0400
+@@ -45,6 +45,8 @@
+ int log_perror = 1;
+ #endif
+ int log_priority;
++int log_isc_blurb=1;
++
+ void (*log_cleanup) (void);
+ 
+ #define CVT_BUF_MAX 1023
+@@ -76,7 +78,9 @@
+ 	  write (STDERR_FILENO, "\n", 1);
+   }
+ 
+-#if !defined (NOMINUM)
++#if !defined(NOMINUM)
++  if ( log_isc_blurb )
++  {
+   log_error ("%s", "");
+   log_error ("If you did not get this software from ftp.isc.org, please");
+   log_error ("get the latest from ftp.isc.org and install that before");
+@@ -94,7 +98,12 @@
+   log_error ("the README file.");
+   log_error ("%s", "");
+   log_error ("exiting.");
++  }else
++  {
++      log_error ("exiting.");
++  }
+ #endif
++
+   if (log_cleanup)
+ 	  (*log_cleanup) ();
+   exit (1);
+--- dhcp-3.0.3/client/dhclient.c.no_isc_blurb	2005-04-18 13:21:08.509169000 -0400
++++ dhcp-3.0.3/client/dhclient.c	2005-04-18 13:49:27.574402000 -0400
+@@ -34,7 +34,7 @@
+ static char ocopyright[] =
+ "$Id: dhcp-3.0.3-no_isc_blurb.patch,v 1.1 2005/12/09 14:13:30 uberlord Exp $ Copyright (c) 2004 Internet Systems Consortium.  All rights reserved.\n";
+ #endif /* not lint */
+-
++ 
+ #include "dhcpd.h"
+ #include "version.h"
+ 
+@@ -81,6 +81,8 @@
+ 
+ void do_release(struct client_state *);
+ 
++extern int log_isc_blurb;
++
+ int main (argc, argv, envp)
+ 	int argc;
+ 	char **argv, **envp;
+@@ -176,6 +178,7 @@
+ 		} else if (!strcmp (argv [i], "-q")) {
+ 			quiet = 1;
+ 			quiet_interface_discovery = 1;
++			log_isc_blurb = 0;      
+ 		} else if (!strcmp (argv [i], "-s")) {
+ 			if (++i == argc)
+ 				usage ();
+--- dhcp-3.0.3/server/dhcpd.c.no_isc_blurb	2005-12-08 10:01:40.000000000 +0000
++++ dhcp-3.0.3/server/dhcpd.c	2005-12-08 10:05:55.000000000 +0000
+@@ -62,6 +62,9 @@
+ struct iaddr server_identifier;
+ int server_identifier_matched;
+ 
++
++extern int log_isc_blurb;
++
+ #if defined (NSUPDATE)
+ 
+ /* This stuff is always executed to figure the default values for certain
+@@ -368,6 +371,7 @@
+ 		} else if (!strcmp (argv [i], "-q")) {
+ 			quiet = 1;
+ 			quiet_interface_discovery = 1;
++			log_isc_blurb = 0;
+ 		} else if (!strcmp (argv [i], "--version")) {
+ 			log_info ("isc-dhcpd-%s", DHCP_VERSION);
+ 			exit (0);
+--- dhcp-3.0.3/relay/dhcrelay.c.no_isc_blurb	2005-12-08 10:21:00.000000000 +0000
++++ dhcp-3.0.3/relay/dhcrelay.c	2005-12-08 10:21:50.000000000 +0000
+@@ -102,6 +102,8 @@
+ static char message [] = "Internet Systems Consortium DHCP Relay Agent";
+ static char url [] = "For info, please visit http://www.isc.org/sw/dhcp/";
+ 
++extern int log_isc_blurb;
++
+ int main (argc, argv, envp)
+ 	int argc;
+ 	char **argv, **envp;
+@@ -170,6 +172,7 @@
+ 		} else if (!strcmp (argv [i], "-q")) {
+ 			quiet = 1;
+ 			quiet_interface_discovery = 1;
++			log_isc_blurb = 0;
+ 		} else if (!strcmp (argv [i], "-a")) {
+ 			add_agent_options = 1;
+ 		} else if (!strcmp (argv [i], "-c")) {
diff --git a/net-misc/dhcp/files/dhcp-3.0.4-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-3.0.4-dhclient-stdin-conf.patch
new file mode 100644
index 000000000..3fedc7c0e
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.4-dhclient-stdin-conf.patch
@@ -0,0 +1,83 @@
+--- common/conflex.c.orig	2006-02-21 16:21:45.000000000 +0000
++++ common/conflex.c	2006-02-21 16:23:06.000000000 +0000
+@@ -90,7 +90,7 @@
+ 	struct parse **cfile;
+ {
+ 	/* "Memory" config files have no file. */
+-	if ((*cfile)->file != -1)
++	if ((*cfile)->file != -1 && (*cfile)->file != fileno(stdin))
+ 		close((*cfile)->file);
+ 
+ 	if ((*cfile)->bufsiz)
+--- client/clparse.c.orig	2006-02-22 09:37:12.000000000 +0000
++++ client/clparse.c	2006-02-22 09:38:26.000000000 +0000
+@@ -97,6 +97,11 @@
+ 	status = read_client_conf_file (path_dhclient_conf,
+ 					(struct interface_info *)0,
+ 					&top_level_config);
++
++	/* Read any extra configuration from stdin */
++	read_client_conf_stdin ((struct interface_info *)0,
++					&top_level_config);
++	
+ 	if (status != ISC_R_SUCCESS) {
+ 		;
+ #ifdef LATER
+@@ -148,20 +153,17 @@
+ 	return status;
+ }
+ 
+-int read_client_conf_file (const char *name, struct interface_info *ip,
+-			   struct client_config *client)
++int read_client_conf_actual (int file, const char *name, 
++			     struct interface_info *ip,
++			     struct client_config *client)
+ {
+-	int file;
+ 	struct parse *cfile;
+ 	const char *val;
+ 	int token;
+ 	isc_result_t status;
+ 	
+-	if ((file = open (name, O_RDONLY)) < 0)
+-		return uerr2isc (errno);
+-
+ 	cfile = (struct parse *)0;
+-	new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0);
++	new_parse (&cfile, file, (char *)0, 0, name , 0);
+ 
+ 	do {
+ 		token = peek_token (&val, (unsigned *)0, cfile);
+@@ -177,6 +179,32 @@
+ 	return status;
+ }
+ 
++int read_client_conf_file (const char *name, struct interface_info *ip,
++			   struct client_config *client)
++{
++	int file;
++	isc_result_t status;
++	
++	if ((file = open (name, O_RDONLY)) < 0)
++		return uerr2isc (errno);
++
++	status = read_client_conf_actual(file, name, ip, client);
++
++	return status;
++}
++
++
++int read_client_conf_stdin (struct interface_info *ip,
++			    struct client_config *client)
++{
++	int file = fileno(stdin);
++	isc_result_t status;
++
++	if (isatty(file)) return ISC_R_NOTFOUND;
++	status = read_client_conf_actual(file, "stdin", ip, client);
++
++	return status;
++}
+ 
+ /* lease-file :== client-lease-statements END_OF_FILE
+    client-lease-statements :== <nil>
diff --git a/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch b/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch
new file mode 100644
index 000000000..2fae6f220
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch
@@ -0,0 +1,44 @@
+diff -ur common.orig/bpf.c common/bpf.c
+--- common.orig/bpf.c	2006-09-20 12:52:47 +0100
++++ common/bpf.c	2006-09-20 12:53:22 +0100
+@@ -354,10 +354,6 @@
+ 	int result;
+ 	int fudge;
+ 
+-	if (!strcmp (interface -> name, "fallback"))
+-		return send_fallback (interface, packet, raw,
+-				      len, from, to, hto);
+-
+ 	/* Assemble the headers... */
+ 	assemble_hw_header (interface, (unsigned char *)hw, &hbufp, hto);
+ 	assemble_udp_ip_header (interface,
+@@ -531,17 +527,5 @@
+ 
+ void maybe_setup_fallback ()
+ {
+-	isc_result_t status;
+-	struct interface_info *fbi = (struct interface_info *)0;
+-	if (setup_fallback (&fbi, MDL)) {
+-		if_register_fallback (fbi);
+-		status = omapi_register_io_object ((omapi_object_t *)fbi,
+-						   if_readsocket, 0,
+-						   fallback_discard, 0, 0);
+-		if (status != ISC_R_SUCCESS)
+-			log_fatal ("Can't register I/O handle for %s: %s",
+-				   fbi -> name, isc_result_totext (status));
+-		interface_dereference (&fbi, MDL);
+-	}
+ }
+ #endif
+diff -ur includes.orig/osdep.h includes/osdep.h
+--- includes.orig/osdep.h	2006-09-20 12:54:52 +0100
++++ includes/osdep.h	2006-09-20 12:56:40 +0100
+@@ -190,7 +190,7 @@
+    Currently, all low-level packet interfaces use BSD sockets as a
+    fallback. */
+ 
+-#if defined (USE_BPF_SEND) || defined (USE_NIT_SEND) || \
++#if defined (USE_NIT_SEND) || \
+     defined (USE_DLPI_SEND) || defined (USE_UPF_SEND) || \
+     defined (USE_LPF_SEND) || \
+     (defined (USE_SOCKET_SEND) && defined (HAVE_SO_BINDTODEVICE))
diff --git a/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch
new file mode 100644
index 000000000..5c420ae6e
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch
@@ -0,0 +1,254 @@
+diff -ur client.orig/scripts/bsdos client/scripts/bsdos
+--- client.orig/scripts/bsdos	2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/bsdos	2006-09-07 19:19:53.000000000 +0100
+@@ -1,21 +1,22 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
+-  if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ "x$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ "x$new_domain_name" != x ]; then
+-      # Note that the DHCP 'Domain Name Option' is really just a domain
+-      # name, and that this practice of using the domain name option as
+-      # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; 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"
++      fi
++      for nameserver in $new_domain_name_servers; do
++        conf="${conf}nameserver $nameserver\n"
++      done
++      if [ -x /sbin/resolvconf ]; then
++        printf "$conf" | resolvconf -a "$interface"
++      else
++        printf "$conf" > /etc/resolv.conf
++        chmod 644 /etc/resolv.conf
++      fi
+     fi
+-    for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >> /etc/resolv.conf.dhclient
+-    done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   fi
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+diff -ur client.orig/scripts/freebsd client/scripts/freebsd
+--- client.orig/scripts/freebsd	2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/freebsd	2006-09-07 19:19:32.000000000 +0100
+@@ -11,38 +11,20 @@
+ fi
+ 
+ make_resolv_conf() {
+-  if [ x"$new_domain_name_servers" != x ]; then
+-    ( cat /dev/null > /etc/resolv.conf.dhclient )
+-    exit_status=$?
+-    if [ $exit_status -ne 0 ]; then
+-      $LOGGER "Unable to create /etc/resolv.conf.dhclient: Error $exit_status"
+-    else
+-      if [ "x$new_domain_search" != x ]; then
+-	( echo search $new_domain_search >> /etc/resolv.conf.dhclient )
+-	exit_status=$?
+-      elif [ "x$new_domain_name" != x ]; then
+-	# Note that the DHCP 'Domain Name Option' is really just a domain
+-	# name, and that this practice of using the domain name option as
+-	# a search path is both nonstandard and deprecated.
+-	( echo search $new_domain_name >> /etc/resolv.conf.dhclient )
+-	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
++      conf="# Generated by dhclient for interface $interface\n"
++      if [ "x$new_domain_name" != x ]; then
++        conf="${conf}search $new_domain_name\n"
+       fi
+       for nameserver in $new_domain_name_servers; do
+-	if [ $exit_status -ne 0 ]; then
+-	  break
+-	fi
+-	( echo nameserver $nameserver >>/etc/resolv.conf.dhclient )
+-	exit_status=$?
++        conf="${conf}nameserver $nameserver\n"
+       done
+-
+-      # If there were no errors, attempt to mv the new file into place.
+-      if [ $exit_status -eq 0 ]; then
+-	( mv /etc/resolv.conf.dhclient /etc/resolv.conf )
+-	exit_status = $?
+-      fi
+-
+-      if [ $exit_status -ne 0 ]; then
+-	$LOGGER "Error while writing new /etc/resolv.conf."
++      if [ -x /sbin/resolvconf ]; then
++        printf "$conf" | resolvconf -a "$interface"
++      else
++        printf "$conf" > /etc/resolv.conf
++        chmod 644 /etc/resolv.conf
+       fi
+     fi
+   fi
+diff -ur client.orig/scripts/linux client/scripts/linux
+--- client.orig/scripts/linux	2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/linux	2006-09-07 19:18:57.000000000 +0100
+@@ -23,22 +23,22 @@
+ # of the $1 in its args.
+ 
+ make_resolv_conf() {
+-  if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    chmod 644 /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
+-      # Note that the DHCP 'Domain Name Option' is really just a domain
+-      # name, and that this practice of using the domain name option as
+-      # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; 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"
++      fi
++      for nameserver in $new_domain_name_servers; do
++        conf="${conf}nameserver $nameserver\n"
++      done
++      if [ -x /sbin/resolvconf ]; then
++        printf "$conf" | resolvconf -a "$interface"
++      else
++        printf "$conf" > /etc/resolv.conf
++        chmod 644 /etc/resolv.conf
++      fi
+     fi
+-    for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+-    done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   fi
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+diff -ur client.orig/scripts/netbsd client/scripts/netbsd
+--- client.orig/scripts/netbsd	2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/netbsd	2006-09-07 19:20:10.000000000 +0100
+@@ -1,21 +1,22 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
+-  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ "x$new_domain_search != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ "x$new_domain_name != x ]; then
+-      # Note that the DHCP 'Domain Name Option' is really just a domain
+-      # name, and that this practice of using the domain name option as
+-      # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; 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"
++      fi
++      for nameserver in $new_domain_name_servers; do
++        conf="${conf}nameserver $nameserver\n"
++      done
++      if [ -x /sbin/resolvconf ]; then
++        printf "$conf" | resolvconf -a "$interface"
++      else
++        printf "$conf" > /etc/resolv.conf
++        chmod 644 /etc/resolv.conf
++      fi
+     fi
+-    for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+-    done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   fi
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+diff -ur client.orig/scripts/openbsd client/scripts/openbsd
+--- client.orig/scripts/openbsd	2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/openbsd	2006-09-07 19:20:38.000000000 +0100
+@@ -1,21 +1,22 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
+-  if x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
+-      # Note that the DHCP 'Domain Name Option' is really just a domain
+-      # name, and that this practice of using the domain name option as
+-      # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; 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"
++      fi
++      for nameserver in $new_domain_name_servers; do
++        conf="${conf}nameserver $nameserver\n"
++      done
++      if [ -x /sbin/resolvconf ]; then
++        printf "$conf" | resolvconf -a "$interface"
++      else
++        printf "$conf" > /etc/resolv.conf
++        chmod 644 /etc/resolv.conf
++      fi
+     fi
+-    for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+-    done
+-
+-    mv /etc/ersolv.conf.dhclient /etc/resolv.conf
+   fi
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+diff -ur client.orig/scripts/solaris client/scripts/solaris
+--- client.orig/scripts/solaris	2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/solaris	2006-09-07 19:21:12.000000000 +0100
+@@ -1,21 +1,22 @@
+ #!/bin/sh  
+ 
+ make_resolv_conf() {
+-  if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
+-      # Note that the DHCP 'Domain Name Option' is really just a domain
+-      # name, and that this practice of using the domain name option as
+-      # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; 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"
++      fi
++      for nameserver in $new_domain_name_servers; do
++        conf="${conf}nameserver $nameserver\n"
++      done
++      if [ -x /sbin/resolvconf ]; then
++        printf "$conf" | resolvconf -a "$interface"
++      else
++        printf "$conf" > /etc/resolv.conf
++        chmod 644 /etc/resolv.conf
++      fi
+     fi
+-    for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+-    done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   fi
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
diff --git a/net-misc/dhcp/files/dhcp-3.1.2_p1-CVE-2009-1892.patch b/net-misc/dhcp/files/dhcp-3.1.2_p1-CVE-2009-1892.patch
new file mode 100644
index 000000000..ae1b92af8
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.1.2_p1-CVE-2009-1892.patch
@@ -0,0 +1,12 @@
+diff -uNr dhcp-3.1.2.ORIG/server/dhcp.c dhcp-3.1.2/server/dhcp.c
+--- dhcp-3.1.2.ORIG/server/dhcp.c	2009-07-13 14:26:15.000000000 +0100
++++ dhcp-3.1.2/server/dhcp.c	2009-07-13 14:26:33.000000000 +0100
+@@ -1747,6 +1747,8 @@
+ 				host_reference (&host, h, MDL);
+ 		}
+ 		if (!host) {
++			if (hp)
++				host_dereference (&hp, MDL);
+ 			find_hosts_by_haddr (&hp,
+ 					     packet -> raw -> htype,
+ 					     packet -> raw -> chaddr,
diff --git a/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch b/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch
new file mode 100644
index 000000000..89935df82
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch
@@ -0,0 +1,77 @@
+diff -Nuar --exclude '*.orig' dhcp-3.1.3.orig//client/scripts/linux dhcp-3.1.3//client/scripts/linux
+--- dhcp-3.1.3.orig//client/scripts/linux	2010-10-15 04:59:15.890664245 +0000
++++ dhcp-3.1.3//client/scripts/linux	2010-10-15 05:04:57.940396350 +0000
+@@ -118,7 +118,7 @@
+ if [ x$reason = xPREINIT ]; then
+   if [ x$alias_ip_address != x ]; then
+     # Bring down alias interface. Its routes will disappear too.
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+   if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
+    then
+@@ -127,7 +127,7 @@
+     # Add route to make broadcast work. Do not omit netmask.
+     route add default dev $interface netmask 0.0.0.0
+   else
+-    ifconfig $interface 0 up
++    ifconfig $interface 0.0.0.0 up
+   fi
+ 
+   # We need to give the kernel some time to get the interface up.
+@@ -155,12 +155,12 @@
+   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+ 		[ x$alias_ip_address != x$old_ip_address ]; then
+     # Possible new alias. Remove old alias.
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+     # IP address changed. Bringing down the interface will delete all routes,
+     # and clear the ARP cache.
+-    ifconfig $interface inet 0 down
++    ifconfig $interface inet 0.0.0.0
+ 
+   fi
+   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+@@ -179,7 +179,7 @@
+   fi
+   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+    then
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+     ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+     route add -host $alias_ip_address $interface:0
+   fi
+@@ -191,11 +191,11 @@
+    || [ x$reason = xSTOP ]; then
+   if [ x$alias_ip_address != x ]; then
+     # Turn off alias interface.
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+   if [ x$old_ip_address != x ]; then
+     # Shut down interface, which will delete routes and clear arp cache.
+-    ifconfig $interface inet 0 down
++    ifconfig $interface inet 0.0.0.0
+   fi
+   if [ x$alias_ip_address != x ]; then
+     ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+@@ -206,7 +206,7 @@
+ 
+ if [ x$reason = xTIMEOUT ]; then
+   if [ x$alias_ip_address != x ]; then
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+   fi
+   ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+@@ -227,7 +227,7 @@
+     make_resolv_conf
+     exit_with_hooks 0
+   fi
+-  ifconfig $interface inet 0 down
++  ifconfig $interface inet 0.0.0.0
+   exit_with_hooks 1
+ fi
+ 
diff --git a/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch
new file mode 100644
index 000000000..d3f29714b
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch
@@ -0,0 +1,216 @@
+diff -uNr dhcp-4.0.0.ORIG/client/clparse.c dhcp-4.0.0/client/clparse.c
+--- dhcp-4.0.0.ORIG/client/clparse.c	2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/clparse.c	2008-09-01 11:48:17.000000000 +0100
+@@ -37,7 +37,7 @@
+ 
+ struct client_config top_level_config;
+ 
+-#define NUM_DEFAULT_REQUESTED_OPTS	9
++#define NUM_DEFAULT_REQUESTED_OPTS	10
+ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
+ 
+ static void parse_client_default_duid(struct parse *cfile);
+@@ -98,15 +98,20 @@
+ 				dhcp_universe.code_hash, &code, 0, MDL);
+ 
+ 	/* 8 */
+-	code = D6O_NAME_SERVERS;
++	code = DHO_NTP_SERVERS;
+ 	option_code_hash_lookup(&default_requested_options[7],
+-				dhcpv6_universe.code_hash, &code, 0, MDL);
++				dhcp_universe.code_hash, &code, 0, MDL);
+ 
+ 	/* 9 */
+-	code = D6O_DOMAIN_SEARCH;
++	code = D6O_NAME_SERVERS;
+ 	option_code_hash_lookup(&default_requested_options[8],
+ 				dhcpv6_universe.code_hash, &code, 0, MDL);
+ 
++	/* 10 */
++	code = D6O_DOMAIN_SEARCH;
++	option_code_hash_lookup(&default_requested_options[9],
++				dhcpv6_universe.code_hash, &code, 0, MDL);
++
+ 	for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
+ 		if (default_requested_options[code] == NULL)
+ 			log_fatal("Unable to find option definition for "
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/bsdos dhcp-4.0.0/client/scripts/bsdos
+--- dhcp-4.0.0.ORIG/client/scripts/bsdos	2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/bsdos	2008-09-01 11:39:30.000000000 +0100
+@@ -29,6 +29,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ x$new_ntp_servers != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/freebsd dhcp-4.0.0/client/scripts/freebsd
+--- dhcp-4.0.0.ORIG/client/scripts/freebsd	2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/freebsd	2008-09-01 11:39:30.000000000 +0100
+@@ -73,6 +73,26 @@
+       fi
+     fi
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/linux dhcp-4.0.0/client/scripts/linux
+--- dhcp-4.0.0.ORIG/client/scripts/linux	2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/linux	2008-09-01 11:39:30.000000000 +0100
+@@ -55,6 +55,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/netbsd dhcp-4.0.0/client/scripts/netbsd
+--- dhcp-4.0.0.ORIG/client/scripts/netbsd	2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/netbsd	2008-09-01 11:39:30.000000000 +0100
+@@ -29,6 +29,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/openbsd dhcp-4.0.0/client/scripts/openbsd
+--- dhcp-4.0.0.ORIG/client/scripts/openbsd	2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/openbsd	2008-09-01 11:39:30.000000000 +0100
+@@ -29,6 +29,26 @@
+ 
+     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/solaris dhcp-4.0.0/client/scripts/solaris
+--- dhcp-4.0.0.ORIG/client/scripts/solaris	2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/solaris	2008-09-01 11:39:30.000000000 +0100
+@@ -17,6 +17,26 @@
+ 
+     mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   fi
++  # If we're making confs, may as well make an ntp.conf too
++  make_ntp_conf
++}
++
++make_ntp_conf() {
++  if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++    if [ "x$new_ntp_servers" != x ]; then
++      conf="# Generated by dhclient for interface $interface\n"
++      conf="${conf}restrict default noquery notrust nomodify\n"
++      conf="${conf}restrict 127.0.0.1\n"
++      for ntpserver in $new_ntp_servers; do
++        conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++        conf="${conf}server $ntpserver\n"
++      done
++      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++      conf="${conf}logfile /var/log/ntp.log\n"
++      printf "${conf}" > /etc/ntp.conf
++      chmod 644 /etc/ntp.conf
++    fi
++  fi
+ }
+ 
+ # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
diff --git a/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch
new file mode 100644
index 000000000..ddbe4a39d
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch
@@ -0,0 +1,114 @@
+diff -uNr dhcp-4.0.1.ORIG/client/clparse.c dhcp-4.0.1/client/clparse.c
+--- dhcp-4.0.1.ORIG/client/clparse.c	2009-03-30 13:54:47.000000000 +0100
++++ dhcp-4.0.1/client/clparse.c	2009-03-30 13:58:02.000000000 +0100
+@@ -174,6 +174,10 @@
+ #endif
+ 	}
+ 
++       /* Read any extra configuration from stdin */
++	read_client_conf_stdin ((struct interface_info *)0,
++				&top_level_config);
++
+ 	/* Set up state and config structures for clients that don't
+ 	   have per-interface configuration statements. */
+ 	config = (struct client_config *)0;
+@@ -203,23 +207,13 @@
+ 	return status;
+ }
+ 
+-int read_client_conf_file (const char *name, struct interface_info *ip,
++int read_client_conf_actual (struct parse *cfile, struct interface_info *ip,
+ 			   struct client_config *client)
+ {
+-	int file;
+-	struct parse *cfile;
+ 	const char *val;
+ 	int token;
+ 	isc_result_t status;
+ 	
+-	if ((file = open (name, O_RDONLY)) < 0)
+-		return uerr2isc (errno);
+-
+-	cfile = NULL;
+-	status = new_parse(&cfile, file, NULL, 0, path_dhclient_conf, 0);
+-	if (status != ISC_R_SUCCESS || cfile == NULL)
+-		return status;
+-
+ 	do {
+ 		token = peek_token (&val, (unsigned *)0, cfile);
+ 		if (token == END_OF_FILE)
+@@ -230,10 +224,74 @@
+ 	status = (cfile -> warnings_occurred
+ 		  ? ISC_R_BADPARSE
+ 		  : ISC_R_SUCCESS);
++	return status;
++}
++
++int read_client_conf_file (const char *name, struct interface_info *ip,
++			   struct client_config *client)
++{
++	int file;
++	struct parse *cfile;
++	isc_result_t status;
++	
++	if ((file = open (name, O_RDONLY)) < 0)
++		return uerr2isc (errno);
++
++	cfile = (struct parse *)0;
++	new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0);
++	status = read_client_conf_actual(cfile, ip, client);
+ 	end_parse (&cfile);
+ 	return status;
+ }
+ 
++int read_client_conf_stdin (struct interface_info *ip,
++			    struct client_config *client)
++{
++	int file;
++	char *buffer = NULL, *p;
++	unsigned buflen, len = 0;
++	struct parse *cfile;
++	size_t bytes;
++	isc_result_t status;
++
++	file = fileno(stdin);
++	if (isatty (file))
++		return ISC_R_NOTFOUND;
++	if (fcntl (file, F_SETFL, O_NONBLOCK) < 0)
++		log_fatal ("could not set stdin to non blocking!");
++
++	buflen = BUFSIZ;
++	buffer = malloc (BUFSIZ + 1);
++	p = buffer;
++	do {
++		bytes = read (file, p, BUFSIZ);
++		if (bytes == 0)
++			break;
++		if (bytes == -1)
++			log_fatal ("failed to read stdin!");
++		if (bytes >= BUFSIZ) {
++			buflen += BUFSIZ;
++			len += BUFSIZ;
++			buffer = realloc (buffer, buflen + 1);
++			if (!buffer)
++				log_fatal ("not enough buffer to read stdin!");
++			p = buffer + len;
++		} else {
++			len += bytes;
++			break;
++		}
++	} while(1);
++	buffer[len] = '\0';
++
++	cfile = (struct parse *)0;
++	status = new_parse (&cfile, -1, buffer, len, "stdin", 0);
++	if (status == ISC_R_SUCCESS) {
++		status = read_client_conf_actual (cfile, ip, client);
++		end_parse (&cfile);
++	}
++	free(buffer);
++	return status;
++}
+ 
+ /* lease-file :== client-lease-statements END_OF_FILE
+    client-lease-statements :== <nil>
diff --git a/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch b/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch
new file mode 100644
index 000000000..f882a1345
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch
@@ -0,0 +1,31 @@
+ripped from Fedora & tweaked 
+
+--- dhcp-4.2.0/omapip/errwarn.c
++++ dhcp-4.2.0/omapip/errwarn.c
+@@ -76,20 +76,13 @@
+ 
+ #if !defined (NOMINUM)
+   log_error ("%s", "");
+-  log_error ("If you did not get this software from ftp.isc.org, please");
+-  log_error ("get the latest from ftp.isc.org and install that before");
+-  log_error ("requesting help.");
++  log_error ("This version of ISC DHCP is based on the release available");
++  log_error ("on ftp.isc.org.  Features have been added and other changes");
++  log_error ("have been made to the base software release in order to make");
++  log_error ("it work better with this distribution.");
+   log_error ("%s", "");
+-  log_error ("If you did get this software from ftp.isc.org and have not");
+-  log_error ("yet read the README, please read it before requesting help.");
+-  log_error ("If you intend to request help from the dhcp-server@isc.org");
+-  log_error ("mailing list, please read the section on the README about");
+-  log_error ("submitting bug reports and requests for help.");
+-  log_error ("%s", "");
+-  log_error ("Please do not under any circumstances send requests for");
+-  log_error ("help directly to the authors of this software - please");
+-  log_error ("send them to the appropriate mailing list as described in");
+-  log_error ("the README file.");
++  log_error ("Please report for this software via the Gentoo Bugzilla site:");
++  log_error ("    http://bugs.gentoo.org/");
+   log_error ("%s", "");
+   log_error ("exiting.");
+ #endif
diff --git a/net-misc/dhcp/files/dhcp-4.2.0-improved-xid.patch b/net-misc/dhcp/files/dhcp-4.2.0-improved-xid.patch
new file mode 100644
index 000000000..567601f06
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.0-improved-xid.patch
@@ -0,0 +1,138 @@
+diff -up dhcp-4.2.0/client/dhclient.c.xid dhcp-4.2.0/client/dhclient.c

+--- dhcp-4.2.0/client/dhclient.c.xid	2010-09-23 06:21:03.000000000 -0400

++++ dhcp-4.2.0/client/dhclient.c	2010-09-23 09:14:09.000000000 -0400

+@@ -805,6 +805,26 @@ main(int argc, char **argv) {

+ 		}

+ 	}

+ 

++	/* We create a backup seed before rediscovering interfaces in order to

++	   have a seed built using all of the available interfaces

++	   It's interesting if required interfaces doesn't let us defined

++	   a really unique seed due to a lack of valid HW addr later

++	   (this is the case with DHCP over IB)

++	   We only use the last device as using a sum could broke the

++	   uniqueness of the seed among multiple nodes

++	 */

++	unsigned backup_seed = 0;

++	for (ip = interfaces; ip; ip = ip -> next) {

++		int junk;

++		if ( ip -> hw_address.hlen <= sizeof seed )

++		  continue;

++		memcpy (&junk,

++			&ip -> hw_address.hbuf [ip -> hw_address.hlen -

++						sizeof seed], sizeof seed);

++		backup_seed = junk;

++	}

++

++

+ 	/* At this point, all the interfaces that the script thinks

+ 	   are relevant should be running, so now we once again call

+ 	   discover_interfaces(), and this time ask it to actually set

+@@ -819,14 +839,36 @@ main(int argc, char **argv) {

+ 	   Not much entropy, but we're booting, so we're not likely to

+ 	   find anything better. */

+ 	seed = 0;

++	int seed_flag = 0;

+ 	for (ip = interfaces; ip; ip = ip->next) {

+ 		int junk;

++		if ( ip -> hw_address.hlen <= sizeof seed )

++		  continue;

+ 		memcpy(&junk,

+ 		       &ip->hw_address.hbuf[ip->hw_address.hlen -

+ 					    sizeof seed], sizeof seed);

+ 		seed += junk;

++		seed_flag = 1;

+ 	}

+-	srandom(seed + cur_time);

++	if ( seed_flag == 0 ) {

++		if ( backup_seed != 0 ) {

++		  seed = backup_seed;

++		  log_info ("xid: rand init seed (0x%x) built using all"

++			    " available interfaces",seed);

++		}

++		else {

++		  seed = cur_time^((unsigned) gethostid()) ;

++		  log_info ("xid: warning: no netdev with useable HWADDR found"

++			    " for seed's uniqueness enforcement");

++		  log_info ("xid: rand init seed (0x%x) built using gethostid",

++			    seed);

++		}

++		/* we only use seed and no current time as a broadcast reply */

++		/* will certainly be used by the hwaddrless interface */

++		srandom(seed);

++	}

++	else

++	        srandom(seed + cur_time);

+ 

+ 	/* Setup specific Infiniband options */

+ 	for (ip = interfaces; ip; ip = ip->next) {

+@@ -1310,7 +1352,7 @@ void dhcpack (packet)

+ 		return;

+ 	}

+ 

+-	log_info ("DHCPACK from %s", piaddr (packet -> client_addr));

++	log_info ("DHCPACK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);

+ 

+ 	lease = packet_to_lease (packet, client);

+ 	if (!lease) {

+@@ -2010,7 +2052,7 @@ void dhcpnak (packet)

+ 		return;

+ 	}

+ 

+-	log_info ("DHCPNAK from %s", piaddr (packet -> client_addr));

++	log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);

+ 

+ 	if (!client -> active) {

+ #if defined (DEBUG)

+@@ -2136,10 +2178,10 @@ void send_discover (cpp)

+ 		client -> packet.secs = htons (65535);

+ 	client -> secs = client -> packet.secs;

+ 

+-	log_info ("DHCPDISCOVER on %s to %s port %d interval %ld",

++	log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)",

+ 	      client -> name ? client -> name : client -> interface -> name,

+ 	      inet_ntoa (sockaddr_broadcast.sin_addr),

+-	      ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval));

++	      ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), client -> xid);

+ 

+ 	/* Send out a packet. */

+ 	result = send_packet (client -> interface, (struct packet *)0,

+@@ -2394,10 +2436,10 @@ void send_request (cpp)

+ 			client -> packet.secs = htons (65535);

+ 	}

+ 

+-	log_info ("DHCPREQUEST on %s to %s port %d",

++	log_info ("DHCPREQUEST on %s to %s port %d (xid=0x%x)",

+ 	      client -> name ? client -> name : client -> interface -> name,

+ 	      inet_ntoa (destination.sin_addr),

+-	      ntohs (destination.sin_port));

++	      ntohs (destination.sin_port), client -> xid);

+ 

+ 	if (destination.sin_addr.s_addr != INADDR_BROADCAST &&

+ 	    fallback_interface)

+@@ -2427,10 +2469,10 @@ void send_decline (cpp)

+ 

+ 	int result;

+ 

+-	log_info ("DHCPDECLINE on %s to %s port %d",

++	log_info ("DHCPDECLINE on %s to %s port %d (xid=0x%x)",

+ 	      client -> name ? client -> name : client -> interface -> name,

+ 	      inet_ntoa (sockaddr_broadcast.sin_addr),

+-	      ntohs (sockaddr_broadcast.sin_port));

++	      ntohs (sockaddr_broadcast.sin_port), client -> xid);

+ 

+ 	/* Send out a packet. */

+ 	result = send_packet (client -> interface, (struct packet *)0,

+@@ -2470,10 +2512,10 @@ void send_release (cpp)

+ 		return;

+ 	}

+ 

+-	log_info ("DHCPRELEASE on %s to %s port %d",

++	log_info ("DHCPRELEASE on %s to %s port %d (xid=0x%x)",

+ 	      client -> name ? client -> name : client -> interface -> name,

+ 	      inet_ntoa (destination.sin_addr),

+-	      ntohs (destination.sin_port));

++	      ntohs (destination.sin_port), client -> xid);

+ 

+ 	if (fallback_interface)

+ 		result = send_packet (fallback_interface,

diff --git a/net-misc/dhcp/files/dhcp-4.2.0-lpf-ib.patch b/net-misc/dhcp/files/dhcp-4.2.0-lpf-ib.patch
new file mode 100644
index 000000000..52a7aa8a2
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.0-lpf-ib.patch
@@ -0,0 +1,538 @@
+diff -up dhcp-4.2.0/common/lpf.c.ib dhcp-4.2.0/common/lpf.c

+--- dhcp-4.2.0/common/lpf.c.ib	2010-09-23 05:24:09.000000000 -0400

++++ dhcp-4.2.0/common/lpf.c	2010-09-23 06:21:03.000000000 -0400

+@@ -42,6 +42,7 @@

+ #include "includes/netinet/udp.h"

+ #include "includes/netinet/if_ether.h"

+ #include <net/if.h>

++#include <ifaddrs.h>

+ 

+ #ifndef PACKET_AUXDATA

+ #define PACKET_AUXDATA 8

+@@ -59,6 +60,15 @@ struct tpacket_auxdata

+ /* Reinitializes the specified interface after an address change.   This

+    is not required for packet-filter APIs. */

+ 

++/* Default broadcast address for IPoIB */

++static unsigned char default_ib_bcast_addr[20] = {

++ 	0x00, 0xff, 0xff, 0xff,

++	0xff, 0x12, 0x40, 0x1b,

++	0x00, 0x00, 0x00, 0x00,

++	0x00, 0x00, 0x00, 0x00,

++	0xff, 0xff, 0xff, 0xff

++};

++

+ #ifdef USE_LPF_SEND

+ void if_reinitialize_send (info)

+ 	struct interface_info *info;

+@@ -86,10 +96,21 @@ int if_register_lpf (info)

+ 		struct sockaddr common;

+ 	} sa;

+ 	struct ifreq ifr;

++	int type;

++	int protocol;

+ 

+ 	/* Make an LPF socket. */

+-	if ((sock = socket(PF_PACKET, SOCK_RAW,

+-			   htons((short)ETH_P_ALL))) < 0) {

++	get_hw_addr(info);

++

++	if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {

++		type = SOCK_DGRAM;

++		protocol = ETHERTYPE_IP;

++	} else {

++		type = SOCK_RAW;

++		protocol = ETH_P_ALL;

++	}

++

++	if ((sock = socket(PF_PACKET, type, htons((short)protocol))) < 0) {

+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||

+ 		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||

+ 		    errno == EAFNOSUPPORT || errno == EINVAL) {

+@@ -111,6 +132,7 @@ int if_register_lpf (info)

+ 	/* Bind to the interface name */

+ 	memset (&sa, 0, sizeof sa);

+ 	sa.ll.sll_family = AF_PACKET;

++	sa.ll.sll_protocol = htons(protocol);

+ 	sa.ll.sll_ifindex = ifr.ifr_ifindex;

+ 	if (bind (sock, &sa.common, sizeof sa)) {

+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||

+@@ -126,8 +148,6 @@ int if_register_lpf (info)

+ 		log_fatal ("Bind socket to interface: %m");

+ 	}

+ 

+-	get_hw_addr(info->name, &info->hw_address);

+-

+ 	return sock;

+ }

+ #endif /* USE_LPF_SEND || USE_LPF_RECEIVE */

+@@ -182,6 +202,8 @@ void if_deregister_send (info)

+    in bpf includes... */

+ extern struct sock_filter dhcp_bpf_filter [];

+ extern int dhcp_bpf_filter_len;

++extern struct sock_filter dhcp_ib_bpf_filter [];

++extern int dhcp_ib_bpf_filter_len;

+ 

+ #if defined (HAVE_TR_SUPPORT)

+ extern struct sock_filter dhcp_bpf_tr_filter [];

+@@ -199,11 +221,13 @@ void if_register_receive (info)

+ 	/* Open a LPF device and hang it on this interface... */

+ 	info -> rfdesc = if_register_lpf (info);

+ 

+-	val = 1;

+-	if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,

+-			sizeof val) < 0) {

+-		if (errno != ENOPROTOOPT)

+-			log_fatal ("Failed to set auxiliary packet data: %m");

++	if (info->hw_address.hbuf[0] != HTYPE_INFINIBAND) {

++		val = 1;

++		if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA,

++				&val, sizeof val) < 0) {

++			if (errno != ENOPROTOOPT)

++				log_fatal ("Failed to set auxiliary packet data: %m");

++		}

+ 	}

+ 

+ #if defined (HAVE_TR_SUPPORT)

+@@ -249,15 +273,28 @@ static void lpf_gen_filter_setup (info)

+ 

+ 	memset(&p, 0, sizeof(p));

+ 

+-	/* Set up the bpf filter program structure.    This is defined in

+-	   bpf.c */

+-	p.len = dhcp_bpf_filter_len;

+-	p.filter = dhcp_bpf_filter;

+-

+-        /* Patch the server port into the LPF  program...

+-	   XXX changes to filter program may require changes

+-	   to the insn number(s) used below! XXX */

+-	dhcp_bpf_filter [8].k = ntohs ((short)local_port);

++	if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {

++		/* Set up the bpf filter program structure. */

++		p.len = dhcp_ib_bpf_filter_len;

++		p.filter = dhcp_ib_bpf_filter;

++

++		/* Patch the server port into the LPF program...

++		   XXX

++		   changes to filter program may require changes

++		   to the insn number(s) used below!

++		   XXX */

++		dhcp_ib_bpf_filter[6].k = ntohs ((short)local_port);

++	} else {

++		/* Set up the bpf filter program structure.

++		   This is defined in bpf.c */

++		p.len = dhcp_bpf_filter_len;

++		p.filter = dhcp_bpf_filter;

++

++		/* Patch the server port into the LPF  program...

++		   XXX changes to filter program may require changes

++		   to the insn number(s) used below! XXX */

++		dhcp_bpf_filter [8].k = ntohs ((short)local_port);

++	}

+ 

+ 	if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,

+ 			sizeof p) < 0) {

+@@ -314,6 +351,54 @@ static void lpf_tr_filter_setup (info)

+ #endif /* USE_LPF_RECEIVE */

+ 

+ #ifdef USE_LPF_SEND

++ssize_t send_packet_ib(interface, packet, raw, len, from, to, hto)

++	struct interface_info *interface;

++	struct packet *packet;

++	struct dhcp_packet *raw;

++	size_t len;

++	struct in_addr from;

++	struct sockaddr_in *to;

++	struct hardware *hto;

++{

++	unsigned ibufp = 0;

++	double ih [1536 / sizeof (double)];

++	unsigned char *buf = (unsigned char *)ih;

++	ssize_t result;

++

++	union sockunion {

++		struct sockaddr sa;

++		struct sockaddr_ll sll;

++		struct sockaddr_storage ss;

++	} su;

++

++	assemble_udp_ip_header (interface, buf, &ibufp, from.s_addr,

++				to->sin_addr.s_addr, to->sin_port,

++				(unsigned char *)raw, len);

++	memcpy (buf + ibufp, raw, len);

++

++	memset(&su, 0, sizeof(su));

++	su.sll.sll_family = AF_PACKET;

++	su.sll.sll_protocol = htons(ETHERTYPE_IP);

++

++	if (!(su.sll.sll_ifindex = if_nametoindex(interface->name))) {

++		errno = ENOENT;

++		log_error ("send_packet_ib: %m - failed to get if index");

++		return -1;

++	}

++

++	su.sll.sll_hatype = htons(HTYPE_INFINIBAND);

++	su.sll.sll_halen = sizeof(interface->bcast_addr);

++	memcpy(&su.sll.sll_addr, interface->bcast_addr, 20);

++

++	result = sendto(interface->wfdesc, buf, ibufp + len, 0,

++			&su.sa, sizeof(su));

++

++	if (result < 0)

++		log_error ("send_packet_ib: %m");

++

++	return result;

++}

++

+ ssize_t send_packet (interface, packet, raw, len, from, to, hto)

+ 	struct interface_info *interface;

+ 	struct packet *packet;

+@@ -334,6 +419,11 @@ ssize_t send_packet (interface, packet, 

+ 		return send_fallback (interface, packet, raw,

+ 				      len, from, to, hto);

+ 

++	if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {

++		return send_packet_ib(interface, packet, raw, len, from,

++				      to, hto);

++	}

++

+ 	if (hto == NULL && interface->anycast_mac_addr.hlen)

+ 		hto = &interface->anycast_mac_addr;

+ 

+@@ -355,6 +445,42 @@ ssize_t send_packet (interface, packet, 

+ #endif /* USE_LPF_SEND */

+ 

+ #ifdef USE_LPF_RECEIVE

++ssize_t receive_packet_ib (interface, buf, len, from, hfrom)

++	struct interface_info *interface;

++	unsigned char *buf;

++	size_t len;

++	struct sockaddr_in *from;

++	struct hardware *hfrom;

++{

++	int length = 0;

++	int offset = 0;

++	unsigned char ibuf [1536];

++	unsigned bufix = 0;

++	unsigned paylen;

++

++	length = read(interface->rfdesc, ibuf, sizeof(ibuf));

++

++	if (length <= 0)

++		return length;

++

++	offset = decode_udp_ip_header(interface, ibuf, bufix, from,

++				       (unsigned)length, &paylen, 0);

++

++	if (offset < 0)

++		return 0;

++

++	bufix += offset;

++	length -= offset;

++

++	if (length < paylen)

++		log_fatal("Internal inconsistency at %s:%d.", MDL);

++

++	/* Copy out the data in the packet... */

++	memcpy(buf, &ibuf[bufix], paylen);

++

++	return (ssize_t)paylen;

++}

++

+ ssize_t receive_packet (interface, buf, len, from, hfrom)

+ 	struct interface_info *interface;

+ 	unsigned char *buf;

+@@ -381,6 +507,10 @@ ssize_t receive_packet (interface, buf, 

+ 	};

+ 	struct cmsghdr *cmsg;

+ 

++	if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {

++		return receive_packet_ib(interface, buf, len, from, hfrom);

++	}

++

+ 	length = recvmsg (interface -> rfdesc, &msg, 0);

+ 	if (length <= 0)

+ 		return length;

+@@ -461,33 +591,41 @@ void maybe_setup_fallback ()

+ }

+ 

+ void

+-get_hw_addr(const char *name, struct hardware *hw) {

+-	int sock;

+-	struct ifreq tmp;

+-	struct sockaddr *sa;

++get_hw_addr(struct interface_info *info)

++{

++	struct hardware *hw = &info->hw_address;

++	char *name = info->name;

++	struct ifaddrs *ifaddrs;

++	struct ifaddrs *ifa;

++	struct sockaddr_ll *sll = NULL;

+ 

+-	if (strlen(name) >= sizeof(tmp.ifr_name)) {

+-		log_fatal("Device name too long: \"%s\"", name);

+-	}

++	if (getifaddrs(&ifaddrs) == -1)

++		log_fatal("Failed to get interfaces");

++

++	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {

++

++		if (ifa->ifa_addr->sa_family != AF_PACKET)

++			continue;

+ 

+-	sock = socket(AF_INET, SOCK_DGRAM, 0);

+-	if (sock < 0) {

+-		log_fatal("Can't create socket for \"%s\": %m", name);

++		if (ifa->ifa_flags & IFF_LOOPBACK)

++			continue;

++

++		if (strcmp(ifa->ifa_name, name) == 0) {

++			sll = (struct sockaddr_ll *)(void *)ifa->ifa_addr;

++			break;

++		}

+ 	}

+ 

+-	memset(&tmp, 0, sizeof(tmp));

+-	strcpy(tmp.ifr_name, name);

+-	if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {

+-		log_fatal("Error getting hardware address for \"%s\": %m", 

+-			  name);

++	if (sll == NULL) {

++		freeifaddrs(ifaddrs);

++		log_fatal("Failed to get HW address for %s\n", name);

+ 	}

+ 

+-	sa = &tmp.ifr_hwaddr;

+-	switch (sa->sa_family) {

++	switch (sll->sll_hatype) {

+ 		case ARPHRD_ETHER:

+ 			hw->hlen = 7;

+ 			hw->hbuf[0] = HTYPE_ETHER;

+-			memcpy(&hw->hbuf[1], sa->sa_data, 6);

++			memcpy(&hw->hbuf[1], sll->sll_addr, 6);

+ 			break;

+ 		case ARPHRD_IEEE802:

+ #ifdef ARPHRD_IEEE802_TR

+@@ -495,18 +633,36 @@ get_hw_addr(const char *name, struct har

+ #endif /* ARPHRD_IEEE802_TR */

+ 			hw->hlen = 7;

+ 			hw->hbuf[0] = HTYPE_IEEE802;

+-			memcpy(&hw->hbuf[1], sa->sa_data, 6);

++			memcpy(&hw->hbuf[1], sll->sll_addr, 6);

+ 			break;

+ 		case ARPHRD_FDDI:

+ 			hw->hlen = 17;

+ 			hw->hbuf[0] = HTYPE_FDDI;

+-			memcpy(&hw->hbuf[1], sa->sa_data, 16);

++			memcpy(&hw->hbuf[1], sll->sll_addr, 16);

++			break;

++		case ARPHRD_INFINIBAND:

++			/* For Infiniband, save the broadcast address and store

++			 * the port GUID into the hardware address.

++			 */

++			if (ifa->ifa_flags & IFF_BROADCAST) {

++				struct sockaddr_ll *bll;

++

++				bll = (struct sockaddr_ll *)ifa->ifa_broadaddr;

++				memcpy(&info->bcast_addr, bll->sll_addr, 20);

++			} else {

++				memcpy(&info->bcast_addr, default_ib_bcast_addr,

++				       20);

++			}

++

++			hw->hlen = 1;

++			hw->hbuf[0] = HTYPE_INFINIBAND;

+ 			break;

+ 		default:

++			freeifaddrs(ifaddrs);

+ 			log_fatal("Unsupported device type %ld for \"%s\"",

+-				  (long int)sa->sa_family, name);

++				  (long int)sll->sll_family, name);

+ 	}

+ 

+-	close(sock);

++	freeifaddrs(ifaddrs);

+ }

+ #endif

+diff -up dhcp-4.2.0/includes/dhcp.h.ib dhcp-4.2.0/includes/dhcp.h

+--- dhcp-4.2.0/includes/dhcp.h.ib	2009-11-19 20:49:01.000000000 -0500

++++ dhcp-4.2.0/includes/dhcp.h	2010-09-23 06:21:03.000000000 -0400

+@@ -79,6 +79,7 @@ struct dhcp_packet {

+ #define HTYPE_ETHER	1               /* Ethernet 10Mbps              */

+ #define HTYPE_IEEE802	6               /* IEEE 802.2 Token Ring...	*/

+ #define HTYPE_FDDI	8		/* FDDI...			*/

++#define HTYPE_INFINIBAND 32		/* Infiniband IPoIB		*/

+ 

+ /* Magic cookie validating dhcp options field (and bootp vendor

+    extensions field). */

+diff -up dhcp-4.2.0/client/dhclient.c.ib dhcp-4.2.0/client/dhclient.c

+--- dhcp-4.2.0/client/dhclient.c.ib	2010-09-23 06:11:14.000000000 -0400

++++ dhcp-4.2.0/client/dhclient.c	2010-09-23 06:21:03.000000000 -0400

+@@ -98,6 +98,29 @@ static void usage(void);

+ 

+ static isc_result_t write_duid(struct data_string *duid);

+ 

++static void setup_ib_interface(struct interface_info *ip)

++{

++	struct group *g;

++

++	/* Set the broadcast flag */

++	ip->client->config->bootp_broadcast_always = 1;

++

++	/*

++	 * Find out if a dhcp-client-identifier option was specified either

++	 * in the config file or on the command line

++	 */

++	for (g = ip->client->config->on_transmission; g != NULL; g = g->next) {

++		if ((g->statements != NULL) &&

++		    (strcmp(g->statements->data.option->option->name,

++			    "dhcp-client-identifier") == 0)) {

++			return;

++		}

++	}

++

++	/* No client ID specified */

++	log_fatal("dhcp-client-identifier must be specified for InfiniBand");

++}

++

+ int

+ main(int argc, char **argv) {

+ 	int fd;

+@@ -805,6 +828,14 @@ main(int argc, char **argv) {

+ 	}

+ 	srandom(seed + cur_time);

+ 

++	/* Setup specific Infiniband options */

++	for (ip = interfaces; ip; ip = ip->next) {

++		if (ip->client &&

++		    (ip->hw_address.hbuf[0] == HTYPE_INFINIBAND)) {

++			setup_ib_interface(ip);

++		}

++	}

++

+ 	/* Start a configuration state machine for each interface. */

+ #ifdef DHCPv6

+ 	if (local_family == AF_INET6) {

+diff -up dhcp-4.2.0/common/bpf.c.ib dhcp-4.2.0/common/bpf.c

+--- dhcp-4.2.0/common/bpf.c.ib	2010-09-23 05:24:01.000000000 -0400

++++ dhcp-4.2.0/common/bpf.c	2010-09-23 06:37:48.000000000 -0400

+@@ -116,7 +116,7 @@ int if_register_bpf (info)

+ 		log_fatal ("Can't attach interface %s to bpf device %s: %m",

+ 		       info -> name, filename);

+ 

+-	get_hw_addr(info->name, &info->hw_address);

++	get_hw_addr(info);

+ 

+ 	return sock;

+ }

+@@ -198,11 +198,44 @@ struct bpf_insn dhcp_bpf_filter [] = {

+ 	BPF_STMT(BPF_RET+BPF_K, 0),

+ };

+ 

++/* Packet filter program for DHCP over Infiniband.

++ *

++ * XXX

++ * Changes to the filter program may require changes to the constant offsets

++ * used in lpf_gen_filter_setup to patch the port in the BPF program!

++ * XXX

++ */

++struct bpf_insn dhcp_ib_bpf_filter [] = {

++	/* Packet filter for Infiniband */

++	/* Make sure it's a UDP packet... */

++	BPF_STMT(BPF_LD + BPF_B + BPF_ABS, 9),

++	BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 0, 6),

++

++	/* Make sure this isn't a fragment... */

++	BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 6),

++	BPF_JUMP(BPF_JMP + BPF_JSET + BPF_K, 0x1fff, 4, 0),

++

++	/* Get the IP header length... */

++	BPF_STMT(BPF_LDX + BPF_B + BPF_MSH, 0),

++

++	/* Make sure it's to the right port... */

++	BPF_STMT(BPF_LD + BPF_H + BPF_IND, 2),

++	BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 67, 0, 1),

++

++	/* If we passed all the tests, ask for the whole packet. */

++	BPF_STMT(BPF_RET + BPF_K, (u_int)-1),

++

++	/* Otherwise, drop it. */

++	BPF_STMT(BPF_RET + BPF_K, 0),

++};

++

+ #if defined (DEC_FDDI)

+ struct bpf_insn *bpf_fddi_filter;

+ #endif

+ 

+ int dhcp_bpf_filter_len = sizeof dhcp_bpf_filter / sizeof (struct bpf_insn);

++int dhcp_ib_bpf_filter_len = sizeof dhcp_ib_bpf_filter / sizeof (struct bpf_insn);

++

+ #if defined (HAVE_TR_SUPPORT)

+ struct bpf_insn dhcp_bpf_tr_filter [] = {

+         /* accept all token ring packets due to variable length header */

+@@ -552,7 +585,9 @@ void maybe_setup_fallback ()

+ }

+ 

+ void

+-get_hw_addr(const char *name, struct hardware *hw) {

++get_hw_addr(struct interface_info *info) {

++	struct hardware *hw = &info->hw_address;

++	char *name = info->name;

+ 	struct ifaddrs *ifa;

+ 	struct ifaddrs *p;

+ 	struct sockaddr_dl *sa;

+diff -up dhcp-4.2.0/common/socket.c.ib dhcp-4.2.0/common/socket.c

+--- dhcp-4.2.0/common/socket.c.ib	2009-11-19 20:49:01.000000000 -0500

++++ dhcp-4.2.0/common/socket.c	2010-09-23 06:21:03.000000000 -0400

+@@ -283,7 +283,7 @@ if_register_socket(struct interface_info

+ 

+ 	/* If this is a normal IPv4 address, get the hardware address. */

+ 	if ((local_family == AF_INET) && (strcmp(info->name, "fallback") != 0))

+-		get_hw_addr(info->name, &info->hw_address);

++		get_hw_addr(info);

+ 

+ 	return sock;

+ }

+@@ -429,7 +429,7 @@ if_register6(struct interface_info *info

+ 	if (req_multi)

+ 		if_register_multicast(info);

+ 

+-	get_hw_addr(info->name, &info->hw_address);

++	get_hw_addr(info);

+ 

+ 	if (!quiet_interface_discovery) {

+ 		if (info->shared_network != NULL) {

+diff -up dhcp-4.2.0/includes/dhcpd.h.ib dhcp-4.2.0/includes/dhcpd.h

+--- dhcp-4.2.0/includes/dhcpd.h.ib	2010-09-23 06:07:17.000000000 -0400

++++ dhcp-4.2.0/includes/dhcpd.h	2010-09-23 06:21:03.000000000 -0400

+@@ -1214,6 +1214,7 @@ struct interface_info {

+ 	struct shared_network *shared_network;

+ 				/* Networks connected to this interface. */

+ 	struct hardware hw_address;	/* Its physical address. */

++	u_int8_t bcast_addr[20];	/* Infiniband broadcast address */

+ 	struct in_addr *addresses;	/* Addresses associated with this

+ 					 * interface.

+ 					 */

+@@ -2324,7 +2325,7 @@ void print_dns_status (int, struct dhcp_

+ #endif

+ const char *print_time(TIME);

+ 

+-void get_hw_addr(const char *name, struct hardware *hw);

++void get_hw_addr(struct interface_info *info);

+ 

+ /* socket.c */

+ #if defined (USE_SOCKET_SEND) || defined (USE_SOCKET_RECEIVE) \

+diff -up dhcp-4.2.0/common/dlpi.c.ib dhcp-4.2.0/common/dlpi.c

+--- dhcp-4.2.0/common/dlpi.c.ib	2010-09-23 05:24:05.000000000 -0400

++++ dhcp-4.2.0/common/dlpi.c	2010-09-23 06:39:26.000000000 -0400

+@@ -1342,7 +1342,9 @@ void maybe_setup_fallback ()

+ #endif /* USE_DLPI_SEND */

+ 

+ void 

+-get_hw_addr(const char *name, struct hardware *hw) {

++get_hw_addr(struct interface_info *info) {

++	struct hardware *hw = &info->hw_address;

++	char *name = info->name;

+ 	int sock, unit;

+ 	long buf[DLPI_MAXDLBUF];

+         union DL_primitives *dlp;

diff --git a/net-misc/dhcp/files/dhcp-4.2.0-options.patch b/net-misc/dhcp/files/dhcp-4.2.0-options.patch
new file mode 100644
index 000000000..6c2062afa
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.0-options.patch
@@ -0,0 +1,401 @@
+diff -up dhcp-4.2.0/client/clparse.c.options dhcp-4.2.0/client/clparse.c

+--- dhcp-4.2.0/client/clparse.c.options	2009-11-19 20:48:58.000000000 -0500

++++ dhcp-4.2.0/client/clparse.c	2010-09-23 06:07:17.000000000 -0400

+@@ -136,6 +136,7 @@ isc_result_t read_client_conf ()

+ 	/* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)

+ 	 */

+ 	top_level_config.requested_lease = 7200;

++	top_level_config.bootp_broadcast_always = 0;

+ 

+ 	group_allocate (&top_level_config.on_receipt, MDL);

+ 	if (!top_level_config.on_receipt)

+@@ -303,7 +304,8 @@ void read_client_leases ()

+ 	interface-declaration |

+ 	LEASE client-lease-statement |

+ 	ALIAS client-lease-statement |

+-	KEY key-definition */

++	KEY key-definition |

++	BOOTP_BROADCAST_ALWAYS */

+ 

+ void parse_client_statement (cfile, ip, config)

+ 	struct parse *cfile;

+@@ -717,6 +719,12 @@ void parse_client_statement (cfile, ip, 

+ 		parse_reject_statement (cfile, config);

+ 		return;

+ 

++	      case BOOTP_BROADCAST_ALWAYS:

++		token = next_token(&val, (unsigned*)0, cfile);

++		config -> bootp_broadcast_always = 1;

++		parse_semi (cfile);

++		return;

++

+ 	      default:

+ 		lose = 0;

+ 		stmt = (struct executable_statement *)0;

+diff -up dhcp-4.2.0/client/dhclient.c.options dhcp-4.2.0/client/dhclient.c

+--- dhcp-4.2.0/client/dhclient.c.options	2010-02-17 15:33:55.000000000 -0500

++++ dhcp-4.2.0/client/dhclient.c	2010-09-23 06:11:14.000000000 -0400

+@@ -39,6 +39,12 @@

+ #include <limits.h>

+ #include <dns/result.h>

+ 

++/*

++ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define

++ * that when building ISC code.

++ */

++extern int asprintf(char **strp, const char *fmt, ...);

++

+ TIME default_lease_time = 43200; /* 12 hours... */

+ TIME max_lease_time = 86400; /* 24 hours... */

+ 

+@@ -82,6 +88,9 @@ int wanted_ia_na = -1;		/* the absolute 

+ int wanted_ia_ta = 0;

+ int wanted_ia_pd = 0;

+ char *mockup_relay = NULL;

++int bootp_broadcast_always = 0;

++

++extern u_int32_t default_requested_options[];

+ 

+ void run_stateless(int exit_mode);

+ 

+@@ -112,6 +121,15 @@ main(int argc, char **argv) {

+ 	int local_family_set = 0;

+ #endif /* DHCPv6 */

+ 	char *s;

++	char *dhcp_client_identifier_arg = NULL;

++	char *dhcp_host_name_arg = NULL;

++	char *dhcp_fqdn_arg = NULL;

++	char *dhcp_vendor_class_identifier_arg = NULL;

++	char *dhclient_request_options = NULL;

++

++	int timeout_arg = 0;

++	char *arg_conf = NULL;

++	int arg_conf_len = 0;

+ 

+ 	/* Initialize client globals. */

+ 	memset(&default_duid, 0, sizeof(default_duid));

+@@ -297,6 +315,88 @@ main(int argc, char **argv) {

+ 		} else if (!strcmp(argv[i], "--version")) {

+ 			log_info("isc-dhclient-%s", PACKAGE_VERSION);

+ 			exit(0);

++		} else if (!strcmp(argv[i], "-I")) {

++			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {

++				usage();

++				exit(1);

++			}

++

++			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {

++				log_error("-I option dhcp-client-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);

++				exit(1);

++			}

++

++			dhcp_client_identifier_arg = argv[i];

++		} else if (!strcmp(argv[i], "-B")) {

++			bootp_broadcast_always = 1;

++		} else if (!strcmp(argv[i], "-H")) {

++			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {

++				usage();

++				exit(1);

++			}

++

++			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {

++				log_error("-H option host-name string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);

++				exit(1);

++			}

++

++			if (dhcp_host_name_arg != NULL) {

++				log_error("The -H <host-name> and -F <fqdn> arguments are mutually exclusive");

++				exit(1);

++			}

++

++			dhcp_host_name_arg = argv[i];

++		} else if (!strcmp(argv[i], "-F")) {

++			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {

++				usage();

++				exit(1);

++			}

++

++			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {

++				log_error("-F option fqdn.fqdn string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);

++				exit(1);

++			}

++

++			if (dhcp_fqdn_arg != NULL) {

++				log_error("Only one -F <fqdn> argument can be specified");

++				exit(1);

++			}

++

++			if (dhcp_host_name_arg != NULL) {

++				log_error("The -F <fqdn> and -H <host-name> arguments are mutually exclusive");

++				exit(1);

++			}

++

++			dhcp_fqdn_arg = argv[i];

++		} else if (!strcmp(argv[i], "-timeout")) {

++			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {

++				usage();

++				exit(1);

++			}

++

++			if ((timeout_arg = atoi(argv[i])) <= 0) {

++				log_error("-T timeout option must be > 0 - bad value: %s",argv[i]);

++				exit(1);

++			}

++		} else if (!strcmp(argv[i], "-V")) {

++			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {

++				usage();

++				exit(1);

++			}

++

++			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {

++				log_error("-V option vendor-class-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);

++				exit(1);

++			}

++

++			dhcp_vendor_class_identifier_arg = argv[i];

++		} else if (!strcmp(argv[i], "-R")) {

++			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {

++				usage();

++				exit(1);

++			}

++

++			dhclient_request_options = argv[i];

+ 		} else if (argv[i][0] == '-') {

+ 		    usage();

+ 		} else if (interfaces_requested < 0) {

+@@ -466,6 +566,166 @@ main(int argc, char **argv) {

+ 	/* Parse the dhclient.conf file. */

+ 	read_client_conf();

+ 

++	/* Parse any extra command line configuration arguments: */

++	if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {

++		arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);

++

++		if ((arg_conf == 0) || (arg_conf_len <= 0))

++			log_fatal("Unable to send -I option dhcp-client-identifier");

++	}

++

++	if ((dhcp_host_name_arg != NULL) && (*dhcp_host_name_arg != '\0')) {

++		if (arg_conf == 0) {

++			arg_conf_len = asprintf(&arg_conf, "send host-name \"%s\";", dhcp_host_name_arg);

++

++			if ((arg_conf == 0) || (arg_conf_len <= 0))

++				log_fatal("Unable to send -H option host-name");

++		} else {

++			char *last_arg_conf = arg_conf;

++			arg_conf = NULL;

++			arg_conf_len = asprintf(&arg_conf, "%s\nsend host-name \"%s\";", last_arg_conf, dhcp_host_name_arg);

++

++			if ((arg_conf == 0) || (arg_conf_len <= 0))

++				log_fatal("Unable to send -H option host-name");

++

++			free(last_arg_conf);

++		}

++	}

++

++	if ((dhcp_fqdn_arg != NULL) && (*dhcp_fqdn_arg != '\0')) {

++		if (arg_conf == 0) {

++			arg_conf_len = asprintf(&arg_conf,  "send fqdn.fqdn \"%s\";", dhcp_fqdn_arg);

++

++			if ((arg_conf == 0) || (arg_conf_len <= 0))

++				log_fatal("Unable to send -F option fqdn.fqdn");

++		} else {

++			char *last_arg_conf = arg_conf;

++			arg_conf = NULL;

++			arg_conf_len = asprintf(&arg_conf, "%s\nsend fqdn.fqdn \"%s\";", last_arg_conf, dhcp_fqdn_arg);

++

++			if ((arg_conf == 0)  || (arg_conf_len <= 0))

++				log_fatal("Unable to send -F option fqdn.fqdn");

++

++			free(last_arg_conf);

++		}

++	}

++

++	if (timeout_arg) {

++		if (arg_conf == 0) {

++			arg_conf_len = asprintf(&arg_conf,  "timeout %d;", timeout_arg);

++

++			if ((arg_conf == 0) || (arg_conf_len <= 0))

++				log_fatal("Unable to process -timeout timeout argument");

++		} else {

++			char *last_arg_conf = arg_conf;

++			arg_conf = NULL;

++			arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);

++

++			if ((arg_conf == 0) || (arg_conf_len == 0))

++				log_fatal("Unable to process -timeout timeout argument");

++

++			free(last_arg_conf);

++		}

++	}

++

++	if ((dhcp_vendor_class_identifier_arg != NULL) && (*dhcp_vendor_class_identifier_arg != '\0')) {

++		if (arg_conf == 0) {

++			arg_conf_len = asprintf(&arg_conf,  "send vendor-class-identifier \"%s\";", dhcp_vendor_class_identifier_arg);

++

++			if ((arg_conf == 0) || (arg_conf_len <= 0))

++				log_fatal("Unable to send -V option vendor-class-identifier");

++		} else {

++			char *last_arg_conf = arg_conf;

++			arg_conf = NULL;

++			arg_conf_len = asprintf(&arg_conf, "%s\nsend vendor-class-identifier \"%s\";", last_arg_conf, dhcp_vendor_class_identifier_arg);

++

++			if ((arg_conf == 0) || (arg_conf_len <= 0))

++				log_fatal("Unable to send -V option vendor-class-identifier");

++

++			free(last_arg_conf);

++		}

++	}

++

++	if (dhclient_request_options != NULL) {

++		if (arg_conf == 0) {

++			arg_conf_len = asprintf(&arg_conf,  "request %s;", dhclient_request_options);

++

++			if ((arg_conf == 0) || (arg_conf_len <= 0))

++				log_fatal("Unable to parse -R <request options list> argument");

++		} else {

++			char *last_arg_conf = arg_conf;

++			arg_conf = NULL;

++			arg_conf_len = asprintf(&arg_conf, "%s\nrequest %s;", last_arg_conf, dhclient_request_options);

++

++			if ((arg_conf == 0)  || (arg_conf_len <= 0))

++				log_fatal("Unable to parse -R <request options list> argument");

++

++			free(last_arg_conf);

++		}

++	}

++

++	if (arg_conf) {

++		if (arg_conf_len == 0)

++			if ((arg_conf_len = strlen(arg_conf)) == 0)

++				/* huh ? cannot happen ! */

++				log_fatal("Unable to process -I/-H/-F/-timeout/-V/-R configuration arguments");

++

++		/* parse the extra dhclient.conf configuration arguments

++		 * into top level config: */

++		struct parse *cfile = (struct parse *)0;

++		const char *val = NULL;

++		int token;

++

++		status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -I/-H/-F/-timeout/-V/-R configuration arguments", 0);

++

++		if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))

++			log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");

++		/* more detailed parse failures will be logged */

++

++		do {

++			token = peek_token(&val, (unsigned *)0, cfile);

++			if (token == END_OF_FILE)

++				break;

++

++			parse_client_statement(cfile, (struct interface_info *)0, &top_level_config);

++		} while (1);

++

++		if (cfile -> warnings_occurred)

++			log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");

++		end_parse(&cfile);

++

++		if (timeout_arg) {

++			/* we just set the toplevel timeout, but per-client

++			 * timeouts may still be at defaults. Also, it makes no

++			 * sense having the reboot_timeout or backoff_cutoff

++			 * greater than the timeout:

++			 */

++			if ((top_level_config.backoff_cutoff == 15) && (top_level_config.backoff_cutoff > (timeout_arg / 2)))

++				top_level_config.backoff_cutoff = (((unsigned long)(timeout_arg / 2)) == 0) ? timeout_arg : (unsigned long)(timeout_arg / 2);

++

++			for (ip=interfaces; ip; ip = ip->next) {

++				if (ip->client->config->timeout == 60)

++					ip->client->config->timeout = timeout_arg;

++

++				if ((ip->client->config->reboot_timeout == 10) && (ip->client->config->reboot_timeout > ip->client->config->timeout))

++					ip->client->config->reboot_timeout = ip->client->config->timeout;

++				if ((ip->client->config->backoff_cutoff == 15) && (ip->client->config->backoff_cutoff > top_level_config.backoff_cutoff))

++					ip->client->config->backoff_cutoff = top_level_config.backoff_cutoff;

++			}

++		}

++

++		if ((dhclient_request_options != 0) && (top_level_config.requested_options != (void *) default_requested_options)) {

++			for (ip=interfaces; ip; ip = ip->next) {

++				if (ip->client->config->requested_options == (void *) default_requested_options)

++					ip->client->config->requested_options = top_level_config.requested_options;

++			}

++		}

++

++		free(arg_conf);

++		arg_conf = NULL;

++		arg_conf_len = 0;

++	}

++

+ 	/* Parse the lease database. */

+ 	read_client_leases();

+ 

+@@ -2337,7 +2597,8 @@ void make_discover (client, lease)

+ 	client -> packet.xid = random ();

+ 	client -> packet.secs = 0; /* filled in by send_discover. */

+ 

+-	if (can_receive_unicast_unconfigured (client -> interface))

++	if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always))

++	    && can_receive_unicast_unconfigured(client->interface))

+ 		client -> packet.flags = 0;

+ 	else

+ 		client -> packet.flags = htons (BOOTP_BROADCAST);

+@@ -2421,7 +2682,9 @@ void make_request (client, lease)

+ 	} else {

+ 		memset (&client -> packet.ciaddr, 0,

+ 			sizeof client -> packet.ciaddr);

+-		if (can_receive_unicast_unconfigured (client -> interface))

++		if ((!(bootp_broadcast_always ||

++		    client ->config->bootp_broadcast_always)) &&

++		    can_receive_unicast_unconfigured (client -> interface))

+ 			client -> packet.flags = 0;

+ 		else

+ 			client -> packet.flags = htons (BOOTP_BROADCAST);

+@@ -2483,7 +2746,8 @@ void make_decline (client, lease)

+ 	client -> packet.hops = 0;

+ 	client -> packet.xid = client -> xid;

+ 	client -> packet.secs = 0; /* Filled in by send_request. */

+-	if (can_receive_unicast_unconfigured (client -> interface))

++	if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always))

++	    && can_receive_unicast_unconfigured (client->interface))

+ 		client -> packet.flags = 0;

+ 	else

+ 		client -> packet.flags = htons (BOOTP_BROADCAST);

+diff -up dhcp-4.2.0/common/conflex.c.options dhcp-4.2.0/common/conflex.c

+--- dhcp-4.2.0/common/conflex.c.options	2010-03-24 17:49:47.000000000 -0400

++++ dhcp-4.2.0/common/conflex.c	2010-09-23 06:07:17.000000000 -0400

+@@ -803,6 +803,8 @@ intern(char *atom, enum dhcp_token dfv) 

+ 			return BALANCE;

+ 		if (!strcasecmp (atom + 1, "ound"))

+ 			return BOUND;

++		if (!strcasecmp (atom + 1, "ootp-broadcast-always"))

++			return BOOTP_BROADCAST_ALWAYS;

+ 		break;

+ 	      case 'c':

+ 		if (!strcasecmp(atom + 1, "ase"))

+diff -up dhcp-4.2.0/includes/dhcpd.h.options dhcp-4.2.0/includes/dhcpd.h

+--- dhcp-4.2.0/includes/dhcpd.h.options	2010-09-23 05:24:32.000000000 -0400

++++ dhcp-4.2.0/includes/dhcpd.h	2010-09-23 06:07:17.000000000 -0400

+@@ -1119,6 +1119,9 @@ struct client_config {

+ 	int do_forward_update;		/* If nonzero, and if we have the

+ 					   information we need, update the

+ 					   A record for the address we get. */

++

++	int bootp_broadcast_always;	/* If nonzero, always set the BOOTP_BROADCAST

++					   flag in requests */

+ };

+ 

+ /* Per-interface state used in the dhcp client... */

+diff -up dhcp-4.2.0/includes/dhctoken.h.options dhcp-4.2.0/includes/dhctoken.h

+--- dhcp-4.2.0/includes/dhctoken.h.options	2010-02-17 15:33:55.000000000 -0500

++++ dhcp-4.2.0/includes/dhctoken.h	2010-09-23 06:08:18.000000000 -0400

+@@ -357,7 +357,8 @@ enum dhcp_token {

+ 	CONFLICT_DONE = 660,

+ 	AUTO_PARTNER_DOWN = 661,

+ 	GETHOSTNAME = 662,

+-	REWIND = 663

++	REWIND = 663,

++	BOOTP_BROADCAST_ALWAYS = 664

+ };

+ 

+ #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\

diff --git a/net-misc/dhcp/files/dhcp-4.2.0-xen-checksum.patch b/net-misc/dhcp/files/dhcp-4.2.0-xen-checksum.patch
new file mode 100644
index 000000000..fe33bdf50
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.0-xen-checksum.patch
@@ -0,0 +1,245 @@
+diff -up dhcp-4.2.0/common/bpf.c.xen dhcp-4.2.0/common/bpf.c

+--- dhcp-4.2.0/common/bpf.c.xen	2009-11-19 20:48:59.000000000 -0500

++++ dhcp-4.2.0/common/bpf.c	2010-09-23 05:24:01.000000000 -0400

+@@ -485,7 +485,7 @@ ssize_t receive_packet (interface, buf, 

+ 		offset = decode_udp_ip_header (interface,

+ 					       interface -> rbuf,

+ 					       interface -> rbuf_offset,

+-  					       from, hdr.bh_caplen, &paylen);

++  					       from, hdr.bh_caplen, &paylen, 0);

+ 

+ 		/* If the IP or UDP checksum was bad, skip the packet... */

+ 		if (offset < 0) {

+diff -up dhcp-4.2.0/common/dlpi.c.xen dhcp-4.2.0/common/dlpi.c

+--- dhcp-4.2.0/common/dlpi.c.xen	2009-11-19 20:49:00.000000000 -0500

++++ dhcp-4.2.0/common/dlpi.c	2010-09-23 05:24:05.000000000 -0400

+@@ -694,7 +694,7 @@ ssize_t receive_packet (interface, buf, 

+ 	length -= offset;

+ #endif

+ 	offset = decode_udp_ip_header (interface, dbuf, bufix,

+-				       from, length, &paylen);

++				       from, length, &paylen, 0);

+ 

+ 	/*

+ 	 * If the IP or UDP checksum was bad, skip the packet...

+diff -up dhcp-4.2.0/common/lpf.c.xen dhcp-4.2.0/common/lpf.c

+--- dhcp-4.2.0/common/lpf.c.xen	2009-07-23 14:52:19.000000000 -0400

++++ dhcp-4.2.0/common/lpf.c	2010-09-23 05:24:09.000000000 -0400

+@@ -29,18 +29,33 @@

+ #include "dhcpd.h"

+ #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)

+ #include <sys/ioctl.h>

++#include <sys/socket.h>

+ #include <sys/uio.h>

+ #include <errno.h>

+ 

+ #include <asm/types.h>

+ #include <linux/filter.h>

+ #include <linux/if_ether.h>

++#include <linux/if_packet.h>

+ #include <netinet/in_systm.h>

+ #include "includes/netinet/ip.h"

+ #include "includes/netinet/udp.h"

+ #include "includes/netinet/if_ether.h"

+ #include <net/if.h>

+ 

++#ifndef PACKET_AUXDATA

++#define PACKET_AUXDATA 8

++

++struct tpacket_auxdata

++{

++	__u32		tp_status;

++	__u32		tp_len;

++	__u32		tp_snaplen;

++	__u16		tp_mac;

++	__u16		tp_net;

++};

++#endif

++

+ /* Reinitializes the specified interface after an address change.   This

+    is not required for packet-filter APIs. */

+ 

+@@ -66,10 +81,14 @@ int if_register_lpf (info)

+ 	struct interface_info *info;

+ {

+ 	int sock;

+-	struct sockaddr sa;

++	union {

++		struct sockaddr_ll ll;

++		struct sockaddr common;

++	} sa;

++	struct ifreq ifr;

+ 

+ 	/* Make an LPF socket. */

+-	if ((sock = socket(PF_PACKET, SOCK_PACKET,

++	if ((sock = socket(PF_PACKET, SOCK_RAW,

+ 			   htons((short)ETH_P_ALL))) < 0) {

+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||

+ 		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||

+@@ -84,11 +103,16 @@ int if_register_lpf (info)

+ 		log_fatal ("Open a socket for LPF: %m");

+ 	}

+ 

++	memset (&ifr, 0, sizeof ifr);

++	strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);

++	if (ioctl (sock, SIOCGIFINDEX, &ifr))

++		log_fatal ("Failed to get interface index: %m");

++

+ 	/* Bind to the interface name */

+ 	memset (&sa, 0, sizeof sa);

+-	sa.sa_family = AF_PACKET;

+-	strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);

+-	if (bind (sock, &sa, sizeof sa)) {

++	sa.ll.sll_family = AF_PACKET;

++	sa.ll.sll_ifindex = ifr.ifr_ifindex;

++	if (bind (sock, &sa.common, sizeof sa)) {

+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||

+ 		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||

+ 		    errno == EAFNOSUPPORT || errno == EINVAL) {

+@@ -170,9 +194,18 @@ static void lpf_gen_filter_setup (struct

+ void if_register_receive (info)

+ 	struct interface_info *info;

+ {

++	int val;

++

+ 	/* Open a LPF device and hang it on this interface... */

+ 	info -> rfdesc = if_register_lpf (info);

+ 

++	val = 1;

++	if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,

++			sizeof val) < 0) {

++		if (errno != ENOPROTOOPT)

++			log_fatal ("Failed to set auxiliary packet data: %m");

++	}

++

+ #if defined (HAVE_TR_SUPPORT)

+ 	if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)

+ 		lpf_tr_filter_setup (info);

+@@ -294,7 +327,6 @@ ssize_t send_packet (interface, packet, 

+ 	double hh [16];

+ 	double ih [1536 / sizeof (double)];

+ 	unsigned char *buf = (unsigned char *)ih;

+-	struct sockaddr sa;

+ 	int result;

+ 	int fudge;

+ 

+@@ -315,15 +347,7 @@ ssize_t send_packet (interface, packet, 

+ 				(unsigned char *)raw, len);

+ 	memcpy (buf + ibufp, raw, len);

+ 

+-	/* For some reason, SOCK_PACKET sockets can't be connected,

+-	   so we have to do a sentdo every time. */

+-	memset (&sa, 0, sizeof sa);

+-	sa.sa_family = AF_PACKET;

+-	strncpy (sa.sa_data,

+-		 (const char *)interface -> ifp, sizeof sa.sa_data);

+-

+-	result = sendto (interface -> wfdesc,

+-			 buf + fudge, ibufp + len - fudge, 0, &sa, sizeof sa);

++	result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);

+ 	if (result < 0)

+ 		log_error ("send_packet: %m");

+ 	return result;

+@@ -340,14 +364,35 @@ ssize_t receive_packet (interface, buf, 

+ {

+ 	int length = 0;

+ 	int offset = 0;

++	int nocsum = 0;

+ 	unsigned char ibuf [1536];

+ 	unsigned bufix = 0;

+ 	unsigned paylen;

++	unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];

++	struct iovec iov = {

++		.iov_base = ibuf,

++		.iov_len = sizeof ibuf,

++	};

++	struct msghdr msg = {

++		.msg_iov = &iov,

++		.msg_iovlen = 1,

++		.msg_control = cmsgbuf,

++		.msg_controllen = sizeof(cmsgbuf),

++	};

++	struct cmsghdr *cmsg;

+ 

+-	length = read (interface -> rfdesc, ibuf, sizeof ibuf);

++	length = recvmsg (interface -> rfdesc, &msg, 0);

+ 	if (length <= 0)

+ 		return length;

+ 

++	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {

++		if (cmsg->cmsg_level == SOL_PACKET &&

++		    cmsg->cmsg_type == PACKET_AUXDATA) {

++			struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);

++			nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;

++		}

++	}

++

+ 	bufix = 0;

+ 	/* Decode the physical header... */

+ 	offset = decode_hw_header (interface, ibuf, bufix, hfrom);

+@@ -364,7 +409,7 @@ ssize_t receive_packet (interface, buf, 

+ 

+ 	/* Decode the IP and UDP headers... */

+ 	offset = decode_udp_ip_header (interface, ibuf, bufix, from,

+-				       (unsigned)length, &paylen);

++				       (unsigned)length, &paylen, nocsum);

+ 

+ 	/* If the IP or UDP checksum was bad, skip the packet... */

+ 	if (offset < 0)

+diff -up dhcp-4.2.0/common/nit.c.xen dhcp-4.2.0/common/nit.c

+--- dhcp-4.2.0/common/nit.c.xen	2009-11-19 20:49:01.000000000 -0500

++++ dhcp-4.2.0/common/nit.c	2010-09-23 05:24:18.000000000 -0400

+@@ -369,7 +369,7 @@ ssize_t receive_packet (interface, buf, 

+ 

+ 	/* Decode the IP and UDP headers... */

+ 	offset = decode_udp_ip_header (interface, ibuf, bufix,

+-				       from, length, &paylen);

++				       from, length, &paylen, 0);

+ 

+ 	/* If the IP or UDP checksum was bad, skip the packet... */

+ 	if (offset < 0)

+diff -up dhcp-4.2.0/common/packet.c.xen dhcp-4.2.0/common/packet.c

+--- dhcp-4.2.0/common/packet.c.xen	2009-07-23 14:52:20.000000000 -0400

++++ dhcp-4.2.0/common/packet.c	2010-09-23 05:24:21.000000000 -0400

+@@ -211,7 +211,7 @@ ssize_t

+ decode_udp_ip_header(struct interface_info *interface,

+ 		     unsigned char *buf, unsigned bufix,

+ 		     struct sockaddr_in *from, unsigned buflen,

+-		     unsigned *rbuflen)

++		     unsigned *rbuflen, int nocsum)

+ {

+   unsigned char *data;

+   struct ip ip;

+@@ -322,7 +322,7 @@ decode_udp_ip_header(struct interface_in

+ 					   8, IPPROTO_UDP + ulen))));

+ 

+   udp_packets_seen++;

+-  if (usum && usum != sum) {

++  if (!nocsum && usum && usum != sum) {

+ 	  udp_packets_bad_checksum++;

+ 	  if (udp_packets_seen > 4 &&

+ 	      (udp_packets_seen / udp_packets_bad_checksum) < 2) {

+diff -up dhcp-4.2.0/common/upf.c.xen dhcp-4.2.0/common/upf.c

+--- dhcp-4.2.0/common/upf.c.xen	2009-11-19 20:49:01.000000000 -0500

++++ dhcp-4.2.0/common/upf.c	2010-09-23 05:24:25.000000000 -0400

+@@ -320,7 +320,7 @@ ssize_t receive_packet (interface, buf, 

+ 

+ 	/* Decode the IP and UDP headers... */

+ 	offset = decode_udp_ip_header (interface, ibuf, bufix,

+-				       from, length, &paylen);

++				       from, length, &paylen, 0);

+ 

+ 	/* If the IP or UDP checksum was bad, skip the packet... */

+ 	if (offset < 0)

+diff -up dhcp-4.2.0/includes/dhcpd.h.xen dhcp-4.2.0/includes/dhcpd.h

+--- dhcp-4.2.0/includes/dhcpd.h.xen	2010-06-01 13:29:59.000000000 -0400

++++ dhcp-4.2.0/includes/dhcpd.h	2010-09-23 05:24:32.000000000 -0400

+@@ -2769,7 +2769,7 @@ ssize_t decode_hw_header PROTO ((struct 

+ 				 unsigned, struct hardware *));

+ ssize_t decode_udp_ip_header PROTO ((struct interface_info *, unsigned char *,

+ 				     unsigned, struct sockaddr_in *,

+-				     unsigned, unsigned *));

++				     unsigned, unsigned *, int));

+ 

+ /* ethernet.c */

+ void assemble_ethernet_header PROTO ((struct interface_info *, unsigned char *,

diff --git a/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch
new file mode 100644
index 000000000..6d8caecdf
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch
@@ -0,0 +1,384 @@
+--- a/client/scripts/bsdos
++++ b/client/scripts/bsdos
+@@ -1,34 +1,41 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+     if [ "x$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_search}\n"
+     elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >> /etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     for nameserver in ${new_dhcp6_name_servers} ; do
+-      echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
++
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+ }
+--- a/client/scripts/freebsd
++++ b/client/scripts/freebsd
+@@ -11,68 +11,41 @@
+ fi
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    ( cat /dev/null > /etc/resolv.conf.dhclient )
+-    exit_status=$?
+-    if [ $exit_status -ne 0 ]; then
+-      $LOGGER "Unable to create /etc/resolv.conf.dhclient: Error $exit_status"
+-    else
+-      if [ "x$new_domain_search" != x ]; then
+-	( echo search $new_domain_search >> /etc/resolv.conf.dhclient )
+-	exit_status=$?
+-      elif [ "x$new_domain_name" != x ]; then
+-	# Note that the DHCP 'Domain Name Option' is really just a domain
+-	# name, and that this practice of using the domain name option as
+-	# a search path is both nonstandard and deprecated.
+-	( echo search $new_domain_name >> /etc/resolv.conf.dhclient )
+-	exit_status=$?
+-      fi
+-      for nameserver in $new_domain_name_servers; do
+-	if [ $exit_status -ne 0 ]; then
+-	  break
+-	fi
+-	( echo nameserver $nameserver >>/etc/resolv.conf.dhclient )
+-	exit_status=$?
+-      done
+-
+-      # If there were no errors, attempt to mv the new file into place.
+-      if [ $exit_status -eq 0 ]; then
+-	( mv /etc/resolv.conf.dhclient /etc/resolv.conf )
+-	exit_status=$?
+-      fi
+-
+-      if [ $exit_status -ne 0 ]; then
+-	$LOGGER "Error while writing new /etc/resolv.conf."
+-      fi
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
++      # Note that the DHCP 'Domain Name Option' is really just a domain
++      # name, and that this practice of using the domain name option as
++      # a search path is both nonstandard and deprecated.
++      conf="${conf}search ${new_domain_name}\n"
+     fi
++    for nameserver in $new_domain_name_servers; do
++      conf="${conf}nameserver ${nameserver}\n"
++    done
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    ( cat /dev/null > /etc/resolv.conf.dhclient6 )
+-    exit_status=$?
+-    if [ $exit_status -ne 0 ] ; then
+-      $LOGGER "Unable to create /etc/resolv.conf.dhclient6: Error $exit_status"
+-    else
+-      if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-	( echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 )
+-	exit_status=$?
+-      fi
+-      for nameserver in ${new_dhcp6_name_servers} ; do
+-	if [ $exit_status -ne 0 ] ; then
+-	  break
+-	fi
+-        ( echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6 )
+-	exit_status=$?
+-      done
+-
+-      if [ $exit_status -eq 0 ] ; then
+-        ( mv /etc/resolv.conf.dhclient6 /etc/resolv.conf )
+-	exit_status=$?
+-      fi
++    if [ "x${new_dhcp6_domain_search}" != x ] ; then
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
++    fi
++    for nameserver in ${new_dhcp6_name_servers} ; do
++      conf="${conf}nameserver ${nameserver}\n"
++    done
++  fi
+ 
+-      if [ $exit_status -ne 0 ] ; then
+-	$LOGGER "Error while writing new /etc/resolv.conf."
+-      fi
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
+     fi
+   fi
++
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+ }
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -26,35 +26,41 @@
+ ip=/sbin/ip
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    chmod 644 /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     for nameserver in ${new_dhcp6_name_servers} ; do
+-      echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
++
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+ }
+--- a/client/scripts/netbsd
++++ b/client/scripts/netbsd
+@@ -1,34 +1,41 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
+-  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ "x$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ "x$new_domain_name" != x ]; then
++  if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
++  if [ x"$new_domain_name_servers" != x ]; then
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     for nameserver in ${new_dhcp6_name_servers} ; do
+-      echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
++
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+ }
+--- a/client/scripts/openbsd
++++ b/client/scripts/openbsd
+@@ -1,34 +1,41 @@
+ #!/bin/sh
+ 
+ make_resolv_conf() {
+-  if x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
++  if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
++  if [ x"$new_domain_name_servers" != x ]; then
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
+     done
+-
+-    mv /etc/ersolv.conf.dhclient /etc/resolv.conf
+   elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
+-
+     if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
+     fi
+     for nameserver in ${new_dhcp6_name_servers} ; do
+-      echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6
++      conf="${conf}nameserver ${nameserver}\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
++
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+ }
+--- a/client/scripts/solaris
++++ b/client/scripts/solaris
+@@ -1,22 +1,41 @@
+ #!/bin/sh  
+ 
+ make_resolv_conf() {
++  if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++    return 0
++  fi
++  local conf=
+   if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
++    if [ "x$new_domain_search" != x ]; then
++      conf="${conf}search ${new_domain_search}\n"
++    elif [ "x$new_domain_name" != x ]; then
+       # Note that the DHCP 'Domain Name Option' is really just a domain
+       # name, and that this practice of using the domain name option as
+       # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
++      conf="${conf}search ${new_domain_name}\n"
+     fi
+     for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++      conf="${conf}nameserver ${nameserver}\n"
++    done
++  elif [ "x${new_dhcp6_name_servers}" != x ] ; then
++    if [ "x${new_dhcp6_domain_search}" != x ] ; then
++      conf="${conf}search ${new_dhcp6_domain_search}\n"
++    fi
++    for nameserver in ${new_dhcp6_name_servers} ; do
++      conf="${conf}nameserver ${nameserver}\n"
+     done
++  fi
+ 
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
++  if [ x"$conf" != x ]; then
++    conf="# Generated by dhclient or interface $interface\n${conf}"
++    if type resolvconf >/dev/null 2>&1; then
++      printf "${conf}" | resolvconf -a $interface
++    else
++      printf "${conf}" > /etc/resolv.conf
++      chmod 644 /etc/resolv.conf
++    fi
+   fi
++
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+ }
diff --git a/net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch b/net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch
new file mode 100644
index 000000000..11aaacefd
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch
@@ -0,0 +1,46 @@
+http://bugs.gentoo.org/265531
+
+--- dhcp-4.2.1/client/scripts/linux
++++ dhcp-4.2.1/client/scripts/linux
+@@ -193,12 +193,14 @@
+     ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+     # Add a network route to the computed network address.
+-    for router in $new_routers; do
+-      if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	route add -host $router dev $interface
+-      fi
+-      route add default gw $router $metric_arg dev $interface
+-    done
++    if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then
++      for router in $new_routers; do
++        if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
++	  route add -host $router dev $interface
++        fi
++        route add default gw $router $metric_arg dev $interface
++      done
++    fi
+   fi
+   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+    then
+@@ -244,12 +246,14 @@
+       ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+       route add -host $alias_ip_address dev $interface:0
+     fi
+-    for router in $new_routers; do
+-      if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	route add -host $router dev $interface
+-      fi
+-      route add default gw $router $metric_arg dev $interface
+-    done
++    if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then
++      for router in $new_routers; do
++        if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
++	  route add -host $router dev $interface
++        fi
++        route add default gw $router $metric_arg dev $interface
++      done
++    fi
+     make_resolv_conf
+     exit_with_hooks 0
+   fi
diff --git a/net-misc/dhcp/files/dhcpd.conf b/net-misc/dhcp/files/dhcpd.conf
new file mode 100644
index 000000000..1672633c8
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.conf
@@ -0,0 +1,29 @@
+# /etc/conf.d/dhcpd: config file for /etc/init.d/dhcpd
+
+# If you require more than one instance of dhcpd you can create symbolic
+# links to dhcpd service like so
+#   cd /etc/init.d
+#   ln -s dhcpd dhcpd.foo
+#   cd ../conf.d
+#   cp dhcpd dhcpd.foo
+# Now you can edit dhcpd.foo and specify a different configuration file.
+# You'll also need to specify a pidfile in that dhcpd.conf file.
+# See the pid-file-name option in the dhcpd.conf man page for details.
+
+# If you wish to run dhcpd in a chroot, uncomment the following line
+# DHCPD_CHROOT="/chroot/dhcp"
+
+# Then run emerge dhcp --config
+# All file paths below are relative to the chroot.
+# You can specify a different chroot directory but MAKE SURE it's empty.
+
+# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf
+# DHCPD_CONF="/etc/dhcp/dhcpd.conf"
+
+# Configure which interface or interfaces to for dhcpd to listen on.
+# List all interfaces space separated. If this is not specified then
+# we listen on all interfaces.
+# DHCPD_IFACE=""
+
+# Insert any other dhcpd options - see the man page for a full list.
+# DHCPD_OPTS=""
diff --git a/net-misc/dhcp/files/dhcpd.init2 b/net-misc/dhcp/files/dhcpd.init2
new file mode 100644
index 000000000..82cb26e77
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.init2
@@ -0,0 +1,94 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init2,v 1.1 2009/07/09 14:45:22 chainsaw Exp $
+
+opts="configtest"
+
+DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
+
+depend() {
+	need net
+	use logger dns
+}
+
+get_var() {
+	sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' \
+		"${DHCPD_CHROOT}/${DHCPD_CONF}"
+}
+
+checkconfig() {
+	/usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t 1>/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} has detected a syntax error in your configuration files:"
+		/usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t
+	fi
+
+	return $ret
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
+start() {
+	# Work out our cffile if it's on our DHCPD_OPTS
+	case " ${DHCPD_OPTS} " in
+		*" -cf "*) 
+			DHCPD_CONF=" ${DHCPD_OPTS} "
+			DHCPD_CONF="${DHCPD_CONF##* -cf }"
+			DHCPD_CONF="${DHCPD_CONF%% *}"
+			;;
+		*)	DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}"
+			;;
+	esac
+
+	if [ ! -f "${DHCPD_CHROOT}/${DHCPD_CONF}" ] ; then
+		eerror "${DHCPD_CHROOT}/${DHCPD_CONF} does not exist"
+		return 1
+	fi
+
+	checkconfig || return 1
+
+	local leasefile="$(get_var lease-file-name)"
+	leasefile="${DHCPD_CHROOT}/${leasefile:-/var/lib/dhcp/dhcpd.leases}"
+	if [ ! -f "${leasefile}" ] ; then
+		ebegin "Creating ${leasefile}"
+		touch "${leasefile}"
+		chown dhcp:dhcp "${leasefile}"
+		eend $? || return 1
+	fi
+
+	# Setup LD_PRELOAD so name resolution works in our chroot.
+	if [ -n "${DHCPD_CHROOT}" ] ; then
+	    LD_PRELOAD="${LD_PRELOAD} /usr/lib/libresolv.so"
+	    export LD_PRELOAD="${LD_PRELOAD} /usr/lib/libnss_dns.so"
+	fi
+
+	local pidfile="$(get_var pid-file-name)"
+	pidfile="${pidfile:-/var/run/dhcp/dhcpd.pid}"
+
+	ebegin "Starting ${DHCPD_CHROOT:+chrooted }${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dhcpd \
+		--pidfile "${DHCPD_CHROOT}/${pidfile}" \
+		-- ${DHCPD_OPTS} -q -pf "${pidfile}" \
+		-user dhcp -group dhcp \
+		${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} ${DHCPD_IFACE}
+	eend $? \
+	    && save_options chroot "${DHCPD_CHROOT}" \
+	    && save_options pidfile "${pidfile}"
+}
+
+stop() {
+	local chroot="$(get_options chroot)"
+	
+	checkconfig || return 1
+
+	ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/dhcpd \
+	    --pidfile "${chroot}/$(get_options pidfile)"
+	eend $?
+}
diff --git a/net-misc/dhcp/files/dhcpd.init3 b/net-misc/dhcp/files/dhcpd.init3
new file mode 100755
index 000000000..3b0053142
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.init3
@@ -0,0 +1,94 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init3,v 1.1 2011/03/05 23:59:20 vapier Exp $
+
+opts="configtest"
+
+DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/${SVCNAME}.conf}
+
+depend() {
+	need net
+	use logger dns
+}
+
+get_var() {
+	sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' \
+		"${DHCPD_CHROOT}/${DHCPD_CONF}"
+}
+
+checkconfig() {
+	dhcpd ${DHCPD_OPTS} ${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} -t 1>/dev/null 2>&1
+	local ret=$?
+	if [ $ret -ne 0 ] ; then
+		eerror "${SVCNAME} has detected a syntax error in your configuration files:"
+		dhcpd ${DHCPD_OPTS} ${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} -t
+	fi
+
+	return $ret
+}
+
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
+start() {
+	# Work out our cffile if it's in our DHCPD_OPTS
+	case " ${DHCPD_OPTS} " in
+		*" -cf "*)
+			DHCPD_CONF=" ${DHCPD_OPTS} "
+			DHCPD_CONF="${DHCPD_CONF##* -cf }"
+			DHCPD_CONF="${DHCPD_CONF%% *}"
+			;;
+		*)	DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}"
+			;;
+	esac
+
+	if [ ! -f "${DHCPD_CHROOT}/${DHCPD_CONF}" ] ; then
+		eerror "${DHCPD_CHROOT}/${DHCPD_CONF} does not exist"
+		return 1
+	fi
+
+	checkconfig || return 1
+
+	checkpath -d -o dhcp:dhcp /var/run/dhcp /var/lib/dhcp
+
+	local leasefile="$(get_var lease-file-name)"
+	leasefile="${leasefile:-/var/lib/dhcp/${SVCNAME}.leases}"
+	if [ ! -f "${DHCPD_CHROOT}${leasefile}" ] ; then
+		ebegin "Creating ${leasefile}"
+		touch "${DHCPD_CHROOT}${leasefile}"
+		chown dhcp:dhcp "${DHCPD_CHROOT}${leasefile}"
+		eend $? || return 1
+	fi
+
+	# Setup LD_PRELOAD so name resolution works in our chroot.
+	if [ -n "${DHCPD_CHROOT}" ] ; then
+		LD_PRELOAD="${LD_PRELOAD} /usr/lib/libresolv.so"
+		export LD_PRELOAD="${LD_PRELOAD} /usr/lib/libnss_dns.so"
+	fi
+
+	local pidfile="$(get_var pid-file-name)"
+	pidfile="${pidfile:-/var/run/dhcp/${SVCNAME}.pid}"
+
+	ebegin "Starting ${DHCPD_CHROOT:+chrooted }${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dhcpd \
+		--pidfile "${DHCPD_CHROOT}/${pidfile}" \
+		-- ${DHCPD_OPTS} -q -pf "${pidfile}" -lf "${leasefile}" \
+		-user dhcp -group dhcp \
+		${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} ${DHCPD_IFACE}
+	eend $? \
+		&& save_options chroot "${DHCPD_CHROOT}" \
+		&& save_options pidfile "${pidfile}"
+}
+
+stop() {
+	local chroot="$(get_options chroot)"
+	
+	ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/dhcpd \
+		--pidfile "${chroot}/$(get_options pidfile)"
+	eend $?
+}
diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf
new file mode 100644
index 000000000..1102d3a41
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay.conf
@@ -0,0 +1,13 @@
+# /etc/conf.d/dhcrelay: config file for /etc/init.d/dhcrelay
+
+# Configure which interface or interfaces to for dhcrelay to listen on
+# and send to.
+# List all interfaces space separated. If this is not specified then
+# we use all interfaces.
+#IFACE=""
+
+# Insert any other options needed.  See dhcrelay(8) for details.
+#DHCRELAY_OPTS=""
+
+# Space separated list of IPs to forward BOOTP/DHCP packets to.
+DHCRELAY_SERVERS=""
diff --git a/net-misc/dhcp/files/dhcrelay.init b/net-misc/dhcp/files/dhcrelay.init
new file mode 100644
index 000000000..2f92956be
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay.init
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init,v 1.2 2007/03/22 15:36:59 uberlord Exp $
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	if [ -z "${DHCRELAY_SERVERS}" ]; then
+		eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/dhcrelay"
+		return 1
+	fi
+
+	local IFACES= i=
+	for i in ${IFACE} ; do
+		IFACES="${IFACES} -i ${i}"
+	done
+
+	ebegin "Starting dhcrelay"
+	start-stop-daemon --start --exec /usr/sbin/dhcrelay \
+		-- -q ${IFACES} ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dhcrelay"
+	start-stop-daemon --stop --pidfile /var/run/dhcrelay.pid
+	eend $?
+}
diff --git a/net-misc/dhcp/files/dhcrelay.init2 b/net-misc/dhcp/files/dhcrelay.init2
new file mode 100755
index 000000000..4f09249a6
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay.init2
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init2,v 1.2 2011/03/08 20:13:26 vapier Exp $
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	if [ -z "${DHCRELAY_SERVERS}" ]; then
+		eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/dhcrelay"
+		return 1
+	fi
+
+	checkpath -d /var/run/dhcp
+
+	ebegin "Starting dhcrelay"
+	start-stop-daemon --start --exec /usr/sbin/dhcrelay \
+		-- -q $(printf -- '-i %s ' ${IFACE}) ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dhcrelay"
+	start-stop-daemon --stop --pidfile /var/run/dhcp/dhcrelay.pid
+	eend $?
+}
diff --git a/net-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml
new file mode 100644
index 000000000..62e79c820
--- /dev/null
+++ b/net-misc/dhcp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>base-system</herd>
+	<longdescription lang="en">The ISC DHCP client/server package.</longdescription>
+	<longdescription lang="ja">ISC DHCP クライアント/サーバ・パッケージです。</longdescription>
+	<use>
+		<flag name='client'>Install the dhclient program</flag>
+		<flag name='server'>Install the dhcpd and dhcrelay programs</flag>
+		<flag name='infiniband'>Enable ipoib support</flag>
+	</use>
+</pkgmetadata>