delete all old versions

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@1329 6952d904-891a-0410-993b-d76249ca496b
2009-07-07 06:00:54 +00:00 · 2009-07-07 06:00:54 +00:00 · c2bb82ef29
commit c2bb82ef29
parent 990c1c61da
43 changed files with 0 additions and 15583 deletions
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@ -1,32 +0,0 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  14 Mar 2009; Mario Fetka <mario.fetka@gmail.com>
  +files/dhcp-4.0.1-dhclient-stdin-conf.patch, +dhcp-4.0.1-r1.ebuild:
  Upstream Bump and bump patch dhclient-stdin-conf
  14 Mar 2009; Mario Fetka <mario.fetka@gmail.com> +dhcp-3.1.2-r1.ebuild:
  Upstream Bump
  01 Nov 2008; Mario Fetka <mario.fetka@gmail.com>
  +files/dhcp-4.0-dhclient-metric.patch, +files/dhcp-4.0-dhclient-ntp.patch,
  +files/dhcp-4.0-dhclient-resolvconf.patch,
  +files/dhcp-4.0-dhclient-script-correct-operators.patch,
  +files/dhcp-4.0-dhclient-stdin-conf.patch,
  +files/dhcp-4.0-linux-ipv6-header.patch,
  +files/dhcp-4.0-no_isc_blurb.patch, +files/dhcp-4.0-paranoia.patch,
  files/dhcp-ebuild.patch, +dhcp-4.0.0-r1.ebuild:
  Bump
  30 Jul 2008; Mario Fetka <mario.fetka@gmail.com>
  +files/dhcp-4.0.0-ldap-1.patch:
  add 4.0 ldap patch
  30 Jul 2008; Mario Fetka <mario.fetka@gmail.com> +files/dhcp-ebuild.patch,
  +dhcp-3.1.1-r1.ebuild:
  Bump
  08 Jun 2008; Mario Fetka <mario-fetka@gmx.at> +metadata.xml:
  Initial ldap patched dhcp
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@ -1,47 +0,0 @@
 AUX dhcp-3.0-ddns-example.patch 401 RMD160 0188ae91fb58fc6f8c0d1b5bcbed58582dfed099 SHA1 c9e0f4c9ccbf1ff89076ff1bec37fb6d1276b7f0 SHA256 cf136ce92ea8f3337b9ded9c6f4f019db9782a68c63a3e8b712d26a04c2c9584
 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-dhclient-resolvconf.patch 6659 RMD160 27e6d97ca0ca52fc85abeb4f21f4cea526cbffcb SHA1 d4808b4ba195a2fe1232136c2e36fb534a4c07c3 SHA256 3e2ec3758f6a56658aa1ef9c8ab29f655716015f0c75eba022fa6e1a5e28b1ac
 AUX dhcp-3.0.3-dhclient-stdin-conf.patch 1948 RMD160 42f32a5bbfe2a937827c2972ef84cfa78c2c401c SHA1 ac7afd5ecbde5348e9acea532dab1e01e3a58e8b SHA256 e1bfd26b7da10acc4bd718e35aae4235308abcacde78dedf39533b11ab18b3ae
 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.3-tr.patch 377 RMD160 fe81fefb55796b4e06fa73ec180026dceef5599d SHA1 947a4002e7e2b21cd80fe0a3d0f6f044d5c6faff SHA256 05f81ad7c0e8cd2d2f3e81c0cd1aecc0f2a2787672037eca87e66a814150f5c8
 AUX dhcp-3.0.3-x-option.patch 6478 RMD160 a0fa5b3c7caf2d303a76c3d6fc135783cfa2bbc6 SHA1 4c77474307f9e657e45618f93ba9120eafd83a9e SHA256 6628629a95ee7e711f9dbce6b7d527b15f98eaf7592a1d0855d7bf65961bc3f7
 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.0-ldap.patch 186418 RMD160 a84a45107f5b050c859a6a78e6a05be48e553364 SHA1 30f60d83e01decf0de6556f4abab85b168071062 SHA256 2c061f5cd90858d9cacc7176c60c1d9f26a6f034daf161c4f4df1e381eed91cb
 AUX dhcp-3.1.0a1-dhclient-resolvconf.patch 10316 RMD160 183bedd1660bf5a5f9dc7d002199e76aec12341c SHA1 1e0332ea31cfdbe92f3053405587f08117de8f8b SHA256 112b2ed44aab92592eb3810c61ada7f30d9d01fe43b647667326972a37b412a1
 AUX dhcp-4.0-dhclient-metric.patch 8100 RMD160 cd599d5523be30809024b8e0f81cd84e4d932317 SHA1 ba9ff19cc5274b0e3e8408eba4725e0546413954 SHA256 a1c5589ac1c57ba7fe66336646f4286ebd7112f05abf5ae59b69ff26e7409afc
 AUX dhcp-4.0-dhclient-ntp.patch 7966 RMD160 d6dd1c3363f06712a82231eae1eb559f5a45bbb5 SHA1 3c1b373c6649c1ccb44f205fbee116c134514f4e SHA256 e93bda7f2baae9163f96ab0408bfbe885caa96a8698f9e566b8a9dc04de9359b
 AUX dhcp-4.0-dhclient-resolvconf.patch 14516 RMD160 0a53cbb795c4d4989f5632b6314b69be5bd94611 SHA1 e1db8ecca4de1c45fcec7e93fb13d186931d74f6 SHA256 1cdbb9ed297426b2d44063ffb8642c9c5cdf54dc2f9c3c8f59100f4ab2c40986
 AUX dhcp-4.0-dhclient-script-correct-operators.patch 1382 RMD160 3a37a68c5e9ab44b6f885e1e644f6138557ba45c SHA1 c5459430398b9c92ce9585672860abc6d247c451 SHA256 f5f1a75e9873b141d4b0a0f4fde911e6dfdddf13985e28e1789029ef7a072dfb
 AUX dhcp-4.0-dhclient-stdin-conf.patch 3009 RMD160 749a3768dd709b54ad0ce6fc53828e8e777f32c7 SHA1 49d2a5db802431d894c0c790addd7c6752be7070 SHA256 b3136285b6a9099ac1018d768b072c03bd136c1b5bffa58e48c5101dfe79cd83
 AUX dhcp-4.0-linux-ipv6-header.patch 817 RMD160 cd395ba33c6e729862af7a3c869d412e91ad5b41 SHA1 1e268892009a58caa8b6030be192a25583a96dd5 SHA256 dbb6f22c99dcf31fd91f89061398dea194476d37a1e328736adaff6fe2f00c6d
 AUX dhcp-4.0-no_isc_blurb.patch 2748 RMD160 f29d8705fab63320c18c6319dd5703a51acc1687 SHA1 d8af8f4567e4bdbfac5d8e5455dede87a188ad40 SHA256 603e9a6f28264e35513f40f987d10e4fdce6d5e4f8d48aa46f83b8687d57dff0
 AUX dhcp-4.0-paranoia.patch 4996 RMD160 2f8339e3d8af9164c91cc5a3bab7605ecd728295 SHA1 94db8a07b82b69d0a05645b08ef5d0ec0b99bd19 SHA256 14d328d400cdc1b4d7d6329d9c8e997b2c5e76e8f21330e267a75d6240799058
 AUX dhcp-4.0.0-ldap-1.patch 173862 RMD160 73a7d17638eeb47a93386281fc1d25c7b15f2d6f SHA1 da02fb9b0865b17fb94b6840dbddb2267d4617d7 SHA256 445379243ea745a7389fbb5a37dd77d2ca6b644baace2d843453a26d42038af8
 AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 RMD160 d418d62ce059cb57200356bf4c83565b6dbc18b2 SHA1 01d4367a7713f083f7b0d5d484e846aa5b188d6a SHA256 07da738eecfab459702829d78008fe673f9a408398862c33e6bee3c41ca79268
 AUX dhcp-ebuild.patch 1058 RMD160 41ee0def17846786c19cf88695dbe0d2886ddbcf SHA1 cc32b5a520649b68a35179bf71dd464d70a470df SHA256 00b4963336a23d860c4d095178acf8086fa2ea930611992a0a9ad87a5e58189c
 AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
 AUX dhcpd.init 1989 RMD160 7f6b6858020100e47efa5d6a0809b2959e551249 SHA1 2c611adc6425fd095740aa56d09d8aafb4fea58a SHA256 916bfeb81dcb3423fd4239270ac2dce2e6dc105b28a06e03b352f6bf6b30ed1e
 AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730
 AUX dhcrelay.init 736 RMD160 04566b87bd6dbb8bb754b26409ca30b878ef3ca3 SHA1 72742b308314b2e1476b27e94212fbf4d179adc4 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c
 DIST dhcp-3.1.0.tar.gz 797100 RMD160 59ef8b695b66d3cb61437e25a179d9f17639017d SHA1 f33d017f055648e6571aa26cf314d37857491a2e SHA256 26d02217f53e40ab7c7140cf58d99b55a64979c8501481b28da9c432f0f92243
 DIST dhcp-3.1.1.tar.gz 798228 RMD160 08ed15d26ca64928e1d3b07c631cbbfa9a3dc8cb SHA1 3f7e013cb62aed0f3af45bdd97424d8b63e9c280 SHA256 129024c7545e3e8d37e75cd5d534b50c53955592c4935189a57916e216355f6d
 DIST dhcp-3.1.2.tar.gz 799626 RMD160 026ac48b176ec273397fafa8a834a21fd6331681 SHA1 a60cccec2402a35025ddaafc8ac896595188560e SHA256 80daba1e4ac220a0945778aa3c1c9eb7860c4426645660bebb8ed35a3231a2fb
 DIST dhcp-4.0.0.tar.gz 1043725 RMD160 86963598124617bc7d1059262c75176db431f26d SHA1 acb4ab7634ba002893b15baba1443ef4d6c92201 SHA256 8efee52b567e934d0e80fb33f17dc0cc9f43892dc2e177a242eddebd64e23c68
 DIST dhcp-4.0.1.tar.gz 1050570 RMD160 a9764a76d105778362fe4b58e77783331ee3448a SHA1 7d813740ab4a64e474f1c01b1395617987532ed1 SHA256 965d09a7759250eff7d6d06d37425ea085c14edb5b405f8357ef5ec72ded28ef
 EBUILD dhcp-3.1.0-r1.ebuild 7622 RMD160 831ed83951cf678c02ea5b2a7b6c0c873009270f SHA1 a1be08f55e97189d6cde851491b410294db6c6c0 SHA256 a7ca880b7af8422ed152f09eb9c5917b6c3186d51f2a87ab043eae560b94d127
 EBUILD dhcp-3.1.1-r1.ebuild 7627 RMD160 be9c724df2ed0914b35aaf5fd3e84668abc8876e SHA1 d25967f3fc46afbd60b8eb38573e175efdfe2a69 SHA256 bb9c72fa54c65b5bccb0fb4b155fd84a71ae198deb3ea6abe2c617364d18601a
 EBUILD dhcp-3.1.2-r1.ebuild 7627 RMD160 0cf3930678dd424a3ff6c2c153e1a5dbe8cda735 SHA1 90bc8917affa48f76c7d53af3ca2440c0350a7e2 SHA256 a84de839390f6a8a1c3e40ce76151f9b1bab801ffe4db16a8d16230e6c1ad720
 EBUILD dhcp-4.0.0-r1.ebuild 6928 RMD160 b64f080ddd84c08e1101dd31c60a2924e6cbb997 SHA1 49253dae217afb93d7988b79986c9b4369b17884 SHA256 ac73f2c317f58de897bf2f3ddab6b067c0901501d477f5ae1d57f6b1a37efd93
 EBUILD dhcp-4.0.1-r1.ebuild 6930 RMD160 af6ed20b8c2130e12d4f9abed6d30dddadc9977f SHA1 c147b5a32eaf6ba0351ea294d11a548eddeaac79 SHA256 9f1ac6615ed95b954e4ce29d9c3b00aa0be84f0a4aff074718a3b1816866b3fe
 MISC ChangeLog 1135 RMD160 3a06c94e10d32936e20d3404a86dbd4eca5179bd SHA1 8025c300da408776dabf1bada795805490b3bd13 SHA256 ebaa5bba8fe5070aa0617164df4cf650494b4c2a16e7185ea7970b1077c4721b
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
--- a/net-misc/dhcp/dhcp-3.1.0-r1.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.0-r1.ebuild
@ -1,244 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.0.ebuild,v 1.11 2008/01/10 09:14:57 vapier Exp $
 inherit eutils flag-o-matic multilib toolchain-funcs
 MY_PV="${PV//_alpha/a}"
 MY_PV="${MY_PV//_beta/b}"
 MY_PV="${MY_PV//_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 LICENSE="isc-dhcp"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="doc minimal static selinux kernel_linux ldap"
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
 	kernel_linux? ( sys-apps/net-tools )
 	ldap? ( net-nds/openldap )"
 PROVIDE="virtual/dhcpc"
 S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Gentoo patches - these will probably never be accepted upstream
 	# Enable chroot support
 	epatch "${FILESDIR}/${PN}"-3.0-paranoia.patch
 	# Fix some permission issues
 	epatch "${FILESDIR}/${PN}"-3.0-fix-perms.patch
 	# Enable dhclient to equery NTP servers
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-ntp.patch
 	# resolvconf support in dhclient-script
 	epatch "${FILESDIR}/${PN}"-3.1.0a1-dhclient-resolvconf.patch
 	# Fix setting hostnames on Linux
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch
 	# Allow mtu settings
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-mtu.patch
 	# Allow dhclient to use IF_METRIC to set route metrics
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-metric.patch
 	# Stop downing the interface on Linux as that breaks link dameons
 	# such as wpa_supplicant and netplug
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-no-down.patch
 	# Quiet the isc blurb
 	epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch
 	# Enable dhclient to get extra configuration from stdin
 	epatch "${FILESDIR}/${PN}"-3.0.4-dhclient-stdin-conf.patch
 	# Disable fallback interfaces when using BPF
 	# This allows more than one dhclient instance on the BSD's
 	epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
 	# General fixes which will probably be accepted upstream eventually
 	# Install libdst, #75544
 	epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch
 	# Fix building on Gentoo/FreeBSD
 	epatch "${FILESDIR}/${PN}"-3.0.2-gmake.patch
 	# NetworkManager support patches
 	# If they fail to apply to future versions they will be dropped
 	# Add dbus support to dhclient
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
 	# Ldap support patch
 	# Add ldap support to dhcpd
 	use ldap && epatch "${FILESDIR}/${PN}"-3.1.0-ldap.patch
 	# Brand the version with Gentoo
 	# include revision if >0
 	local newver="${MY_PV}-Gentoo"
 	use ldap && local newver="${MY_PV}-Gentoo-LDAP"
 	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
 	sed -i '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
 		includes/version.h || 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
 	# Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
 	local x=
 	for x in Makefile.dist $(ls */Makefile.dist) ; do
 		sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}" || die
 	done
 	# Only install different man pages if we don't have en
 	if [[ " ${LINGUAS} " != *" en "* ]]; then
 		# Install Japanese man pages
 		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
 			einfo "Installing Japanese documention"
 			cp doc/ja_JP.eucJP/dhclient* client
 			cp doc/ja_JP.eucJP/dhcp* common
 		fi
 	fi
 	# Now remove the non-english docs so there are no errors later
 	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
 }
 src_compile() {
 	use static && append-ldflags -static
 	cat <<-END >> includes/site.h
 	#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
 	#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
 	#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
 	#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
 	#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
 	#define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
 	#define DHCPD_LOG_FACILITY LOG_LOCAL1
 	END
 	cat <<-END > site.conf
 	CC = $(tc-getCC)
 	LFLAGS = ${LDFLAGS}
 	LIBDIR = /usr/$(get_libdir)
 	INCDIR = /usr/include
 	ETC = /etc/dhcp
 	VARDB = /var/lib/dhcp
 	VARRUN = /var/run/dhcp
 	ADMMANDIR = /usr/share/man/man8
 	ADMMANEXT = .8
 	FFMANDIR = /usr/share/man/man5
 	FFMANEXT = .5
 	LIBMANDIR = /usr/share/man/man3
 	LIBMANEXT = .3
 	USRMANDIR = /usr/share/man/man1
 	USRMANEXT = .1
 	MANCAT = man
 	END
 	./configure --copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" \
 		|| die "configure failed"
 	# Remove server support from the Makefile
 	# We still install some extra crud though
 	if use minimal ; then
 		sed -i -e 's/\(server\|relay\|dhcpctl\)/ /g' work.*/Makefile || die
 	fi
 	emake || die "compile problem"
 }
 src_install() {
 	make install DESTDIR="${D}" || die
 	use doc && dodoc README RELNOTES doc/*
 	insinto /etc/dhcp
 	newins client/dhclient.conf dhclient.conf.sample
 	keepdir /var/{lib,run}/dhcp
 	# Install our server files
 	if ! use minimal ; then
 		insinto /etc/dhcp
 		newins server/dhcpd.conf dhcpd.conf.sample
 		newinitd "${FILESDIR}"/dhcpd.init dhcpd
 		newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
 		newconfd "${FILESDIR}"/dhcpd.conf dhcpd
 		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
 		# We never want portage to own this file
 		rm -f "${D}"/var/lib/dhcp/dhcpd.leases
 	fi
 }
 pkg_preinst() {
 	if ! use minimal ; then
 		enewgroup dhcp
 		enewuser dhcp -1 -1 /var/lib/dhcp dhcp
 	fi
 }
 pkg_postinst() {
 	use minimal && return
 	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
 	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
 		ewarn
 		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
 		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
 		ewarn "and dhcp should be removed from the default runlevel"
 		ewarn
 	fi
 	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
 	einfo
 	einfo "If you would like to run dhcpd in a chroot, simply configure the"
 	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
 	einfo "  emerge --config =${PF}"
 }
 pkg_config() {
 	if use minimal ; then
 		eerror "${PN} has not been compiled for server support"
 		eerror "emerge ${PN} without the minimal USE flag to use dhcp sever"
 		return 1
 	fi
 	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"
 }
--- a/net-misc/dhcp/dhcp-3.1.1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.1-r1.ebuild
@ -1,244 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.1.ebuild,v 1.8 2008/06/29 11:13:40 klausman Exp $
 inherit eutils flag-o-matic multilib toolchain-funcs
 MY_PV="${PV//_alpha/a}"
 MY_PV="${MY_PV//_beta/b}"
 MY_PV="${MY_PV//_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 LICENSE="isc-dhcp"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="doc minimal static selinux kernel_linux ldap"
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
 	kernel_linux? ( sys-apps/net-tools )
 	ldap? ( net-nds/openldap )"
 PROVIDE="virtual/dhcpc"
 S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Gentoo patches - these will probably never be accepted upstream
 	# Enable chroot support
 	epatch "${FILESDIR}/${PN}"-3.0-paranoia.patch
 	# Fix some permission issues
 	epatch "${FILESDIR}/${PN}"-3.0-fix-perms.patch
 	# Enable dhclient to equery NTP servers
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-ntp.patch
 	# resolvconf support in dhclient-script
 	epatch "${FILESDIR}/${PN}"-3.1.0a1-dhclient-resolvconf.patch
 	# Fix setting hostnames on Linux
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch
 	# Allow mtu settings
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-mtu.patch
 	# Allow dhclient to use IF_METRIC to set route metrics
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-metric.patch
 	# Stop downing the interface on Linux as that breaks link dameons
 	# such as wpa_supplicant and netplug
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-no-down.patch
 	# Quiet the isc blurb
 	epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch
 	# Enable dhclient to get extra configuration from stdin
 	epatch "${FILESDIR}/${PN}"-3.0.4-dhclient-stdin-conf.patch
 	# Disable fallback interfaces when using BPF
 	# This allows more than one dhclient instance on the BSD's
 	epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
 	# General fixes which will probably be accepted upstream eventually
 	# Install libdst, #75544
 	epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch
 	# Fix building on Gentoo/FreeBSD
 	epatch "${FILESDIR}/${PN}"-3.0.2-gmake.patch
 	# NetworkManager support patches
 	# If they fail to apply to future versions they will be dropped
 	# Add dbus support to dhclient
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
 	# Ldap support patch
 	# Add ldap support to dhcpd
 	use ldap && epatch "${FILESDIR}/${PN}"-3.1.0-ldap.patch
 	# Brand the version with Gentoo
 	# include revision if >0
 	local newver="${MY_PV}-Gentoo"
 	use ldap && local newver="${MY_PV}-Gentoo-LDAP"
 	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
 	sed -i '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
 		includes/version.h || 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
 	# Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
 	local x=
 	for x in Makefile.dist $(ls */Makefile.dist) ; do
 		sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}" || die
 	done
 	# Only install different man pages if we don't have en
 	if [[ " ${LINGUAS} " != *" en "* ]]; then
 		# Install Japanese man pages
 		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
 			einfo "Installing Japanese documention"
 			cp doc/ja_JP.eucJP/dhclient* client
 			cp doc/ja_JP.eucJP/dhcp* common
 		fi
 	fi
 	# Now remove the non-english docs so there are no errors later
 	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
 }
 src_compile() {
 	use static && append-ldflags -static
 	cat <<-END >> includes/site.h
 	#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
 	#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
 	#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
 	#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
 	#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
 	#define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
 	#define DHCPD_LOG_FACILITY LOG_LOCAL1
 	END
 	cat <<-END > site.conf
 	CC = $(tc-getCC)
 	LFLAGS = ${LDFLAGS}
 	LIBDIR = /usr/$(get_libdir)
 	INCDIR = /usr/include
 	ETC = /etc/dhcp
 	VARDB = /var/lib/dhcp
 	VARRUN = /var/run/dhcp
 	ADMMANDIR = /usr/share/man/man8
 	ADMMANEXT = .8
 	FFMANDIR = /usr/share/man/man5
 	FFMANEXT = .5
 	LIBMANDIR = /usr/share/man/man3
 	LIBMANEXT = .3
 	USRMANDIR = /usr/share/man/man1
 	USRMANEXT = .1
 	MANCAT = man
 	END
 	./configure --copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" \
 		|| die "configure failed"
 	# Remove server support from the Makefile
 	# We still install some extra crud though
 	if use minimal ; then
 		sed -i -e 's/\(server\|relay\|dhcpctl\)/ /g' work.*/Makefile || die
 	fi
 	emake || die "compile problem"
 }
 src_install() {
 	make install DESTDIR="${D}" || die
 	use doc && dodoc README RELNOTES doc/*
 	insinto /etc/dhcp
 	newins client/dhclient.conf dhclient.conf.sample
 	keepdir /var/{lib,run}/dhcp
 	# Install our server files
 	if ! use minimal ; then
 		insinto /etc/dhcp
 		newins server/dhcpd.conf dhcpd.conf.sample
 		newinitd "${FILESDIR}"/dhcpd.init dhcpd
 		newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
 		newconfd "${FILESDIR}"/dhcpd.conf dhcpd
 		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
 		# We never want portage to own this file
 		rm -f "${D}"/var/lib/dhcp/dhcpd.leases
 	fi
 }
 pkg_preinst() {
 	if ! use minimal ; then
 		enewgroup dhcp
 		enewuser dhcp -1 -1 /var/lib/dhcp dhcp
 	fi
 }
 pkg_postinst() {
 	use minimal && return
 	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
 	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
 		ewarn
 		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
 		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
 		ewarn "and dhcp should be removed from the default runlevel"
 		ewarn
 	fi
 	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
 	einfo
 	einfo "If you would like to run dhcpd in a chroot, simply configure the"
 	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
 	einfo "  emerge --config =${PF}"
 }
 pkg_config() {
 	if use minimal ; then
 		eerror "${PN} has not been compiled for server support"
 		eerror "emerge ${PN} without the minimal USE flag to use dhcp sever"
 		return 1
 	fi
 	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"
 }
--- a/net-misc/dhcp/dhcp-3.1.2-r1.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.2-r1.ebuild
@ -1,244 +0,0 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.1.ebuild,v 1.8 2008/06/29 11:13:40 klausman Exp $
 inherit eutils flag-o-matic multilib toolchain-funcs
 MY_PV="${PV//_alpha/a}"
 MY_PV="${MY_PV//_beta/b}"
 MY_PV="${MY_PV//_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 LICENSE="isc-dhcp"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="doc minimal static selinux kernel_linux ldap"
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
 	kernel_linux? ( sys-apps/net-tools )
 	ldap? ( net-nds/openldap )"
 PROVIDE="virtual/dhcpc"
 S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Gentoo patches - these will probably never be accepted upstream
 	# Enable chroot support
 	epatch "${FILESDIR}/${PN}"-3.0-paranoia.patch
 	# Fix some permission issues
 	epatch "${FILESDIR}/${PN}"-3.0-fix-perms.patch
 	# Enable dhclient to equery NTP servers
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-ntp.patch
 	# resolvconf support in dhclient-script
 	epatch "${FILESDIR}/${PN}"-3.1.0a1-dhclient-resolvconf.patch
 	# Fix setting hostnames on Linux
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch
 	# Allow mtu settings
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-mtu.patch
 	# Allow dhclient to use IF_METRIC to set route metrics
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-metric.patch
 	# Stop downing the interface on Linux as that breaks link dameons
 	# such as wpa_supplicant and netplug
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-no-down.patch
 	# Quiet the isc blurb
 	epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch
 	# Enable dhclient to get extra configuration from stdin
 	epatch "${FILESDIR}/${PN}"-3.0.4-dhclient-stdin-conf.patch
 	# Disable fallback interfaces when using BPF
 	# This allows more than one dhclient instance on the BSD's
 	epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
 	# General fixes which will probably be accepted upstream eventually
 	# Install libdst, #75544
 	epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch
 	# Fix building on Gentoo/FreeBSD
 	epatch "${FILESDIR}/${PN}"-3.0.2-gmake.patch
 	# NetworkManager support patches
 	# If they fail to apply to future versions they will be dropped
 	# Add dbus support to dhclient
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
 	# Ldap support patch
 	# Add ldap support to dhcpd
 	use ldap && epatch "${FILESDIR}/${PN}"-3.1.0-ldap.patch
 	# Brand the version with Gentoo
 	# include revision if >0
 	local newver="${MY_PV}-Gentoo"
 	use ldap && local newver="${MY_PV}-Gentoo-LDAP"
 	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
 	sed -i '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
 		includes/version.h || 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
 	# Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
 	local x=
 	for x in Makefile.dist $(ls */Makefile.dist) ; do
 		sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}" || die
 	done
 	# Only install different man pages if we don't have en
 	if [[ " ${LINGUAS} " != *" en "* ]]; then
 		# Install Japanese man pages
 		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
 			einfo "Installing Japanese documention"
 			cp doc/ja_JP.eucJP/dhclient* client
 			cp doc/ja_JP.eucJP/dhcp* common
 		fi
 	fi
 	# Now remove the non-english docs so there are no errors later
 	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
 }
 src_compile() {
 	use static && append-ldflags -static
 	cat <<-END >> includes/site.h
 	#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
 	#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
 	#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
 	#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
 	#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
 	#define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
 	#define DHCPD_LOG_FACILITY LOG_LOCAL1
 	END
 	cat <<-END > site.conf
 	CC = $(tc-getCC)
 	LFLAGS = ${LDFLAGS}
 	LIBDIR = /usr/$(get_libdir)
 	INCDIR = /usr/include
 	ETC = /etc/dhcp
 	VARDB = /var/lib/dhcp
 	VARRUN = /var/run/dhcp
 	ADMMANDIR = /usr/share/man/man8
 	ADMMANEXT = .8
 	FFMANDIR = /usr/share/man/man5
 	FFMANEXT = .5
 	LIBMANDIR = /usr/share/man/man3
 	LIBMANEXT = .3
 	USRMANDIR = /usr/share/man/man1
 	USRMANEXT = .1
 	MANCAT = man
 	END
 	./configure --copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" \
 		|| die "configure failed"
 	# Remove server support from the Makefile
 	# We still install some extra crud though
 	if use minimal ; then
 		sed -i -e 's/\(server\|relay\|dhcpctl\)/ /g' work.*/Makefile || die
 	fi
 	emake || die "compile problem"
 }
 src_install() {
 	make install DESTDIR="${D}" || die
 	use doc && dodoc README RELNOTES doc/*
 	insinto /etc/dhcp
 	newins client/dhclient.conf dhclient.conf.sample
 	keepdir /var/{lib,run}/dhcp
 	# Install our server files
 	if ! use minimal ; then
 		insinto /etc/dhcp
 		newins server/dhcpd.conf dhcpd.conf.sample
 		newinitd "${FILESDIR}"/dhcpd.init dhcpd
 		newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
 		newconfd "${FILESDIR}"/dhcpd.conf dhcpd
 		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
 		# We never want portage to own this file
 		rm -f "${D}"/var/lib/dhcp/dhcpd.leases
 	fi
 }
 pkg_preinst() {
 	if ! use minimal ; then
 		enewgroup dhcp
 		enewuser dhcp -1 -1 /var/lib/dhcp dhcp
 	fi
 }
 pkg_postinst() {
 	use minimal && return
 	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
 	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
 		ewarn
 		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
 		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
 		ewarn "and dhcp should be removed from the default runlevel"
 		ewarn
 	fi
 	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
 	einfo
 	einfo "If you would like to run dhcpd in a chroot, simply configure the"
 	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
 	einfo "  emerge --config =${PF}"
 }
 pkg_config() {
 	if use minimal ; then
 		eerror "${PN} has not been compiled for server support"
 		eerror "emerge ${PN} without the minimal USE flag to use dhcp sever"
 		return 1
 	fi
 	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"
 }
--- a/net-misc/dhcp/dhcp-4.0.0-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.0.0-r1.ebuild
@ -1,218 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.0.0.ebuild,v 1.2 2008/10/26 03:45:20 vapier Exp $
 inherit eutils flag-o-matic autotools
 MY_PV="${PV//_alpha/a}"
 MY_PV="${MY_PV//_beta/b}"
 MY_PV="${MY_PV//_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 LICENSE="isc-dhcp"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="doc ipv6 selinux kernel_linux vim-syntax ldap"
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
 	kernel_linux? ( sys-apps/net-tools )
 	vim-syntax? ( app-vim/dhcpd-syntax )
 	ldap? ( net-nds/openldap )"
 PROVIDE="virtual/dhcpc"
 S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Gentoo patches - these will probably never be accepted upstream
 	# Enable chroot support
 	epatch "${FILESDIR}/${PN}"-4.0-paranoia.patch
 	# 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.0-dhclient-resolvconf.patch
 	# Fix setting hostnames on Linux
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch
 	# Allow mtu settings
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-mtu.patch
 	# Allow dhclient to use IF_METRIC to set route metrics
 	epatch "${FILESDIR}/${PN}"-4.0-dhclient-metric.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
 	# Quiet the isc blurb
 	epatch "${FILESDIR}/${PN}"-4.0-no_isc_blurb.patch
 	# Enable dhclient to get extra configuration from stdin
 	epatch "${FILESDIR}/${PN}"-4.0-dhclient-stdin-conf.patch
 	# Disable fallback interfaces when using BPF
 	# This allows more than one dhclient instance on the BSD's
 	epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
 	# This allows the software to actually compile on linux
 	epatch "${FILESDIR}/${PN}"-4.0-linux-ipv6-header.patch
 	# Consistent style for the if statements, also resolves
 	# unary operator expected warnings (new style is wrong).
 	epatch "${FILESDIR}/${PN}"-4.0-dhclient-script-correct-operators.patch
 	# 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
 	# Ldap support patch
 	# Add ldap support to dhcpd
 	use ldap && epatch "${FILESDIR}/${PN}"-4.0.0-ldap-1.patch
 	# Brand the version with Gentoo
 	# include revision if >0
 	local newver="Gentoo"
 	use ldap && local newver="Gentoo-LDAP"
 	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
 	sed -i "/AC_INIT/s/\(\[[0-9]\+\.[0-9]\+\.[0-9]\+\)/\1-${newver}/" \
 		configure.ac || 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
 	# Only install different man pages if we don't have en
 	if [[ " ${LINGUAS} " != *" en "* ]]; then
 		# Install Japanese man pages
 		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
 			einfo "Installing Japanese documention"
 			cp doc/ja_JP.eucJP/dhclient* client
 			cp doc/ja_JP.eucJP/dhcp* common
 		fi
 	fi
 	# Now remove the non-english docs so there are no errors later
 	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
 	eautoreconf
 }
 src_compile() {
 	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-srv-pid-file=/var/run/dhcp/dhcpd.pid \
 		--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
 		--with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \
 		$(use_enable ipv6 dhcpv6) \
 		|| die
 	emake || die "compile problem"
 }
 src_install() {
 	for installdir in includes tests common minires dst omapip client dhcpctl relay server; do
 		cd "${S}/${installdir}"
 		if [ "${installdir}" == client ]; then
 			make install DESTDIR="${D}" exec_prefix="" || die
 		else
 			make install DESTDIR="${D}" exec_prefix="/usr" || die
 		fi
 	done
 	cd "${S}"
 	exeinto /sbin
 	if use kernel_linux; then
 		newexe "${S}"/client/scripts/linux dhclient-script
 	else
 		newexe "${S}"/client/scripts/freebsd dhclient-script
 	fi
 	use doc && dodoc README RELNOTES doc/*
 	insinto /etc/dhcp
 	newins client/dhclient.conf dhclient.conf.sample
 	keepdir /var/{lib,run}/dhcp
 	# Install our server files
 	insinto /etc/dhcp
 	newins server/dhcpd.conf dhcpd.conf.sample
 	newinitd "${FILESDIR}"/dhcpd.init dhcpd
 	newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
 	newconfd "${FILESDIR}"/dhcpd.conf dhcpd
 	newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
 	# We never want portage to own this file
 	rm -f "${D}"/var/lib/dhcp/dhcpd.leases
 }
 pkg_preinst() {
 	enewgroup dhcp
 	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
 }
 pkg_postinst() {
 	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
 	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
 		ewarn
 		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
 		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
 		ewarn "and dhcp should be removed from the default runlevel"
 		ewarn
 	fi
 	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
 	einfo
 	einfo "If you would like to run dhcpd in a chroot, simply configure the"
 	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
 	einfo "  emerge --config =${PF}"
 }
 pkg_config() {
 	local CHROOT="$(
 		sed -n -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"
 }
--- a/net-misc/dhcp/dhcp-4.0.1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.0.1-r1.ebuild
@ -1,218 +0,0 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.0.0.ebuild,v 1.2 2008/10/26 03:45:20 vapier Exp $
 inherit eutils flag-o-matic autotools
 MY_PV="${PV//_alpha/a}"
 MY_PV="${MY_PV//_beta/b}"
 MY_PV="${MY_PV//_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 LICENSE="isc-dhcp"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="doc ipv6 selinux kernel_linux vim-syntax ldap"
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
 	kernel_linux? ( sys-apps/net-tools )
 	vim-syntax? ( app-vim/dhcpd-syntax )
 	ldap? ( net-nds/openldap )"
 PROVIDE="virtual/dhcpc"
 S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Gentoo patches - these will probably never be accepted upstream
 	# Enable chroot support
 	epatch "${FILESDIR}/${PN}"-4.0-paranoia.patch
 	# 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.0-dhclient-resolvconf.patch
 	# Fix setting hostnames on Linux
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch
 	# Allow mtu settings
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-mtu.patch
 	# Allow dhclient to use IF_METRIC to set route metrics
 	epatch "${FILESDIR}/${PN}"-4.0-dhclient-metric.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
 	# Quiet the isc blurb
 	epatch "${FILESDIR}/${PN}"-4.0-no_isc_blurb.patch
 	# Enable dhclient to get extra configuration from stdin
 	epatch "${FILESDIR}/${PN}"-4.0.1-dhclient-stdin-conf.patch
 	# Disable fallback interfaces when using BPF
 	# This allows more than one dhclient instance on the BSD's
 	epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
 	# This allows the software to actually compile on linux
 	epatch "${FILESDIR}/${PN}"-4.0-linux-ipv6-header.patch
 	# Consistent style for the if statements, also resolves
 	# unary operator expected warnings (new style is wrong).
 	epatch "${FILESDIR}/${PN}"-4.0-dhclient-script-correct-operators.patch
 	# 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
 	# Ldap support patch
 	# Add ldap support to dhcpd
 	use ldap && epatch "${FILESDIR}/${PN}"-4.0.0-ldap-1.patch
 	# Brand the version with Gentoo
 	# include revision if >0
 	local newver="Gentoo"
 	use ldap && local newver="Gentoo-LDAP"
 	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
 	sed -i "/AC_INIT/s/\(\[[0-9]\+\.[0-9]\+\.[0-9]\+\)/\1-${newver}/" \
 		configure.ac || 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
 	# Only install different man pages if we don't have en
 	if [[ " ${LINGUAS} " != *" en "* ]]; then
 		# Install Japanese man pages
 		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
 			einfo "Installing Japanese documention"
 			cp doc/ja_JP.eucJP/dhclient* client
 			cp doc/ja_JP.eucJP/dhcp* common
 		fi
 	fi
 	# Now remove the non-english docs so there are no errors later
 	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
 	eautoreconf
 }
 src_compile() {
 	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-srv-pid-file=/var/run/dhcp/dhcpd.pid \
 		--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
 		--with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \
 		$(use_enable ipv6 dhcpv6) \
 		|| die
 	emake || die "compile problem"
 }
 src_install() {
 	for installdir in includes tests common minires dst omapip client dhcpctl relay server; do
 		cd "${S}/${installdir}"
 		if [ "${installdir}" == client ]; then
 			make install DESTDIR="${D}" exec_prefix="" || die
 		else
 			make install DESTDIR="${D}" exec_prefix="/usr" || die
 		fi
 	done
 	cd "${S}"
 	exeinto /sbin
 	if use kernel_linux; then
 		newexe "${S}"/client/scripts/linux dhclient-script
 	else
 		newexe "${S}"/client/scripts/freebsd dhclient-script
 	fi
 	use doc && dodoc README RELNOTES doc/*
 	insinto /etc/dhcp
 	newins client/dhclient.conf dhclient.conf.sample
 	keepdir /var/{lib,run}/dhcp
 	# Install our server files
 	insinto /etc/dhcp
 	newins server/dhcpd.conf dhcpd.conf.sample
 	newinitd "${FILESDIR}"/dhcpd.init dhcpd
 	newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
 	newconfd "${FILESDIR}"/dhcpd.conf dhcpd
 	newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
 	# We never want portage to own this file
 	rm -f "${D}"/var/lib/dhcp/dhcpd.leases
 }
 pkg_preinst() {
 	enewgroup dhcp
 	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
 }
 pkg_postinst() {
 	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
 	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
 		ewarn
 		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
 		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
 		ewarn "and dhcp should be removed from the default runlevel"
 		ewarn
 	fi
 	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
 	einfo
 	einfo "If you would like to run dhcpd in a chroot, simply configure the"
 	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
 	einfo "  emerge --config =${PF}"
 }
 pkg_config() {
 	local CHROOT="$(
 		sed -n -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"
 }
--- a/net-misc/dhcp/files/dhcp-3.0-ddns-example.patch
+++ b/net-misc/dhcp/files/dhcp-3.0-ddns-example.patch
@ -1,13 +0,0 @@
 diff -ur a/server/dhcpd.conf b/server/dhcpd.conf
 --- a/server/dhcpd.conf	2001-01-25 08:33:11 +0000
 +++ b/server/dhcpd.conf	2007-07-19 10:29:43 +0100
@@ -21,6 +21,9 @@
 # No service will be given on this subnet, but declaring it helps the 
 # DHCP server to understand the network topology.
 +# Disable dynamic DNS updates.
 +ddns-update-style none;
 +
 subnet 10.152.187.0 netmask 255.255.255.0 {
 }
--- a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
+++ b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
@ -1,15 +0,0 @@
 --- 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);
--- a/net-misc/dhcp/files/dhcp-3.0-paranoia.patch
+++ b/net-misc/dhcp/files/dhcp-3.0-paranoia.patch
@ -1,207 +0,0 @@
 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]",
--- a/net-misc/dhcp/files/dhcp-3.0.2-gmake.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.2-gmake.patch
@ -1,66 +0,0 @@
 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
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
@ -1,84 +0,0 @@
 --- 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
 }
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
@ -1,16 +0,0 @@
 --- 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
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch
@ -1,200 +0,0 @@
 --- 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
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch
@ -1,180 +0,0 @@
 --- 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
--- 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
@ -1,70 +0,0 @@
 --- 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
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch
@ -1,186 +0,0 @@
 --- 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.
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch
@ -1,191 +0,0 @@
 --- client/scripts/bsdos
 +++ client/scripts/bsdos
@@ -1,11 +1,22 @@
 #!/bin/sh
 make_resolv_conf() {
 -  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
 -    echo search $new_domain_name >/etc/resolv.conf
 -    for nameserver in $new_domain_name_servers; do
 -      echo nameserver $nameserver >>/etc/resolv.conf
 -    done
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
 +    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      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
   fi
   # If we're making confs, may as well make an ntp.conf too
   make_ntp_conf
 --- client/scripts/freebsd
 +++ client/scripts/freebsd
@@ -11,25 +11,21 @@
 fi
 make_resolv_conf() {
 -  if [ x"$new_domain_name_servers" != x ]; then
 -    if [ "x$new_domain_name" != x ]; then
 -      ( echo search $new_domain_name >/etc/resolv.conf )
 -      exit_status=$?
 -    else
 -      if [ -e /etc/resolv.conf ] ; then
 -	( rm /etc/resolv.conf )
 -	exit_status=$?
 -      else
 -	( touch /etc/resolv.conf )
 -	exit_status=$?
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
 +    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      conf="# Generated by dhclient for interface $interface\n"
 +      if [ "x$new_domain_name" != x ]; then
 +        conf="${conf}search $new_domain_name\n"
       fi
 -    fi
 -    if [ $exit_status -ne 0 ]; then
 -      $LOGGER "WARNING: Unable to update resolv.conf: Error $exit_status"
 -    else
       for nameserver in $new_domain_name_servers; do
 -	( echo nameserver $nameserver >>/etc/resolv.conf )
 +        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
   fi
   # If we're making confs, may as well make an ntp.conf too
 --- client/scripts/linux
 +++ client/scripts/linux
@@ -23,12 +23,22 @@
 # of the $1 in its args.
 make_resolv_conf() {
 -  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
 -    echo search $new_domain_name >/etc/resolv.conf
 -    chmod 644 /etc/resolv.conf
 -    for nameserver in $new_domain_name_servers; do
 -      echo nameserver $nameserver >>/etc/resolv.conf
 -    done
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
 +    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      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
   fi
   # If we're making confs, may as well make an ntp.conf too
   make_ntp_conf
 --- client/scripts/netbsd
 +++ client/scripts/netbsd
@@ -1,11 +1,22 @@
 #!/bin/sh
 make_resolv_conf() {
 -  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
 -    echo search $new_domain_name >/etc/resolv.conf
 -    for nameserver in $new_domain_name_servers; do
 -      echo nameserver $nameserver >>/etc/resolv.conf
 -    done
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
 +    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      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
   fi
   # If we're making confs, may as well make an ntp.conf too
   make_ntp_conf
 --- client/scripts/openbsd
 +++ client/scripts/openbsd
@@ -1,11 +1,22 @@
 #!/bin/sh
 make_resolv_conf() {
 -  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
 -    echo search $new_domain_name >/etc/resolv.conf
 -    for nameserver in $new_domain_name_servers; do
 -      echo nameserver $nameserver >>/etc/resolv.conf
 -    done
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
 +    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      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
   fi
   # If we're making confs, may as well make an ntp.conf too
   make_ntp_conf
 --- client/scripts/solaris
 +++ client/scripts/solaris
@@ -1,11 +1,22 @@
 #!/bin/sh  
 make_resolv_conf() {
 -  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
 -    echo search $new_domain_name >/etc/resolv.conf
 -    for nameserver in $new_domain_name_servers; do
 -      echo nameserver $nameserver >>/etc/resolv.conf
 -    done
 +  if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
 +    if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
 +      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
   fi
   # If we're making confs, may as well make an ntp.conf too
   make_ntp_conf
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-stdin-conf.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-stdin-conf.patch
@ -1,77 +0,0 @@
 --- 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);
@@ -174,11 +174,36 @@
 	status = (cfile -> warnings_occurred
 		  ? ISC_R_BADPARSE
 		  : ISC_R_SUCCESS);
 -	close (file);
 	end_parse (&cfile);
 	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>
--- a/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch
@ -1,14 +0,0 @@
 --- 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
--- 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
@ -1,105 +0,0 @@
 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")) {
--- a/net-misc/dhcp/files/dhcp-3.0.3-tr.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-tr.patch
@ -1,12 +0,0 @@
 --- work.linux-2.2/common/tr.c	2005/08/14 11:34:24	1.1
 +++ work.linux-2.2/common/tr.c	2005/08/14 11:35:16
@@ -40,6 +40,9 @@ static char copyright[] =
 #include "includes/netinet/if_ether.h"
 #include "netinet/if_tr.h"
 #include <sys/time.h>
 +#ifdef __linux__
 +#include <linux/types.h>
 +#endif
 /*
  * token ring device handling subroutines.  These are required as token-ring
--- a/net-misc/dhcp/files/dhcp-3.0.3-x-option.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-x-option.patch
@ -1,216 +0,0 @@
 --- dhcp-3.0.2/common/parse.c.extended_option_environment	2005-04-05 17:49:36.513062562 -0400
 +++ dhcp-3.0.2/common/parse.c	2005-04-05 17:49:36.580052656 -0400
@@ -1270,6 +1270,10 @@
 	option_hash_add (option -> universe -> hash,
 			 (const char *)option -> name,
 			 0, option, MDL);
 +#ifdef EXTENDED_NEW_OPTION_INFO
 +	if ( new_option_info_tree != 0L )
 +		add_new_option_info( option );
 +#endif
 	return 1;
 }
 --- dhcp-3.0.2/common/tables.c.extended_option_environment	2004-09-01 13:06:35.000000000 -0400
 +++ dhcp-3.0.2/common/tables.c	2005-04-05 18:04:23.915838623 -0400
@@ -1238,3 +1238,40 @@
 			   fqdn_universe.name, 0,
 			   &fqdn_universe, MDL);
 }
 +
 +#ifdef EXTENDED_NEW_OPTION_INFO
 +#include <search.h>
 +
 +void *new_option_info_tree = 0L;
 +
 +static int  new_option_info_comparator( const void* p1, const void *p2 )
 +{
 +	uint32_t ocode1 =  (((const struct option*)p1)->universe->index << 8)
 +		          |(((const struct option*)p1)->code),
 +		 ocode2 =  (((const struct option*)p2)->universe->index << 8)
 +	                  |(((const struct option*)p2)->code);
 +	return( (ocode1 == ocode2) 
 +		? 0 
 +		:( ( ocode1 > ocode2 )
 +		   ?  1
 +		   : -1
 +	         )
 +	      );
 +}
 +
 +void *add_new_option_info( struct option *option )
 +{
 +	if ( option->universe->index >= fqdn_universe.index )
 +		return 0L;
 +	if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO )
 +		new_option_info_tree = (void*)0L;
 +	return tsearch( option, &(new_option_info_tree), new_option_info_comparator );
 +}
 +
 +void *lookup_new_option_info( struct option *option )
 +{
 +	if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO )
 +		return 0L;
 +	return tfind( option, &(new_option_info_tree), new_option_info_comparator );
 +}
 +#endif
 --- dhcp-3.0.2/includes/dhcpd.h.extended_option_environment	2004-11-24 12:39:16.000000000 -0500
 +++ dhcp-3.0.2/includes/dhcpd.h	2005-04-05 17:49:36.613047777 -0400
@@ -1800,6 +1800,13 @@
 void initialize_common_option_spaces PROTO ((void));
 struct universe *config_universe;
 +#ifdef EXTENDED_NEW_OPTION_INFO
 +#define GENERATE_NEW_OPTION_INFO ((void*)1)
 +extern void   *new_option_info_tree;
 +extern void   *add_new_option_info( struct option*);
 +extern void   *lookup_new_option_info( struct option *);
 +#endif
 +
 /* stables.c */
 #if defined (FAILOVER_PROTOCOL)
 extern failover_option_t null_failover_option;
 --- dhcp-3.0.2/client/dhclient.c.extended_option_environment	2005-04-05 17:49:36.566054726 -0400
 +++ dhcp-3.0.2/client/dhclient.c	2005-04-05 17:49:36.617047185 -0400
@@ -74,7 +74,9 @@
 int onetry=0;
 int quiet=0;
 int nowait=0;
 -
 +#ifdef EXTENDED_NEW_OPTION_INFO
 +int extended_option_environment = 0;
 +#endif
 static void usage PROTO ((void));
 void do_release(struct client_state *);
@@ -204,6 +206,11 @@
 		} else if (!strcmp (argv [i], "--version")) {
 			log_info ("isc-dhclient-%s", DHCP_VERSION);
 			exit (0);
 +#ifdef EXTENDED_NEW_OPTION_INFO
 +		} else if (!strcmp (argv [i], "-x")) {
 +		    extended_option_environment = 1;
 +		    new_option_info_tree = GENERATE_NEW_OPTION_INFO;
 +#endif
  		} else if (argv [i][0] == '-') {
  		    usage ();
 		} else {
@@ -572,7 +579,11 @@
 	log_info (arr);
 	log_info (url);
 +#ifdef EXTENDED_NEW_OPTION_INFO
 +	log_error ("Usage: dhclient [-1dqr] [-nwx] [-p <port>] %s",
 +#else
 	log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s",
 +#endif
 		   "[-s server]");
 	log_error ("                [-cf config-file] [-lf lease-file]%s",
 		   "[-pf pid-file] [-e VAR=val]");
@@ -2529,8 +2540,28 @@
 struct envadd_state {
 	struct client_state *client;
 	const char *prefix;
 +        struct universe *universe;
 };
 +#ifdef EXTENDED_NEW_OPTION_INFO			
 +static 
 +void build_universe_info_envvar
 +(      struct option_cache *oc,
 +       struct packet *p, struct lease *l,
 +       struct client_state *client,
 +       struct option_state *in_o,
 +       struct option_state *cf_o,
 +       struct binding_scope **scope,
 +       struct universe *u, void *es	          
 +)
 +{
 +    char info_name[512], info_data[512];
 +    snprintf(info_name, 512, "%s._universe_.", oc->option->universe->name);
 +    snprintf(info_data, 512, "%u:%s", oc->option->code,oc->option->format);
 +    client_envadd( client, info_name, oc->option->name, info_data );
 +}
 +#endif
 +
 void client_option_envadd (struct option_cache *oc,
 			   struct packet *packet, struct lease *lease,
 			   struct client_state *client_state,
@@ -2547,6 +2578,31 @@
 				   in_options, cfg_options, scope, oc, MDL)) {
 		if (data.len) {
 			char name [256];
 +#ifdef EXTENDED_NEW_OPTION_INFO			
 +			if (  extended_option_environment )
 +			{
 +				if(  ( oc->option->universe != &dhcp_universe )
 +				   &&( oc->option->universe->index > fqdn_universe.index )
 +				   &&( es->universe !=  oc->option->universe )
 +			          )
 +				{
 +					es->universe = oc->option->universe;
 +					(*(es->universe->foreach))
 +					     (  (struct packet *)0, (struct lease *)0, 
 +						client_state, 
 +						in_options, cfg_options, 
 +						scope, es->universe, es, 
 +						build_universe_info_envvar
 +					     );
 +				}else
 +				if ( lookup_new_option_info(oc->option) != 0L )			   
 +					build_universe_info_envvar
 +					      ( oc, packet, lease, client_state, 
 +						in_options, cfg_options, scope,
 +						oc->option->universe, es 
 +					      );
 +			}
 +#endif
 			if (dhcp_option_ev_name (name, sizeof name,
 						 oc -> option)) {
 				client_envadd (es -> client, es -> prefix,
@@ -2575,6 +2631,7 @@
 	es.client = client;
 	es.prefix = prefix;
 +	es.universe = 0L;
 	client_envadd (client,
 		       prefix, "ip_address", "%s", piaddr (lease -> address));
@@ -2788,7 +2845,14 @@
 			s = option -> name;
 			if (j + 1 == buflen)
 				return 0;
 +#ifdef EXTENDED_NEW_OPTION_INFO
 +			if ( ! extended_option_environment )
 +			    buf [j++] = '_';
 +			else
 +			    buf [j++] = '.';
 +#else
 			buf [j++] = '_';
 +#endif
 		}
 		++i;
 	} while (i != 2);
 --- dhcp-3.0.2/client/dhclient.8.extended_option_environment	2004-09-29 19:01:46.000000000 -0400
 +++ dhcp-3.0.2/client/dhclient.8	2005-04-05 17:49:36.619046889 -0400
@@ -78,6 +78,9 @@
 .B -w
 ]
 [
 +.B -x
 +]
 +[
 .I if0
 [
 .I ...ifN
@@ -252,6 +255,10 @@
 supplying the
 .B -nw
 flag.
 +.PP
 +The -x argument enables eXtended option information to be created in the
 +-s dhclient-script environment, which would allow applications running 
 +in that environment to handle options they do not know about in advance.
 .SH CONFIGURATION
 The syntax of the dhclient.conf(5) file is discussed separately.
 .SH OMAPI
--- 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
@ -1,83 +0,0 @@
 --- 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>
--- a/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch
@ -1,44 +0,0 @@
 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))
--- a/net-misc/dhcp/files/dhcp-3.1.0-ldap.patch
+++ b/net-misc/dhcp/files/dhcp-3.1.0-ldap.patch
--- a/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch
+++ b/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch
@ -1,254 +0,0 @@
 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
--- a/net-misc/dhcp/files/dhcp-4.0-dhclient-metric.patch
+++ b/net-misc/dhcp/files/dhcp-4.0-dhclient-metric.patch
@ -1,205 +0,0 @@
 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 13:22:40.000000000 +0100
 +++ dhcp-4.0.0/client/scripts/bsdos	2008-09-01 13:23:24.000000000 +0100
@@ -95,6 +95,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"
@@ -156,7 +159,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
@@ -213,7 +216,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
 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 13:22:40.000000000 +0100
 +++ dhcp-4.0.0/client/scripts/freebsd	2008-09-01 13:23:24.000000000 +0100
@@ -139,6 +139,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"
@@ -200,7 +203,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"
@@ -264,7 +267,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"
 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 13:22:40.000000000 +0100
 +++ dhcp-4.0.0/client/scripts/linux	2008-09-01 13:26:19.000000000 +0100
@@ -98,11 +98,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/'`
 -
 ###
 ### DHCPv4 Handlers
 ###
@@ -125,6 +120,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).
@@ -136,15 +134,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
@@ -186,12 +176,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 ];
@@ -234,12 +226,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
 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 13:22:40.000000000 +0100
 +++ dhcp-4.0.0/client/scripts/netbsd	2008-09-01 13:23:33.000000000 +0100
