]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/blob - contrib/isc-dhcp/FREEBSD-upgrade
Resolve conflicts.
[FreeBSD/FreeBSD.git] / contrib / isc-dhcp / FREEBSD-upgrade
1 # ex:ts=8
2 $FreeBSD$
3
4 ISC DHCP client 3.0.1rc14
5         originals can be found at: ftp://ftp.isc.org/isc/dhcp/
6
7
8 For the import of ISC-dhclient the following files were removed:
9         doc/*                   relay/*                 server/*
10
11         client/scripts/
12         bsdos                   linux                   netbsd
13         nextstep                solaris                 openbsd
14
15         contrib/
16         dhcp.spec               solaris.init            ms2isc/
17
18         includes/cf/
19         aix.h                   alphaosf.h              bsdos.h
20         cygwin32.h              hpux.h                  irix.h
21         linux.h                 netbsd.h                nextstep.h
22         openbsd.h               qnx.h                   rhapsody.h
23         sample.h                sco.h                   sunos4.h
24         sunos5-5.h              ultrix.h
25
26         `find . -name '.cvsignore' -delete`
27
28 Imported by:
29
30         cvs import -m 'Import ISC DHCP 3.0.1 RC14 client.' \
31                 src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc14
32
33
34 To make local changes to isc-dhcp, simply patch and commit to the main
35 branch (aka HEAD).  Never make local changes on the vendor (ISC) branch.
36
37 All local changes should be submitted to the ISC for inclusion in the 
38 next vendor release.
39
40 Local Changes:
41
42         client/clparse.c
43           r1.6 - prefer strlcpy to strcpy.
44         client/dhclient.8 
45           r1.14 - interface polling
46           r1.6 - document -D option.
47           - remove dhcpd from SEE ALSO section.
48         client/dhclient.c
49           r1.35 - interface polling
50           r1.32 - interface polling
51           r1.31 - interface polling
52           r1.30 - interface polling
53           r1.29 - interface polling
54           r1.28 - interface polling
55           r1.27 - interface polling
56           r1.26 - interface polling
57           r1.19 - connect std{in,out,err}.
58           r1.13 - prefer strlcpy to strcpy.
59           r1.6  - quiet by default.
60                 - document -D option.
61         client/dhclient.conf.5
62                 - Remove dhcpd from SEE ALSO section.
63         common/dhcp-options.5
64           r1.2 - note that hostname is only set if not already set.
65                - Remove dhcpd from SEE ALSO section.
66         common/dispatch.c
67           r1.2 - interface polling
68         includes/dhcpd.h
69           r1.5 - interface polling
70           r1.4 - interface polling
71           r1.3 - interface polling
72           r1.2 - interface polling
73     (see CVS logs for complete details)
74
75 mbr@FreeBSD.org
76 murray@FreeBSD.org
77 obrien@NUXI.com
78 15-Jan-2003