From owner-cvs-all@FreeBSD.ORG  Mon Apr  9 01:44:27 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7750F16A407;
	Mon,  9 Apr 2007 01:44:17 +0000 (UTC)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 67A2813C45B;
	Mon,  9 Apr 2007 01:44:17 +0000 (UTC)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l391iHoQ034991;
	Mon, 9 Apr 2007 01:44:17 GMT
	(envelope-from gshapiro@repoman.freebsd.org)
Received: (from gshapiro@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l391iHxi034987;
	Mon, 9 Apr 2007 01:44:17 GMT (envelope-from gshapiro)
Message-Id: <200704090144.l391iHxi034987@repoman.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Mon, 9 Apr 2007 01:44:17 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/contrib/sendmail/mail.local mail.local.c
 src/contrib/sendmail/src
 conf.c conf.h err.c headers.c mailq.1 mci.c savemail.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2007 01:44:27 -0000

gshapiro    2007-04-09 01:44:17 UTC

  FreeBSD src repository

  Modified files:
    contrib/sendmail/mail.local mail.local.c 
    contrib/sendmail/src conf.c conf.h err.c headers.c mailq.1 
                         mci.c savemail.c 
  Log:
  Resolve conflicts from sendmail 8.14.1 import
  
  Revision  Changes    Path
  1.27      +4 -2      src/contrib/sendmail/mail.local/mail.local.c
  1.31      +257 -298  src/contrib/sendmail/src/conf.c
  1.25      +7 -6      src/contrib/sendmail/src/conf.h
  1.14      +23 -25    src/contrib/sendmail/src/err.c
  1.24      +210 -78   src/contrib/sendmail/src/headers.c
  1.15      +23 -3     src/contrib/sendmail/src/mailq.1
  1.23      +17 -17    src/contrib/sendmail/src/mci.c
  1.20      +73 -67    src/contrib/sendmail/src/savemail.c