@@ -95,6 +95,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"
@@ -156,7 +159,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
@@ -213,7 +216,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
 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 13:22:40.000000000 +0100
 +++ dhcp-4.0.0/client/scripts/solaris	2008-09-01 13:23:33.000000000 +0100
@@ -78,6 +78,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
@@ -140,7 +143,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
@@ -181,7 +184,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
--- a/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch
+++ b/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch
@ -1,216 +0,0 @@
 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.
--- a/net-misc/dhcp/files/dhcp-4.0-dhclient-resolvconf.patch
+++ b/net-misc/dhcp/files/dhcp-4.0-dhclient-resolvconf.patch
@ -1,390 +0,0 @@
 diff -ur a/client/scripts/bsdos b/client/scripts/bsdos
 --- a/client/scripts/bsdos	2008-09-01 14:41:00.000000000 +0100
 +++ b/client/scripts/bsdos	2008-09-01 14:57:33.000000000 +0100
@@ -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
 }
 diff -ur a/client/scripts/freebsd b/client/scripts/freebsd
 --- a/client/scripts/freebsd	2008-09-01 14:41:00.000000000 +0100
 +++ b/client/scripts/freebsd	2008-09-01 15:00:18.000000000 +0100
@@ -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
 }
 diff -ur a/client/scripts/linux b/client/scripts/linux
 --- a/client/scripts/linux	2008-09-01 14:41:00.000000000 +0100
 +++ b/client/scripts/linux	2008-09-01 14:58:09.000000000 +0100
