From owner-cvs-all  Sat Feb  8 12:35:54 2003
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 74FC337B401; Sat,  8 Feb 2003 12:35:52 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1B07B43F3F; Sat,  8 Feb 2003 12:35:52 -0800 (PST)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h18KZpbv066570;
	Sat, 8 Feb 2003 12:35:51 -0800 (PST)
	(envelope-from gshapiro@repoman.freebsd.org)
Received: (from gshapiro@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18KZpeZ066568;
	Sat, 8 Feb 2003 12:35:51 -0800 (PST)
Message-Id: <200302082035.h18KZpeZ066568@repoman.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Sat, 8 Feb 2003 12:35:51 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org, legacy-committers@FreeBSD.org
Subject: cvs commit: src/contrib/sendmail/cf/m4 cfhead.m4 src/contrib/sendmail/mail.local
         mail.local.c src/contrib/sendmail/smrsh smrsh.c
         src/contrib/sendmail/src conf.c conf.h headers.c mailq.1 mci.c
         savemail.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

gshapiro    2003/02/08 12:35:51 PST

  Modified files:
    contrib/sendmail/cf/m4 cfhead.m4 
    contrib/sendmail/mail.local mail.local.c 
    contrib/sendmail/smrsh smrsh.c 
    contrib/sendmail/src conf.c conf.h headers.c mailq.1 mci.c 
                         savemail.c 
  Log:
  Resolve conflicts from sendmail 8.12.7 import
  
  Revision  Changes    Path
  1.13      +3 -3      src/contrib/sendmail/cf/m4/cfhead.m4
  1.21      +28 -3     src/contrib/sendmail/mail.local/mail.local.c
  1.14      +9 -9      src/contrib/sendmail/smrsh/smrsh.c
  1.19      +52 -12    src/contrib/sendmail/src/conf.c
  1.21      +4 -1      src/contrib/sendmail/src/conf.h
  1.13      +3 -3      src/contrib/sendmail/src/headers.c
  1.12      +24 -2     src/contrib/sendmail/src/mailq.1
  1.13      +3 -1      src/contrib/sendmail/src/mci.c
  1.14      +2 -20     src/contrib/sendmail/src/savemail.c

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message