From 8f883415dc24ae03cbcdcf2a618b2a75267613d7 Mon Sep 17 00:00:00 2001
From: Seemant Kulleen <seemant@gentoo.org>
Date: Mon, 8 Mar 2004 23:45:36 +0000
Subject: Forced a version bump on these ebuilds.  Basically -r0 is now -r4,
 -r2 is now -r5 and -r3 is now -r6.  The reason for the revision bump was to
 make this package PROVIDE virtual/dhcp.  Closes a long-standing
 bloat-reduction request made on gentoo-dev mailing list by:  William Hubbs
 <kc5eiv@kc5eiv.homeip.net> at
 http://article.gmane.org/gmane.linux.gentoo.devel/11579

---
 net-misc/dhcp/ChangeLog                   |  13 ++-
 net-misc/dhcp/Manifest                    |  20 ++---
 net-misc/dhcp/dhcp-3.0_p2-r2.ebuild       | 128 ----------------------------
 net-misc/dhcp/dhcp-3.0_p2-r3.ebuild       | 133 -----------------------------
 net-misc/dhcp/dhcp-3.0_p2-r4.ebuild       | 107 +++++++++++++++++++++++
 net-misc/dhcp/dhcp-3.0_p2-r5.ebuild       | 131 ++++++++++++++++++++++++++++
 net-misc/dhcp/dhcp-3.0_p2-r6.ebuild       | 136 ++++++++++++++++++++++++++++++
 net-misc/dhcp/dhcp-3.0_p2.ebuild          | 102 ----------------------
 net-misc/dhcp/files/digest-dhcp-3.0_p2    |   1 -
 net-misc/dhcp/files/digest-dhcp-3.0_p2-r2 |   2 -
 net-misc/dhcp/files/digest-dhcp-3.0_p2-r3 |   2 -
 net-misc/dhcp/files/digest-dhcp-3.0_p2-r4 |   1 +
 net-misc/dhcp/files/digest-dhcp-3.0_p2-r5 |   2 +
 net-misc/dhcp/files/digest-dhcp-3.0_p2-r6 |   2 +
 14 files changed, 401 insertions(+), 379 deletions(-)
 delete mode 100644 net-misc/dhcp/dhcp-3.0_p2-r2.ebuild
 delete mode 100644 net-misc/dhcp/dhcp-3.0_p2-r3.ebuild
 create mode 100644 net-misc/dhcp/dhcp-3.0_p2-r4.ebuild
 create mode 100644 net-misc/dhcp/dhcp-3.0_p2-r5.ebuild
 create mode 100644 net-misc/dhcp/dhcp-3.0_p2-r6.ebuild
 delete mode 100644 net-misc/dhcp/dhcp-3.0_p2.ebuild
 delete mode 100644 net-misc/dhcp/files/digest-dhcp-3.0_p2
 delete mode 100644 net-misc/dhcp/files/digest-dhcp-3.0_p2-r2
 delete mode 100644 net-misc/dhcp/files/digest-dhcp-3.0_p2-r3
 create mode 100644 net-misc/dhcp/files/digest-dhcp-3.0_p2-r4
 create mode 100644 net-misc/dhcp/files/digest-dhcp-3.0_p2-r5
 create mode 100644 net-misc/dhcp/files/digest-dhcp-3.0_p2-r6