@@ -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
 }
 diff -ur a/client/scripts/netbsd b/client/scripts/netbsd
 --- a/client/scripts/netbsd	2008-09-01 14:41:00.000000000 +0100
 +++ b/client/scripts/netbsd	2008-09-01 14:58:40.000000000 +0100
@@ -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
 }
 diff -ur a/client/scripts/openbsd b/client/scripts/openbsd
 --- a/client/scripts/openbsd	2008-09-01 14:41:00.000000000 +0100
 +++ b/client/scripts/openbsd	2008-09-01 14:59:12.000000000 +0100
@@ -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
 }
 diff -ur a/client/scripts/solaris b/client/scripts/solaris
 --- a/client/scripts/solaris	2008-09-01 14:41:00.000000000 +0100
 +++ b/client/scripts/solaris	2008-09-01 14:59:27.000000000 +0100
@@ -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
 }
--- a/net-misc/dhcp/files/dhcp-4.0-dhclient-script-correct-operators.patch
+++ b/net-misc/dhcp/files/dhcp-4.0-dhclient-script-correct-operators.patch
@ -1,48 +0,0 @@
 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-03 00:52:41.000000000 +0100
 +++ dhcp-4.0.0/client/scripts/linux	2008-09-03 00:53:16.000000000 +0100
