diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-04-11 13:54:51 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-04-11 13:54:51 +0000 |
| commit | 2ce5cc3b9c05582290badad2d396a9a9ee6e5551 (patch) | |
| tree | c64eb1eccc86684415c557ed156f55cfdda9445e /net-misc | |
| parent | uh, please mr repoman wont you generate me a Manifest (diff) | |
| download | historical-2ce5cc3b9c05582290badad2d396a9a9ee6e5551.tar.gz historical-2ce5cc3b9c05582290badad2d396a9a9ee6e5551.tar.bz2 historical-2ce5cc3b9c05582290badad2d396a9a9ee6e5551.zip | |
Fix patch so we just show timeout errors.
Package-Manager: portage-2.1_pre7-r5
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/dhcpcd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/dhcpcd/Manifest | 18 | ||||
| -rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch | 23 |
3 files changed, 24 insertions, 23 deletions
diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog index 53c8e72a0d45..15558f1c4b83 100644 --- a/net-misc/dhcpcd/ChangeLog +++ b/net-misc/dhcpcd/ChangeLog @@ -1,14 +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.86 2006/04/11 11:40:32 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.87 2006/04/11 13:54:51 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. + if we failed to get a lease. Also, we now report timeout 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 daee9deae3d8..dc3be079c34b 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 90d0dda6de626f7c4881f6f5b27b7537 ChangeLog 13341 -RMD160 5ced764677a2e36225f05d4c67e365facd57386d ChangeLog 13341 -SHA256 2a887b9523598b2162e21da020bc5b18c78e903d09845ed93b0a2ef4b45eba28 ChangeLog 13341 +MD5 e927fb06e638b848e9f3aaea73810be0 ChangeLog 13349 +RMD160 f1e8d8b8069a7f276abb6b8b055a9dbfca36fd27 ChangeLog 13349 +SHA256 b1cb3f309131bafe418b98688729dfd8e05219738de284a00d6693ed3b11f080 ChangeLog 13349 MD5 0b8b0543807996684c88f7f67415e051 dhcpcd-2.0.0.ebuild 1272 RMD160 317485962740c01aceae309dce2101f805dc79c1 dhcpcd-2.0.0.ebuild 1272 SHA256 892ff54f38d2a5ce98c85fe97672671ae747a0fbeb82e604a5596d00c30c153e dhcpcd-2.0.0.ebuild 1272 @@ -25,9 +25,9 @@ SHA256 a1b0553a2f0bb8c9bf476e3d1ed1f10a9694a79459e0e0325bf8533c1cfe289c dhcpcd-2 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 56f44cde1e392533e5149ee758a4aab7 files/dhcpcd-2.0.4-exit.patch 697 +RMD160 2c22afa440021ad84bc42f005f78eb4425084526 files/dhcpcd-2.0.4-exit.patch 697 +SHA256 c2b08b9068f3d4a6aab49e6d895c94ea1c6e12b01b65bdcf46ad230e28cbbf1b files/dhcpcd-2.0.4-exit.patch 697 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 @@ -52,7 +52,7 @@ SHA256 6b61ce7b8fead175e30dd71a5aa43158854e4f054a5fc5ba4b5a452420ec4bf7 metadata -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFEO5XDEbVyYKaZ/NERArYAAJ4vJjxAmRc172iokgmzBUdRDkzjrACcCOe1 -hi1CcgKAPN1uRcSMRDojurQ= -=vlYO +iD8DBQFEO7WPEbVyYKaZ/NERAu3+AJwN5tfmUpacQBIHXrw2MJ1C76pnkwCeMxqV +s+8R+IlEj7b5W0REAkqP22c= +=PCnk -----END PGP SIGNATURE----- diff --git a/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch b/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch index 94cf796a31a5..76daa9a17bde 100644 --- a/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch +++ b/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch @@ -1,5 +1,17 @@ --- src/signals.c +++ src/signals.c +@@ -110,7 +110,10 @@ + if ( currState == &dhcpReboot ) + siglongjmp(env,4); /* failed to acquire the same IP address */ + else +- syslog(LOG_ERR,"timed out waiting for a valid DHCP server response\n"); ++ { ++ syslog(LOG_ERR,"timed out waiting for a valid DHCP server response\n"); ++ fprintf(stderr,"timed out waiting for a valid DHCP server response\n"); ++ } + } + } + } @@ -129,7 +129,7 @@ if (!Persistent && sig != SIGTERM) dhcpStop(); @@ -9,14 +21,3 @@ } /*****************************************************************************/ 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 ) - { |