fix init script so it is compatible with baselayout-1 for bug #346805.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux i686

4 files changed, 129 insertions, 2 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 06a7274b7cb7..089d0320b068 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.298 2011/01/04 23:13:45 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.299 2011/01/27 20:31:31 williamh Exp $
+
+*dhcpcd-5.2.10-r2 (27 Jan 2011)
+
+  27 Jan 2011; William Hubbs <williamh@gentoo.org> +files/dhcpcd.initd-1,
+  +dhcpcd-5.2.10-r2.ebuild:
+  Fix init script so it is compatible with baselayout-1 and also make sure
+  that we require at least openrc-0.6.1 so that our test for compatibility
+  will work. This fixes #346805.
 
 *dhcpcd-5.2.10-r1 (04 Jan 2011)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 47af1b887f81..f64c58ee5115 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,4 +1,5 @@
 AUX dhcpcd.initd 327 RMD160 5391020a6e28fb411fde4ae1610182dcc27abc59 SHA1 2f255cce666c11b1082593e8ff2ef67ad6c3e0a0 SHA256 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492
+AUX dhcpcd.initd-1 500 RMD160 154c421adaee89a5ad6a95479d3707d58d4949f2 SHA1 8073c2cc3a5cfe12aa214744e895a96ef633ad16 SHA256 96ea2b4110bcddb8a06690e9ecec42f55937cb5c6f5cf7ec59516df70ab8056e
 DIST dhcpcd-4.0.15.tar.bz2 52767 RMD160 a6b00ed30ce850cbe58c4aed1937f4bb8dcfd043 SHA1 bb1bbbe5b97bc8fd1fc1d4bea7067fe76f59182d SHA256 8ad7619eea8414851225b2ad2e204678911aca22791941f4caa49db435b2bca0
 DIST dhcpcd-5.2.10.tar.bz2 71140 RMD160 da982b48bd5a1a9dc2a6208b1e3390d78199e923 SHA1 3ff749f8a6ebc6231a011547ffe6cc7b4267f335 SHA256 d3325c697d6e2a2d09c80cedb358bb78561da33304183874d7c44f96fd5d9f5f
 DIST dhcpcd-5.2.6.tar.bz2 68489 RMD160 8c3d9d97973ea73583b2615df870becd88df9d3e SHA1 40219474d02d28e054aa6c10985ce59a070ac0c3 SHA256 fcba1dc87d8cb4b47a9b33ac7eb6fd1059026d524023374016abfe7ac98b8562
@@ -7,10 +8,11 @@ DIST dhcpcd-5.2.8.tar.bz2 70069 RMD160 29833dfa04e21d90ad7dbb9541d0883af275e4cd
 DIST dhcpcd-5.2.9.tar.bz2 71101 RMD160 3e5f87b6febc8644c7df34f411573aacbde7eaaa SHA1 434397b1e881ddf3a97abe44c4cbadd5ff19436b SHA256 368a931dabe91842da4fcccb9b8ef2606b72e025191e4e32856a1ba3f2516756
 EBUILD dhcpcd-4.0.15.ebuild 2824 RMD160 19259ffd4642c02dd0c581040c08356adfadeac3 SHA1 d35baa045b9eb62dc70457b200daa3caca5a9435 SHA256 8f2ff68d4110a5bfd0aba9014fb017c0bb03e005122d3a789d01ecbcc5d16325
 EBUILD dhcpcd-5.2.10-r1.ebuild 2881 RMD160 b1aee6c7ac8430a9afd28a4adf1b3c0cf8902730 SHA1 e46b45771dde3b896d832223863525ff291f92ec SHA256 ff8d35c17a0dbd2b21f5d104dac03979add5a6fba6d7f5f65df96db9f018e0ea