(limited to 'net-misc/dhcp')

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 7e895208b8ff..3a3726c434a7 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.35 2004/03/08 23:02:24 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.36 2004/03/08 23:45:35 seemant Exp $
+
+*dhcp-3.0_p2-r5 (08 Mar 2004)
+
+  08 Mar 2004; Seemant Kulleen <seemant@gentoo.org> dhcp-3.0_p2-r2.ebuild,
+  dhcp-3.0_p2-r3.ebuild, dhcp-3.0_p2-r4.ebuild, dhcp-3.0_p2-r5.ebuild,
+  dhcp-3.0_p2-r6.ebuild, dhcp-3.0_p2.ebuild:
+  Forced a version bump on these ebuilds. Basically -r0 is now -r4, -r2 is now
+  -r5 and -r3 is now -r6. The reason for the revision bump was to make this
+  package PROVIDE virtual/dhcp. Closes a long-standing bloat-reduction request
+  made on gentoo-dev mailing list by: William Hubbs <kc5eiv@kc5eiv.homeip.net>
+  at http://article.gmane.org/gmane.linux.gentoo.devel/11579
 
   09 Mar 2004; Bartosch Pixa <darkspecter@gentoo.org> dhcp-3.0_p2-r2.ebuild:
   set ppc in keywords
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index f925bab62837..47afbb825d4b 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,17 +1,17 @@
+MD5 29b07a55514bc637a4c9551e3831ab1f dhcp-3.0_p2-r4.ebuild 2764
+MD5 3496bc4f42e0fc24d9c4e5c29fa35f60 dhcp-3.0_p2-r6.ebuild 4050
+MD5 acd88204ca093a36f5342c90e063c5d5 dhcp-3.0_p2-r5.ebuild 3874
 MD5 403c6bb685696eec8558f62080cdc92c ChangeLog 5754
-MD5 2688d353bf0ff8abf3789129a4a2b2b2 dhcp-3.0_p2.ebuild 2744
 MD5 9384ae7ba3e9f56b8027ea92f607042d metadata.xml 215
-MD5 ec7337fbd11f64b3204ccd875c8c1c22 dhcp-3.0_p2-r2.ebuild 3848
-MD5 ef085351101ecc5dc733a45548e7777a dhcp-3.0_p2-r3.ebuild 4017
-MD5 063e8ff79e456cfa7d29604bd4ba11ac files/conf.dhcpd 388
+MD5 b2e221805d63d5ea9f403fb63d39b8cc files/dhcp.conf 641
 MD5 498a3eb0e9deaf705f17fff3834f5b90 files/dhclient.c-3.0-dw-cli-fix.patch 734
+MD5 35c670df0455b8758adc60b15bfc1ea8 files/dhcrelay.rc6 571
+MD5 063e8ff79e456cfa7d29604bd4ba11ac files/conf.dhcpd 388
+MD5 d6ae01f5dcc87b11d4d96a34e7cc52a3 files/digest-dhcp-3.0_p2-r4 63
+MD5 a941fa952582373e42b07b61bd66a168 files/digest-dhcp-3.0_p2-r5 129
+MD5 a941fa952582373e42b07b61bd66a168 files/digest-dhcp-3.0_p2-r6 129
+MD5 60a68862dcb861fb6ec9f789fdb94d64 files/dhcrelay.conf 512
 MD5 322dca2a8f001a76dd817a3f2f9fd34d files/dhcp.rc6 1107
 MD5 03ea1fadd836c88a60b890650ea5edb6 files/dhcp.rc7 774
-MD5 d6ae01f5dcc87b11d4d96a34e7cc52a3 files/digest-dhcp-3.0_p2 63
-MD5 b2e221805d63d5ea9f403fb63d39b8cc files/dhcp.conf 641
 MD5 28ebabb4ad513afb04314634ecd9db25 files/dhcp-3.0pl2-user-option-fix.patch 1519
-MD5 a941fa952582373e42b07b61bd66a168 files/digest-dhcp-3.0_p2-r2 129
 MD5 d909d81a4d4ea39ddfc9898d33488c73 files/dhcp-3.0pl2-fix-perms.patch 485
