gentoo auto-resync : 22:05:2023 - 02:55:39

5 files changed, 6 insertions, 307 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index f9e3c90afdf1..0fbace203700 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -12,7 +12,7 @@ AUX dhcp-4.4.3-nogateway.patch 1904 BLAKE2B 9cb4c4a491e590958ed0654f0b1d7006e310
 AUX dhcp-4.4.3-quieter-ping.patch 2622 BLAKE2B fc9c49f60419d39f81d097c70ee61db879578225c4d6c90eb9828852bd1c3fb5daf8de5651b0d75a020767bb7e8b7917355d7e68cc7f8fc3052e010e96115be1 SHA512 4338ca0fd733676ed6ecc790cd5305b9eca468a9be206f0a1d195d024974aabdb7def81d2181261d3b6033fd4e9b5461c07adfb3b16d1df1dc2e5f819c90ba47
 AUX dhcp.tmpfiles 75 BLAKE2B 5985efbb3c21c86cef4bc8796b54274df5db96a62e2cb7a50891a381ae63750d007b7fc730cfbc33c455776d565eda1b7cac7dc648e652c7659c1f36271ecbdf SHA512 c47c3bc0e17a7fc645d72fc7500459fa742e579b9fb1cdeac2e553146845bc26abfbdb80c63a2a1d1c56c2cfccc4a5790706a4e739265f63a7b4604a089100f4
 AUX dhcpd.conf2 1068 BLAKE2B abbe4f73517fba252398da00b9aa801d0ea411ac639b219cad4a64700b74cc14322af131e0053af948f1f1b35c5a3556af75092ea5565e01d7c0d1a602ea7c40 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d
-AUX dhcpd.init5 2882 BLAKE2B 9ce56c4aef62641508b8f4d366672725dd277c18846f9a001de8d244ca03720aba2c52ca7bd34ac63b08db082489d915c23bd1c685c37699034373bde1a7c37f SHA512 0cf238f3e79ee5d1ba059331664fd092d025ecb8fdb3f1d428713d7cd81ad4efe10ad7ad4ef48146aa6c9763293c1641057a257480e58a639fc6cc20e623f4c1
+AUX dhcpd.init5 2759 BLAKE2B 9a4fef8409ca24d535a1ac001000f58ec14e8962eee2bf10f691075eeab3d0e3c92f3fc7ed673f3693a3dc10e7555841ed325ac8d5cde1039851b787d0e8c592 SHA512 a09fa2246ea4ce72625f78fd006d7ba77c690e09984d65cd8c1de855909c2f26e43c12acf80db80a4469158f1d1c26b915a4e139e64b20ab9414592a92a83525
 AUX dhcpd.tmpfiles 75 BLAKE2B 8e4ddbccb162c620df175dbb39621659f9905c54ba2dc46d3863438e030dee3a04bb4b528bb7ee91a1cb47564081e48ac6937a6aee4ea026adcdb1887e643152 SHA512 0c34ab0ef8618e6792ba8bda797877ce2e6c4fa433b4944dbc03cc4fc69efe26ce4b5e4dec661fbb2b7ae4173d908de02f4e86f8539364789a23f36cfd8edacb
 AUX dhcpd4.service 320 BLAKE2B db6ae11706e4201d1f5896ad7594551dae759be1625652a698833cc29e9121b479b7d0a5f7127eada6c8774d8e6d3ff55485f8487e8f5fc120a1b722d70a1a27 SHA512 58ba2c3cb0ac1265d501ceb13cf2bb13eace39929f4f31edb62d6998e1d850490d6b634fff60dabbe8e6940d69958398dc2f6e78fe5158d8021dc8b805c2639e
 AUX dhcpd6.service 326 BLAKE2B d25b992eb7c4eb50984aff7c4c8a247ab55cd201d9002b65a64ac05d311811b876383a1672f8b9e5d297a8e0986a2b6e21eabb7c680ce0ee8faac5693e7da0dc SHA512 8ae33e59f595f86c9f085e60e86ba97dfc991aaa52f922e5c32f46fbba303ae5368d030e42af3cc26fbe986050d8c6275099d5e34f9f46f6d2da9fb4c3eb5ed7
