FREEBSD-upgrade revision 285305
1238384Sjkim$FreeBSD: stable/10/contrib/sendmail/FREEBSD-upgrade 285305 2015-07-09 05:27:30Z gshapiro $ 2238384Sjkim 3238384Sjkimsendmail 8.15.2 4238384Sjkim originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ 5238384Sjkim 6238384SjkimFor the import of sendmail, the following directories were renamed: 7238384Sjkim 8238384Sjkim sendmail -> src 9238384Sjkim 10238384SjkimImported using the instructions at: 11238384Sjkim 12238384Sjkimhttp://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html 13238384Sjkim 14238384SjkimThen merged using: 15238384Sjkim 16238384Sjkim% set FSVN=svn+ssh://svn.freebsd.org/base 17238384Sjkim% svn checkout $FSVN/head/contrib/sendmail head 18238384Sjkim% cd head 19238384Sjkim% svn merge --accept=postpone $FSVN/vendor/sendmail/dist . 20238384Sjkim% svn rm --force */Build [e-v]*/*.0 cf/cf/generic-*.cf cf/cf/Build 21238384Sjkim% svn rm --force Build devtools doc/op/op.ps src/makesendmail src/sysexits.h 22238384Sjkim% svn propset -R svn:keywords FreeBSD=%H . 23238384Sjkim% svn propdel svn:keywords libmilter/docs/*.jpg 24238384Sjkim% svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=. 25238384Sjkim% svn status 26238384Sjkim% svn diff 27238384Sjkim% svn commit 28238384Sjkim 29238384SjkimAfter importing, bump the version of src/etc/sendmail/freebsd*mc 30238384Sjkimso mergemaster will merge /etc/mail/freebsd*cf by making a minor 31238384Sjkimchange and committing. 32238384Sjkim 33238384SjkimTo make local changes to sendmail, simply patch and commit to the head. 34238384SjkimNever make local changes in the vendor area (/vendor/sendmail/). 35246772Sjkim 36238384SjkimAll local changes should be submitted to the Sendmail Consortium 37238384Sjkim<sendmail@sendmail.org> for inclusion in the next vendor release. 38238384Sjkim 39238384SjkimThe following files make up the sendmail build/install/runtime 40238384Sjkiminfrastructure in FreeBSD: 41238384Sjkim 42 Makefile.inc1 43 bin/Makefile 44 bin/rmail/Makefile 45 contrib/sendmail/ 46 etc/Makefile 47 etc/defaults/make.conf (obsolete) 48 etc/defaults/periodic.conf 49 etc/defaults/rc.conf 50 etc/mail/Makefile 51 etc/mail/README 52 etc/mail/access.sample 53 etc/mail/aliases 54 etc/mail/mailer.conf 55 etc/mail/mailertable.sample 56 etc/mail/virtusertable.sample 57 etc/mtree/BSD.include.dist 58 etc/mtree/BSD.sendmail.dist 59 etc/mtree/BSD.usr.dist 60 etc/mtree/BSD.var.dist 61 etc/periodic/daily/440.status-mailq 62 etc/periodic/daily/500.queuerun 63 etc/rc 64 etc/rc.sendmail 65 etc/sendmail/Makefile 66 etc/sendmail/freebsd.mc 67 etc/sendmail/freebsd.submit.mc 68 etc/sendmail/freefall.mc 69 lib/Makefile 70 lib/libmilter/Makefile 71 lib/libsm/Makefile 72 lib/libsmdb/Makefile 73 lib/libsmutil/Makefile 74 libexec/Makefile 75 libexec/mail.local/Makefile 76 libexec/smrsh/Makefile 77 share/Makefile 78 share/doc/smm/Makefile 79 share/doc/smm/08.sendmailop/Makefile 80 share/examples/etc/make.conf 81 share/man/man5/make.conf.5 82 share/man/man5/periodic.conf.5 83 share/man/man5/rc.conf.5 84 share/man/man7/hier.7 85 share/man/man8/Makefile 86 share/man/man8/rc.sendmail.8 87 share/mk/bsd.libnames.mk 88 share/sendmail/Makefile 89 usr.bin/Makefile 90 usr.bin/vacation/Makefile 91 usr.sbin/Makefile 92 usr.sbin/editmap/Makefile 93 usr.sbin/mailstats/Makefile 94 usr.sbin/makemap/Makefile 95 usr.sbin/praliases/Makefile 96 usr.sbin/sendmail/Makefile 97 usr.sbin/mailwrapper/Makefile 98 99gshapiro@FreeBSD.org 10008-July-2015 101