Version bump and fix hostname patch slightly.

Package-Manager: portage-2.1.1_pre3-r5

5 files changed, 263 insertions, 15 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 7baaad56f10b..94d147d72827 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.110 2006/07/09 01:53:56 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.111 2006/07/28 00:11:42 uberlord Exp $
 
+*dhcp-3.0.5_beta1 (27 Jul 2006)
+
+  27 Jul 2006; Roy Marples <uberlord@gentoo.org>
+  files/dhcp-3.0.3-dhclient-hostname.patch, +dhcp-3.0.5_beta1.ebuild:
+  Version bump and fix hostname patch slightly.
+  
   09 Jul 2006; Joshua Kinard <kumba@gentoo.org> dhcp-3.0.3-r9.ebuild:
   Marked stable on mips.
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 7499db4a30d1..5541103ef43f 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -14,10 +14,10 @@ AUX dhcp-3.0.3-dhclient-dbus.patch 2774 RMD160 250582d89894a58a297786c4a6884b542
 MD5 eef265cca1745a6efdfc8d4d1ca2c453 files/dhcp-3.0.3-dhclient-dbus.patch 2774
 RMD160 250582d89894a58a297786c4a6884b54219c4b6f files/dhcp-3.0.3-dhclient-dbus.patch 2774
 SHA256 d70292c5b61648ba5970ab436429ced33e807bd6f68ba06dcd2b9d4073b02ea4 files/dhcp-3.0.3-dhclient-dbus.patch 2774
-AUX dhcp-3.0.3-dhclient-hostname.patch 437 RMD160 5a1bd6bec0edf591eab4557f2e0f23539c673548 SHA1 80c9c65de30628b7df6d15db9f7b6ae814675c78 SHA256 bdb152ff929f561a93983d647efd027a0193d2a12678076b3203d73bff966383
-MD5 79cefb676f3abc197b30c120c09e46b0 files/dhcp-3.0.3-dhclient-hostname.patch 437
-RMD160 5a1bd6bec0edf591eab4557f2e0f23539c673548 files/dhcp-3.0.3-dhclient-hostname.patch 437
-SHA256 bdb152ff929f561a93983d647efd027a0193d2a12678076b3203d73bff966383 files/dhcp-3.0.3-dhclient-hostname.patch 437
+AUX dhcp-3.0.3-dhclient-hostname.patch 523 RMD160 38c20bcc417822ae858626eb5d0eaf7e669c1ca0 SHA1 5d2c3a1da74a1d151c9fbf08e01e4545e989078c SHA256 57c09edd2bf48cd65745e3b14499f7f3c26d529f60fd2ab122887ae968e26bbd
+MD5 8c4c668abfe5c8b78eb7066391686d30 files/dhcp-3.0.3-dhclient-hostname.patch 523
+RMD160 38c20bcc417822ae858626eb5d0eaf7e669c1ca0 files/dhcp-3.0.3-dhclient-hostname.patch 523
+SHA256 57c09edd2bf48cd65745e3b14499f7f3c26d529f60fd2ab122887ae968e26bbd files/dhcp-3.0.3-dhclient-hostname.patch 523
 AUX dhcp-3.0.3-dhclient-metric.patch 7270 RMD160 04187868f66e03a62dafd31b4cdcdd2029283ce5 SHA1 1d726d1526ae97adbdf1b259bb55e05145060375 SHA256 7e5ace014ed55d7d4e90a6cdac7dec4842ea9d178bb19bf6cdccf295eba9da7d
 MD5 f63ddf696f98bd5e300aae865cdbfdb9 files/dhcp-3.0.3-dhclient-metric.patch 7270
 RMD160 04187868f66e03a62dafd31b4cdcdd2029283ce5 files/dhcp-3.0.3-dhclient-metric.patch 7270
