net-misc/dhcpcd: bump to 4.0.1 as per Roy's comments in bug #235643

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 x86_64

3 files changed, 95 insertions, 2 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 1529f1f5b620..602fe6f8feea 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.203 2008/08/24 20:57:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.204 2008/08/25 10:17:39 remi Exp $
+
+*dhcpcd-4.0.1 (25 Aug 2008)
+
+  25 Aug 2008; Rémi Cardona <remi@gentoo.org> +dhcpcd-4.0.1.ebuild:
+  bump to 4.0.1 as per Roy's comments in bug #235643
 
 *dhcpcd-4.0.0 (24 Aug 2008)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 6be3718766bb..c719d3e8d151 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -7,6 +7,7 @@ DIST dhcpcd-3.2.2.tar.bz2 44779 RMD160 14ad80c09ad2a8ace6840f628fa4e5fa09a33df4
 DIST dhcpcd-3.2.3.tar.bz2 45030 RMD160 4319dc97c97f08124a6466d096eeb2a21b4d069d SHA1 666d6bafd86c9986efe28076d0b7e5d3349006e2 SHA256 89d5fc05d7fd643200333116400d8a0eda9adf1c7f2a70e6cbca977c8d3843fe
 DIST dhcpcd-4.0.0-rc5.tar.bz2 51241 RMD160 35bfa384431833eaa131015cd2acb4ea57164ea2 SHA1 ba300384f211d5846b3d1e4c722b9759b3048978 SHA256 cd03d3d457ddb4dadb09118cb048a8c4097d750a0c47cdc687137a577985ddf7
 DIST dhcpcd-4.0.0.tar.bz2 51674 RMD160 62bef2c676f656dd846ce5c3260866cb841e1a11 SHA1 cb8c04d727ae48ccbcec9872b3b7d3fca09f5afd SHA256 b895e51b0863a2053652eaad9ca6d12e5fb9e393bc7ff54a1fd958cc83355093
+DIST dhcpcd-4.0.1.tar.bz2 51875 RMD160 02bd22ddfa42fa2eca3a8e7ea94503ba4e153ca5 SHA1 663cc46ba51c79eeb87528fc4b757792e0df3567 SHA256 b647561725c06291a61dcbe9592b8b95f6256f32db35f934c9e4dcb3b0ec84c1
 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
@@ -14,5 +15,6 @@ EBUILD dhcpcd-3.2.2.ebuild 2624 RMD160 803c8bea3619c62397c45b7791860279e1fd52b4
 EBUILD dhcpcd-3.2.3.ebuild 2616 RMD160 0fd64284267ee4563b2fcb981bb0b242594dbcf1 SHA1 8f6c1fd86f767bc8b78f86154799b7f036a789f0 SHA256 cfc4316ad4039f3b359d129af0ae7f2a64d001e728cadbd1f36e3c0a441ccb0d
 EBUILD dhcpcd-4.0.0.ebuild 2284 RMD160 668e78d5f86ac17d0702e8916473643ce0b95ccf SHA1 44e0c89671035321797c3463ef3c32b8295d5a2b SHA256 04768c5fb605dc519a97bf7c7626e3e454bbed2aec0853f03f431da2e033758f
 EBUILD dhcpcd-4.0.0_rc5.ebuild 2288 RMD160 d4384039fb30761826dd4b4ac057a2594695f27f SHA1 c02dba6e6e3a1f1063339beb14d4641337c6f0d4 SHA256 020af651289eba68f9bf020e0cadc85ad126a78e14133cdf269b3c7c9c0a9211
-MISC ChangeLog 28795 RMD160 47980da5bff4e245980ddd98d2f0e52c18498c8d SHA1 b5e1ece8bf8e4f37265114d6968b145b2fa61b0b SHA256 7da12bd9cc0e5da0ffd6291424779a9949221280bd55160ee6a6c2b4dc5eb83a
+EBUILD dhcpcd-4.0.1.ebuild 2281 RMD160 7c0f461f47bc8bbee92cdf045991b1434527e3e2 SHA1 6f8064ced3f85b08e93ab8be1a796458b2158110 SHA256 5efaa6e8c7cdc7578dd761db185dc0f89be26ab34c878746f4f2076fa49f7c78
+MISC ChangeLog 28944 RMD160 3e879c6564db5c6056d76b8c076618f7795c6149 SHA1 fe8add3a87b02153ca72a88915bbb2fb2d5d9df7 SHA256 539eee20f06615915d106807d0e37477a69dff54dff97f7b11a32dcd4e5c4203
 MISC metadata.xml 474 RMD160 a0dd1b7ce940eac39d4c9d32f0a5473e44ea291b SHA1 a007fba723b719e14bbb5cb2b8d9f2d62d1e87da SHA256 ed92d0ec6aff23c23eaf1bf7c36357a7a7cd63723b6312caccbb2becb3bd0c72
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.1.ebuild
new file mode 100644
index 000000000000..67a15b6eb6d7
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-4.0.1.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.1.ebuild,v 1.1 2008/08/25 10:17:39 remi 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
+}