xref: /freebsd/contrib/sendmail/FREEBSD-upgrade (revision c1d255d3)
1$FreeBSD$
2
3sendmail 8.16.1
4	originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
5
6For the import of sendmail, the following directories were renamed:
7
8	sendmail -> src
9
10Imported using the instructions at:
11
12http://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html
13
14Then merged using:
15
16% set FSVN=svn+ssh://repo.freebsd.org/base
17% svn checkout $FSVN/head/contrib/sendmail head
18% cd head
19### Replace XXXXXX with import revision number in next command:
20% svn merge -c rXXXXXX --accept=postpone '^/vendor/sendmail/dist' .
21% svn resolve --accept working cf/cf/Build \
22    cf/cf/generic-{bsd4.4,hpux{9,10},linux,mpeix,nextstep3.3,osf1,solaris,sunos4.1,ultrix4}.cf \
23    devtools doc/op/op.ps editmap/editmap.0 mail.local/mail.local.0 mailstats/mailstats.0 \
24    makemap/makemap.0 praliases/praliases.0 rmail/rmail.0 smrsh/smrsh.0 \
25    src/{aliases,mailq,newaliases,sendmail}.0 vacation/vacation.0
26% svn propset -R svn:keywords FreeBSD=%H .
27% svn propdel svn:keywords libmilter/docs/*.jpg
28% svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=.
29% svn status
30% svn diff
31% svn commit
32
33After importing, bump the version of src/etc/sendmail/freebsd*mc
34so mergemaster will merge /etc/mail/freebsd*cf by making a minor
35change and committing.
36
37To make local changes to sendmail, simply patch and commit to the head.
38Never make local changes in the vendor area (/vendor/sendmail/).
39
40All local changes should be submitted to the Sendmail Consortium
41<sendmail@sendmail.org> for inclusion in the next vendor release.
42
43The following files make up the sendmail build/install/runtime
44infrastructure in FreeBSD:
45
46	Makefile.inc1
47	bin/Makefile
48	bin/rmail/Makefile
49	contrib/sendmail/
50	etc/Makefile
51	etc/defaults/make.conf (obsolete)
52	etc/defaults/periodic.conf
53	etc/defaults/rc.conf
54	etc/mail/Makefile
55	etc/mail/README
56	etc/mail/access.sample
57	etc/mail/aliases
58	etc/mail/mailer.conf
59	etc/mail/mailertable.sample
60	etc/mail/virtusertable.sample
61	etc/mtree/BSD.include.dist
62	etc/mtree/BSD.sendmail.dist
63	etc/mtree/BSD.usr.dist
64	etc/mtree/BSD.var.dist
65	etc/periodic/daily/440.status-mailq
66	etc/periodic/daily/500.queuerun
67	etc/rc
68	etc/rc.sendmail
69	etc/sendmail/Makefile
70	etc/sendmail/freebsd.mc
71	etc/sendmail/freebsd.submit.mc
72	etc/sendmail/freefall.mc
73	lib/Makefile
74	lib/libmilter/Makefile
75	lib/libsm/Makefile
76	lib/libsmdb/Makefile
77	lib/libsmutil/Makefile
78	libexec/Makefile
79	libexec/mail.local/Makefile
80	libexec/smrsh/Makefile
81	share/Makefile
82	share/doc/smm/Makefile
83	share/doc/smm/08.sendmailop/Makefile
84	share/examples/etc/make.conf
85	share/man/man5/make.conf.5
86	share/man/man5/periodic.conf.5
87	share/man/man5/rc.conf.5
88	share/man/man7/hier.7
89	share/man/man8/Makefile
90	share/man/man8/rc.sendmail.8
91	share/mk/bsd.libnames.mk
92	share/sendmail/Makefile
93	tools/build/mk/OptionalObsoleteFiles.inc
94	usr.bin/Makefile
95	usr.bin/vacation/Makefile
96	usr.sbin/Makefile
97	usr.sbin/editmap/Makefile
98	usr.sbin/mailstats/Makefile
99	usr.sbin/makemap/Makefile
100	usr.sbin/praliases/Makefile
101	usr.sbin/sendmail/Makefile
102	usr.sbin/mailwrapper/Makefile
103
104gshapiro@FreeBSD.org
10515-July-2020
106