Quiet ping output by default #296921 by Martin Mokrejš. Always accept the -4 option even when USE=-ipv6 #437108 by Stefan Reimer.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

5 files changed, 366 insertions, 15 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index ff0119ca513b..b4756a0e6918 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.218 2012/10/07 06:25:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.219 2012/10/10 04:16:40 vapier Exp $
+
+*dhcp-4.2.4_p2-r1 (10 Oct 2012)
+
+  10 Oct 2012; Mike Frysinger <vapier@gentoo.org> +dhcp-4.2.4_p2-r1.ebuild,
+  +files/dhcp-4.2.4-always-accept-4.patch, +files/dhcp-4.2.4-quieter-ping.patch:
+  Quiet ping output by default #296921 by Martin Mokrejš.  Always accept the -4
+  option even when USE=-ipv6 #437108 by Stefan Reimer.
 
 *dhcp-4.2.4_p2 (07 Oct 2012)
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index ab313561db15..f36c5acebdb9 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -29,6 +29,8 @@ AUX dhcp-4.2.2-bind-parallel-build.patch 304 SHA256 cff322da581742ef1a8019641ee9
 AUX dhcp-4.2.2-dhclient-resolvconf.patch 14535 SHA256 a87f33e33fc3f3a103264909cc85c477036949f2c00c428d562c12b560f09877 SHA512 2e5343c3401c61c8d33e0b16832dd3daec308b4c17f67f5ffa86b13e194f2cb96db6c3696134df1114b839261b03bc890becf925465f312ab67855db33738abf WHIRLPOOL 203bb55c61b7018efdfb9c8083bc70c8a23693da90943ae7720c8968b3d7dcb0d2f27699e3a417efe8bde69347d762d9c0433093da03599cd6a0a67fd603a5fb
 AUX dhcp-4.2.2-dhclient-stdin-conf.patch 3017 SHA256 701da4d022490bf9e1cfd946c752a00a2d2ab9a1fd5030281c1608f367cc68fe SHA512 1adfa938e5531040008981dd4dcba37219bce0794524d3c3530eff527528ef7b22aa6fd540f9ac175339372e98347c0a91b86b4bb5f2aa93f04217b9902c3388 WHIRLPOOL c42b3880b5cf710613021c192fc5bc1290bd04db9d79b991bac9e361f58fd84514044a19a5eff82695845e017c996cd46b29b697bfe718e51fba413caf925096
 AUX dhcp-4.2.2-nogateway.patch 1671 SHA256 3fed5823812c134e1819c8ac10c5fc718df86f4013ffc7505efbbe692319480e SHA512 fefbb402020dfdc3eff75da50bfaed0f30c5b90facd4b4ca25ac38d62f14bb85b18028261b32ac3f4654afc8e6915fcdd6f5e580444f2efe882f6f75ea10be0c WHIRLPOOL 91d38301aaecc4a2199ffd0be19d5c2b36531446524aeb65e743adb82220d20b18f53f3e740b5286bdf578f8fd35b2511f52747406b914d1c4d2841d1677e1bd
