Browse Source

* updated dhcpcd (1.3.22-pl4 -> 3.0.18)

git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21529 10447126-35f2-4685-b0cf-6dd780d3921f
early
Minto van der Sluis 18 years ago
parent
commit
be08491f24
  1. 27
      network/dhcpcd/dhcpcd.desc
  2. 68
      network/dhcpcd/nodetach_option.patch

27
network/dhcpcd/dhcpcd.desc

@ -1,11 +1,8 @@
[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../dhcpcd/dhcpcd.desc
[COPY] Copyright (C) 2006 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] Copyright (C) 2007 The OpenSDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
[COPY]
@ -15,27 +12,23 @@
[COPY] GNU General Public License can be found in the file COPYING.
[COPY] --- SDE-COPYRIGHT-NOTE-END ---
[I] Dynamic Host Configuration Protocol (DHCP) Client Daemon
[T] This is an RFC2131, RFC2132 and RFC1541 compliant DHCP client daemon. dhcpcd
[T] gets an IP address and other information from a corresponding DHCP server,
[T] configures the network interface automatically, and tries to renew the lease
[T] time according to RFC2131 or RFC1541 depending on the command line option.
[I] A DHCP client daemon for Linux
[U] http://www.phystech.com/download/dhcpcd.html
[T] Dhcpcd is an RFC2131-, RFC2132-, and RFC1541-compliant DHCP client
[T] daemon. It gets an IP address and other information from the DHCP server,
[T] automatically configures the network interface, and tries to renew the
[T] lease time according to RFC2131 or RFC1541.
[A] Yoichi Hariguchi <yoichi@fore.com>
[A] Sergei Viznyuk <sv@phystech.com>
[U] http://dhcpcd.berlios.de/
[A] Simon Kelley <simon@thekelleys.org.uk>
[M] The OpenSDE Community <list@opensde.org>
[C] extra/network
[F] AUTOMAKE-QUIRK
[L] GPL
[S] Stable
[V] 1.3.22-pl4
[V] 3.0.18
[P] X -----5---9 116.600
[D] 4166186276 dhcpcd-1.3.22-pl4.tar.gz http://www.phystech.com/ftp/
[D] 515959284 dhcpcd-3.0.18.tar.bz2 http://download.berlios.de/dhcpcd/

68
network/dhcpcd/nodetach_option.patch

@ -1,68 +0,0 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../dhcpcd/nodetach_option.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- T2-COPYRIGHT-NOTE-END ---
--- ./dhcpcd.c.orig 2004-11-05 18:06:47.000000000 -0300
+++ ./dhcpcd.c 2004-11-05 18:17:19.000000000 -0300
@@ -59,6 +59,7 @@
int ReplNTPConf = 1;
int SetDomainName = 0;
int SetHostName = 0;
+int NoDetach = 0;
int BroadcastResp = 0;
time_t TimeOut = DEFAULT_TIMEOUT;
int magic_cookie = 0;
@@ -145,6 +146,10 @@
s++;
DebugFlag=1;
goto prgs;
+ case 'a':
+ s++;
+ NoDetach=1;
+ goto prgs;
case 'r':
s++;
BeRFC1541=1;
@@ -325,7 +330,7 @@
default:
usage: print_version();
fprintf(stderr,
-"Usage: dhcpcd [-dknrBCDHNRSTY] [-l leasetime] [-h hostname] [-t timeout]\n\
+"Usage: dhcpcd [-adknrBCDHNRSTY] [-l leasetime] [-h hostname] [-t timeout]\n\
[-i vendorClassID] [-I ClientID] [-c filename] [-s [ipaddr]]\n\
[-w windowsize] [-L ConfigDir] [-G [gateway]] [interface]\n");
exit(1);
@@ -375,9 +380,12 @@
if ( TestCase ) exit(0);
#endif
alarm(0);
-#ifdef DEBUG
+#ifndef DEBUG
+ if ( NoDetach ) {
+#endif
writePidFile(getpid());
-#else
+#ifndef DEBUG
+ } else {
#ifdef EMBED
s=vfork();
#else
@@ -396,6 +404,7 @@
(void)dup2(i,STDERR_FILENO);
if ( i > 2 ) (void)close(i);
}
+ }
#endif
chdir("/");
do currState=(void *(*)())currState(); while ( currState );
Loading…
Cancel
Save