Date: Sun, 17 Feb 2002 13:58:34 -0800 (PST) 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/mail.local mail.local.8 mail.local.c src/contrib/sendmail/mailstats mailstats.c src/contrib/sendmail/makemap makemap.c src/contrib/sendmail/praliases praliases.c src/contrib/sendmail/rmail ... Message-ID: <200202172158.g1HLwYY94683@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
gshapiro 2002/02/17 13:58:34 PST
Modified files:
contrib/sendmail/cf/m4 cfhead.m4
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
contrib/sendmail/vacation vacation.1
Log:
Resolve conflicts from sendmail 8.12.2 import
Revision Changes Path
1.9 +64 -14 src/contrib/sendmail/cf/m4/cfhead.m4
1.9 +25 -10 src/contrib/sendmail/mail.local/mail.local.8
1.14 +303 -319 src/contrib/sendmail/mail.local/mail.local.c
1.10 +137 -70 src/contrib/sendmail/mailstats/mailstats.c
1.7 +115 -161 src/contrib/sendmail/makemap/makemap.c
1.8 +56 -100 src/contrib/sendmail/praliases/praliases.c
1.10 +73 -115 src/contrib/sendmail/rmail/rmail.c
1.6 +6 -6 src/contrib/sendmail/smrsh/smrsh.8
1.9 +74 -71 src/contrib/sendmail/smrsh/smrsh.c
1.6 +3 -3 src/contrib/sendmail/src/aliases.5
1.12 +1344 -1260 src/contrib/sendmail/src/conf.c
1.15 +43 -2694 src/contrib/sendmail/src/conf.h
1.8 +275 -148 src/contrib/sendmail/src/err.c
1.10 +245 -223 src/contrib/sendmail/src/headers.c
1.8 +5 -3 src/contrib/sendmail/src/mailq.1
1.8 +307 -217 src/contrib/sendmail/src/mci.c
1.10 +350 -272 src/contrib/sendmail/src/savemail.c
1.7 +51 -29 src/contrib/sendmail/src/sendmail.8
1.5 +41 -21 src/contrib/sendmail/vacation/vacation.1
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202172158.g1HLwYY94683>