+AUX dhcp-4.2.4-always-accept-4.patch 907 SHA256 2a876b92ff385e97955279eab8d7658b9a323cdf16c4a162ba649166cae10194 SHA512 682583d3a68b9609b16ba5029fb14a068c5e4ba1134b91e3c5c91f8cfa0d97d68e7b0fec2aa3d4e224bef9e97765971ca423e54f853a74ff6a2e24715ce17a2c WHIRLPOOL 27516c02bcece28eac935f2a6fbfbf64e3b31b75206151ec618daa906b21a40b62497cefe2e793c1ae74b0b4ee5decde363c9908a632bb38513e14cbb64347e5
+AUX dhcp-4.2.4-quieter-ping.patch 2771 SHA256 8acf6266190a76f13c942da5c0a52c38421259f3fd63426134ad245e65081db0 SHA512 1a17a7ca52aa2a56e483e5f70e9878d7472f8eb3982b4f04c6cb3c32f839fa3972f79f632f99f47196a7e7b9fd8826392b94daaa074691d26636b793fcd40e73 WHIRLPOOL aa0b2bc3f3c539eaa6de27f9ce98525c5342af9a257cf36b8889b40455b3264f7b824a615146539ab012bcf4e5a55a7f1992cfc6222ce77976709c1a88dc907b
 AUX dhcpd.conf 1092 SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5 SHA512 21467475571e914b60084a20eacba794806631c84c33e5977db0c5f3b572752c2518c807daac107ec9cbfe4d4ef0cdf54e9797d7ab064e7386b586b00619e035 WHIRLPOOL 0c9a81b3b19f6b91687db7a7ede9107afc0e50fe1ee9d86e848fa444d0da9c55798b545cb8215ec1149d48163a944d6f86969430570b26012f0a19413cff278a
 AUX dhcpd.conf2 1068 SHA256 e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d WHIRLPOOL eef0331ee019b561de2f3e46860d2c470f6de05be9104f46316d61b09bad9687d916af94eb4b399612bfd05340cda5f68f87886200801de485bd3665cc0886b9
 AUX dhcpd.init2 2421 SHA256 fef93e5a7264780044a977ade27e9cc70de824063791bcd07d3db81c11c16df5 SHA512 ab7f9c310ad7d6342aa996ae4a94f71e7df71ecaea569cec721637f75ba1a26681769181ef6f2eef1b11cb6bbf5827ab7503ba6012a689d82ac1b96eb918c444 WHIRLPOOL bfc0a4e31521c8b527c5c47ee449d2f2c9e84c4316fa869ba019fb31c9cc9db884d65d016a537c53874556fdc95165039705943dae32b30a8853900685cbfc2e
@@ -58,23 +60,24 @@ EBUILD dhcp-4.2.2.ebuild 7474 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc9
 EBUILD dhcp-4.2.3_p1.ebuild 7211 SHA256 663b373b3661a23ae1364ba18a52ade63022aad8229bc1b275cc82d110b07253 SHA512 469187bbf12ab52530e85a9227ae9d52aa617aa9a16732f21cb22e3987e681dd44b69f7c4dd3c5eb9ec207d8ab9ad34d1a61504d8a24c23eb3a494845ae6564d WHIRLPOOL 23a042697190429f090e31daedc663059c00e6228e8b9193e78f30e3799fa24bb7a3e25a3b58bed3e2e70d2ff5d625916a06b91d33580527005d96357082ee18
 EBUILD dhcp-4.2.3_p2.ebuild 7242 SHA256 cb357fc0589a09af61868fedcfc31dad70df8278a5ef78a1cd23ae96170ded9e SHA512 69eefa262861c301d5de344eaf45dfc88d211a1b0434d6898fc8bc802ec8804b7e588d5dec524183c193c2a8d41e95eaa0f2272ba3fb64a37641ce45df3fc86a WHIRLPOOL 5b0263ae207a72874c4d3576845d8f973cb768c22b2b19993b0eaa78f83f20984da74fbb35ec45725fa7f2b56666c26b7c26e39112414da194e640a901f248a1
 EBUILD dhcp-4.2.4_p1.ebuild 7236 SHA256 3d49361c1f952bbc3e14a46b872f33ae6cac102842ea6c6ac2f5ad326dd90da0 SHA512 d00831932a3cfdb7ff0cf451ccb29a22812a79c82800b4faad9d82289002728744bfa58046f60dcaaa08da21657ea10818a8eaf75f7ee24bb8d8d6fac3c136f5 WHIRLPOOL 47259067563ecb691837308974f57c98a4c79339ee19f6f2afc8b18e6d3e20425d70fda4a5ce731680ebc901357607315dfc7e82b6e1e54dfc6c4be0324d02f7
