Fix a regression in dhcpcd-2.0.4 where we would exit with a zero status

  if we failed to get a lease. Also, we now report errors to stderr as well
(Portage version: 2.1_pre7-r5)

5 files changed, 100 insertions, 14 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 56f061f8d84d..53c8e72a0d45 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.85 2006/04/07 23:08:06 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.86 2006/04/11 11:40:32 uberlord Exp $
+
+*dhcpcd-2.0.4-r1 (11 Apr 2006)
+
+  11 Apr 2006; Roy Marples <uberlord@gentoo.org>
+  +files/dhcpcd-2.0.4-exit.patch, +dhcpcd-2.0.4-r1.ebuild:
+  Fix a regression in dhcpcd-2.0.4 where we would exit with a zero status
+  if we failed to get a lease. Also, we now report errors to stderr as well
+  as syslog.
 
 *dhcpcd-2.0.4 (07 Apr 2006)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index afa33805735e..d3d4557bf5d0 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b599de65d681becc64a4ee488b9ddee3 ChangeLog 13037
-RMD160 b9d7e24e0ea59dfe24f5cbe3c82b0ebbb9aed4c0 ChangeLog 13037
-SHA256 f59109de54f0f6c9d084ad6f9304470d3311c543735df9e32cf071df34def005 ChangeLog 13037
+MD5 2ec16cd8648f04c272d12588948ab55c ChangeLog 13341
+RMD160 3418f7d25d01e1012663a204b9c36f4c1b928452 ChangeLog 13341
+SHA256 50cfc5451f19ac79324bf3b1c242a05023a19b92eac36dbe45d26bb2e52581bd ChangeLog 13341
 MD5 0b8b0543807996684c88f7f67415e051 dhcpcd-2.0.0.ebuild 1272
 RMD160 317485962740c01aceae309dce2101f805dc79c1 dhcpcd-2.0.0.ebuild 1272
 SHA256 892ff54f38d2a5ce98c85fe97672671ae747a0fbeb82e604a5596d00c30c153e dhcpcd-2.0.0.ebuild 1272
@@ -16,12 +13,18 @@ SHA256 50fbcba690ccc7f313621a1643a602ecd9a29bed252dac946187872fd6f7d380 dhcpcd-2
 MD5 64a8863a26a6c7b9df9f7b8ba557be75 dhcpcd-2.0.3.ebuild 1204
 RMD160 a5ca2f8ea07ccbfe49f379e9e83e4c5aadb1791b dhcpcd-2.0.3.ebuild 1204
 SHA256 2680b0621d069ef7f1233026bc904010ea68f1cd7a1af6e1cbeff2164055105c dhcpcd-2.0.3.ebuild 1204
+MD5 cb0b728593c76e921962227e0cbc6f17 dhcpcd-2.0.4-r1.ebuild 1330
+RMD160 0da0dd2143a6fbef7bfa9ffceef815ea339d7fda dhcpcd-2.0.4-r1.ebuild 1330
+SHA256 22b34af66e985d1f9e70cb55b0dfd6eae3188effb754439f63df340058376166 dhcpcd-2.0.4-r1.ebuild 1330
 MD5 4287b887903539cb97131bef047de176 dhcpcd-2.0.4.ebuild 1218
 RMD160 a43fa4feacd12ab56b612b89409ac73b136a5bdc dhcpcd-2.0.4.ebuild 1218
 SHA256 a1b0553a2f0bb8c9bf476e3d1ed1f10a9694a79459e0e0325bf8533c1cfe289c dhcpcd-2.0.4.ebuild 1218
 MD5 766b1f15f697d5f05d0991c2765f3ff8 files/dhcpcd-2.0.0-gcc2.patch 2873
 RMD160 33650d65c00a8ca76fa3b3285ecd0f6888af8d0a files/dhcpcd-2.0.0-gcc2.patch 2873
 SHA256 b6e8c46740574227ef3ad40ced16f02547c95f08cfe9cba3aa5d5a114c7f14dd files/dhcpcd-2.0.0-gcc2.patch 2873
+MD5 00d366f5aceaa0903b662bac2edcbcb7 files/dhcpcd-2.0.4-exit.patch 702
+RMD160 16f07fcaccc8a18fed0a8312b66593a168fb1d0a files/dhcpcd-2.0.4-exit.patch 702
+SHA256 95ce200e6a245753b70a1f11c03a7f17622f212e3ddb9d3ddf88c3f8293272a2 files/dhcpcd-2.0.4-exit.patch 702
 MD5 fe6d79bf7b6253ca5a55ce4692064518 files/digest-dhcpcd-2.0.0 65
 RMD160 c10d621cf2b120b5033c028e94980e142e9b3e84 files/digest-dhcpcd-2.0.0 65
 SHA256 4bded0b78221833f7a80091c489298e32e7c4bd4e3853023f6fe0b5c53116162 files/digest-dhcpcd-2.0.0 65
