New upstream rc. May not work with NetworkManager as dhclient now has it's

  own -x option which conflicts with one of the patches.
Package-Manager: portage-2.1.3_rc8

4 files changed, 260 insertions, 5 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 6212fa078a68..f60174993e82 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.129 2007/07/19 09:38:27 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.130 2007/07/19 09:55:38 uberlord Exp $
+
+*dhcp-3.1.0_rc2 (19 Jul 2007)
+
+  19 Jul 2007; Roy Marples <uberlord@gentoo.org> +dhcp-3.1.0_rc2.ebuild:
+  New upstream rc. May not work with NetworkManager as dhclient now has it's
+  own -x option which conflicts with one of the patches.
 
   19 Jul 2007; Roy Marples <uberlord@gentoo.org>
   +files/dhcp-3.0-ddns-example.patch, dhcp-3.0.3-r9.ebuild,
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 3513db8dfc3f..b3fec1affbe9 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -97,6 +97,7 @@ SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c files/dh
 DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SHA1 1e2e6c3ecdb8046a39aaabe1a36171e1d45d21e4 SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe
 DIST dhcp-3.0.6.tar.gz 891513 RMD160 6b7dbad413f83f9bce4ed92a8abc60394a06c6ad SHA1 204e509580d57d0cfff23529274612ca8c710efb SHA256 9f77b0ebf975d71578e2d305a2e07b900a9462b7efaac41826facfb4d4f00f4d
 DIST dhcp-3.1.0a3.tar.gz 776225 RMD160 29f4259fbe6c8f5e619001513827c97a2ab7d628 SHA1 b731552005b2385d87756208f3e03297b40f80d0 SHA256 06d0ffe09cc1c32b7b27719d372414937818665349cdbe9c13652c1ae63677f2
+DIST dhcp-3.1.0rc2.tar.gz 796994 RMD160 a6c8e10e9083ee0e1b8ee504914af41e88fde3fb SHA1 8212c2b29a6a3f5573348c96ff223191f90578a3 SHA256 52623a0db60802507dfad5c1d344a05997ba86d25fac44aac0d1d612ba01a187
 EBUILD dhcp-3.0.3-r9.ebuild 7186 RMD160 e59315a08a6b382915ec7ded0a4c7cfa38c9a5de SHA1 6c11653e84a8f3e81913f3916dabb6d6a38aedb5 SHA256 eee8b146f259da6645b0f901038e63f6c9d4dec8ffd1627c997ad8fde76338b0
 MD5 165433f5c0a15eb7d8ac9044b0f1a871 dhcp-3.0.3-r9.ebuild 7186
 RMD160 e59315a08a6b382915ec7ded0a4c7cfa38c9a5de dhcp-3.0.3-r9.ebuild 7186
@@ -109,10 +110,14 @@ EBUILD dhcp-3.1.0_alpha3.ebuild 7470 RMD160 2dbd200561617977c3a4834b8fdf76575dcf
 MD5 0f7965d4331e77b1811b4b5677b003c0 dhcp-3.1.0_alpha3.ebuild 7470
 RMD160 2dbd200561617977c3a4834b8fdf76575dcf6f7f dhcp-3.1.0_alpha3.ebuild 7470
 SHA256 148da65354609598ec0223e81558919aa1f09e650ec34234d00d623162724810 dhcp-3.1.0_alpha3.ebuild 7470
