Version bump, fixes loop with infinite leases.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26-gentoo i686

3 files changed, 105 insertions, 2 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 2eec9362aed2..4482705ad9bb 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.199 2008/07/23 16:24:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.200 2008/07/27 10:47:00 ikelos Exp $
+
+*dhcpcd-4.0.0_rc3 (27 Jul 2008)
+
+  27 Jul 2008; Mike Auty <ikelos@gentoo.org> +dhcpcd-4.0.0_rc3.ebuild:
+  Version bump, fixes loop with infinite leases.
 
 *dhcpcd-4.0.0_rc2 (23 Jul 2008)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index c3f696317924..d53abcc1d828 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dhcpcd-2.0.0-alwaysup.patch 269 RMD160 32639a49176d07495704da4c9cae6237fe12333a SHA1 b9d1107ef2e06dd9f97e9530eddc5b1c25d5dd9b SHA256 6c8bb55db74b400cd98d406c6f96e18956f33efb2e814f12d974a43799f0f902
 AUX dhcpcd-3.0.16-min-message.patch 531 RMD160 8407d4009490cda04100456f095aed5da89f2168 SHA1 335f121022a494082afe6872c4d2c7b921fd67b8 SHA256 0229c7272be152ee6c8d2f8c0fd7e31f6cb05ac9d508b3e785739723a1acd2c9
 DIST dhcpcd-2.0.5.tar.bz2 124838 RMD160 205632ea754c51d39827cfbdb9839368a4f17a78 SHA1 f2480d142dfce4128b13d434497ad933f4c337d1 SHA256 0b3acf8306f5ad1fb036703c9ede302c416d9f118950903306c647357113a411
@@ -8,6 +11,7 @@ DIST dhcpcd-3.2.3.tar.bz2 45030 RMD160 4319dc97c97f08124a6466d096eeb2a21b4d069d
 DIST dhcpcd-4.0.0-beta9.tar.bz2 48081 RMD160 d038c4f0b3e6f3851667c99f742a2e24382c6eac SHA1 aae02289c9ad5bbacb51940ef176e86ed6d71688 SHA256 595837c96916d8f7dae1b6f521f04e9bb59f2fc53a6a63db06e72164ef814ec4
 DIST dhcpcd-4.0.0-rc1.tar.bz2 49816 RMD160 79fcc9858ddc703ef0ea943614bb1a6ca7519aec SHA1 ceb1e864cb551b839679767de807d5620275af86 SHA256 1d96d9c826502e918059fe9c7f7ec3b538f2c113d20435051062f998e94754fc
 DIST dhcpcd-4.0.0-rc2.tar.bz2 49681 RMD160 e3b2f937ee6cadad2fc54f9692f956004c083472 SHA1 92b8d6a3803fac8f0502bfae559282890a114d97 SHA256 9af71b5ac7e64b25be0eeacd5406875e284347f138524366d86947932bcf2586
+DIST dhcpcd-4.0.0-rc3.tar.bz2 49416 RMD160 a197d4e4a5c7e0752dba2a47415d6c3f578683f0 SHA1 1629a23e7997b889dd206ab41fb18c40bf9b7a36 SHA256 f83f98dd0da21347b51a3a6d4b18a75481a2ec49a52ec118b2220c2f368020f4
 EBUILD dhcpcd-2.0.5-r1.ebuild 1418 RMD160 d99f4100936bb4ec364a7432dd7c87d1ef909b80 SHA1 05abf531156b25459f7e2d4f8d8015ede8437de3 SHA256 dd23842eab6793416fb5565f8499e728282d5e00c4838a5f93325a00f5bd63f4
 EBUILD dhcpcd-3.0.16-r1.ebuild 953 RMD160 82b53e937a113c528e36aeace26cf705c0140ed9 SHA1 24e50b8e6effdba118f7b5389d24b0d3db94c9a9 SHA256 d6b9ee3c8da4c740bd0a5ca50c148874605ef33c5244680185b191749b6a5888
 EBUILD dhcpcd-3.1.5-r1.ebuild 1969 RMD160 0b5565aaa6466acbcf68dfae7c34896227fc8f1e SHA1 63ebd2efc08fa00e8bdfbc9314ee1736aede7495 SHA256 9ee0903aeff1102be6fe98a14259dbf2b8f9b0bb106716057c5ff495f7ff6b96