-MD5 60a68862dcb861fb6ec9f789fdb94d64 files/dhcrelay.conf 512
-MD5 35c670df0455b8758adc60b15bfc1ea8 files/dhcrelay.rc6 571
-MD5 a941fa952582373e42b07b61bd66a168 files/digest-dhcp-3.0_p2-r3 129
diff --git a/net-misc/dhcp/dhcp-3.0_p2-r2.ebuild b/net-misc/dhcp/dhcp-3.0_p2-r2.ebuild
deleted file mode 100644
index 9da175cafbac..000000000000
--- a/net-misc/dhcp/dhcp-3.0_p2-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r2.ebuild,v 1.11 2004/03/08 23:02:24 darkspecter Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol."
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P/_p/pl}.tar.gz
-	http://www.episec.com/people/edelkind/patches/dhcp/dhcp-3.0+paranoia.patch"
-
-LICENSE="isc-dhcp"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips ppc64 hppa"
-IUSE="static"
-
-DEPEND="virtual/glibc
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/${P/_p/pl}"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}/dhcp-3.0pl2-user-option-fix.patch"
-	epatch "${FILESDIR}/dhclient.c-3.0-dw-cli-fix.patch"
-	epatch "${DISTDIR}/dhcp-3.0+paranoia.patch"
-}
-
-src_compile() {
-	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
-	if [ "${ARCH}" = "sparc" ] ; then
-		filter-flags "-O3"
-		filter-flags "-O2"
-		filter-flags "-O"
-	fi
-
-	use static && append-flags -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 = gcc
-	LIBDIR = /usr/lib
-	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 --with-nsupdate \
-		--copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" || die "configure failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	enewgroup dhcp
-	enewuser dhcp -1 /bin/false /var/lib/dhcp dhcp
-
-	einstall DESTDIR="${D}"
-
-	insinto /etc/dhcp
-	newins server/dhcpd.conf dhcpd.conf.sample
-	newins client/dhclient.conf dhclient.conf.sample
-	dosed "s:/etc/dhclient-script:/etc/dhcp/dhclient-script:" \
-		/etc/dhcp/dhclient.conf.sample
-	mv "${D}/sbin/dhclient-script" "${D}/etc/dhcp/dhclient-script.sample"
-
-	dodoc ANONCVS CHANGES COPYRIGHT README RELNOTES doc/*
-	newdoc client/dhclient.conf dhclient.conf.sample
-	newdoc client/scripts/linux dhclient-script.sample
-	newdoc server/dhcpd.conf dhcpd.conf.sample
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/dhcp.conf" dhcp
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/dhcp.rc6" dhcp
-
-	keepdir /var/{lib,run}/dhcp
-}
-
-pkg_postinst() {
-	chown dhcp:dhcp "${ROOT}/var/lib/dhcp" "${ROOT}/var/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 like to run dhcpd in chroot AND this is a new install OR"
-	einfo "your dhcpd doesn't already run in chroot, simply run:"
-	einfo "  ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "Before running the above command you might want to change the chroot"
-	einfo "dir in /etc/conf.d/dhcp, otherwise /chroot/dhcp will be used."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/dhcp 2>/dev/null`
-
-	if [ ! -d "${CHROOT:=/chroot/dhcp}" ] ; then
-		ebegin "Setting up the chroot directory"
-		mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run}
-		cp -R /etc/dhcp "${CHROOT}/etc/"
-		cp -R /var/lib/dhcp "${CHROOT}/var/lib"
-		chown -R dhcp:dhcp "${CHROOT}/var/lib" "${CHROOT}/var/run"
-		eend
-
-		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/dhcp`" ] ; then
-			sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' -i /etc/conf.d/dhcp
-		fi
-
-		einfo "To enable logging from the DHCP server, configure your"
-		einfo "logger (`best_version virtual/logger`) to listen on ${CHROOT}/dev/log"
-	else
-		eerror
-		eerror "${CHROOT} already exists. Quitting."
-		eerror
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild b/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild
deleted file mode 100644
index c2181385f65e..000000000000
--- a/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild,v 1.6 2004/03/04 15:52:40 gustavoz Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol."
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P/_p/pl}.tar.gz
-	http://www.episec.com/people/edelkind/patches/dhcp/dhcp-3.0+paranoia.patch"
-
-LICENSE="isc-dhcp"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~ppc64 sparc ~mips hppa"
-IUSE="static"
-
-RDEPEND="virtual/glibc"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/${P/_p/pl}"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}/dhcp-3.0pl2-user-option-fix.patch"
-	epatch "${FILESDIR}/dhclient.c-3.0-dw-cli-fix.patch"
-	epatch "${DISTDIR}/dhcp-3.0+paranoia.patch"
-	epatch "${FILESDIR}/dhcp-3.0pl2-fix-perms.patch"
-}
-
-src_compile() {
-	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
-	if [ "${ARCH}" = "sparc" ] ; then
-		filter-flags "-O3"
-		filter-flags "-O2"
-		filter-flags "-O"
-	fi
-
-	use static && append-flags -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 = gcc
-	LIBDIR = /usr/lib
-	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 --with-nsupdate \
-		--copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" || die "configure failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	enewgroup dhcp
-	enewuser dhcp -1 /bin/false /var/lib/dhcp dhcp
-
-	einstall DESTDIR="${D}"
-
-	insinto /etc/dhcp
-	newins server/dhcpd.conf dhcpd.conf.sample
-	newins client/dhclient.conf dhclient.conf.sample
-	dosed "s:/etc/dhclient-script:/etc/dhcp/dhclient-script:" \
-		/etc/dhcp/dhclient.conf.sample
-	mv "${D}/sbin/dhclient-script" "${D}/etc/dhcp/dhclient-script.sample"
-
-	dodoc ANONCVS CHANGES COPYRIGHT README RELNOTES doc/*
-	newdoc client/dhclient.conf dhclient.conf.sample
-	newdoc client/scripts/linux dhclient-script.sample
-	newdoc server/dhcpd.conf dhcpd.conf.sample
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/dhcp.rc6" dhcp
-	newexe "${FILESDIR}/dhcrelay.rc6" dhcrelay
-	insinto /etc/conf.d
-	newins "${FILESDIR}/dhcp.conf" dhcp
-	newins "${FILESDIR}/dhcrelay.conf" dhcrelay
-
-	keepdir /var/{lib,run}/dhcp
-}
-
-pkg_postinst() {
-	chown dhcp:dhcp "${ROOT}/var/lib/dhcp" "${ROOT}/var/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 like to run dhcpd in chroot AND this is a new install OR"
-	einfo "your dhcpd doesn't already run in chroot, simply run:"
-	einfo "  ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "Before running the above command you might want to change the chroot"
-	einfo "dir in /etc/conf.d/dhcp, otherwise /chroot/dhcp will be used."
-	echo
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/dhcp 2>/dev/null`
-
-	if [ ! -d "${CHROOT:=/chroot/dhcp}" ] ; then
-		ebegin "Setting up the chroot directory"
-		mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
-		cp -R /etc/dhcp "${CHROOT}/etc/"
-		cp -R /var/lib/dhcp "${CHROOT}/var/lib"
-		chown -R dhcp:dhcp "${CHROOT}/var/lib" "${CHROOT}/var/run/dhcp"
-		eend
-
-		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/dhcp`" ] ; then
-			sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' -i /etc/conf.d/dhcp
-		fi
-
-		einfo "To enable logging from the DHCP server, configure your"
-		einfo "logger (`best_version virtual/logger`) to listen on ${CHROOT}/dev/log"
-	else
-		eerror
-		eerror "${CHROOT} already exists. Quitting."
-		eerror
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-3.0_p2-r4.ebuild b/net-misc/dhcp/dhcp-3.0_p2-r4.ebuild
new file mode 100644
index 000000000000..c9e5f9725ee6
--- /dev/null
+++ b/net-misc/dhcp/dhcp-3.0_p2-r4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r4.ebuild,v 1.1 2004/03/08 23:45:35 seemant Exp $
+
+IUSE=""
+
+inherit flag-o-matic
+
+#This should be fairly consistant now, unless we have any _pre releases...
+MY_P="${P/_p/pl}"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="ISC Dynamic Host Configuration Protocol"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+
+SLOT="0"
+LICENSE="isc-dhcp"
+KEYWORDS="x86 ppc sparc ~mips amd64"
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	sys-apps/groff"
+
+PROVIDE="virtual/dhcpc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/dhclient.c-3.0-dw-cli-fix.patch
+
+	cd ${S}/includes
+	cat <<- END >> site.h
+#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
+#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
+#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
+	END
+}
+
+src_compile() {
+	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
+	# start fix
+	if [ ${ARCH} = "sparc" ]
+	then
+		filter-flags "-O3"
+		filter-flags "-O2"
+		filter-flags "-O"
+	fi
+	# end fix
+	cat <<- END > site.conf
+CC = gcc ${CFLAGS}
+ETC = /etc/dhcp
+VARDB = /var/lib/dhcp
+ADMMANDIR = /usr/share/man/man8
+FFMANDIR = /usr/share/man/man5
+LIBMANDIR = /usr/share/man/man3
+END
+	./configure --with-nsupdate || die
+	emake || die
+}
+
+src_install() {
+	dodir /var/lib/dhcp
+	touch ${D}/var/lib/dhcp/dhclient.leases
+	touch ${D}/var/lib/dhcp/dhcpd.leases
+
+	cd ${S}/work.linux-2.2/client
+	into / ; dosbin dhclient
+	doman *.5 *.8
+
+	cd ../dhcpctl ; dolib libdhcpctl.a ; doman *.3
+	insinto /usr/include ; doins dhcpctl.h
+
+	cd ../omapip ; dolib libomapi.a ; doman *.3
+	cd ../relay ; dosbin dhcrelay ; doman *.8
+	cd ../common ; doman *.5
+	cd ../server ; dosbin dhcpd ; doman *.5 *.8
+
+	cd ${S}/client
+	# admins might wanna edit dhclient-script, so /etc is proper for it.
+	dosed "s:/etc/dhclient-script:/etc/dhcp/dhclient-script:" dhclient.conf
+	insinto /etc/dhcp ; newins dhclient.conf dhclient.conf.sample
+	exeinto /etc/dhcp ; newexe scripts/linux dhclient-script.sample
+
+	cd ${S}/server
+	insinto /etc/dhcp ; newins dhcpd.conf dhcpd.conf.sample
+
+	cd ${S}/includes/omapip
+	insinto /usr/include/omapip ; doins alloc.h buffer.h omapip.h
+
+	cd ${S}/includes/isc-dhcp
+	insinto /usr/include/isc-dhcp
+	doins boolean.h dst.h int.h lang.h list.h result.h types.h
+
+	cd ${S}
+	dodoc ANONCVS CHANGES COPYRIGHT README RELNOTES
+	newdoc client/dhclient.conf dhclient.conf.sample
+	newdoc client/scripts/linux dhclient-script.sample
+	newdoc server/dhcpd.conf dhcpd.conf.sample
+	docinto doc ; dodoc doc/*
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/conf.dhcpd dhcp
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/dhcp.rc7 dhcp
+}
diff --git a/net-misc/dhcp/dhcp-3.0_p2-r5.ebuild b/net-misc/dhcp/dhcp-3.0_p2-r5.ebuild
new file mode 100644
index 000000000000..0260299348d3
--- /dev/null
+++ b/net-misc/dhcp/dhcp-3.0_p2-r5.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r5.ebuild,v 1.1 2004/03/08 23:45:35 seemant Exp $
+
+IUSE="static"
+
+inherit eutils flag-o-matic
+
+MY_P=${P/_p/pl}
+S=${WORKDIR}/${MY_P}
+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
+	http://www.episec.com/people/edelkind/patches/dhcp/dhcp-3.0+paranoia.patch"
+
+LICENSE="isc-dhcp"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~mips ppc64 hppa"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4"
+
+PROVIDE="virtual/dhcpc"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/dhcp-3.0pl2-user-option-fix.patch"
+	epatch "${FILESDIR}/dhclient.c-3.0-dw-cli-fix.patch"
+	epatch "${DISTDIR}/dhcp-3.0+paranoia.patch"
+}
+
+src_compile() {
+	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
+	if [ "${ARCH}" = "sparc" ] ; then
+		filter-flags "-O3"
+		filter-flags "-O2"
+		filter-flags "-O"
+	fi
+
+	use static && append-flags -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 = gcc
+	LIBDIR = /usr/lib
+	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 --with-nsupdate \
+		--copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" || die "configure failed"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	enewgroup dhcp
+	enewuser dhcp -1 /bin/false /var/lib/dhcp dhcp
+
+	einstall DESTDIR="${D}"
+
+	insinto /etc/dhcp
+	newins server/dhcpd.conf dhcpd.conf.sample
+	newins client/dhclient.conf dhclient.conf.sample
+	dosed "s:/etc/dhclient-script:/etc/dhcp/dhclient-script:" \
+		/etc/dhcp/dhclient.conf.sample
+	mv "${D}/sbin/dhclient-script" "${D}/etc/dhcp/dhclient-script.sample"
+
+	dodoc ANONCVS CHANGES COPYRIGHT README RELNOTES doc/*
+	newdoc client/dhclient.conf dhclient.conf.sample
+	newdoc client/scripts/linux dhclient-script.sample
+	newdoc server/dhcpd.conf dhcpd.conf.sample
+
+	insinto /etc/conf.d
+	newins "${FILESDIR}/dhcp.conf" dhcp
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/dhcp.rc6" dhcp
+
+	keepdir /var/{lib,run}/dhcp
+}
+
+pkg_postinst() {
+	chown dhcp:dhcp "${ROOT}/var/lib/dhcp" "${ROOT}/var/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 like to run dhcpd in chroot AND this is a new install OR"
+	einfo "your dhcpd doesn't already run in chroot, simply run:"
+	einfo "  ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	einfo "Before running the above command you might want to change the chroot"
+	einfo "dir in /etc/conf.d/dhcp, otherwise /chroot/dhcp will be used."
+	echo
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/dhcp 2>/dev/null`
+
+	if [ ! -d "${CHROOT:=/chroot/dhcp}" ] ; then
+		ebegin "Setting up the chroot directory"
+		mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run}
+		cp -R /etc/dhcp "${CHROOT}/etc/"
+		cp -R /var/lib/dhcp "${CHROOT}/var/lib"
+		chown -R dhcp:dhcp "${CHROOT}/var/lib" "${CHROOT}/var/run"
+		eend
+
+		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/dhcp`" ] ; then
+			sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' -i /etc/conf.d/dhcp
+		fi
+
+		einfo "To enable logging from the DHCP server, configure your"
+		einfo "logger (`best_version virtual/logger`) to listen on ${CHROOT}/dev/log"
+	else
+		eerror
+		eerror "${CHROOT} already exists. Quitting."
+		eerror
+	fi
+}
diff --git a/net-misc/dhcp/dhcp-3.0_p2-r6.ebuild b/net-misc/dhcp/dhcp-3.0_p2-r6.ebuild
new file mode 100644
index 000000000000..2e404c27b283
--- /dev/null
+++ b/net-misc/dhcp/dhcp-3.0_p2-r6.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r6.ebuild,v 1.1 2004/03/08 23:45:35 seemant Exp $
+
+IUSE="static"
+
+inherit eutils flag-o-matic
+
+MY_P=${P/_p/pl}
+S=${WORKDIR}/${MY_P}
+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
+	http://www.episec.com/people/edelkind/patches/dhcp/dhcp-3.0+paranoia.patch"
+
+SLOT="0"
+LICENSE="isc-dhcp"
+KEYWORDS="x86 ~ppc ~ppc64 sparc ~mips hppa"
+
+RDEPEND="virtual/glibc"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+PROVIDE="virtual/dhcpc"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/dhcp-3.0pl2-user-option-fix.patch"
+	epatch "${FILESDIR}/dhclient.c-3.0-dw-cli-fix.patch"
+	epatch "${DISTDIR}/dhcp-3.0+paranoia.patch"
+	epatch "${FILESDIR}/dhcp-3.0pl2-fix-perms.patch"
+}
+
+src_compile() {
+	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
+	if [ "${ARCH}" = "sparc" ] ; then
+		filter-flags "-O3"
+		filter-flags "-O2"
+		filter-flags "-O"
+	fi
+
+	use static && append-flags -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 = gcc
+	LIBDIR = /usr/lib
+	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 --with-nsupdate \
+		--copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" || die "configure failed"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	enewgroup dhcp
+	enewuser dhcp -1 /bin/false /var/lib/dhcp dhcp
+
+	einstall DESTDIR="${D}"
+
+	insinto /etc/dhcp
+	newins server/dhcpd.conf dhcpd.conf.sample
+	newins client/dhclient.conf dhclient.conf.sample
+	dosed "s:/etc/dhclient-script:/etc/dhcp/dhclient-script:" \
+		/etc/dhcp/dhclient.conf.sample
+	mv "${D}/sbin/dhclient-script" "${D}/etc/dhcp/dhclient-script.sample"
+
+	dodoc ANONCVS CHANGES COPYRIGHT README RELNOTES doc/*
+	newdoc client/dhclient.conf dhclient.conf.sample
+	newdoc client/scripts/linux dhclient-script.sample
+	newdoc server/dhcpd.conf dhcpd.conf.sample
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/dhcp.rc6" dhcp
+	newexe "${FILESDIR}/dhcrelay.rc6" dhcrelay
+	insinto /etc/conf.d
+	newins "${FILESDIR}/dhcp.conf" dhcp
+	newins "${FILESDIR}/dhcrelay.conf" dhcrelay
+
+	keepdir /var/{lib,run}/dhcp
+}
+
+pkg_postinst() {
+	chown dhcp:dhcp "${ROOT}/var/lib/dhcp" "${ROOT}/var/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 like to run dhcpd in chroot AND this is a new install OR"
+	einfo "your dhcpd doesn't already run in chroot, simply run:"
+	einfo "  ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	einfo "Before running the above command you might want to change the chroot"
+	einfo "dir in /etc/conf.d/dhcp, otherwise /chroot/dhcp will be used."
+	echo
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/dhcp 2>/dev/null`
+
+	if [ ! -d "${CHROOT:=/chroot/dhcp}" ] ; then
+		ebegin "Setting up the chroot directory"
+		mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
+		cp -R /etc/dhcp "${CHROOT}/etc/"
+		cp -R /var/lib/dhcp "${CHROOT}/var/lib"
+		chown -R dhcp:dhcp "${CHROOT}/var/lib" "${CHROOT}/var/run/dhcp"
+		eend
+
+		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/dhcp`" ] ; then
+			sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' -i /etc/conf.d/dhcp
+		fi
+
+		einfo "To enable logging from the DHCP server, configure your"
+		einfo "logger (`best_version virtual/logger`) to listen on ${CHROOT}/dev/log"
+	else
+		eerror
+		eerror "${CHROOT} already exists. Quitting."
+		eerror
+	fi
+}
diff --git a/net-misc/dhcp/dhcp-3.0_p2.ebuild b/net-misc/dhcp/dhcp-3.0_p2.ebuild
deleted file mode 100644
index ee831f150254..000000000000
--- a/net-misc/dhcp/dhcp-3.0_p2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2.ebuild,v 1.7 2004/01/15 01:04:44 max Exp $
-
-#This should be fairly consistant now, unless we have any _pre releases...
-MYP="${P/_p/pl}"
-
-# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
-# start fix
-inherit flag-o-matic
-if [ ${ARCH} = "sparc" ]
-then
-	filter-flags "-O3"
-	filter-flags "-O2"
-	filter-flags "-O"
-fi
-# end fix
-
-S=${WORKDIR}/${MYP}
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MYP}.tar.gz"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-LICENSE="isc-dhcp"
-KEYWORDS="x86 ppc sparc ~mips amd64"
-
-SLOT="0"
-DEPEND="virtual/glibc sys-apps/groff"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	patch -p0 < ${FILESDIR}/dhclient.c-3.0-dw-cli-fix.patch || die
-
-	cd ${S}/includes
-	cat <<- END >> site.h
-#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
-#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
-#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
-	END
-}
-
-src_compile() {
-	cat <<- END > site.conf
-CC = gcc ${CFLAGS}
-ETC = /etc/dhcp
-VARDB = /var/lib/dhcp
-ADMMANDIR = /usr/share/man/man8
-FFMANDIR = /usr/share/man/man5
-LIBMANDIR = /usr/share/man/man3
-END
-	./configure --with-nsupdate || die
-	emake || die
-}
-
-src_install() {
-	dodir /var/lib/dhcp
-	touch ${D}/var/lib/dhcp/dhclient.leases
-	touch ${D}/var/lib/dhcp/dhcpd.leases
-
-	cd ${S}/work.linux-2.2/client
-	into / ; dosbin dhclient
-	into /usr ; doman *.5 *.8
-
-	cd ../dhcpctl ; dolib libdhcpctl.a ; doman *.3
-	insinto /usr/include ; doins dhcpctl.h
-
-	cd ../omapip ; dolib libomapi.a ; doman *.3
-	cd ../relay ; dosbin dhcrelay ; doman *.8
-	cd ../common ; doman *.5
-	cd ../server ; dosbin dhcpd ; doman *.5 *.8
-
-	cd ${S}/client
-	# admins might wanna edit dhclient-script, so /etc is proper for it.
-	dosed "s:/etc/dhclient-script:/etc/dhcp/dhclient-script:" dhclient.conf
-	insinto /etc/dhcp ; newins dhclient.conf dhclient.conf.sample
-	exeinto /etc/dhcp ; newexe scripts/linux dhclient-script.sample
-
-	cd ${S}/server
-	insinto /etc/dhcp ; newins dhcpd.conf dhcpd.conf.sample
-
-	cd ${S}/includes/omapip
-	insinto /usr/include/omapip ; doins alloc.h buffer.h omapip.h
-
-	cd ${S}/includes/isc-dhcp
-	insinto /usr/include/isc-dhcp
-	doins boolean.h dst.h int.h lang.h list.h result.h types.h
-
-	cd ${S}
-	dodoc ANONCVS CHANGES COPYRIGHT README RELNOTES
-	newdoc client/dhclient.conf dhclient.conf.sample
-	newdoc client/scripts/linux dhclient-script.sample
-	newdoc server/dhcpd.conf dhcpd.conf.sample
-	docinto doc ; dodoc doc/*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.dhcpd dhcp
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dhcp.rc7 dhcp
-}
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0_p2 b/net-misc/dhcp/files/digest-dhcp-3.0_p2
deleted file mode 100644
index 69ed0169648a..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cb5db7a0c23deaef4724b5fc3f9a869 dhcp-3.0pl2.tar.gz 865196
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r2 b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r2
deleted file mode 100644
index 5c34b82115a3..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2cb5db7a0c23deaef4724b5fc3f9a869 dhcp-3.0pl2.tar.gz 865196
-MD5 66becf9870e0293bbd35d1fba770751a dhcp-3.0+paranoia.patch 5366
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r3 b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r3
deleted file mode 100644
index 5c34b82115a3..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2cb5db7a0c23deaef4724b5fc3f9a869 dhcp-3.0pl2.tar.gz 865196
-MD5 66becf9870e0293bbd35d1fba770751a dhcp-3.0+paranoia.patch 5366
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r4 b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r4
new file mode 100644
index 000000000000..69ed0169648a
--- /dev/null
+++ b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r4
@@ -0,0 +1 @@
+MD5 2cb5db7a0c23deaef4724b5fc3f9a869 dhcp-3.0pl2.tar.gz 865196
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r5 b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r5
new file mode 100644
index 000000000000..5c34b82115a3
--- /dev/null
+++ b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r5
@@ -0,0 +1,2 @@
+MD5 2cb5db7a0c23deaef4724b5fc3f9a869 dhcp-3.0pl2.tar.gz 865196
+MD5 66becf9870e0293bbd35d1fba770751a dhcp-3.0+paranoia.patch 5366
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r6 b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r6
new file mode 100644
index 000000000000..5c34b82115a3
--- /dev/null
+++ b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r6
@@ -0,0 +1,2 @@
+MD5 2cb5db7a0c23deaef4724b5fc3f9a869 dhcp-3.0pl2.tar.gz 865196
+MD5 66becf9870e0293bbd35d1fba770751a dhcp-3.0+paranoia.patch 5366
-- 
cgit v1.2.3-65-gdbad