cvs commit: src/contrib/sendmail/cf/feature nodns.m4 src/contrib/sendmail/cf/m4 cfhead.m4 src/contrib/sendmail/contrib oldbind.compat.c src/contrib/sendmail/mail.local mail.local.8 mail.local.c src/contrib/sendmail/mailstats ...

[Gregory Neil Shapiro]

gshapiro    2004-08-01 01:16:16 UTC

  FreeBSD src repository

  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/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 
  Removed files:
    contrib/sendmail/cf/feature nodns.m4 
    contrib/sendmail/contrib oldbind.compat.c 
    contrib/sendmail/libsm vsprintf.c 
  Log:
  Resolve conflicts from sendmail 8.13.1 import
  
  Revision  Changes    Path
  1.2       +0 -21     src/contrib/sendmail/cf/feature/nodns.m4 (dead)
  1.17      +4 -3      src/contrib/sendmail/cf/m4/cfhead.m4
  1.2       +0 -79     src/contrib/sendmail/contrib/oldbind.compat.c (dead)
  1.2       +0 -66     src/contrib/sendmail/libsm/vsprintf.c (dead)
  1.13      +27 -4     src/contrib/sendmail/mail.local/mail.local.8
  1.25      +182 -5    src/contrib/sendmail/mail.local/mail.local.c
  1.15      +2 -18     src/contrib/sendmail/mailstats/mailstats.c
  1.12      +10 -10    src/contrib/sendmail/makemap/makemap.c
  1.12      +4 -4      src/contrib/sendmail/smrsh/smrsh.8
  1.18      +2 -2      src/contrib/sendmail/smrsh/smrsh.c
  1.11      +13 -2     src/contrib/sendmail/src/aliases.5
  1.26      +153 -125  src/contrib/sendmail/src/conf.c
  1.23      +11 -1     src/contrib/sendmail/src/conf.h
  1.13      +3 -3      src/contrib/sendmail/src/err.c
  1.20      +164 -44   src/contrib/sendmail/src/headers.c
  1.14      +16 -2     src/contrib/sendmail/src/mailq.1
  1.17      +11 -7     src/contrib/sendmail/src/mci.c
  1.16      +10 -5     src/contrib/sendmail/src/savemail.c
  1.13      +20 -4     src/contrib/sendmail/src/sendmail.8
  1.12      +18 -3     src/contrib/sendmail/vacation/vacation.1