diff options
author | mbr <mbr@FreeBSD.org> | 2004-08-15 23:37:10 +0000 |
---|---|---|
committer | mbr <mbr@FreeBSD.org> | 2004-08-15 23:37:10 +0000 |
commit | 7a3bb5bd7ec70b9c0f9b5b04f647f22db5c4b9f6 (patch) | |
tree | d31da35e3e8b49288d27c8adb0c88da734cc03f3 /contrib/isc-dhcp | |
parent | 2124202717de0eca4214a6f36088e9cfbeedf5e8 (diff) | |
download | FreeBSD-src-7a3bb5bd7ec70b9c0f9b5b04f647f22db5c4b9f6.zip FreeBSD-src-7a3bb5bd7ec70b9c0f9b5b04f647f22db5c4b9f6.tar.gz |
Resolve conflicts from dhclient 3.0.1 final import.
No functional changes in this import.
Diffstat (limited to 'contrib/isc-dhcp')
-rw-r--r-- | contrib/isc-dhcp/FREEBSD-upgrade | 8 | ||||
-rw-r--r-- | contrib/isc-dhcp/client/dhclient.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/contrib/isc-dhcp/FREEBSD-upgrade b/contrib/isc-dhcp/FREEBSD-upgrade index b1db259..c838b2f 100644 --- a/contrib/isc-dhcp/FREEBSD-upgrade +++ b/contrib/isc-dhcp/FREEBSD-upgrade @@ -1,7 +1,7 @@ # ex:ts=8 $FreeBSD$ -ISC DHCP client 3.0.1rc14 +ISC DHCP client 3.0.1 originals can be found at: ftp://ftp.isc.org/isc/dhcp/ @@ -27,8 +27,8 @@ For the import of ISC-dhclient the following files were removed: Imported by: - cvs import -m 'Import ISC DHCP 3.0.1 RC14 client.' \ - src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc14 + cvs import -m 'Import ISC DHCP 3.0.1 client.' \ + src/contrib/isc-dhcp ISC isc_dhcp_3_0_1 To make local changes to isc-dhcp, simply patch and commit to the main @@ -65,8 +65,6 @@ Local Changes: - Remove dhcpd from SEE ALSO section. common/dispatch.c r1.2 - interface polling - common/parse.c - r1.2 - 64bit time_t fix includes/dhcpd.h r1.5 - interface polling r1.4 - interface polling diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c index 00e681f..1b90541 100644 --- a/contrib/isc-dhcp/client/dhclient.c +++ b/contrib/isc-dhcp/client/dhclient.c @@ -33,7 +33,7 @@ #ifndef lint static char ocopyright[] = "$FreeBSD$\n" -"$Id: dhclient.c,v 1.129.2.18 2004/06/10 17:59:12 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n"; +"$Id: dhclient.c,v 1.129.2.19 2004/07/10 00:11:16 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" |