Version bump. Remove old. Proxy commit for Roy.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64

6 files changed, 44 insertions, 114 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 22e9e7625cdf..5810d3c6a6c2 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.223 2008/11/10 11:40:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.224 2008/11/21 13:08:25 scarabeus Exp $
+
+*dhcpcd-4.99.5 (21 Nov 2008)
+*dhcpcd-4.0.5 (21 Nov 2008)
+
+  21 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org>
+  -files/dhcpcd-4.99.2-no-empty-clientid.patch, +dhcpcd-4.0.5.ebuild,
+  -dhcpcd-4.99.2.ebuild, -dhcpcd-4.99.3.ebuild, -dhcpcd-4.99.4.ebuild,
+  +dhcpcd-4.99.5.ebuild:
+  Version bump for 4.0 and 5.0 series. Cleanup 5.0.
 
 *dhcpcd-4.99.4 (10 Nov 2008)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 35cf8af7f913..8c6e7e8d8079 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,7 +1,6 @@
 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
 AUX dhcpcd-4.0.1-no-empty-clientid.patch 543 RMD160 15359a072fa874496ce7cba66984bc6398401fd4 SHA1 5a713790bf8477b9c4c542cf61db655f34952ce0 SHA256 52713ef4cd55fefb2fb6e6c826c03efc5745b2897f568e3b0c0dd7e8f0941237
-AUX dhcpcd-4.99.2-no-empty-clientid.patch 669 RMD160 4edf5fb92731c002a2bde71139e789e1dda20e05 SHA1 39b7b9d032d5bc67eafd381a4c9d0ff3dbcc1bb5 SHA256 fe9cbb10521cea816bb157caa2f2467f7e6c4b63a45e43f51f1986a72f50286a
 DIST dhcpcd-2.0.5.tar.bz2 124838 RMD160 205632ea754c51d39827cfbdb9839368a4f17a78 SHA1 f2480d142dfce4128b13d434497ad933f4c337d1 SHA256 0b3acf8306f5ad1fb036703c9ede302c416d9f118950903306c647357113a411
 DIST dhcpcd-3.0.16.tar.bz2 31639 RMD160 24ab33bf453a0eb3301fc879e7e98f607aaf14d6 SHA1 bc597e6d5b006f4ac4dc74b87ebf3b6fa8a2af91 SHA256 324318a4d9feabf313011bdf8e0152beb904e7f4611cc539f767304343639be7
 DIST dhcpcd-3.1.5.tar.bz2 40958 RMD160 a00b50c2aadcce5f23d0dcca7691dea173d219fa SHA1 17396b60ffd780c0dd08035e98e23b35c7f3ca39 SHA256 ce98a97a2002d672de67d32bb0226d12146788bd16b1c5ef1a319c82b7933e0e
@@ -13,9 +12,8 @@ DIST dhcpcd-4.0.1.tar.bz2 51697 RMD160 4a539349a02af358b93bdfc0998db4ccaad5970b
 DIST dhcpcd-4.0.2.tar.bz2 51625 RMD160 e2bf8fce66404e70f03f331de2fc83503bdbf077 SHA1 3224bb58fd82efb2f86e6a1f76dce6bff20cdc1d SHA256 19aba85cf98906ea38397fadf2d23841c343bce9d995d8684d0c083524bf6523
 DIST dhcpcd-4.0.3.tar.bz2 51943 RMD160 bd44e76c4aadbff3ea24bc0ee292fee77ff75a1c SHA1 9fa8b562be73c712d0a44f2179214f93ae9705d9 SHA256 f825fcb8bddb2386bae1c874e7632c7bc736015b685f19f3a300511b241a088f
 DIST dhcpcd-4.0.4.tar.bz2 51949 RMD160 02e521b60ee375df94adb8e147a447eb965fab4f SHA1 08066240dde04dba22a2e38775169570d56189dc SHA256 73018fe2a79a3bcb1e1c8a0967acd0a29c7bff88dffdc94ed4ca89206d203402