-MISC ChangeLog 22184 RMD160 03e80e09dccc7f27b155565c55c5fa3981c51e1e SHA1 d1e33fb2ac6632aca02e081211b7569430fb4b5d SHA256 5ea761b4899c6c20bd11007d84245aa3bfab1e5f9f3ec6495326efd397fc2ac8
-MD5 9e00110436cfffd9e34d949d505f91e3 ChangeLog 22184
-RMD160 03e80e09dccc7f27b155565c55c5fa3981c51e1e ChangeLog 22184
-SHA256 5ea761b4899c6c20bd11007d84245aa3bfab1e5f9f3ec6495326efd397fc2ac8 ChangeLog 22184
+EBUILD dhcp-3.1.0_rc2.ebuild 7530 RMD160 5109e858086ce41a33ac26a3c669c1c3cb485c95 SHA1 7df5e5ba030972059372260604b5ca10b14e7332 SHA256 cce0f54ef456157baaf9294bc839a7d83608489a17f32b8e5f49c959fc56249c
+MD5 752e878203442d7599a1980d75c645b0 dhcp-3.1.0_rc2.ebuild 7530
+RMD160 5109e858086ce41a33ac26a3c669c1c3cb485c95 dhcp-3.1.0_rc2.ebuild 7530
+SHA256 cce0f54ef456157baaf9294bc839a7d83608489a17f32b8e5f49c959fc56249c dhcp-3.1.0_rc2.ebuild 7530
+MISC ChangeLog 22423 RMD160 1b657ca60cced349ec2ab1ead08d1c64186913f4 SHA1 3edc9d3ce7a6cca0e7b21009c2dd66d58b6f21e5 SHA256 48ddd4d11741fa8621e74f10e17baec6cacb8ece1d2c042fbc2aa95e2cf83c7d
+MD5 6da8429e9eea9d37f4f91c37597752e1 ChangeLog 22423
+RMD160 1b657ca60cced349ec2ab1ead08d1c64186913f4 ChangeLog 22423
+SHA256 48ddd4d11741fa8621e74f10e17baec6cacb8ece1d2c042fbc2aa95e2cf83c7d ChangeLog 22423
 MISC metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 SHA1 f2013226d45685a4bd06c3f7723df78e134486d4 SHA256 16dccfd59e8db49b0c9b9bb34f99188f9773a2ef00757d4fb429fea4293ac44e
 MD5 3ccab43e194be4b8df2632546cbd028e metadata.xml 441
 RMD160 489c700355a49fda7d249a7b3f72066add57e779 metadata.xml 441
@@ -126,3 +131,6 @@ SHA256 622e26ecac9d66a2552d0717c8b8b00c68210661721bbf8275e52aff8bf8ee22 files/di
 MD5 b206b65f86a9414d928a2113216894e4 files/digest-dhcp-3.1.0_alpha3 238
 RMD160 603b185b1f6168de71c846fb502846e54a057a1b files/digest-dhcp-3.1.0_alpha3 238
 SHA256 aebd4e694e3dfba16531ccb8219cdbf79bd02a4c4be5bae323e87f2c61001a30 files/digest-dhcp-3.1.0_alpha3 238
+MD5 1868ca4f472bed6095cbb74361bbc342 files/digest-dhcp-3.1.0_rc2 241
+RMD160 fb929a6b40f100384870c2913ff00ec1bb163045 files/digest-dhcp-3.1.0_rc2 241
+SHA256 35336780842ad991480ce47c491c78531398d93cc25fc4bf0a987e21dab10fc7 files/digest-dhcp-3.1.0_rc2 241
diff --git a/net-misc/dhcp/dhcp-3.1.0_rc2.ebuild b/net-misc/dhcp/dhcp-3.1.0_rc2.ebuild
new file mode 100644
index 000000000000..bd2008eca035
--- /dev/null
+++ b/net-misc/dhcp/dhcp-3.1.0_rc2.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2007 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_rc2.ebuild,v 1.1 2007/07/19 09:55:38 uberlord 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"
+
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+	kernel_linux? ( sys-apps/net-tools )"
+
+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
+	# Enable eXtended options
+	# dhcp-3.1.0_rc2 has it's own -x option which conflicts here
+	#epatch "${FILESDIR}/${PN}"-3.1.0a1-x-option.patch
+	# Add dbus support to dhclient
+	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
+
+	# Brand the version with Gentoo
+	# include revision if >0
+	local newver="${MY_PV}-Gentoo"
+	[[ ${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 -DEXTENDED_NEW_OPTION_INFO \
+		${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
+	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"
+}
diff --git a/net-misc/dhcp/files/digest-dhcp-3.1.0_rc2 b/net-misc/dhcp/files/digest-dhcp-3.1.0_rc2
new file mode 100644
index 000000000000..a0b901feab1d
--- /dev/null
+++ b/net-misc/dhcp/files/digest-dhcp-3.1.0_rc2
@@ -0,0 +1,3 @@
+MD5 a577e77d43cf2116d0f229c2b8551b0b dhcp-3.1.0rc2.tar.gz 796994
+RMD160 a6c8e10e9083ee0e1b8ee504914af41e88fde3fb dhcp-3.1.0rc2.tar.gz 796994
+SHA256 52623a0db60802507dfad5c1d344a05997ba86d25fac44aac0d1d612ba01a187 dhcp-3.1.0rc2.tar.gz 796994