@@ -92,6 +92,7 @@ RMD160 da83794f49e52f072924386b2fd4511d07d985e6 files/dhcrelay.init 748
 SHA256 0d16910b1197946165da7812acffecef8ee3b31cdf8f9a596ca6ecb19756fcee files/dhcrelay.init 748
 DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SHA1 1e2e6c3ecdb8046a39aaabe1a36171e1d45d21e4 SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe
 DIST dhcp-3.0.4.tar.gz 883245 RMD160 f5636d87e1e2138bd239157f54d8f73c73af73ac SHA1 2efe316d69563bf2440cbb4efc2bc06ef9445db3 SHA256 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7
+DIST dhcp-3.0.5b1.tar.gz 882916 RMD160 165c5c1911cbc220afd3a215409c2a3f6d71e36f SHA1 99d6f00e76f56613c8c21b644b01e361a935acff SHA256 c3ace29b42aaeb0d940492b1f5632d0f3160c000289504bcc2afe06bdf3fb9fc
 EBUILD dhcp-3.0.3-r4.ebuild 4062 RMD160 310de76cfa0feff02e9620ed113e5c2647b3b8c8 SHA1 ac1c0205c709db260c22e6ee9782583b18749e83 SHA256 a2083988469dbf8795387c94da9cff44b8f2dadf89048b32f261954dae3a434a
 MD5 b268712b328548de32d5db06619787a8 dhcp-3.0.3-r4.ebuild 4062
 RMD160 310de76cfa0feff02e9620ed113e5c2647b3b8c8 dhcp-3.0.3-r4.ebuild 4062
@@ -108,10 +109,14 @@ EBUILD dhcp-3.0.4-r2.ebuild 7106 RMD160 97045530e54bc7d38d749abdb7a3183281b63adb
 MD5 d27d758e791ff94904a192f13dbdac7c dhcp-3.0.4-r2.ebuild 7106
 RMD160 97045530e54bc7d38d749abdb7a3183281b63adb dhcp-3.0.4-r2.ebuild 7106
 SHA256 0139e97c2821718924a06d4c22eeea0567a7d36cb35960acdf32d04974dd04c1 dhcp-3.0.4-r2.ebuild 7106
-MISC ChangeLog 19063 RMD160 57cb04cc18737067657e2d0b885b2541dc503469 SHA1 2f4c70503af2d5434b26232239fb9d1ff3b5bb30 SHA256 95d818b7537c8cadb70dfd54642d1bb8cc257b7c8a2960ac4d96e6c51c977ddd
-MD5 d82dc792c2e683c419ee5160dd00b55b ChangeLog 19063
-RMD160 57cb04cc18737067657e2d0b885b2541dc503469 ChangeLog 19063
-SHA256 95d818b7537c8cadb70dfd54642d1bb8cc257b7c8a2960ac4d96e6c51c977ddd ChangeLog 19063
+EBUILD dhcp-3.0.5_beta1.ebuild 7032 RMD160 885b8a99bbbbaae1a0c0e91fe43729dd83a0db5b SHA1 628b3c6d3d213b8d9d3d767b663551fca5e5a0ed SHA256 f131c7e68f9433bb76327ad4079063988e10a46795d9850e36b6406ca424ff37
+MD5 233a4872d49fc463f304fa4797753e69 dhcp-3.0.5_beta1.ebuild 7032
+RMD160 885b8a99bbbbaae1a0c0e91fe43729dd83a0db5b dhcp-3.0.5_beta1.ebuild 7032
+SHA256 f131c7e68f9433bb76327ad4079063988e10a46795d9850e36b6406ca424ff37 dhcp-3.0.5_beta1.ebuild 7032
+MISC ChangeLog 19269 RMD160 d133630a5e0c2296d1e9cf99582ee42c22c3a35f SHA1 cefd3e7358b57c21c622a0820b3595d14fc46c0f SHA256 b6af990e9415d15653e364e007bccedb48a5abbad9cf10d0c67196d4a6175166
+MD5 3a4fd0629bdd477c1765883aa6cb6fb7 ChangeLog 19269
+RMD160 d133630a5e0c2296d1e9cf99582ee42c22c3a35f ChangeLog 19269
+SHA256 b6af990e9415d15653e364e007bccedb48a5abbad9cf10d0c67196d4a6175166 ChangeLog 19269
 MISC metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 SHA1 f2013226d45685a4bd06c3f7723df78e134486d4 SHA256 16dccfd59e8db49b0c9b9bb34f99188f9773a2ef00757d4fb429fea4293ac44e
 MD5 3ccab43e194be4b8df2632546cbd028e metadata.xml 441
 RMD160 489c700355a49fda7d249a7b3f72066add57e779 metadata.xml 441