+EBUILD dhcp-4.2.4_p2-r1.ebuild 7459 SHA256 c6eafd4e540351031d403e182d5cf2b47d90034132e6e23ceb9d2bc0033d0680 SHA512 607af624d23431845376663f8881752927bca67060a51d2b6d8099a98c04169455c8e53211215fa1ac3051bd9f021df2f8c23b2987ae0138534e9892e76627aa WHIRLPOOL f74353d7c611744296ebe07465037407a594ba4717a055d54bd84984562ea833a9e6acfaddf6637ddf6d53482963845158a88289a559c9bc2e62716ee50b71b3
 EBUILD dhcp-4.2.4_p2.ebuild 7331 SHA256 13044c2c3be4889c5dcc82447722cd8cb049b47d3f3076d0b16ee7fdac313c35 SHA512 a15dde74681b7774706e7b10d5e93f0b87a8884f403dbde6139bb3103c478bd16399ffacec0b08bc47dcfd984b9baa48ed2ff534a1da92661566d66f23504723 WHIRLPOOL 6ec6f841639a6c3575f104819bb2ee15931db7c06ab4c448bbcbf2d7dcc64e2a0739fd708e23eedec431a1733347f8b724f1cabe0812ce052b20111265f95c1e
-MISC ChangeLog 36846 SHA256 f299fdf78eeb62c322520f0bdfda9478ce360ba746d09bb904c05b5f4b8f558c SHA512 bc800a150a79bda47eaa49da5a8518a0366b67b19c20593092d23e5ebbe7dedf1b0261111bd8da4ab53bf4dc85e58cc4989fb371619f665b2d4efa68a096953c WHIRLPOOL 09b43fab292a918b2bf0fa36998ebc802c2f696415651a375c3ca6c50a4109516efc2d1616dbaa9773f61e4248dc27b6f1aed1cdba1c055cc1839e915651fe7b
+MISC ChangeLog 37173 SHA256 98e330f40fd08d38a8a79a7736503680ed4ef4f4c6424e4365f9a601fe3cd092 SHA512 1c38fda4c21672ff188aa531aa88666d9f0b453138260f02d6d91673d071cc602d740fe7f9fb37973547f260b8764ff2a744ff3bc81f5ec3d6ae29ccdc6e14cd WHIRLPOOL 5233cef709507a5caedd523c778050cb5a3015487bda6e1b2ffbcb76c4edae40ede542331a8ea222da28563d26c841a0b9fa19662c2e6ba7c0d59ec678c4e1c3
 MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQcSBzAAoJELEHsLL7fEFWZhwP/1KtRBXbdmHotw5EpFc9eRPX