@@ -37,13 +40,9 @@ SHA256 827fae54807ab0abe15deb200fb70f7d189d57009e84fc7a2620ab72c24f4453 files/di
 MD5 f959066821c5f17e2c8dea8bce0c152c files/digest-dhcpcd-2.0.4 241
 RMD160 0ddbc49870faadd85c925d3cb4241f3570f26d71 files/digest-dhcpcd-2.0.4 241
 SHA256 97493ce1e0050b70ef62ae358a636e950a50b927fb77a874fcae57b1dad488f2 files/digest-dhcpcd-2.0.4 241
+MD5 f959066821c5f17e2c8dea8bce0c152c files/digest-dhcpcd-2.0.4-r1 241
+RMD160 0ddbc49870faadd85c925d3cb4241f3570f26d71 files/digest-dhcpcd-2.0.4-r1 241
+SHA256 97493ce1e0050b70ef62ae358a636e950a50b927fb77a874fcae57b1dad488f2 files/digest-dhcpcd-2.0.4-r1 241
 MD5 8f5546891831502f0667f11299937b8f metadata.xml 308
 RMD160 c00f6df0a19d2da9e194f53c7d16a506f0edc3ca metadata.xml 308
 SHA256 6b61ce7b8fead175e30dd71a5aa43158854e4f054a5fc5ba4b5a452420ec4bf7 metadata.xml 308
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENvDjEbVyYKaZ/NERAn7CAJ4tOxmHr793t5PevnnGOnUdjE8KWACdESeR
-w9YdaSfEpCp/u834h+Qg42U=
-=AtNJ
------END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-2.0.4-r1.ebuild b/net-misc/dhcpcd/dhcpcd-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..dac5efdcc9ec
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-2.0.4-r1.ebuild
@@ -0,0 +1,54 @@
+# 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.4-r1.ebuild,v 1.1 2006/04/11 11:40:32 uberlord Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="A DHCP client only"
+HOMEPAGE="http://developer.berlios.de/projects/dhcpcd/"
+SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="build debug static"
+
+DEPEND=""
+PROVIDE="virtual/dhcpc"
+
+pkg_setup() {
+	if use debug ; then
+		ewarn "WARNING: dhcpcd will provide good debugging output with the"
+		ewarn "debug USE flag enabled but will not actually configure the"
+		ewarn "interface or setup /etc/resolv.conf"
+	fi
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Return non zero when we fail to get a lease and log errors to stderr.
+	epatch "${FILESDIR}/${P}-exit.patch"
+
+	# Redefine the location of ntp.drift
+	sed -i 's:/etc/ntp\.drift:/var/lib/ntp/ntp.drift:' src/dhcpconfig.c
+}
+
+src_compile() {
+	local myconf="$(use_enable debug)"
+	use static && append-flags -static
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	into /
+	dosbin src/dhcpcd || die
+
+	if ! use build ; then
+		dodoc AUTHORS ChangeLog NEWS README
+		doman src/dhcpcd.8
+	fi
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch b/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch
new file mode 100644
index 000000000000..94cf796a31a5
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch
@@ -0,0 +1,22 @@
+--- src/signals.c
++++ src/signals.c
+@@ -129,7 +129,7 @@
+   if (!Persistent && sig != SIGTERM)
+     dhcpStop();
+   deletePidFile();
+-  exit(0);
++  exit(sig);
+ }
+ /*****************************************************************************/
+ void signalSetup()
+--- src/dhcpcd.c
++++ src/dhcpcd.c
+@@ -427,7 +427,7 @@
+   if ( killFlag ) killPid(killFlag);
+   if ( ! TestCase ) checkIfAlreadyRunning();
+   if ( versionFlag ) print_version();
+-  openlog(PACKAGE,LOG_PID|(DebugFlag?LOG_CONS:0),LOG_LOCAL0);
++  openlog(PACKAGE,LOG_PID|(DebugFlag?LOG_CONS:0)|LOG_PERROR,LOG_LOCAL0);
+   signalSetup();
+   if ( mkdir(ConfigDir,S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) && errno != EEXIST )
+     {
diff --git a/net-misc/dhcpcd/files/digest-dhcpcd-2.0.4-r1 b/net-misc/dhcpcd/files/digest-dhcpcd-2.0.4-r1
new file mode 100644
index 000000000000..3fe9cec80392
--- /dev/null
+++ b/net-misc/dhcpcd/files/digest-dhcpcd-2.0.4-r1
@@ -0,0 +1,3 @@
+MD5 f7918c3ac86acc325d7495328f18ef19 dhcpcd-2.0.4.tar.bz2 123701
+RMD160 3406f5bb456ea523f1045426a5bcfe6887711131 dhcpcd-2.0.4.tar.bz2 123701
+SHA256 6be201d6c664f8e6a0e1b44965bc9229b7c27421f2b0fb78ae9883364e07e79a dhcpcd-2.0.4.tar.bz2 123701