Date: Sat, 12 Aug 2000 15:19:17 -0700 (PDT) From: Gregory Neil Shapiro <gshapiro@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/sendmail/cf/m4 cfhead.m4 src/contrib/sendmail/cf/ostype bsd4.4.m4 src/contrib/sendmail/cf/sh makeinfo.sh src/contrib/sendmail/contrib bitdomain.c src/contrib/sendmail/doc/op op.ps src/contrib/sendmail/mail.local mail.local.8 mail.local.c ... Message-ID: <200008122219.PAA42807@freefall.freebsd.org>
index | next in thread | raw e-mail
gshapiro 2000/08/12 15:19:16 PDT
Modified files:
contrib/sendmail/cf/m4 cfhead.m4
contrib/sendmail/cf/ostype bsd4.4.m4
contrib/sendmail/cf/sh makeinfo.sh
contrib/sendmail/contrib bitdomain.c
contrib/sendmail/mail.local mail.local.8 mail.local.c
contrib/sendmail/mailstats mailstats.c
contrib/sendmail/makemap makemap.c
contrib/sendmail/praliases praliases.c
contrib/sendmail/rmail rmail.c
contrib/sendmail/smrsh smrsh.8 smrsh.c
contrib/sendmail/src aliases.5 conf.c conf.h err.c headers.c
mailq.1 mci.c savemail.c sendmail.8
Removed files:
contrib/sendmail/doc/op op.ps
Log:
Fix conflicts from merge of sendmail 8.11.0.
PR: bin/11552 misc/18512 bin/15088
Revision Changes Path
1.4 +133 -21 src/contrib/sendmail/cf/m4/cfhead.m4
1.4 +5 -5 src/contrib/sendmail/cf/ostype/bsd4.4.m4
1.4 +5 -2 src/contrib/sendmail/cf/sh/makeinfo.sh
1.3 +8 -6 src/contrib/sendmail/contrib/bitdomain.c
1.6 +76 -60 src/contrib/sendmail/mail.local/mail.local.8
1.7 +971 -583 src/contrib/sendmail/mail.local/mail.local.c
1.6 +83 -61 src/contrib/sendmail/mailstats/mailstats.c
1.4 +300 -740 src/contrib/sendmail/makemap/makemap.c
1.4 +265 -218 src/contrib/sendmail/praliases/praliases.c
1.5 +186 -150 src/contrib/sendmail/rmail/rmail.c
1.4 +10 -4 src/contrib/sendmail/smrsh/smrsh.8
1.4 +250 -82 src/contrib/sendmail/smrsh/smrsh.c
1.4 +101 -64 src/contrib/sendmail/src/aliases.5
1.6 +1692 -930 src/contrib/sendmail/src/conf.c
1.7 +831 -557 src/contrib/sendmail/src/conf.h
1.4 +347 -93 src/contrib/sendmail/src/err.c
1.5 +332 -164 src/contrib/sendmail/src/headers.c
1.4 +51 -44 src/contrib/sendmail/src/mailq.1
1.4 +230 -130 src/contrib/sendmail/src/mci.c
1.5 +306 -180 src/contrib/sendmail/src/savemail.c
1.4 +523 -416 src/contrib/sendmail/src/sendmail.8
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200008122219.PAA42807>