Bump to 4.{0,99}.6

Package-Manager: portage-2.1.6_rc1/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 203 insertions, 2 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 5810d3c6a6c2..f0f24f24edd9 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.224 2008/11/21 13:08:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.225 2008/11/25 22:19:08 welp Exp $
+
+*dhcpcd-4.99.6 (25 Nov 2008)
+*dhcpcd-4.0.6 (25 Nov 2008)
+
+  25 Nov 2008; <welp@gentoo.org> +dhcpcd-4.0.6.ebuild,
+  +dhcpcd-4.99.6.ebuild:
+  Bump to 4.{0,99}.6
 
 *dhcpcd-4.99.5 (21 Nov 2008)
 *dhcpcd-4.0.5 (21 Nov 2008)
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 8c6e7e8d8079..60ab8c80cdc6 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
 AUX dhcpcd-4.0.1-no-empty-clientid.patch 543 RMD160 15359a072fa874496ce7cba66984bc6398401fd4 SHA1 5a713790bf8477b9c4c542cf61db655f34952ce0 SHA256 52713ef4cd55fefb2fb6e6c826c03efc5745b2897f568e3b0c0dd7e8f0941237
@@ -13,7 +16,9 @@ DIST dhcpcd-4.0.2.tar.bz2 51625 RMD160 e2bf8fce66404e70f03f331de2fc83503bdbf077
 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.0.5.tar.bz2 52226 RMD160 f3a8211bf4d6c72aa69b89b0bb5ce79974174a40 SHA1 46cfbd025b3374e8a39e18513658861fef2b617b SHA256 2741fe78fa49106065d753537e3d2b9fd544beb402fbac9da0514efcd643d93c
+DIST dhcpcd-4.0.6.tar.bz2 52502 RMD160 88319e8691979417a74ba505e72ac06b0780fdbc SHA1 c9327d00cd0614a8ca26f0f240ea8a892569436a SHA256 dc1b7704b2a91a667ff18a8dd8a66bdcc70474d56989ff44618a5a07a2e8041f
 DIST dhcpcd-4.99.5.tar.bz2 56334 RMD160 e4be4ca9739647c67fe1916ccee2379739e648e9 SHA1 6cfa2d9d1eb33c204e35217652d831af9d8ac8e0 SHA256 d37be98e3eb24505fb4fc8f50666693a11ac0299114d16f422e18948592f11e0
+DIST dhcpcd-4.99.6.tar.bz2 56612 RMD160 5a18b5b05ad72bde8ae3446c0c97881a0172cc53 SHA1 97255f180f25cfbe36b5db326aa5fe8ae0244b12 SHA256 838ba12d1099e96653fa7bfad276bb3b99925d1d4c97c983406d5b1eb93f1c19
 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
@@ -27,6 +32,15 @@ EBUILD dhcpcd-4.0.2.ebuild 2298 RMD160 083b33ad4770f517c2f931b3f44b96a76e52f1de
 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.0.5.ebuild 2710 RMD160 743336a52e41be54b277554aa872d5989eb36628 SHA1 5855540788370ee461cce82dd7544409c1e58e2b SHA256 c840c5611bc969ba43939664c8b9ec0e876fc286559669c6f9199dff5f70d459
+EBUILD dhcpcd-4.0.6.ebuild 2705 RMD160 92811bb549255bbe01a32fb73c17e4b2470f0b0d SHA1 4807501810b87e5088ff6da3de0a92793eb766b5 SHA256 e6ad9b967e61957982d323b82013a65e5b327d3622f6f3d1d74ffc1f909dedb0
 EBUILD dhcpcd-4.99.5.ebuild 2627 RMD160 64cc11f09ee16e98c6eb08d07c810ee48af94843 SHA1 b840c0f9435f93a1c8b984a7d59cf24a16136d67 SHA256 ed0d2110321ebb98fd39df81a26951e3584f8df59fa66ea055528a3f6d3b7348
-MISC ChangeLog 31794 RMD160 0bb7c2b34de75e0e85df8a1be8fbe38b12535bbe SHA1 a23c2e3efe621d8b3280d81aa9d6086457a9a238 SHA256 e50ee781e633906bf7e5115e1b973c297f656f891ac5d008023c0da03ebbcd99
+EBUILD dhcpcd-4.99.6.ebuild 2622 RMD160 6f669ab1cf4b13e91cd0ab517b209427eefa6b26 SHA1 649516231245134cb5acd0fa068098c0659036af SHA256 b9085640868d97d74836d786e9fa91aeff1b32a0940b63af783a607353863192
+MISC ChangeLog 31949 RMD160 bf29569b56a5fb472a10ac7ceb57145946903681 SHA1 b8ee48efc592658cd3d41833c03eba03dee5a691 SHA256 922bc1f176009646c24758b37f719e173940e184cd89186dfee21320940b52c8
 MISC metadata.xml 474 RMD160 a0dd1b7ce940eac39d4c9d32f0a5473e44ea291b SHA1 a007fba723b719e14bbb5cb2b8d9f2d62d1e87da SHA256 ed92d0ec6aff23c23eaf1bf7c36357a7a7cd63723b6312caccbb2becb3bd0c72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkseeIACgkQ+yr3c76ZoXdcxQCdGNG3UiFWz9aHXVo5ytWnwiRZ
+kiUAn01Dq2OIAtUVSlxx69045Lq5ot6u
+=VVay
+-----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.6.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.6.ebuild
new file mode 100644
index 000000000000..1a3ebe428d7d
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-4.0.6.ebuild
@@ -0,0 +1,94 @@
+# 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.6.ebuild,v 1.1 2008/11/25 22:19:08 welp 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/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="+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
+	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.6.ebuild b/net-misc/dhcpcd/dhcpcd-4.99.6.ebuild
new file mode 100644
index 000000000000..783263f3256f
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-4.99.6.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.99.6.ebuild,v 1.1 2008/11/25 22:19:08 welp 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/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
+}
+
+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
+
+	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 ''"
+}