@@ -258,7 +232,7 @@
 ### DHCPv6 Handlers
 ###
 -if [ ${reason} = PREINIT6 ] ; then
 +if [ x$reason = xPREINIT6 ] ; then
   # Ensure interface is up.
   ${ip} link set ${interface} up
@@ -268,7 +242,7 @@
   exit_with_hooks 0
 fi
 -if [ ${reason} = BOUND6 ] ; then
 +if [ x$reason = xBOUND6 ] ; then
   if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
     exit_with_hooks 2;
   fi
@@ -282,7 +256,7 @@
   exit_with_hooks 0
 fi
 -if [ ${reason} = RENEW6 ] || [ ${reason} = REBIND6 ] ; then
 +if [ x$reason = xRENEW6 ] || [ x$reason} = xREBIND6 ] ; then
   # Make sure nothing has moved around on us.
   # Nameservers/domains/etc.
@@ -294,7 +268,7 @@
   exit_with_hooks 0
 fi
 -if [ ${reason} = DEPREF6 ] ; then
 +if [ x$reason = xDEPREF6 ] ; then
   if [ x${new_ip6_prefixlen} = x ] ; then
     exit_with_hooks 2;
   fi
@@ -307,7 +281,7 @@
   exit_with_hooks 0
 fi
 -if [ ${reason} = EXPIRE6 -o ${reason} = RELEASE6 -o ${reason} = STOP6 ] ; then
 +if [ x$reason = xEXPIRE6 -o x$reason = xRELEASE6 -o x$reason = xSTOP6 ] ; then
   if [ x${old_ip6_address} = x ] || [ x${old_ip6_prefixlen} = x ] ; then
     exit_with_hooks 2;
   fi
