]> CyberLeo.Net >> Repos - FreeBSD/releng/8.1.git/blob - contrib/sendmail/FREEBSD-upgrade
Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.
[FreeBSD/releng/8.1.git] / contrib / sendmail / FREEBSD-upgrade
1 $FreeBSD$
2
3 sendmail 8.14.4
4         originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
5
6 For the import of sendmail, the following directories were renamed:
7
8         sendmail -> src
9
10 For the merge of sendmail, the following files were removed:
11
12         Build
13         cf/cf/Build
14         cf/cf/generic-*.cf
15         devtools/*
16         doc/op/op.ps
17         */Build
18         [e-v]*/*.0
19         sendmail/makesendmail
20         sendmail/sysexits.h
21
22 Imported using the instructions at:
23
24 http://wiki.freebsd.org/SubversionPrimer/VendorImports
25
26 Then merged using:
27
28 % set FSVN=svn+ssh://svn.freebsd.org/base
29 % svn checkout $FSVN/head/contrib/sendmail head
30 % cd head
31 % svn merge --accept=postpone $FSVN/vendor/sendmail/dist .
32 % svn rm --force */Build [e-v]*/*.0 cf/cf/generic-*.cf cf/cf/Build
33 % svn rm --force Build devtools doc/op/op.ps src/makesendmail src/sysexits.h
34 % svn propset -R svn:keywords FreeBSD=%H .
35 % svn propdel svn:keywords libmilter/docs/*.jpg
36 % svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=.
37 % svn status
38 % svn diff
39 % svn commit
40
41 After importing, bump the version of src/etc/sendmail/freebsd*mc
42 so mergemaster will merge /etc/mail/freebsd*cf:
43
44         (svn command TBD) cvs commit -f src/etc/sendmail/freebsd*mc
45
46 To make local changes to sendmail, simply patch and commit to the head.
47 Never make local changes in the vendor area (/vendor/sendmail/).
48
49 All local changes should be submitted to the Sendmail Consortium
50 <sendmail@sendmail.org> for inclusion in the next vendor release.
51
52 The following files make up the sendmail build/install/runtime
53 infrastructure in FreeBSD:
54
55         Makefile.inc1
56         bin/Makefile
57         bin/rmail/Makefile
58         contrib/sendmail/
59         etc/Makefile
60         etc/defaults/make.conf (RELENG_4)
61         etc/defaults/periodic.conf
62         etc/defaults/rc.conf
63         etc/mail/Makefile
64         etc/mail/README
65         etc/mail/access.sample
66         etc/mail/aliases
67         etc/mail/mailer.conf
68         etc/mail/mailertable.sample
69         etc/mail/virtusertable.sample
70         etc/mtree/BSD.include.dist
71         etc/mtree/BSD.sendmail.dist
72         etc/mtree/BSD.usr.dist
73         etc/mtree/BSD.var.dist
74         etc/periodic/daily/440.status-mailq
75         etc/periodic/daily/500.queuerun
76         etc/rc
77         etc/rc.sendmail
78         etc/sendmail/Makefile
79         etc/sendmail/freebsd.mc
80         etc/sendmail/freebsd.submit.mc
81         etc/sendmail/freefall.mc
82         lib/Makefile
83         lib/libmilter/Makefile
84         lib/libsm/Makefile
85         lib/libsmdb/Makefile
86         lib/libsmutil/Makefile
87         libexec/Makefile
88         libexec/mail.local/Makefile
89         libexec/smrsh/Makefile
90         share/Makefile
91         share/doc/smm/Makefile
92         share/doc/smm/08.sendmailop/Makefile
93         share/examples/etc/make.conf (HEAD)
94         share/man/man5/make.conf.5
95         share/man/man5/periodic.conf.5
96         share/man/man5/rc.conf.5
97         share/man/man7/hier.7
98         share/man/man8/Makefile
99         share/man/man8/rc.sendmail.8
100         share/mk/bsd.libnames.mk
101         share/sendmail/Makefile
102         usr.bin/Makefile
103         usr.bin/vacation/Makefile
104         usr.sbin/Makefile
105         usr.sbin/editmap/Makefile
106         usr.sbin/mailstats/Makefile
107         usr.sbin/makemap/Makefile
108         usr.sbin/praliases/Makefile
109         usr.sbin/sendmail/Makefile
110         usr.sbin/mailwrapper/Makefile
111
112 gshapiro@FreeBSD.org
113 25-January-2010