@@ -16,5 +20,13 @@ EBUILD dhcpcd-3.2.3.ebuild 2616 RMD160 0fd64284267ee4563b2fcb981bb0b242594dbcf1
 EBUILD dhcpcd-4.0.0_beta9.ebuild 2208 RMD160 50d7dd51153fedb74446ea6da2f353a31e5009a7 SHA1 6b9bd12e5c9f0d530735ddf6405dac1dd8703325 SHA256 77f01b00217d6a22db673d1b9b6810b9b0c9e5f892c0efb24887e14ae57ab2a9
 EBUILD dhcpcd-4.0.0_rc1.ebuild 2288 RMD160 794c5e9273b17c815b6cfee1e549516e3ee98655 SHA1 de1dead6ccdde32ad41a9122f38fe6205f40bff8 SHA256 8026b1805252d1d18247d98a077dc775badff9be3b4219eea595c1cced63fe43
 EBUILD dhcpcd-4.0.0_rc2.ebuild 2288 RMD160 37d2dee06a472b79f1ff2fd538e0c65753094e77 SHA1 937e0778c699567bb55cee410e4cd4f26f9709b9 SHA256 5790f59df711585141c9e6cf9adb5a7a88a901d84ebc6d2416ba25f726f242c1
-MISC ChangeLog 28141 RMD160 be5ff23254d9873744e65c9392ad43b20863bd4f SHA1 c5e8a99e049bf96fb8f101b5abb5f03cd8b16587 SHA256 4b1408969044ce63ee606a48c0e0e5e8c784be244cd1094736534db9cf16ee43
+EBUILD dhcpcd-4.0.0_rc3.ebuild 2287 RMD160 e8109ab3dccbb9cb1e5886d260f71dbef158f1b8 SHA1 9c88a329a0e156b53caee963b371e27221507428 SHA256 9a67871941eb4993d0ba99c8370b4cfdd0e5117df6fc6f4d173b06eef8524387
+MISC ChangeLog 28294 RMD160 107289e816daf54a6e78076f576c1032d75643a5 SHA1 eb30eb5fe7e773dbb3531b25d163fd47eca66850 SHA256 07e6ee1bb742231d6d85cec6964216ce5ec587966c06cc650dd04ac4c977d608
 MISC metadata.xml 294 RMD160 a4a156d187ceb572e144d1e83ffbb07652114eaa SHA1 18a4bc93e056a51f051f2e277d8eef144b6584ca SHA256 35cda940f329b0522dd2f0486a24a763f5da0560eacf0045a5faf940ddd883fa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiMUjQACgkQu7rWomwgFXp0vwCffk379X7FsU97HcujSJxBLjIg
+tb4An1UnGRlUGJ1Q/GnMPMOCTcw1IOfX
+=5wNd
+-----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_rc3.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_rc3.ebuild
new file mode 100644
index 000000000000..a26a55c50d29
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-4.0.0_rc3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.0_rc3.ebuild,v 1.1 2008/07/27 10:47:00 ikelos Exp $
+
+EAPI=1
+
+inherit toolchain-funcs
+
+MY_P="${P/_alpha/-alpha}"
+MY_P="${MY_P/_beta/-beta}"
+MY_P="${MY_P/_rc/-rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A DHCP client"
+HOMEPAGE="http://roy.marples.name/dhcpcd"
+SRC_URI="http://roy.marples.name/${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="+compat 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
+
+	if use compat; then
+		elog "dhcpcd-3 command line support enabled"
+		{
+			echo
+			echo "/* User indicated command line compatability */"
+			echo "#define CMDLINE_COMPAT"
+		} >> config.h
+	fi
+}
+
+pkg_setup() {
+	MAKE_ARGS="DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd"
+}
+
+src_compile() {
+	[ -z "${MAKE_ARGS}" ] && die "MAKE_ARGS is empty"
+	emake CC="$(tc-getCC)" ${MAKE_ARGS} || die
+}
+
+src_install() {
+	local hooks="50-ntp.conf"
+	use elibc_glibc && hooks="${hooks} 50-yp.conf"
+	emake ${MAKE_ARGS} HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
+}
+
+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
+}