--- a/net-misc/dhcp/files/dhcp-4.0-dhclient-stdin-conf.patch
+++ b/net-misc/dhcp/files/dhcp-4.0-dhclient-stdin-conf.patch
@ -1,115 +0,0 @@
 diff -ur a/client/clparse.c b/client/clparse.c
 --- a/client/clparse.c	2008-09-03 21:39:30.000000000 +0100
 +++ b/client/clparse.c	2008-09-03 23:10:48.000000000 +0100
@@ -172,6 +172,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;
@@ -201,21 +205,13 @@
 	return status;
 }
 -int read_client_conf_file (const char *name, struct interface_info *ip,
 -			   struct client_config *client)
 +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 = (struct parse *)0;
 -	new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0);
 -
 	do {
 		token = peek_token (&val, (unsigned *)0, cfile);
 		if (token == END_OF_FILE)
@@ -226,10 +222,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>
 Files a/client/clparse.o and b/client/clparse.o differ
 Files a/client/dhclient and b/client/dhclient differ
--- a/net-misc/dhcp/files/dhcp-4.0-linux-ipv6-header.patch
+++ b/net-misc/dhcp/files/dhcp-4.0-linux-ipv6-header.patch
@ -1,25 +0,0 @@
 diff -uNr dhcp-4.0.0.ORIG/common/socket.c dhcp-4.0.0/common/socket.c
 --- dhcp-4.0.0.ORIG/common/socket.c	2008-09-02 10:25:21.000000000 +0100
 +++ dhcp-4.0.0/common/socket.c	2008-09-02 10:27:29.000000000 +0100
@@ -46,6 +46,10 @@
 #include <sys/uio.h>
 #include <sys/uio.h>
 +#ifdef HAVE_LINUX_IPV6_H
 +#include <linux/ipv6.h>
 +#endif
 +
 #ifdef USE_SOCKET_FALLBACK
 # if !defined (USE_SOCKET_SEND)
 #  define if_register_send if_register_fallback
 diff -uNr dhcp-4.0.0.ORIG/configure.ac dhcp-4.0.0/configure.ac
 --- dhcp-4.0.0.ORIG/configure.ac	2008-09-02 10:25:21.000000000 +0100
 +++ dhcp-4.0.0/configure.ac	2008-09-02 10:26:29.000000000 +0100
@@ -37,6 +37,7 @@
 if test "$enable_dhcpv6" != "no"; then
 	AC_DEFINE([DHCPv6], [1], 
 		  [Define to 1 to include DHCPv6 support.])
 +	AC_CHECK_HEADERS(linux/ipv6.h)
 fi
 ###
--- a/net-misc/dhcp/files/dhcp-4.0-no_isc_blurb.patch
+++ b/net-misc/dhcp/files/dhcp-4.0-no_isc_blurb.patch
@ -1,96 +0,0 @@
 diff -uNr dhcp-4.0.0.ORIG/client/dhclient.c dhcp-4.0.0/client/dhclient.c
 --- dhcp-4.0.0.ORIG/client/dhclient.c	2008-09-01 13:38:38.000000000 +0100
 +++ dhcp-4.0.0/client/dhclient.c	2008-09-01 13:41:32.000000000 +0100
@@ -80,6 +80,8 @@
 static isc_result_t write_duid(struct data_string *duid);
 +extern int log_isc_blurb;
 +
 int 
 main(int argc, char **argv) {
 	int fd;
@@ -323,6 +325,7 @@
 		log_info ("%s", "");
 	} else {
 		log_perror = 0;
 +		log_isc_blurb = 0;
 		quiet_interface_discovery = 1;
 	}
 diff -uNr dhcp-4.0.0.ORIG/omapip/errwarn.c dhcp-4.0.0/omapip/errwarn.c
 --- dhcp-4.0.0.ORIG/omapip/errwarn.c	2008-09-01 13:38:38.000000000 +0100
 +++ dhcp-4.0.0/omapip/errwarn.c	2008-09-01 13:39:17.000000000 +0100
@@ -43,6 +43,8 @@
 int log_perror = 1;
 #endif
 int log_priority;
 +int log_isc_blurb=1;
 +
 void (*log_cleanup) (void);
 #define CVT_BUF_MAX 1023
@@ -74,7 +76,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");
@@ -92,7 +96,12 @@
   log_error ("the README file.");
   log_error ("%s", "");
   log_error ("exiting.");
 +  }else
 +  {
 +      log_error ("exiting.");
 +  }
 #endif
 +
   if (log_cleanup)
 	  (*log_cleanup) ();
   exit (1);
 diff -uNr dhcp-4.0.0.ORIG/relay/dhcrelay.c dhcp-4.0.0/relay/dhcrelay.c
 --- dhcp-4.0.0.ORIG/relay/dhcrelay.c	2008-09-01 13:38:38.000000000 +0100
 +++ dhcp-4.0.0/relay/dhcrelay.c	2008-09-01 13:43:15.000000000 +0100