-DIST dhcpcd-4.99.2.tar.bz2 54946 RMD160 a2e3e8b37e41f0b3356f7a7cba6c606dbaf6db0a SHA1 8b49f3dffb47c754ba1629aa971fbf14e137bd26 SHA256 513a6ab9d4010ebc495425816155c44074f7195f7d1550d9653a2dc2c8ecfa95
-DIST dhcpcd-4.99.3.tar.bz2 55836 RMD160 5cf9c3eb2efe7a9cf5b1f722c55a4a498d497e9f SHA1 582675abec2cc580972c246d358e781686c0ceda SHA256 031abbe1dd2a1d382b2af2188967792c18eca5245f36329e314e1427215758d6
-DIST dhcpcd-4.99.4.tar.bz2 55947 RMD160 c26f399c73717c9bab081b733220a861eb60ae56 SHA1 5c282e49067f0cc8a54ba314154c4034147bc3e5 SHA256 7974633ee1efcf74dbf67fd5290137a81a766bac7f175715912cfa2d9f56f10d
+DIST dhcpcd-4.0.5.tar.bz2 52226 RMD160 f3a8211bf4d6c72aa69b89b0bb5ce79974174a40 SHA1 46cfbd025b3374e8a39e18513658861fef2b617b SHA256 2741fe78fa49106065d753537e3d2b9fd544beb402fbac9da0514efcd643d93c
+DIST dhcpcd-4.99.5.tar.bz2 56334 RMD160 e4be4ca9739647c67fe1916ccee2379739e648e9 SHA1 6cfa2d9d1eb33c204e35217652d831af9d8ac8e0 SHA256 d37be98e3eb24505fb4fc8f50666693a11ac0299114d16f422e18948592f11e0
 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
@@ -28,8 +26,7 @@ EBUILD dhcpcd-4.0.1.ebuild 2281 RMD160 7c0f461f47bc8bbee92cdf045991b1434527e3e2
 EBUILD dhcpcd-4.0.2.ebuild 2298 RMD160 083b33ad4770f517c2f931b3f44b96a76e52f1de SHA1 abcf939f6d2e1f78a6b8e484e893b4ed14786d52 SHA256 35d9d1fd5b1da6d97eb6f2a59165af99c815cebddcbd4e241a99ab03f273458b
 EBUILD dhcpcd-4.0.3.ebuild 2307 RMD160 5fe38239c93ec8706ee9c98036c91951c4d8ee5e SHA1 45db4ae39cf8c80a0067df2be6763741c92ace8a SHA256 bd07fbb4ed15b5a0231c49f67b1d0c0974acef6b72830f37da462f3ca49169df
 EBUILD dhcpcd-4.0.4.ebuild 2310 RMD160 e91bc677c9bc5119b253fc3926b3011ba8a4b866 SHA1 fc739daf017ae92c02686cbf016fa6f2b23a49c6 SHA256 a8a1c4e57f9a0d324075c82ae3cbeef7d0d46feea8982e218576cc34bb397945
-EBUILD dhcpcd-4.99.2.ebuild 2152 RMD160 216e84b7b49cf2610e2c60ad7509f98f471b6a80 SHA1 80436a2435f962664a40eb1af9d3e0f725b34114 SHA256 d04f691b3b9d28d2afc1083ffdaaa65fbdbe519606198aaf11ebde61756fd08b
-EBUILD dhcpcd-4.99.3.ebuild 2169 RMD160 7b7e6357bb894ba79a61e41cc559f800e3480b70 SHA1 41212843532b55df45a0b4535025f444cdc1381d SHA256 3c011ca398ee21370722856021a68214349c30b9cb88b380971ba0d05bf0bc14
-EBUILD dhcpcd-4.99.4.ebuild 2172 RMD160 1402af58b4373c594685d4047291f9523bfc4bc4 SHA1 50aeb19da9c834a92055d8c732b7befd752284c5 SHA256 dae38443c734e29236931e5c6989c21de729a629d7e83ef51d58161c4008f176
-MISC ChangeLog 31463 RMD160 99c1f76dbf1339617866e5cb70abfbf1171b252a SHA1 23d53dc6e44275d2bb306e7987f6b56589064575 SHA256 871774e764de13587b48ab4d2ac79c3fdff2fecb2db96635a4a74ead9e75d6e5
+EBUILD dhcpcd-4.0.5.ebuild 2710 RMD160 743336a52e41be54b277554aa872d5989eb36628 SHA1 5855540788370ee461cce82dd7544409c1e58e2b SHA256 c840c5611bc969ba43939664c8b9ec0e876fc286559669c6f9199dff5f70d459
+EBUILD dhcpcd-4.99.5.ebuild 2627 RMD160 64cc11f09ee16e98c6eb08d07c810ee48af94843 SHA1 b840c0f9435f93a1c8b984a7d59cf24a16136d67 SHA256 ed0d2110321ebb98fd39df81a26951e3584f8df59fa66ea055528a3f6d3b7348
+MISC ChangeLog 31794 RMD160 0bb7c2b34de75e0e85df8a1be8fbe38b12535bbe SHA1 a23c2e3efe621d8b3280d81aa9d6086457a9a238 SHA256 e50ee781e633906bf7e5115e1b973c297f656f891ac5d008023c0da03ebbcd99
 MISC metadata.xml 474 RMD160 a0dd1b7ce940eac39d4c9d32f0a5473e44ea291b SHA1 a007fba723b719e14bbb5cb2b8d9f2d62d1e87da SHA256 ed92d0ec6aff23c23eaf1bf7c36357a7a7cd63723b6312caccbb2becb3bd0c72