@@ -24,7 +24,6 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
-EBUILD dhcp-4.4.3_p1-r1.ebuild 8475 BLAKE2B 39e034b81048fd7d446685de0331c32744a41fbbd2535622e845031178e04673b6bcb6473536b4174984e6ac8b555e2ba69ac961af7cd0862fa4c6babba14a72 SHA512 84955c7ae790e002a4e73ead7d1786bd9dcb07495952641ad763813ba6a6a06982d3de8684ca4b5cb9781976984cef51fada95e29fd9711ca4b2417e2a6bf5d8
-EBUILD dhcp-4.4.3_p1-r2.ebuild 8533 BLAKE2B 766d11d1b1b1e672bc3339416764a06c0e3295562d51e4e12bd67f73bd624a6fbb6c1c4bf1dbef03c803f0ffd17868a66fe9fca0a95f04a682ce8e0bd739ddc8 SHA512 f0ad694741ff87f6b7127b6c0436d02decf8c1bbf342ffa91bb3a42b8a3158ee7b5901b29978eeddbee015e4f6ab5a7fb3c121b9c022ae3c1ca010e8d854e20c
-EBUILD dhcp-4.4.3_p1.ebuild 8562 BLAKE2B 9020b201427b8e5db434d2733c0902fad0acf5016b789655b50f9a96837fcbd82200bcf06193d61db351e845dbc04a4f5bf7f8ed710abba9d370fb7e72415d92 SHA512 865b48f2aa8643c20c9a970940cba5f978d3fd9d6e7a68982ec8284e7c1ee7fb0bc9f6cefaf9aba2c950035b7ca52a13a8ec86b6f0e897337751cbc4ec5e68ca
+EBUILD dhcp-4.4.3_p1-r2.ebuild 8475 BLAKE2B 39e034b81048fd7d446685de0331c32744a41fbbd2535622e845031178e04673b6bcb6473536b4174984e6ac8b555e2ba69ac961af7cd0862fa4c6babba14a72 SHA512 84955c7ae790e002a4e73ead7d1786bd9dcb07495952641ad763813ba6a6a06982d3de8684ca4b5cb9781976984cef51fada95e29fd9711ca4b2417e2a6bf5d8
+EBUILD dhcp-4.4.3_p1-r3.ebuild 8533 BLAKE2B 766d11d1b1b1e672bc3339416764a06c0e3295562d51e4e12bd67f73bd624a6fbb6c1c4bf1dbef03c803f0ffd17868a66fe9fca0a95f04a682ce8e0bd739ddc8 SHA512 f0ad694741ff87f6b7127b6c0436d02decf8c1bbf342ffa91bb3a42b8a3158ee7b5901b29978eeddbee015e4f6ab5a7fb3c121b9c022ae3c1ca010e8d854e20c
 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild
index aca3e20ed93e..9fa84b982375 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
 
 BDEPEND="
@@ -76,7 +76,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
 
 	# Possible upstream candidates
