Bump.

Package-Manager: portage-2.1.3_rc6

4 files changed, 257 insertions, 5 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index e7a7b30ebd6b..4e37ac7618c3 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.127 2007/04/26 19:32:44 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.128 2007/07/05 19:46:49 uberlord Exp $
+
+*dhcp-3.0.6 (05 Jul 2007)
+
+  05 Jul 2007; Roy Marples <uberlord@gentoo.org> +dhcp-3.0.6.ebuild:
+  Bump
 
 *dhcp-3.1.0_alpha3 (26 Apr 2007)
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 8c8f97adebf9..8636cc6c6af9 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -92,6 +92,7 @@ RMD160 04566b87bd6dbb8bb754b26409ca30b878ef3ca3 files/dhcrelay.init 736
 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c files/dhcrelay.init 736
 DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SHA1 1e2e6c3ecdb8046a39aaabe1a36171e1d45d21e4 SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe
 DIST dhcp-3.0.5.tar.gz 876591 RMD160 b968e7520fd936bd6f888f77734f3db7df23a636 SHA1 6501ba0e3dbd83ff57d3274538c4e4a1848ffc64 SHA256 dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6
+DIST dhcp-3.0.6.tar.gz 891513 RMD160 6b7dbad413f83f9bce4ed92a8abc60394a06c6ad SHA1 204e509580d57d0cfff23529274612ca8c710efb SHA256 9f77b0ebf975d71578e2d305a2e07b900a9462b7efaac41826facfb4d4f00f4d
 DIST dhcp-3.1.0a2.tar.gz 776040 RMD160 21419b31dc75fce67d86222277282ffa2a9c9007 SHA1 cc8eca9477f7d60f74c77ff0c556212835aa6b8f SHA256 81e4e068df774f473c36999236fab16d742e3c74ae162dfb990db7b134e87a85
 DIST dhcp-3.1.0a3.tar.gz 776225 RMD160 29f4259fbe6c8f5e619001513827c97a2ab7d628 SHA1 b731552005b2385d87756208f3e03297b40f80d0 SHA256 06d0ffe09cc1c32b7b27719d372414937818665349cdbe9c13652c1ae63677f2
 EBUILD dhcp-3.0.3-r9.ebuild 7075 RMD160 be9e27a21a28bcc4d9e1b76ac258977659233c23 SHA1 f09f820dca2bd7495c921d88998abd797c9d8978 SHA256 1be774481ac09e2c36e4827c837408bfe947066ec763187fb7a9f8e276914db5
@@ -106,6 +107,10 @@ EBUILD dhcp-3.0.5.ebuild 7432 RMD160 49b02a4111486e48b838cfa2e066c5aac03cbb9c SH
 MD5 add4a35d4904ef7db2013501b43a8958 dhcp-3.0.5.ebuild 7432
 RMD160 49b02a4111486e48b838cfa2e066c5aac03cbb9c dhcp-3.0.5.ebuild 7432
 SHA256 fc679b95bbad5aa0071feeed22ccd424fd74863e908e33095db64521cbcbed52 dhcp-3.0.5.ebuild 7432
+EBUILD dhcp-3.0.6.ebuild 7432 RMD160 25dfd987f69e7944cd989ef068c03468cbaf0215 SHA1 4a8a4d3fd72cd163f03c37b493c535183a8e9ffd SHA256 141316b6da1615fc374eaab954a66d6076ddff4dc9f5e6368e673591e37b6e63
+MD5 966876247230188b900907df75229f08 dhcp-3.0.6.ebuild 7432
+RMD160 25dfd987f69e7944cd989ef068c03468cbaf0215 dhcp-3.0.6.ebuild 7432
+SHA256 141316b6da1615fc374eaab954a66d6076ddff4dc9f5e6368e673591e37b6e63 dhcp-3.0.6.ebuild 7432
 EBUILD dhcp-3.1.0_alpha2.ebuild 7470 RMD160 db0f05f5c26bf6160bd0d68bdceee8460aeb1766 SHA1 d1eb0d1518a3c5da10d3c5da1b29f788004cd0f0 SHA256 503e84c58f60ce737528b205074e0ee5713d1d2d72bc028cbc9a66db3d2ef999
 MD5 1de7a90d12475125e754b46006f575b2 dhcp-3.1.0_alpha2.ebuild 7470
 RMD160 db0f05f5c26bf6160bd0d68bdceee8460aeb1766 dhcp-3.1.0_alpha2.ebuild 7470
