rev bump for #288588.

Package-Manager: portage-2.2_rc46/cvs/Linux i686

4 files changed, 96 insertions, 4 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 859ef53300ce..c968f6dce5c4 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.262 2009/10/26 02:38:33 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.263 2009/10/26 03:01:46 williamh Exp $
+
+*dhcpcd-5.1.3-r1 (26 Oct 2009)
+
+  26 Oct 2009; William Hubbs <williamh@gentoo.org> +dhcpcd-5.1.3-r1.ebuild,
+  files/dhcpcd.initd:
+  Rev bump for #288588.
+  This adds network to the use line in the init script.
 
 *dhcpcd-5.1.3 (26 Oct 2009)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 5c19f5ba5dfb..2ec54afd9529 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,4 +1,4 @@
-AUX dhcpcd.initd 319 RMD160 c675c053442e2088e5ddd2ad9c528614aec088fe SHA1 33fd906730b0c2f2abc72335dd0133a17e27b72a SHA256 eb50356068ce6ffc664104e9a7eb6169e041e1e6d434f6247b3161ea45156c6a
+AUX dhcpcd.initd 327 RMD160 5391020a6e28fb411fde4ae1610182dcc27abc59 SHA1 2f255cce666c11b1082593e8ff2ef67ad6c3e0a0 SHA256 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492
 DIST dhcpcd-4.0.13.tar.bz2 52669 RMD160 b9addc3346f016e5625cf6c3cc82314d96995452 SHA1 bb141885a30b3b29821b406e77e091700f503434 SHA256 8a55b9a0cc1cdfcbf670eb516d229e8f687f0086a610f8e071d700a837750c47
 DIST dhcpcd-4.0.15.tar.bz2 52767 RMD160 a6b00ed30ce850cbe58c4aed1937f4bb8dcfd043 SHA1 bb1bbbe5b97bc8fd1fc1d4bea7067fe76f59182d SHA256 8ad7619eea8414851225b2ad2e204678911aca22791941f4caa49db435b2bca0
 DIST dhcpcd-4.0.7.tar.bz2 52724 RMD160 4ca55916c9c3023c70312f0cde18c022313d6a35 SHA1 949be0a4d4dbb087cc53f5f8dc26515ef9f9dd0b SHA256 9f7941f87d55f3c70c828f0d31a78da34c0c8ed9867953eab3b1e7b601ce7fef
@@ -18,6 +18,7 @@ EBUILD dhcpcd-5.0.6.ebuild 2770 RMD160 5f5e06305ddff40413311ac041e2fd7b7ffdd4a5
 EBUILD dhcpcd-5.1.0.ebuild 2629 RMD160 57d10537061730f5dac1f53fa0180181d7b78e1b SHA1 2e00a1358fea752286101dfe09f5c03bb56a25ae SHA256 108de946164f973c64abf61762f72c4a30e575913e4141f0ffbd7cb992d1b718
 EBUILD dhcpcd-5.1.1.ebuild 2629 RMD160 dbba526561f1919c380d0f69b784bd91249fc9d6 SHA1 8b4a374405560874f8d935912c88b23fa0042cb6 SHA256 6d622b874b8f579997d728c7ded1268bc9819dc903bd3e5582279927fe5b2e36
 EBUILD dhcpcd-5.1.2.ebuild 2629 RMD160 83c6ff18233bf0579091ac59a6fbdc5447615775 SHA1 ea7f4c4a02b03776785aacb4ecdcbe990cb9d80c SHA256 81955fa5f6bc4ad02ef04d991856929ed5c9a2539ca4d882aac532d07edcad15