-	"${FILESDIR}/${PN}-4.4.3-configure-clang16.patch"
 )
 
 src_prepare() {
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild
index 9fa84b982375..aca3e20ed93e 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
 
 BDEPEND="
@@ -76,6 +76,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
 
 	# Possible upstream candidates
+	"${FILESDIR}/${PN}-4.4.3-configure-clang16.patch"
 )
 
 src_prepare() {
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
deleted file mode 100644
index 955d356609f4..000000000000
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs flag-o-matic tmpfiles
-
-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="https://www.isc.org/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="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
-
-BDEPEND="
-	acct-group/dhcp
-	acct-user/dhcp"
-
-DEPEND="
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap:=
-		ssl? ( dev-libs/openssl:= )
-	)"
-RDEPEND="
-	${BDEPEND}
-	${DEPEND}
-	selinux? ( sec-policy/selinux-dhcp )
-	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
-}
-
-PATCHES=(
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	"${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
-
-	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
-
-	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
-	# bug #265531
-	"${FILESDIR}/${PN}-4.4.3-nogateway.patch"
-	# bug #296921
-	"${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
-	# bug #437108
-	"${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
-	# bug #480636
-	"${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
-	# bug #471142
-	"${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
-	# bug #559832
-	"${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
-
-	# Possible upstream candidates
-)
-
-src_prepare() {
-	default
-
-	# 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 -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || 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 || die
-			cp doc/ja_JP.eucJP/dhcp* common || die
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -r doc/ja_JP.eucJP || die
-
-	# make the bind build work - do NOT make "binddir" local!
-	binddir="${S}/bind"
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch
-	# Only use the relevant subdirs now that ISC
-	#removed the lib/export structure in bind.
-	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
-		-i bind-*/lib/Makefile.in || die
-}
-
-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
-
-	# Breaks with -O3 because of reliance on undefined behaviour
-	# bug #787935
-	append-flags -fno-strict-aliasing
-
-	# bug #720806, bug #801592
-	if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
-		append-libs -latomic
-	fi
-
-	local myeconfargs=(
-		--enable-paranoia
-		--enable-early-chroot
-		--sysconfdir=${e}
-		--with-randomdev=/dev/random
-		$(use_enable ipv6 dhcpv6)
-		$(use_with ldap)
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-		LIBS="${LIBS}"
-	)
-	econf "${myeconfargs[@]}"
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that. bug #383837.
-	cd bind/bind-*/ || die
-	local el
-	eval econf \
-		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
-		--with-randomdev=/dev/random \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# Build local bind cruft first
-	emake -C bind/bind-*/lib install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	docinto html
-	dodoc doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# Move the client to /
-		dodir /sbin
-		mv "${ED}"/usr/sbin/dhclient "${ED}"/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
-
-		newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
-		systemd_dounit "${FILESDIR}"/dhcpd4.service
-		systemd_dounit "${FILESDIR}"/dhcpd6.service
-		systemd_dounit "${FILESDIR}"/dhcrelay4.service
-		systemd_dounit "${FILESDIR}"/dhcrelay6.service
-		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
-		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-
-	diropts -m0750 -o dhcp -g dhcp
-	keepdir /var/lib/dhcp
-}
-
-pkg_preinst() {
-	# 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 "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if use server ; then
-		tmpfiles_process dhcpd.conf
-	fi
-
-	if use client ; then
-		ewarn "The client and relay functionality will be removed in the next release!"
-		ewarn "Upstream have decided to discontinue this functionality."
-	fi
-
-	if [[ -e "${EROOT}"/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/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5
index f0ea9b0c7904..66b29cd3bb00 100644
--- a/net-misc/dhcp/files/dhcpd.init5
+++ b/net-misc/dhcp/files/dhcpd.init5
@@ -77,11 +77,9 @@ start() {
 	local leasefile="$(get_var lease-file-name /var/lib/dhcp/${SVCNAME}.leases)"
 	checkpath -f -o dhcp:dhcp "${chroot}${leasefile}"
 
-	# Setup LD_PRELOAD so name resolution works in our chroot.
 	if [ -n "${chroot}" ] ; then
 		checkpath -d -o root:root -m 755 "${chroot}"/dev "${chroot}"/etc "${chroot}"/proc
 		cp -pP /etc/localtime /etc/resolv.conf "${chroot}"/etc/
-		export LD_PRELOAD="${LD_PRELOAD} libresolv.so libnss_dns.so"
 		if ! mountinfo -q "${chroot}/proc" ; then
 			mount --bind /proc "${chroot}/proc"
 		fi