@@ -114,10 +119,10 @@ 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 21848 RMD160 1f1a43e1b59828fdddc2e896f4c9274d01a255ad SHA1 7a01a24d59325241c2bb232dda25b3fa1386b146 SHA256 f49c70aa29be5db6b90518b05ace18d2a1141db57089b1685810397f2721a5d0
-MD5 398d4a684d4ea2bf69f10061ce9f567c ChangeLog 21848
-RMD160 1f1a43e1b59828fdddc2e896f4c9274d01a255ad ChangeLog 21848
-SHA256 f49c70aa29be5db6b90518b05ace18d2a1141db57089b1685810397f2721a5d0 ChangeLog 21848
+MISC ChangeLog 21952 RMD160 6c8817ac8bd83724469e2b9ce55c321738a6c11c SHA1 a42c6842b2221fc4edfe73b5c538bb922bf9953f SHA256 c6c9fe2e310b9268a7612fe65c12218c3bbd7ac1de2ab16369d4a1fbeb4fe668
+MD5 779e2281fba740d6205f618f49c5b1b2 ChangeLog 21952
+RMD160 6c8817ac8bd83724469e2b9ce55c321738a6c11c ChangeLog 21952
+SHA256 c6c9fe2e310b9268a7612fe65c12218c3bbd7ac1de2ab16369d4a1fbeb4fe668 ChangeLog 21952
 MISC metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 SHA1 f2013226d45685a4bd06c3f7723df78e134486d4 SHA256 16dccfd59e8db49b0c9b9bb34f99188f9773a2ef00757d4fb429fea4293ac44e
 MD5 3ccab43e194be4b8df2632546cbd028e metadata.xml 441
 RMD160 489c700355a49fda7d249a7b3f72066add57e779 metadata.xml 441
@@ -131,6 +136,9 @@ SHA256 3dc56e680549f1bbbce372b339d5bf1d0474bfd8a45d950f5542bec89117606d files/di
 MD5 baa5fba0594aaaf320323529af67db24 files/digest-dhcp-3.0.5-r1 232
 RMD160 412ca9be8de7ae69927b5914b742d8a3e367d7b2 files/digest-dhcp-3.0.5-r1 232
 SHA256 3dc56e680549f1bbbce372b339d5bf1d0474bfd8a45d950f5542bec89117606d files/digest-dhcp-3.0.5-r1 232
+MD5 644e90c92b9c5c796b59dbeb70837965 files/digest-dhcp-3.0.6 232
+RMD160 8af1da7915b74c087a9d2490133ab384ac836414 files/digest-dhcp-3.0.6 232
+SHA256 622e26ecac9d66a2552d0717c8b8b00c68210661721bbf8275e52aff8bf8ee22 files/digest-dhcp-3.0.6 232
 MD5 633acdd0f53ac5b689ccf0d9876382d5 files/digest-dhcp-3.1.0_alpha2 238
 RMD160 6f829c6a9788269b89e5909a83c8e806cd7b955a files/digest-dhcp-3.1.0_alpha2 238
 SHA256 7d2825096cbc840a2559d57c682abc42d901d689a9f2333c46c6dcc180d4e59b files/digest-dhcp-3.1.0_alpha2 238
diff --git a/net-misc/dhcp/dhcp-3.0.6.ebuild b/net-misc/dhcp/dhcp-3.0.6.ebuild
new file mode 100644
index 000000000000..28da6c3e1cc6
--- /dev/null
+++ b/net-misc/dhcp/dhcp-3.0.6.ebuild
@@ -0,0 +1,236 @@
+# 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.0.6.ebuild,v 1.1 2007/07/05 19:46:49 uberlord Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PV="${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.0.3-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
+	epatch "${FILESDIR}/${PN}"-3.0.3-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.0.6 b/net-misc/dhcp/files/digest-dhcp-3.0.6
new file mode 100644
index 000000000000..f7aa449c1448
--- /dev/null
+++ b/net-misc/dhcp/files/digest-dhcp-3.0.6
@@ -0,0 +1,3 @@
+MD5 724bad21ad8b638abadd5fcc07df1a0f dhcp-3.0.6.tar.gz 891513
+RMD160 6b7dbad413f83f9bce4ed92a8abc60394a06c6ad dhcp-3.0.6.tar.gz 891513
+SHA256 9f77b0ebf975d71578e2d305a2e07b900a9462b7efaac41826facfb4d4f00f4d dhcp-3.0.6.tar.gz 891513