diff --git a/net-misc/dhcpcd/dhcpcd-4.99.4.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.5.ebuild
index 002ca336a347..b5f8807846e0 100644
--- a/net-misc/dhcpcd/dhcpcd-4.99.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-4.0.5.ebuild
@@ -1,6 +1,6 @@
 # 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.99.4.ebuild,v 1.1 2008/11/10 11:40:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.5.ebuild,v 1.1 2008/11/21 13:08:25 scarabeus Exp $
 
 EAPI=1
 
@@ -12,14 +12,14 @@ MY_P="${MY_P/_rc/-rc}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+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"
+IUSE="+compat zeroconf"
 
 DEPEND=""
 PROVIDE="virtual/dhcpc"
@@ -37,7 +37,14 @@ src_unpack() {
 		} >> dhcpcd.conf
 	fi
 
-	epatch "${FILESDIR}"/${PN}-4.99.2-no-empty-clientid.patch
+	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() {
@@ -76,4 +83,12 @@ pkg_postinst() {
 		elog "This behaviour can be controlled with the -L flag."
 		elog "See the dhcpcd man page for more details."
 	fi
+	if ! use compat; then
+		elog
+		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 ''"
+	fi
 }
diff --git a/net-misc/dhcpcd/dhcpcd-4.99.2.ebuild b/net-misc/dhcpcd/dhcpcd-4.99.2.ebuild
deleted file mode 100644
index 1b5ffa8e5418..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.99.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.99.2.ebuild,v 1.1 2008/09/25 08:34:17 robbat2 Exp $
-
-EAPI=1
-
-inherit toolchain-funcs eutils
-
-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="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
-
-	epatch "${FILESDIR}"/${PN}-4.99.2-no-empty-clientid.patch
-}
-
-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
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.99.3.ebuild b/net-misc/dhcpcd/dhcpcd-4.99.5.ebuild
index 85d1d92c197d..b1c5d6843fdf 100644
--- a/net-misc/dhcpcd/dhcpcd-4.99.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-4.99.5.ebuild
@@ -1,6 +1,6 @@
 # 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.99.3.ebuild,v 1.1 2008/10/29 15:10:51 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.99.5.ebuild,v 1.1 2008/11/21 13:08:25 scarabeus Exp $
 
 EAPI=1
 
@@ -36,8 +36,6 @@ src_unpack() {
 			echo "noipv4ll"
 		} >> dhcpcd.conf
 	fi
-
-	epatch "${FILESDIR}"/${PN}-4.99.2-no-empty-clientid.patch
 }
 
 pkg_setup() {
@@ -76,4 +74,13 @@ pkg_postinst() {
 		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-4.99.2-no-empty-clientid.patch b/net-misc/dhcpcd/files/dhcpcd-4.99.2-no-empty-clientid.patch
deleted file mode 100644
index 853cbacb7ff2..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-4.99.2-no-empty-clientid.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Restore the 3.x behavior of an empty -I '' argument.
-
-Bug: http://bugs.marples.name/show_bug.cgi?id=116
-Patch: forward-ported from 4.0.1 version.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*.orig' --exclude '*.rej' dhcpcd-4.99.2.orig/if-options.c dhcpcd-4.99.2/if-options.c
---- dhcpcd-4.99.2.orig/if-options.c	2008-09-19 06:36:40.000000000 -0700
-+++ dhcpcd-4.99.2/if-options.c	2008-09-25 01:27:46.115364821 -0700
-@@ -494,7 +494,7 @@
- 	case 'I':
- 		/* Strings have a type of 0 */;
- 		ifo->clientid[1] = 0;
--		if (arg)
-+ 		if (arg && *arg)
- 			s = parse_string_hwaddr((char *)ifo->clientid + 1,
- 						CLIENTID_MAX_LEN, arg, 1);
- 		else