-/N85G8DlqYpE8tEXtGJ1Oq7IKm5Jv3tyiBV5YRBMtNAjHjB/FmAOiOfhgp3gUoFF
-kD6mkbZ8E8Y5hZZ3ss31vTyT3DEkGXKntXyxxhDv76j140R8Bp+fTn47pDgfzYZk
-JkM2aVJEUQ7NgmiTlr7xIGD3wplKp7PdVvTNHwFWRbDsQNCsB5kjQwNBSsRRJmsV
-HQ+8M02DPdd50poCblUWQp9k9kXTMfg4Y++21DzdR93Q+qk181QvrCQF2MAefUjF
-brP5gC2+FOWZfM8M0rn9/aKoiFDfzAvTSfYGRxGYRUIA/mYILN0YRLMXAceoaETR
-3qzxplY1pLzn2jagcD8/8m8yHWWDvkBqWQ5u63XEeGb+C/lsZKMZT5YJTh2Bgius
-UavO93pnD+3P25fInVa6aE7QA/udiRy0/Z7xHtAyUJVU4HCPYrCcL8oIzPw4TNqD
-LMO1s5PpL3s6FCzhjlEOLg9CF1o86Bt4My+/Nm/QZDl7Ea+wvLyhhJfjm6QYMeAa
-+Fahj10R03bHBxC0YT4MJs+LMuQRcCyYaPsaa1JA6Wbj6sWQjqY16+FIm9HhHe1H
-3UTKGsrYqkfjadQWYprSgdFiPJ089qbBbxSmZE4kZzqPLQJlLUSafNO5omnDPhoT
-WfQx3fzSWvplhV75eXhe
-=JZKY
+iQIcBAEBCAAGBQJQdPbKAAoJELEHsLL7fEFWhKQP/jqNswMyJJfZzqcvwpuEEOFl
+lS+1eRqynv5VqT0wHNkAMR5RKsJPR68oddCuC0o965xCwki6wwzNk2YfpD6woHoI
+MhrsbUuARmN+SDlAgxv1EsGwwTdNTDsDfSh5ckKuadckj38Yp3KQvXGXL9WjNA1t
+7t2n4PVDtHA7PhpIJ4z9/OZIMc0o94nBG6KW7VFBwfsnlhCBBV9M27MCmAqb0z89
+OKdXus56uaBxarmUd/w81+D//KOlMiK7icaEv2bLTRTL1dzK0iEbO1LLv6oKimT1
+1LixXClYsfn3i7ILh2/aqbTT5V+TIQRkermtf3yTzBCmv9JUO0373M7f65unn/um
+f/EgAabB1upJ5uu2/5I6zJ3WCaqGpdDZqrIpXnA/e6NsL+UIQbwj0HI5mSS4s7UC
+c74euE3l+Y+sNW6bDLVJ5Xy24YLyOUmx0Y/bzfjWOb+jqiO4ICaQhffXHSQL8boE
+mruroxQXdmL9pYmGsf0wcS0yf7AX5gEU3LyBL5wvzOZn1KLcizLaYKwOqK8Wrhwa
+Bkdhos430n/t/UnK7bCVhnUsDNn+/S0HpugZb4gsugF5OAyEpoi7o9FAQL/HVkg9
+GAffT0KByUW+BEkKpofcPVmwUOITFqHHx/FQcnFzshx9lBZeQUbJ6dK1SGjokax6
+cXBYkyRV+HeFRoJkgRhe
+=Mfgc
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild b/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
new file mode 100644
index 000000000000..cc46e6a3cf42
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.1 2012/10/10 04:16:40 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
+
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+	client? ( kernel_linux? ( sys-apps/net-tools ) )
+	ldap? (
+		net-nds/openldap
+		ssl? ( dev-libs/openssl )
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind
+	unpack ./bind.tar.gz
+}
+
+src_prepare() {
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
+	# Enable dhclient to equery NTP servers
+	epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
+	# resolvconf support in dhclient-script
+	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-resolvconf.patch
+	# Stop downing the interface on Linux as that breaks link daemons
+	# such as wpa_supplicant and netplug
+	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
+	epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
+	# Enable dhclient to get extra configuration from stdin
+	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
+	epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
+	epatch "${FILESDIR}"/${PN}-4.2.1-dhclient-parse_option_param-Bad-format-a.patch #432998
+	epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
+	epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
+
+	# 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
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# Change the hook script locations of the scripts
+	sed -i \
+		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash #158540
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i \
+		-e "/\(script\|host-name\|domain-name\) / d" \
+		client/dhclient.conf || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client
+			cp doc/ja_JP.eucJP/dhcp* common
+		fi
+	fi
+	# Now remove the non-english docs so there are no errors later
+	rm -rf doc/ja_JP.eucJP
+
+	# make the bind build work
+	binddir=${S}/bind
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
+	binddir=${binddir}
+	GMAKE=${MAKE:-gmake}
+	EOF
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
+	cd bind-*/
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
+}
+
+src_configure() {
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
+
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
+	# Use FHS sane paths ... some of these have configure options,
+	# but not all, so just do it all here.
+	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+	cat <<-EOF >> includes/site.h
+	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
+	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
+	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
+	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
+	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
+	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
+	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
+	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
+	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
+	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
+	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
+	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
+	EOF
+
+	econf \
+		--enable-paranoia \
+		--enable-early-chroot \
+		--sysconfdir=${e} \
+		$(use_enable ipv6 dhcpv6) \
+		$(use_with ldap) \
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+	# configure local bind cruft.  symtable option requires
+	# perl and we don't want to require that #383837.
+	cd bind/bind-*/ || die
+	eval econf \
+		$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
+		--disable-symtable \
+		--without-make-clean
+}
+
+src_compile() {
+	# build local bind cruft first
+	emake -C bind/bind-*/lib/export install
+	# then build standard dhcp code
+	emake
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	dohtml doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# move the client to /
+		dodir /sbin
+		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script
+		fi
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.*
+			dosbin contrib/ldap/dhcpd-conf-to-ldap
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+	fi
+
+	# the default config files aren't terribly useful #384087
+	sed -i '/^[^#]/s:^:#:' "${D}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
+		if [ -e "${ROOT}"${f} ] ; then
+			case $(md5sum "${ROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${ROOT}"${f} "${D}"${f};;
+			esac
+		fi
+	done
+}
+
+pkg_postinst() {
+	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
+}
diff --git a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
new file mode 100644
index 000000000000..6cec86c9d9c4
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/437108
+
+always accept the -4 option even if we don't have IPv6 support enabled.
+the relay code does this already.
+
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -170,8 +170,8 @@ main(int argc, char **argv) {
+ 		if (!strcmp(argv[i], "-r")) {
+ 			release_mode = 1;
+ 			no_daemon = 1;
+-#ifdef DHCPv6
+ 		} else if (!strcmp(argv[i], "-4")) {
++#ifdef DHCPv6
+ 			if (local_family_set && local_family != AF_INET)
+ 				log_fatal("Client can only do v4 or v6, not "
+ 					  "both.");
+--- a/server/dhcpd.c
++++ b/server/dhcpd.c
+@@ -373,8 +373,8 @@ main(int argc, char **argv) {
+ 		} else if (!strcmp (argv [i], "-q")) {
+ 			quiet = 1;
+ 			quiet_interface_discovery = 1;
+-#ifdef DHCPv6
+ 		} else if (!strcmp(argv[i], "-4")) {
++#ifdef DHCPv6
+ 			if (local_family_set && (local_family != AF_INET)) {
+ 				log_fatal("Server cannot run in both IPv4 and "
+ 					  "IPv6 mode at the same time.");
diff --git a/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch
new file mode 100644
index 000000000000..66a1fcd79461
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch
@@ -0,0 +1,72 @@
+https://bugs.gentoo.org/296921
+
+`ping -q` will still print out summary information.  send that to /dev/null.
+
+patch by Martin Mokrejš
+
+--- a/client/scripts/bsdos
++++ b/client/scripts/bsdos
+@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+-    if ping -q -c 1 -w 1 $1; then
++    if ping -q -c 1 -w 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- a/client/scripts/freebsd
++++ b/client/scripts/freebsd
+@@ -284,7 +284,7 @@ if [ x$reason = xTIMEOUT ]; then
+   if [ -n "$new_routers" ]; then
+     $LOGGER "New Routers: $new_routers"
+     set -- $new_routers
+-    if ping -q -c 1 $1; then
++    if ping -q -c 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -253,7 +253,7 @@ if [ x$reason = xTIMEOUT ]; then
+   ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+   set $new_routers
+-  if ping -q -c 1 $1; then
++  if ping -q -c 1 $1 >/dev/null; then
+     if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+       ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+--- a/client/scripts/netbsd
++++ b/client/scripts/netbsd
+@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+-    if ping -q -c 1 -w 1 $1; then
++    if ping -q -c 1 -w 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- a/client/scripts/openbsd
++++ b/client/scripts/openbsd
+@@ -245,7 +245,7 @@ if [ x$reason = xTIMEOUT ]; then
+   sleep 1
+   if [ "$new_routers" != "" ]; then
+     set $new_routers
+-    if ping -q -c 1 -w 1 $1; then
++    if ping -q -c 1 -w 1 $1 >/dev/null; then
+       if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+ 	ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
+--- a/client/scripts/openwrt
++++ b/client/scripts/openwrt
+@@ -186,7 +186,7 @@ if [ x$reason = xTIMEOUT ]; then
+   ifconfig $interface $new_ip_address $new_subnet_arg \
+ 				$new_broadcast_arg $mtu_arg $metric_arg
+   set $new_routers
+-  if ping -q -c 1 $1; then
++  if ping -q -c 1 $1 >/dev/null; then
+     if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+       ifconfig $interface:0 $alias_ip_address $alias_subnet_arg