+EBUILD dhcpcd-5.2.10-r2.ebuild 2906 RMD160 b1a374794aa8caa08bf5a9782d2e91453d8eaf8c SHA1 e5ef9b605f5d966561dc310f60a47f9d6d93ab72 SHA256 9e4627d4cfaa2c05f75ceebb0212b108d60dc63bc9f2f5d4f6a72d02ca5819eb
 EBUILD dhcpcd-5.2.10.ebuild 2868 RMD160 fc9f6d38a1b3f6094d49fcfb868511ee822e7a7e SHA1 4eba78811de4e458149d2a9251c6301c91ffafe2 SHA256 6412710efb35e97a04ca2cec47a3a1e128e54d1ef9055e18e3e1327929a30f31
 EBUILD dhcpcd-5.2.6.ebuild 2666 RMD160 eab16c67ae1c34b3d2f1115dacf783608782ce64 SHA1 afe531921993ac3d4c254988a124562a4dcb9b89 SHA256 1c81db20783f7a8629e015f0c738dc48171f953a9712208f241c3af4193eb605
 EBUILD dhcpcd-5.2.7.ebuild 2666 RMD160 a12f4a1b773796e5bf22850aebb57663066160a7 SHA1 36a5628efc05fc789f28020b4ede3cedc06603ad SHA256 9806dcab64800a03b2adb7f36e66f8c325d644b74293588212e795b9eb2a2600
 EBUILD dhcpcd-5.2.8.ebuild 2656 RMD160 f6c36ef68aac0abd19aa981bbedae5e0260095f9 SHA1 5b718cc23cc219f2e6974f0a5300d23267270a6f SHA256 c2d32303d416dadb1ed3ad52a8025a305ddd92d4f674deb9507f484a5d95a82b
 EBUILD dhcpcd-5.2.9.ebuild 2666 RMD160 4f197b83eb39e68b3dc8e828641eefb9f643806c SHA1 b00e0ca845da416e85d92eca065684bf9acce160 SHA256 ba22eba6a5dbc4780381cc52c724f6cb43d9dd8f0b49378c15c57687a9df869b
-MISC ChangeLog 42217 RMD160 9f6b5423b9076dc7c0bae00e8ab5d472bc31f347 SHA1 e1bd7e4294ddeb85cb77289c4cb0c9a3ced44ab4 SHA256 fe5f2a858c1631da672d46948c475013614c4406700857016762dbe37ec5c70b
+MISC ChangeLog 42536 RMD160 ae4d047e58f74d16e2501a304ad20169a2717053 SHA1 ae9e3ce1baa6e1a3d6d72507a4020d23e71b0438 SHA256 2461b5550048b39a02f0187fbc12806bcb845e8e6df9442150c48af799b5c1c2
 MISC metadata.xml 364 RMD160 76c08f52a8358f3e62f42aaa5ee53820c452a104 SHA1 e9161300025ae9ff41c7b68eec327f64be57fcac SHA256 598b041b465927b424f29c9c843a34165bd12bd75dfd2422d79907a1b3b05b32
diff --git a/net-misc/dhcpcd/dhcpcd-5.2.10-r2.ebuild b/net-misc/dhcpcd/dhcpcd-5.2.10-r2.ebuild
new file mode 100644
index 000000000000..03dfb3c0d842
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-5.2.10-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.10-r2.ebuild,v 1.1 2011/01/27 20:31:31 williamh Exp $
+
+EAPI=1
+
+inherit 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="+zeroconf elibc_glibc"
+
+DEPEND=""
+RDEPEND="!<sys-apps/openrc-0.6.0"
+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
+}
+
+src_compile() {
+	local hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	econf --prefix= --libexecdir=/$(get_libdir)/dhcpcd --dbdir=/var/lib/dhcpcd \
+		--localstatedir=/var ${hooks}
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README
+	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
+}
+
+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 upgrading 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 ''"
+	elog
+	elog "Also, users upgrading from 4.0 series should be aware that"
+	elog "the -N, -R and -Y command line options no longer exist."
+	elog "These are controled now by nohook options in dhcpcd.conf."
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd.initd-1 b/net-misc/dhcpcd/files/dhcpcd.initd-1
new file mode 100644
index 000000000000..5d350c078391
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd.initd-1
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
+
+command=/sbin/dhcpcd
+pidfile=/var/run/dhcpcd.pid
+command_args=-q
+name="DHCP Client Daemon"
+
+depend()
+{
+	if [ "${RC_VERSION:-0}" != "0" ]; then
+		provide net
+		need localmount
+		use logger network
+		after bootmisc modules
+		before dns
+	fi
+}
+
+if [ "${RC_VERSION:-0}" = "0" ]; then
+	start()
+	{
+		eerror "This script cannot be used for baselayout-1."
+		return 1
+	}
+fi