Ensure that interface is always up as future dhcpcd's will do this

  automatically and probably drop the -o option. Punt old versions
(Portage version: 2.1.1_pre4-r4)

7 files changed, 49 insertions, 8 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 262230407e7a..f40e71c1f43d 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.103 2006/08/05 20:44:35 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.104 2006/08/13 19:33:47 uberlord Exp $
+
+  13 Aug 2006; Roy Marples <uberlord@gentoo.org>
+  +files/dhcpcd-2.0.0-alwaysup.patch, +files/dhcpcd-2.0.8-alwaysup.patch,
+  dhcpcd-2.0.0.ebuild, dhcpcd-2.0.3.ebuild, dhcpcd-2.0.5.ebuild,
+  dhcpcd-2.0.8-r2.ebuild:
+  Ensure that interface is always up as future dhcpcd's will do this
+  automatically and probably drop the -o option.
 
   05 Aug 2006; Chris White <chriswhite@gentoo.org> metadata.xml:
   metadata.xml translation by Yoshino-san in bug #135033
diff --git a/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild b/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild
index d08142dedc6e..54693a1c09ac 100644
--- a/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild,v 1.14 2005/09/16 02:56:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild,v 1.15 2006/08/13 19:33:48 uberlord Exp $
 
 inherit flag-o-matic eutils
 
@@ -31,6 +31,9 @@ src_unpack() {
 	# Fix compiling on gcc2
 	epatch "${FILESDIR}/${P}-gcc2.patch"
 
+	# Never take the interface down
+	epatch "${FILESDIR}/${PN}-2.0.0-alwaysup.patch"
+
 	# Redefine the location of ntp.drift
 	sed -i 's:/etc/ntp\.drift:/var/lib/ntp/ntp.drift:' src/dhcpconfig.c
 }
diff --git a/net-misc/dhcpcd/dhcpcd-2.0.3.ebuild b/net-misc/dhcpcd/dhcpcd-2.0.3.ebuild
index bdabfb7a2c63..6db1a3e8fb29 100644
--- a/net-misc/dhcpcd/dhcpcd-2.0.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-2.0.3.ebuild,v 1.9 2006/04/23 17:52:16 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-2.0.3.ebuild,v 1.10 2006/08/13 19:33:47 uberlord Exp $
 
 inherit flag-o-matic eutils
 
@@ -28,6 +28,9 @@ src_unpack() {
 	unpack "${A}"
 	cd "${S}"
 
+	# Never take the interface down
+	epatch "${FILESDIR}/${PN}-2.0.0-alwaysup.patch"
+
 	# Redefine the location of ntp.drift
 	sed -i 's:/etc/ntp\.drift:/var/lib/ntp/ntp.drift:' src/dhcpconfig.c
 }
diff --git a/net-misc/dhcpcd/dhcpcd-2.0.5.ebuild b/net-misc/dhcpcd/dhcpcd-2.0.5.ebuild
index d047e93bd6ac..a45c0e390e66 100644
--- a/net-misc/dhcpcd/dhcpcd-2.0.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-2.0.5.ebuild,v 1.10 2006/07/02 20:25:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-2.0.5.ebuild,v 1.11 2006/08/13 19:33:47 uberlord Exp $
 
 inherit flag-o-matic eutils
 
@@ -28,6 +28,9 @@ src_unpack() {
 	unpack "${A}"
 	cd "${S}"
 
+	# Never take the interface down
+	epatch "${FILESDIR}/${PN}-2.0.0-alwaysup.patch"
+
 	# Redefine the location of ntp.drift
 	sed -i 's:/etc/ntp\.drift:/var/lib/ntp/ntp.drift:' src/dhcpconfig.c
 }
diff --git a/net-misc/dhcpcd/dhcpcd-2.0.8-r2.ebuild b/net-misc/dhcpcd/dhcpcd-2.0.8-r2.ebuild
index eed115e75def..bab8a1b89d52 100644
--- a/net-misc/dhcpcd/dhcpcd-2.0.8-r2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-2.0.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-2.0.8-r2.ebuild,v 1.1 2006/07/22 16:33:49 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-2.0.8-r2.ebuild,v 1.2 2006/08/13 19:33:47 uberlord Exp $
 
 inherit flag-o-matic eutils
 
@@ -28,11 +28,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Redefine the location of ntp.drift
-	sed -i 's:/etc/ntp\.drift:/var/lib/ntp/ntp.drift:' src/dhcpconfig.c
+	# Never take the interface down
+	epatch "${FILESDIR}/${PN}-2.0.8-alwaysup.patch"
 
 	epatch "${FILESDIR}/${P}-loglevel.patch"
 	epatch "${FILESDIR}/${P}-no_resolve_hostname.patch"
+
+	# Redefine the location of ntp.drift
+	sed -i 's:/etc/ntp\.drift:/var/lib/ntp/ntp.drift:' src/dhcpconfig.c
 }
 
 src_compile() {
diff --git a/net-misc/dhcpcd/files/dhcpcd-2.0.0-alwaysup.patch b/net-misc/dhcpcd/files/dhcpcd-2.0.0-alwaysup.patch
new file mode 100644
index 000000000000..71356383bdbf
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-2.0.0-alwaysup.patch
@@ -0,0 +1,11 @@
+--- src/dhcpcd.c	(revision 69)
++++ src/dhcpcd.c	(working copy)
+@@ -75,7 +75,7 @@
+ char		*ConfigDir	=	CONFIG_DIR;
+ int		SetDHCPDefaultRoutes=	1;
+ int		Persistent	=	0;
+-int		DownIfaceOnStop	=	1;
++int		DownIfaceOnStop	=	0;
+ 
+ #if 0
+ unsigned char	ClientMACaddr[ETH_ALEN];
diff --git a/net-misc/dhcpcd/files/dhcpcd-2.0.8-alwaysup.patch b/net-misc/dhcpcd/files/dhcpcd-2.0.8-alwaysup.patch
new file mode 100644
index 000000000000..5a33a3ec7e2d
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-2.0.8-alwaysup.patch
@@ -0,0 +1,11 @@
+--- src/dhcpcd.c	(revision 69)
++++ src/dhcpcd.c	(working copy)
+@@ -76,7 +76,7 @@
+ char		*ConfigDir	=	CONFIG_DIR;
+ int		SetDHCPDefaultRoutes=	1;
+ int		Persistent	=	0;
+-int		DownIfaceOnStop	=	1;
++int		DownIfaceOnStop	=	0;
+ int		DoARP		=	1;
+ 
+ #if 0