Minor version bump to fix bug 285505 and bug 277095

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 104 insertions, 2 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 6b0f18dc3224..2913e7602c72 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.259 2009/09/24 03:53:27 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.260 2009/09/25 13:12:57 darkside Exp $
+
+*dhcpcd-4.0.15 (25 Sep 2009)
+
+  25 Sep 2009; Jeremy Olexa <darkside@gentoo.org> +dhcpcd-4.0.15.ebuild:
+  Minor version bump to fix bug 285505 and bug 277095
 
 *dhcpcd-5.1.1 (24 Sep 2009)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 5a1bc6a88a2f..31c94d5c2f2d 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,5 +1,6 @@
 AUX dhcpcd.initd 319 RMD160 c675c053442e2088e5ddd2ad9c528614aec088fe SHA1 33fd906730b0c2f2abc72335dd0133a17e27b72a SHA256 eb50356068ce6ffc664104e9a7eb6169e041e1e6d434f6247b3161ea45156c6a
 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
 DIST dhcpcd-5.0.4.tar.bz2 62058 RMD160 fca6257b30c4c12811ca204bf9e7fe186335928b SHA1 ce958f071b5a2267149e56882a984fb1d2810803 SHA256 af75575f2369ee0c95ae2bbd9711682a37cd57fc85dadaafee1f8092159a3473
 DIST dhcpcd-5.0.5.tar.bz2 62063 RMD160 e47dd9da4c42d6fd99cf3dd9a301220197ae4b73 SHA1 c40d6f987bbf3c42c3cdbd1e6c1bece68ad2e741 SHA256 62099fc0f6aa1db6554f1d9454e0d22f86a179baacff42f7e949944ef44adbc9
@@ -7,11 +8,12 @@ DIST dhcpcd-5.0.6.tar.bz2 62535 RMD160 75ab9fb07ad09bb10f14ef5218da3ea95cceed4a
 DIST dhcpcd-5.1.0.tar.bz2 63589 RMD160 d22e3d4b8f4d16b9cb0a7743a63cbb3057ac17d1 SHA1 4c5c729e1e8fb7ca5fa8a0ab336d9adcbca5c40f SHA256 bb761bc9eefa7f528fd74d9a10518ebd5f99c18fc2b0a98196c8cd106eb9188b
 DIST dhcpcd-5.1.1.tar.bz2 63701 RMD160 ff5d199d642bc309614e305b93c4396768a63f55 SHA1 4ffb9ce39620809f31f894eff4ce3c78f5ecf75e SHA256 93b926d48b8eb1cd0588a06e1dd71432264f06583406d8c355b5152b30d7f9a6
 EBUILD dhcpcd-4.0.13.ebuild 2801 RMD160 72e5fafca539465767da2e45eb561d6e682210f9 SHA1 d01f26974096f6bde0ba7d88a68c4395ddcaed71 SHA256 a0481f0affe87ab79b03d9e76961fb9ecfc77e3f191408832d6fd11c8c35ec0c
+EBUILD dhcpcd-4.0.15.ebuild 2811 RMD160 c93669f196ea654dcb6d95b9a1a5e379883a7e74 SHA1 a4ebc60e7aded946a95372b8df2764c895ab53ef SHA256 d30e27afd3dd74d789272d957cc8b9fc0ab0f067c42c7c80b18b0d7f39272078
 EBUILD dhcpcd-4.0.7.ebuild 2801 RMD160 528a1d33c21b4b8f955f838ce1b6c649d2333a0f SHA1 ff9adf79b34698a05c2907dd23e22fb33a04b946 SHA256 eb90479dfd1042c05d7c252acee706d8b5da3031965f352adfe450b65ed05e7e
 EBUILD dhcpcd-5.0.4.ebuild 2770 RMD160 9e0e09c86dc6d3ab4ff1f1504e8f71c7dd1b6bd4 SHA1 fdf2b8075930d969054aead9418d005982f6df5e SHA256 e66e05f91342ff1bab9ecccb2657fe8e87760806c8bfb94d1e2449356ba57814
 EBUILD dhcpcd-5.0.5.ebuild 2770 RMD160 eb046b02f731731bc2f379e3c0725f19e4588847 SHA1 29ca204cfccae99d30f738d7b90b59a77b8167ea SHA256 360c50efa52c6606a0fe0de0835ef47ea92f2b6391d7a125b5e1d100b4fae9fb
 EBUILD dhcpcd-5.0.6.ebuild 2770 RMD160 5f5e06305ddff40413311ac041e2fd7b7ffdd4a5 SHA1 faacb61e8f93c141d29b83901ee2b584d3f9f020 SHA256 a168ca3b2180f3a3501a9f3e315a3449992160a2a547fb3d179275b985369003
 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
-MISC ChangeLog 36741 RMD160 6d3a839173d313e81895764d5e0f64f8f991892f SHA1 e194c5d52e0e8dbb47206e1fff593874c0a7fe1f SHA256 d98c31ae10f19540d71742beb4894acb5263af684e89171339151420404d384f
+MISC ChangeLog 36899 RMD160 5d04ddb44c02461c8f558272884b36b25112a008 SHA1 b3157f386d440a6b5606c93a0de70e5591380dcf SHA256 c958dca3adb8e3e631939c3f7030dfb0a0483d98a9b0d3d2c7affdf07f3e58d9
 MISC metadata.xml 357 RMD160 b4bef9d1c14522e2223ba92804cc04329cca999f SHA1 15bce697e4cf7a4bdc0f6b44046bc800818c4d29 SHA256 ac2928e35bee8f52aea5b76ee307794a5c134bba68793b7b37400907a41a5881
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.15.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.15.ebuild
new file mode 100644
index 000000000000..0561dc58b733
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-4.0.15.ebuild
@@ -0,0 +1,95 @@
+# 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-4.0.15.ebuild,v 1.1 2009/09/25 13:12:57 darkside 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 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 ~x86 ~sparc-fbsd ~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"
+	use compat && hooks="${hooks} 50-dhcpcd-compat"
+	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
+}