Punted old version.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 8 insertions, 159 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index b39f5d4d44ea..bf8f11d2bd69 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -4,9 +4,6 @@ Hash: SHA1
 MD5 2a79d02dd5446e8e8645357d3fdc69ab ChangeLog 13154
 RMD160 c93bc26c24a942ce6bbbae7874ae40cdd9e37106 ChangeLog 13154
 SHA256 6f10290a1422bebd0db8408716e0a405984d9f3a0a7fa0f234287878c4d23b18 ChangeLog 13154
-MD5 ebdb7174bde371325f0b29b95618ca1c dhcp-3.0.3-r2.ebuild 3921
-RMD160 f4664d42727f58e351bd5621f1f7e6afb630c69d dhcp-3.0.3-r2.ebuild 3921
-SHA256 72d16fd1ccf5cb0fcc78862c676d307be249cda2ec2c4eb314844988c3cb8de8 dhcp-3.0.3-r2.ebuild 3921
 MD5 8b7b795f5d798d2ec03f1ae1b9666a4b dhcp-3.0.3-r3.ebuild 3923
 RMD160 d30c71a55490685abcac6685eb1e770235be0770 dhcp-3.0.3-r3.ebuild 3923
 SHA256 ab2fd77f8b8f14238202236dbad08e3d3cc4a8dc0e857d22451d2c2f4914d98e dhcp-3.0.3-r3.ebuild 3923
@@ -37,18 +34,15 @@ SHA256 05f81ad7c0e8cd2d2f3e81c0cd1aecc0f2a2787672037eca87e66a814150f5c8 files/dh
 MD5 0ab9c8e1c34a43a23d47d9649cd3ddcf files/dhcp.conf 792
 RMD160 7c4ffbe4f47f4fad210c48eb4f92ee15cf651f72 files/dhcp.conf 792
 SHA256 dad532fc00d98edce2da5c1fcce16db42a0084eefc6da00599a7fcfb8faac0f0 files/dhcp.conf 792
-MD5 9ed5ce99abbb851e7d07f30ced0cdb79 files/dhcp.init 1527
-RMD160 f6b601d6c2d9037817b4921b741e109bd8ccd366 files/dhcp.init 1527
-SHA256 933dd721b8af8bc2c0c6040e28a2b716b908a2455d0d0731a728a083b65be9ba files/dhcp.init 1527
+MD5 9046fe7b55b9f48599de9d9d995b9386 files/dhcp.init 1529
+RMD160 bb44d9c3a5e7227f26a1902c213a5a580f3a1da1 files/dhcp.init 1529
+SHA256 ff559ccacfabacfff73e300b17fc5d851f999932b9fe667be09649934ad404cf files/dhcp.init 1529
 MD5 7d49ecbe9f433f8c00d1fafe087abb9b files/dhcrelay.conf 408
 RMD160 943d64b87699f4c0aa498a425b692fc84af882ea files/dhcrelay.conf 408
 SHA256 78cf04d4e32f937bfc658a11492811a0570499481ffc12f2ffb78dc69ca9fad4 files/dhcrelay.conf 408
 MD5 6e2bc3e08290c60d4f339ab9182fce07 files/dhcrelay.init 748
 RMD160 da83794f49e52f072924386b2fd4511d07d985e6 files/dhcrelay.init 748
 SHA256 0d16910b1197946165da7812acffecef8ee3b31cdf8f9a596ca6ecb19756fcee files/dhcrelay.init 748
-MD5 c6df78cb1777bebada64f9c629b9f8eb files/digest-dhcp-3.0.3-r2 62
-RMD160 31f99ba53088ec97602f4b74f2bb0e3c96a543b3 files/digest-dhcp-3.0.3-r2 62
-SHA256 d2e73249481e7821a1c4362f4e9cc744a59ff02070cfc9769d3d6e810685f12f files/digest-dhcp-3.0.3-r2 62
 MD5 414325430622f5011079cd7fd5517485 files/digest-dhcp-3.0.3-r3 232
 RMD160 a8cec86f840528ab049182c2d0f0768d7eaa03dc files/digest-dhcp-3.0.3-r3 232
 SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/digest-dhcp-3.0.3-r3 232