@@ -128,3 +133,6 @@ SHA256 fbea6a9170dda5da61af6c7c6f629d33b642ca3fbfa7f64537bd783e283be420 files/di
 MD5 3ac42f4c7431bc78613c2e61b0a79075 files/digest-dhcp-3.0.4-r2 232
 RMD160 d5e0c33365d8dc2d37caf86a277a0dbfe0b98565 files/digest-dhcp-3.0.4-r2 232
 SHA256 fbea6a9170dda5da61af6c7c6f629d33b642ca3fbfa7f64537bd783e283be420 files/digest-dhcp-3.0.4-r2 232
+MD5 f9d2f721bc98c31ccb50bb163d58bd46 files/digest-dhcp-3.0.5_beta1 238
+RMD160 958a9d61623530100a8841f3165db627c6bf8d9b files/digest-dhcp-3.0.5_beta1 238
+SHA256 4ca44e043c938abd65e07c142c076af509b34727f91b4a7d68087eeaefaabeaf files/digest-dhcp-3.0.5_beta1 238
diff --git a/net-misc/dhcp/dhcp-3.0.5_beta1.ebuild b/net-misc/dhcp/dhcp-3.0.5_beta1.ebuild
new file mode 100644
index 000000000000..39c33902f8de
--- /dev/null
+++ b/net-misc/dhcp/dhcp-3.0.5_beta1.ebuild
@@ -0,0 +1,228 @@
+# 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.5_beta1.ebuild,v 1.1 2006/07/28 00:11:43 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 ~x86 ~x86-fbsd"
+IUSE="doc minimal static selinux"
+
+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
+
+	# 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
+
+	# 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
+		insinto /etc/conf.d
+		newins "${FILESDIR}"/dhcpd.conf dhcpd
+		newins "${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/dhcp-3.0.3-dhclient-hostname.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
index 318f3d3156e6..9a6e7b9698b1 100644
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
@@ -1,13 +1,16 @@
---- client/scripts/linux 
-+++ client/scripts/linux 
-@@ -138,9 +138,8 @@
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -138,10 +138,12 @@
     [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
    current_hostname=`hostname`
    if [ x$current_hostname = x ] || \
 +     [ x$current_hostname = "x(none)" ] || \
++     [ x$current_hostname = xlocalhost ] || \
       [ x$current_hostname = x$old_host_name ]; then
--    if [ x$current_hostname = x ] || \
--       [ x$new_host_name != x$old_host_name ]; then
-       hostname $new_host_name
+     if [ x$current_hostname = x ] || \
+        [ x$new_host_name != x$old_host_name ]; then
+-      hostname $new_host_name
++      hostname "$new_host_name"
      fi
    fi
+     
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.5_beta1 b/net-misc/dhcp/files/digest-dhcp-3.0.5_beta1
new file mode 100644
index 000000000000..047fe1221a90
--- /dev/null
+++ b/net-misc/dhcp/files/digest-dhcp-3.0.5_beta1
@@ -0,0 +1,3 @@
+MD5 34a6e213037e0976d88feea1477ae2d8 dhcp-3.0.5b1.tar.gz 882916
+RMD160 165c5c1911cbc220afd3a215409c2a3f6d71e36f dhcp-3.0.5b1.tar.gz 882916
+SHA256 c3ace29b42aaeb0d940492b1f5632d0f3160c000289504bcc2afe06bdf3fb9fc dhcp-3.0.5b1.tar.gz 882916