+EBUILD dhcpcd-5.1.3-r1.ebuild 2632 RMD160 19b10e0bafe7e0972372da7f97343260600536a6 SHA1 f931429c8caafbe1b4431c40d613c486b7ae807a SHA256 a9286acf8e9addcaa5e371c1d89f01a8cd11ed4d46d56ab16b4390bcc0806b76
 EBUILD dhcpcd-5.1.3.ebuild 2629 RMD160 b9660a42fc4e5bbc6349e049b7fe1d6aacd99d0b SHA1 48ed0949bdcd38d5a0908197c7f2345a03f02e5c SHA256 7d75e4685a11272d34030b925c455c6f56f634266c388ac3d86338e865d12fc9
-MISC ChangeLog 37133 RMD160 f095ef6becd6c4829cae6300104dd82fcf73c6a4 SHA1 2985307e98a0d1092a5cf62393fe92972642d295 SHA256 5136ac081f28dae14c8657ff90838ca01d81c5738b879290ccb79c912e235913
+MISC ChangeLog 37344 RMD160 6b7cff021554f19802c5bf4526380219854a4ad8 SHA1 a1adf91c8f3c4c87730ea0cfae26771e58ea3cb0 SHA256 31b8b88758eeab72e9c166dde8e70b1674783d28ea3a70a70a9ae0a67ab1008e
 MISC metadata.xml 357 RMD160 b4bef9d1c14522e2223ba92804cc04329cca999f SHA1 15bce697e4cf7a4bdc0f6b44046bc800818c4d29 SHA256 ac2928e35bee8f52aea5b76ee307794a5c134bba68793b7b37400907a41a5881
diff --git a/net-misc/dhcpcd/dhcpcd-5.1.3-r1.ebuild b/net-misc/dhcpcd/dhcpcd-5.1.3-r1.ebuild
new file mode 100644
index 000000000000..8f85bf9ec7c0
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-5.1.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.1.3-r1.ebuild,v 1.1 2009/10/26 03:01:46 williamh Exp $
+
+EAPI=1
+
+inherit eutils
+
+MY_P="${P/_alpha/-alpha}"
+MY_P="${MY_P/_beta/-beta}"
+MY_P="${MY_P/_rc/-rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
+LICENSE="BSD-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+
+SLOT="0"
+IUSE="+zeroconf"
+
+DEPEND=""
+PROVIDE="virtual/dhcpc"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if ! use zeroconf; then
+		elog "Disabling zeroconf support"
+		{
+			echo
+			echo "# dhcpcd ebuild requested no zeroconf"
+			echo "noipv4ll"
+		} >> dhcpcd.conf
+	fi
+}
+
+src_compile() {
+	local hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	econf --prefix= --libexecdir=/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
+		--localstatedir=/var ${hooks}
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	# Upgrade the duid file to the new format if needed
+	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local new_duid="${ROOT}"/etc/dhcpcd.duid
+	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
+		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
+	fi
+
+	# Move the duid to /etc, a more sensible location
+	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
+		cp -p "${old_duid}" "${new_duid}"
+	fi
+
+	if use zeroconf; then
+		elog "You have installed dhcpcd with zeroconf support."
+		elog "This means that it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the -L flag."
+		elog "See the dhcpcd man page for more details."
+	fi
+
+	elog
+	elog "Users transfering from 4.0 series should pay attention to removal"
+	elog "of compat useflag. This changes behavior of dhcp in wide manner:"
+	elog "dhcpcd no longer sends a default ClientID for ethernet interfaces."
+	elog "This is so we can re-use the address the kernel DHCP client found."
+	elog "To retain the old behaviour of sending a default ClientID based on the"
+	elog "hardware address for interface, simply add the keyword clientid"
+	elog "to dhcpcd.conf or use commandline parameter -I ''"
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd.initd b/net-misc/dhcpcd/files/dhcpcd.initd
index 0309754b5dc8..d88b0610ddfc 100644
--- a/net-misc/dhcpcd/files/dhcpcd.initd
+++ b/net-misc/dhcpcd/files/dhcpcd.initd
@@ -11,7 +11,7 @@ depend()
 {
 	provide net
 	need localmount
-	use logger
+	use logger network
 	after bootmisc modules
 	before dns
 }