FREEBSD-upgrade revision 182356
164566Sgshapiro$FreeBSD: head/contrib/sendmail/FREEBSD-upgrade 182356 2008-08-28 06:20:43Z gshapiro $ 264566Sgshapiro 3182356Sgshapirosendmail 8.14.3 464566Sgshapiro originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ 564566Sgshapiro 6182356SgshapiroFor the import of sendmail, the following directories were renamed: 764566Sgshapiro 8182356Sgshapiro sendmail -> src 9182356Sgshapiro 10182356SgshapiroFor the merge of sendmail, the following files were removed: 11182356Sgshapiro 1271349Sgshapiro Build 1371349Sgshapiro cf/cf/Build 1490800Sgshapiro cf/cf/generic-*.cf 1564566Sgshapiro devtools/* 1664566Sgshapiro doc/op/op.ps 1790800Sgshapiro */Build 18102532Sgshapiro [e-v]*/*.0 1971349Sgshapiro sendmail/makesendmail 2064566Sgshapiro sendmail/sysexits.h 2164566Sgshapiro 22182356SgshapiroImported using the instructions at: 2364566Sgshapiro 24182356Sgshapirohttp://wiki.freebsd.org/SubversionPrimer/VendorImports 2564566Sgshapiro 26182356SgshapiroThen merged using: 2764566Sgshapiro 28182356Sgshapiro% set FSVN=svn+ssh://svn.freebsd.org/base 29182356Sgshapiro% svn checkout $FSVN/head/contrib/sendmail head 30182356Sgshapiro% cd head 31182356Sgshapiro% svn merge --accept=postpone $FSVN/vendor/sendmail/dist . 32182356Sgshapiro% svn rm --force */Build [e-v]*/*.0 cf/cf/generic-*.cf cf/cf/Build 33182356Sgshapiro% svn rm --force Build devtools doc/op/op.ps src/makesendmail src/sysexits.h 34182356Sgshapiro% svn propset -R svn:keywords FreeBSD=%H . 35182356Sgshapiro% svn propdel svn:keywords libmilter/docs/*.jpg 36182356Sgshapiro% svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=. 37182356Sgshapiro% svn status 38182356Sgshapiro% svn diff 39182356Sgshapiro% svn commit 4064566Sgshapiro 41157704SgshapiroAfter importing, bump the version of src/etc/sendmail/freebsd*mc 42157704Sgshapiroso mergemaster will merge /etc/mail/freebsd*cf: 4364566Sgshapiro 44182356Sgshapiro (svn command TBD) cvs commit -f src/etc/sendmail/freebsd*mc 45157704Sgshapiro 46182356SgshapiroTo make local changes to sendmail, simply patch and commit to the head. 47182356SgshapiroNever make local changes in the vendor area (/vendor/sendmail/). 4864566Sgshapiro 4964566SgshapiroAll local changes should be submitted to the Sendmail Consortium 5064566Sgshapiro<sendmail@sendmail.org> for inclusion in the next vendor release. 5164566Sgshapiro 5293857SgshapiroThe following files make up the sendmail build/install/runtime 5393857Sgshapiroinfrastructure in FreeBSD: 5493857Sgshapiro 5595149Sgshapiro Makefile.inc1 5693857Sgshapiro bin/Makefile 5793857Sgshapiro bin/rmail/Makefile 5893857Sgshapiro contrib/sendmail/ 5993857Sgshapiro etc/Makefile 6093857Sgshapiro etc/defaults/make.conf (RELENG_4) 6194347Sgshapiro etc/defaults/periodic.conf 6293857Sgshapiro etc/defaults/rc.conf 6393857Sgshapiro etc/mail/Makefile 6493857Sgshapiro etc/mail/README 6593857Sgshapiro etc/mail/access.sample 6693857Sgshapiro etc/mail/aliases 6793857Sgshapiro etc/mail/mailer.conf 6893857Sgshapiro etc/mail/mailertable.sample 6993857Sgshapiro etc/mail/virtusertable.sample 7093857Sgshapiro etc/mtree/BSD.include.dist 7195149Sgshapiro etc/mtree/BSD.sendmail.dist 7293857Sgshapiro etc/mtree/BSD.usr.dist 7393857Sgshapiro etc/mtree/BSD.var.dist 7494260Sgshapiro etc/periodic/daily/440.status-mailq 7594260Sgshapiro etc/periodic/daily/500.queuerun 7693857Sgshapiro etc/rc 77127978Sgshapiro etc/rc.sendmail 7893857Sgshapiro etc/sendmail/Makefile 7993857Sgshapiro etc/sendmail/freebsd.mc 80121232Sgshapiro etc/sendmail/freebsd.submit.mc 8193857Sgshapiro etc/sendmail/freefall.mc 8293857Sgshapiro lib/Makefile 8393857Sgshapiro lib/libmilter/Makefile 8493857Sgshapiro lib/libsm/Makefile 8593857Sgshapiro lib/libsmdb/Makefile 8693857Sgshapiro lib/libsmutil/Makefile 8793857Sgshapiro libexec/Makefile 8893857Sgshapiro libexec/mail.local/Makefile 8993857Sgshapiro libexec/smrsh/Makefile 9093857Sgshapiro share/Makefile 9193857Sgshapiro share/doc/smm/Makefile 9293857Sgshapiro share/doc/smm/08.sendmailop/Makefile 9393857Sgshapiro share/examples/etc/make.conf (HEAD) 9493857Sgshapiro share/man/man5/make.conf.5 9594347Sgshapiro share/man/man5/periodic.conf.5 9693857Sgshapiro share/man/man5/rc.conf.5 9793976Sgshapiro share/man/man7/hier.7 9893857Sgshapiro share/man/man8/Makefile 9993857Sgshapiro share/man/man8/rc.sendmail.8 10093857Sgshapiro share/mk/bsd.libnames.mk 10193857Sgshapiro share/sendmail/Makefile 10293857Sgshapiro usr.bin/Makefile 10393857Sgshapiro usr.bin/vacation/Makefile 10493857Sgshapiro usr.sbin/Makefile 10593857Sgshapiro usr.sbin/editmap/Makefile 10693857Sgshapiro usr.sbin/mailstats/Makefile 10793857Sgshapiro usr.sbin/makemap/Makefile 10893857Sgshapiro usr.sbin/praliases/Makefile 10993857Sgshapiro usr.sbin/sendmail/Makefile 11093859Sgshapiro usr.sbin/mailwrapper/Makefile 11193857Sgshapiro 11264566Sgshapirogshapiro@FreeBSD.org 113182356Sgshapiro27-August-2008 114