@@ -97,6 +97,7 @@
 static char arr [] = "All rights reserved.";
 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(int argc, char **argv) {
@@ -163,6 +164,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 -uNr dhcp-4.0.0.ORIG/server/dhcpd.c dhcp-4.0.0/server/dhcpd.c
 --- dhcp-4.0.0.ORIG/server/dhcpd.c	2008-09-01 13:38:38.000000000 +0100
 +++ dhcp-4.0.0/server/dhcpd.c	2008-09-01 13:42:37.000000000 +0100
@@ -61,6 +61,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
@@ -359,6 +362,7 @@
 			lftest = 1;
 			log_perror = -1;
 		} else if (!strcmp (argv [i], "-q")) {
 +			log_isc_blurb = 0;
 			quiet = 1;
 			quiet_interface_discovery = 1;
 #ifdef DHCPv6
--- a/net-misc/dhcp/files/dhcp-4.0-paranoia.patch
+++ b/net-misc/dhcp/files/dhcp-4.0-paranoia.patch
@ -1,189 +0,0 @@
 diff -uNr dhcp-4.0.0.ORIG/configure.ac dhcp-4.0.0/configure.ac
 --- dhcp-4.0.0.ORIG/configure.ac	2008-09-02 10:57:37.000000000 +0100
 +++ dhcp-4.0.0/configure.ac	2008-09-02 11:00:27.000000000 +0100
@@ -30,6 +30,17 @@
 		   [Define to BIG_ENDIAN for MSB (Motorola or SPARC CPUs)
 		    or LITTLE_ENDIAN for LSB (Intel CPUs).])
 +# Paranoia/early chrooting is off by default
 +AC_ARG_ENABLE(paranoia,
 +	AC_HELP_STRING([--enable-paranoia],
 +		       [enable support for early chroot (default is no)]))
 +if test "$enable_paranoia" != "no"; then
 +	AC_DEFINE([PARANOIA], [1], 
 +		  [Define to enable paranoia.])
 +	AC_DEFINE([EARLY_CHROOT], [1], 
 +		  [Define to 1 to chroot early.])
 +fi
 +
 # DHCPv6 is off by default
 AC_ARG_ENABLE(dhcpv6,
 	AC_HELP_STRING([--enable-dhcpv6],
 diff -uNr dhcp-4.0.0.ORIG/server/dhcpd.c dhcp-4.0.0/server/dhcpd.c
 --- dhcp-4.0.0.ORIG/server/dhcpd.c	2008-09-02 10:57:37.000000000 +0100
 +++ dhcp-4.0.0/server/dhcpd.c	2008-09-02 10:57:54.000000000 +0100
@@ -46,6 +46,16 @@
 #include <sys/types.h>
 #include <signal.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(void);
 struct iaddr server_identifier;
@@ -195,6 +205,21 @@
 	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 */
 +
 #ifndef UNIT_TEST
 int 
 main(int argc, char **argv) {
@@ -224,6 +249,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 that file descriptors 0 (stdin), 1, (stdout), and
            2 (stderr) are open. To do this, we assume that when we
@@ -284,6 +317,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 ();
@@ -438,6 +485,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)
 	{
@@ -576,6 +661,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);
@@ -659,6 +748,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);
@@ -1039,6 +1144,10 @@
 #else /* !DHCPv6 */
 		  "             [-cf config-file] [-lf lease-file]\n"
 #endif /* DHCPv6 */
 +#if defined (PARANOIA)
 +		  /* meld into the following string */
 +		  "\n             [-user user] [-group group] [-chroot dir]"
 +#endif /* PARANOIA */
 #if defined (TRACING)
 		  "             [-tf trace-output-file]\n"
 		  "             [-play trace-input-file]\n"
--- a/net-misc/dhcp/files/dhcp-4.0.0-ldap-1.patch
+++ b/net-misc/dhcp/files/dhcp-4.0.0-ldap-1.patch
--- 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
@ -1,114 +0,0 @@
 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-14 09:18:41.222564184 +0100
 +++ dhcp-4.0.1/client/clparse.c	2009-03-14 09:23:19.032649576 +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>
--- a/net-misc/dhcp/files/dhcp-ebuild.patch
+++ b/net-misc/dhcp/files/dhcp-ebuild.patch
@ -1,31 +0,0 @@
 --- dhcp-3.1.0.ebuild	2008-01-10 10:36:28.000000000 +0100
 +++ dhcp-4.0.0-r1.ebuild	2008-07-30 14:55:17.000000000 +0200
@@ -15,10 +15,11 @@
 LICENSE="isc-dhcp"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 -IUSE="doc minimal static selinux kernel_linux"
 +IUSE="doc minimal static selinux kernel_linux ldap"
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
 -	kernel_linux? ( sys-apps/net-tools )"
 +	kernel_linux? ( sys-apps/net-tools )
 +	ldap? ( net-nds/openldap )"
 PROVIDE="virtual/dhcpc"
@@ -65,9 +66,14 @@
 	# Add dbus support to dhclient
 	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
 +	# Ldap support patch
 +	# Add ldap support to dhcpd
 +	use ldap && epatch "${FILESDIR}/${PN}"-3.1.0-ldap.patch
 +
 	# Brand the version with Gentoo
 	# include revision if >0
 	local newver="${MY_PV}-Gentoo"
 +	use ldap && local newver="${MY_PV}-Gentoo-LDAP"
 	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
 	sed -i '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
 		includes/version.h || die
--- a/net-misc/dhcp/files/dhcpd.conf
+++ b/net-misc/dhcp/files/dhcpd.conf
@ -1,29 +0,0 @@
 # /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=""
--- a/net-misc/dhcp/files/dhcpd.init
+++ b/net-misc/dhcp/files/dhcpd.init
@ -1,71 +0,0 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init,v 1.5 2007/04/02 12:34:01 uberlord Exp $
 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}"
 }
 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
 	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)"
 	ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
 	start-stop-daemon --stop --exec /usr/sbin/dhcpd \
 	    --pidfile "${chroot}/$(get_options pidfile)"
 	eend $?
 }
--- a/net-misc/dhcp/files/dhcrelay.conf
+++ b/net-misc/dhcp/files/dhcrelay.conf
@ -1,13 +0,0 @@
 # /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=""
--- a/net-misc/dhcp/files/dhcrelay.init
+++ b/net-misc/dhcp/files/dhcrelay.init
@ -1,32 +0,0 @@
 #!/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 $?
 }
--- a/net-misc/dhcp/metadata.xml
+++ b/net-misc/dhcp/metadata.xml
@ -1,5 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>maintainer-wanted</herd>
 </pkgmetadata>