Commit ID: 10052015E562892E658 CVSROOT: /cvs Module name: src Changes by: t...@herc.mirbsd.org 2013/08/06 20:37:35 UTC
Modified files: gnu/usr.sbin/sendmail: RELEASE_NOTES gnu/usr.sbin/sendmail/cf/m4: version.m4 gnu/usr.sbin/sendmail/contrib: etrn.pl gnu/usr.sbin/sendmail/doc/op: op.me gnu/usr.sbin/sendmail/include/sm: config.h io.h gnu/usr.sbin/sendmail/libmilter: sm_gethost.c gnu/usr.sbin/sendmail/libsm: cf.c fget.c gnu/usr.sbin/sendmail/mailstats: mailstats.c gnu/usr.sbin/sendmail/makemap: makemap.c gnu/usr.sbin/sendmail/praliases: praliases.c gnu/usr.sbin/sendmail/rmail: rmail.c gnu/usr.sbin/sendmail/sendmail: alias.c collect.c conf.c control.c deliver.c main.c map.c mci.c milter.c mime.c parseaddr.c queue.c readcf.c recipient.c savemail.c sendmail.h sfsasl.c srvrsmtp.c tls.c usersmtp.c util.c version.c gnu/usr.sbin/sendmail/vacation: vacation.c Log message: merge To generate a diff of this changeset, execute the following commands: cvs -R rdiff -kk -upr1.6 -r1.7 src/gnu/usr.sbin/sendmail/RELEASE_NOTES cvs -R rdiff -kk -upr1.6 -r1.7 src/gnu/usr.sbin/sendmail/cf/m4/version.m4 cvs -R rdiff -kk -upr1.1.1.1 -r1.2 src/gnu/usr.sbin/sendmail/contrib/etrn.pl cvs -R rdiff -kk -upr1.5 -r1.6 src/gnu/usr.sbin/sendmail/doc/op/op.me cvs -R rdiff -kk -upr1.2 -r1.3 src/gnu/usr.sbin/sendmail/include/sm/config.h cvs -R rdiff -kk -upr1.2 -r1.3 src/gnu/usr.sbin/sendmail/include/sm/io.h cvs -R rdiff -kk -upr1.2 -r1.3 src/gnu/usr.sbin/sendmail/libmilter/sm_gethost.c cvs -R rdiff -kk -upr1.2 -r1.3 src/gnu/usr.sbin/sendmail/libsm/cf.c cvs -R rdiff -kk -upr1.2 -r1.3 src/gnu/usr.sbin/sendmail/libsm/fget.c cvs -R rdiff -kk -upr1.2 -r1.3 src/gnu/usr.sbin/sendmail/mailstats/mailstats.c cvs -R rdiff -kk -upr1.5 -r1.6 src/gnu/usr.sbin/sendmail/makemap/makemap.c cvs -R rdiff -kk -upr1.4 -r1.5 src/gnu/usr.sbin/sendmail/praliases/praliases.c cvs -R rdiff -kk -upr1.2 -r1.3 src/gnu/usr.sbin/sendmail/rmail/rmail.c cvs -R rdiff -kk -upr1.2 -r1.3 src/gnu/usr.sbin/sendmail/sendmail/alias.c cvs -R rdiff -kk -upr1.4 -r1.5 src/gnu/usr.sbin/sendmail/sendmail/collect.c cvs -R rdiff -kk -upr1.14 -r1.15 src/gnu/usr.sbin/sendmail/sendmail/conf.c cvs -R rdiff -kk -upr1.2 -r1.3 src/gnu/usr.sbin/sendmail/sendmail/control.c cvs -R rdiff -kk -upr1.8 -r1.9 src/gnu/usr.sbin/sendmail/sendmail/deliver.c cvs -R rdiff -kk -upr1.7 -r1.8 src/gnu/usr.sbin/sendmail/sendmail/main.c cvs -R rdiff -kk -upr1.9 -r1.10 src/gnu/usr.sbin/sendmail/sendmail/map.c cvs -R rdiff -kk -upr1.3 -r1.4 src/gnu/usr.sbin/sendmail/sendmail/mci.c cvs -R rdiff -kk -upr1.6 -r1.7 src/gnu/usr.sbin/sendmail/sendmail/milter.c cvs -R rdiff -kk -upr1.4 -r1.5 src/gnu/usr.sbin/sendmail/sendmail/mime.c cvs -R rdiff -kk -upr1.5 -r1.6 src/gnu/usr.sbin/sendmail/sendmail/parseaddr.c cvs -R rdiff -kk -upr1.8 -r1.9 src/gnu/usr.sbin/sendmail/sendmail/queue.c cvs -R rdiff -kk -upr1.7 -r1.8 src/gnu/usr.sbin/sendmail/sendmail/readcf.c cvs -R rdiff -kk -upr1.4 -r1.5 src/gnu/usr.sbin/sendmail/sendmail/recipient.c cvs -R rdiff -kk -upr1.3 -r1.4 src/gnu/usr.sbin/sendmail/sendmail/savemail.c cvs -R rdiff -kk -upr1.8 -r1.9 src/gnu/usr.sbin/sendmail/sendmail/sendmail.h cvs -R rdiff -kk -upr1.4 -r1.5 src/gnu/usr.sbin/sendmail/sendmail/sfsasl.c cvs -R rdiff -kk -upr1.14 -r1.15 src/gnu/usr.sbin/sendmail/sendmail/srvrsmtp.c cvs -R rdiff -kk -upr1.4 -r1.5 src/gnu/usr.sbin/sendmail/sendmail/tls.c cvs -R rdiff -kk -upr1.4 -r1.5 src/gnu/usr.sbin/sendmail/sendmail/usersmtp.c cvs -R rdiff -kk -upr1.7 -r1.8 src/gnu/usr.sbin/sendmail/sendmail/util.c cvs -R rdiff -kk -upr1.6 -r1.7 src/gnu/usr.sbin/sendmail/sendmail/version.c cvs -R rdiff -kk -upr1.4 -r1.5 src/gnu/usr.sbin/sendmail/vacation/vacation.c