@@ -61,7 +55,7 @@ SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD/WJbEbVyYKaZ/NERAn3BAJwKzPhIcmKhAbrNeaHbjJXrr0PVzACfWCET
-doPty+LpF2RT/JjgIQNQV+c=
-=Dum1
+iD8DBQFD/ZjQEbVyYKaZ/NERAhtqAJ402C5LOALXoTM7YHXOwYv+FwH8mwCggxTq
+Fqt0zxQPwKQIuCuoDjK5iKU=
+=ZjeB
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-3.0.3-r2.ebuild b/net-misc/dhcp/dhcp-3.0.3-r2.ebuild
deleted file mode 100644
index 3f13c06a94c4..000000000000
--- a/net-misc/dhcp/dhcp-3.0.3-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.3-r2.ebuild,v 1.11 2006/02/18 11:59:19 blubb Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P}.tar.gz"
-
-LICENSE="isc-dhcp"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 s390 sh sparc x86"
-IUSE="static selinux"
-
-RDEPEND="virtual/libc
-	selinux? ( sec-policy/selinux-dhcp )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# Enable chroot
-	epatch "${FILESDIR}/${PN}-3.0-paranoia.patch"
-	# Fix some permission issues
-	epatch "${FILESDIR}/${PN}-3.0-fix-perms.patch"
-	# Fix token ring compiling, #102473 
-	epatch "${FILESDIR}/${P}-tr.patch"
-	# Install libdst, #75544
-	epatch "${FILESDIR}/${P}-libdst.patch"
-	# Fix building on Gentoo/FreeBSD
-	epatch "${FILESDIR}/${PN}-3.0.2-gmake.patch"
-
-	# Enable dhclient to equery NTP servers, fixed #63868
-	epatch "${FILESDIR}/dhclient-ntp.patch"
-
-	# FreeBSD doesn't like -Werror that is forced on
-	sed -i -e 's:-Werror::' Makefile.conf
-}
-
-src_compile() {
-	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
-	[[ ${ARCH} == "sparc" ]] && filter-flags -O3 -O2 -O
-
-	use static && append-ldflags -static
-
-	cat <<-END >> includes/site.h
-	#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
-	#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
-	#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
-	#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
-	#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
-	FFMANDIR = /usr/share/man/man5
-	LIBMANDIR = /usr/share/man/man3
-	USRMANDIR = /usr/share/man/man1
-	END
-
-	./configure --copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" \
-		|| die "configure failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	insinto /etc/dhcp
-	newins server/dhcpd.conf dhcpd.conf.sample
-	newins client/dhclient.conf dhclient.conf.sample
-
-	dodoc README RELNOTES doc/*
-	newdoc client/dhclient.conf dhclient.conf.sample
-	newdoc client/scripts/linux dhclient-script.sample
-	newdoc server/dhcpd.conf dhcpd.conf.sample
-
-	newinitd "${FILESDIR}/dhcp.init" dhcp
-	newinitd "${FILESDIR}/dhcrelay.init" dhcrelay
-	insinto /etc/conf.d
-	newins "${FILESDIR}/dhcp.conf" dhcp
-	newins "${FILESDIR}/dhcrelay.conf" dhcrelay
-
-	keepdir /var/{lib,run}/dhcp
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-}
-
-pkg_postinst() {
-	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
-
-	einfo "You can edit /etc/conf.d/dhcp to customize dhcp settings"
-	einfo
-	einfo "The DHCP ebuild now includes chroot support."
-	einfo "If you would like to run dhcpd in a chroot, simply configure the"
-	einfo "CHROOT directory in /etc/conf.d/dhcp and then run:"
-	einfo "  emerge --config =${PF}"
-	echo
-}
-
-pkg_config() {
-	CHROOT="$(
-		sed -n 's/^[[:blank:]]\?CHROOT="*\([^#"]\+\)"*/\1/p' \
-		/etc/conf.d/dhcp
-	)"
-
-	if [[ -z ${CHROOT} ]]; then
-		eerror "CHROOT not defined in /etc/conf.d/dhcp"
-		return 1
-	fi
-
-	if [[ -d ${CHROOT} ]] ; then
-		ewarn "${CHROOT} already exists - aborting"
-		return 0
-	fi
-
-	ebegin "Setting up the chroot directory"
-	mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
-	cp /etc/{localtime,resolv.conf} "${CHROOT}/etc"
-	cp -R /etc/dhcp "${CHROOT}/etc/"
-	cp -R /var/lib/dhcp "${CHROOT}/var/lib"
-	chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
-	eend
-
-	local logger="$(best_version virtual/logger)"
-	einfo "To enable logging from the DHCP server, configure your"
-	einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
-}
diff --git a/net-misc/dhcp/files/dhcp.init b/net-misc/dhcp/files/dhcp.init
index abe9bb20307e..271556970b3d 100644
--- a/net-misc/dhcp/files/dhcp.init
+++ b/net-misc/dhcp/files/dhcp.init
@@ -1,7 +1,7 @@
 #!/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/dhcp.init,v 1.4 2006/02/23 07:20:45 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.init,v 1.5 2006/02/23 11:13:03 uberlord Exp $
 
 depend() {
 	need net
@@ -31,7 +31,7 @@ start() {
 	# Ensure that LD_PRELOAD is really exported
 	[[ -n ${LD_PRELOAD} ]] && export LD_PRELOAD="${LD_PRELOAD}"
 
-	local pidfile=$(get_var pid-file-name)
+	local pidfile="$(get_var pid-file-name)"
 	pidfile="${pidfile:-/var/run/dhcp/dhcp.pid}"
 
 	ebegin "Starting ${CHROOT:+chrooted }dhcpd"
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.3-r2 b/net-misc/dhcp/files/digest-dhcp-3.0.3-r2
deleted file mode 100644
index b5c6d4ce1238..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f91416a0b8ed3fd0601688cf0b7df58f dhcp-3.0.3.tar.gz 870240