From owner-cvs-src@FreeBSD.ORG  Fri Sep 19 16:14:58 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id CADBB16A4B3; Fri, 19 Sep 2003 16:14:58 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4EDAA43FCB; Fri, 19 Sep 2003 16:14:58 -0700 (PDT)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8JNEwXJ068337;
	Fri, 19 Sep 2003 16:14:58 -0700 (PDT)
	(envelope-from gshapiro@repoman.freebsd.org)
Received: (from gshapiro@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8JNEwTY068336;
	Fri, 19 Sep 2003 16:14:58 -0700 (PDT)
	(envelope-from gshapiro)
Message-Id: <200309192314.h8JNEwTY068336@repoman.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Fri, 19 Sep 2003 16:14:58 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/sendmail/cf/m4 cfhead.m4
 src/contrib/sendmail/mail.local
 mail.local.c src/contrib/sendmail/smrsh smrsh.8
 src/contrib/sendmail/src conf.c headers.c mci.c sendmail.8
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Sep 2003 23:14:58 -0000

gshapiro    2003/09/19 16:14:57 PDT

  FreeBSD src repository

  Modified files:
    contrib/sendmail/cf/m4 cfhead.m4 
    contrib/sendmail/mail.local mail.local.c 
    contrib/sendmail/smrsh smrsh.8 
    contrib/sendmail/src conf.c headers.c mci.c sendmail.8 
  Log:
  Fix sendmail 8.12.10 import conflicts
  
  Revision  Changes    Path
  1.15      +2 -2      src/contrib/sendmail/cf/m4/cfhead.m4
  1.24      +29 -14    src/contrib/sendmail/mail.local/mail.local.c
  1.10      +10 -5     src/contrib/sendmail/smrsh/smrsh.8
  1.24      +51 -30    src/contrib/sendmail/src/conf.c
  1.18      +45 -7     src/contrib/sendmail/src/headers.c
  1.16      +16 -5     src/contrib/sendmail/src/mci.c
  1.11      +5 -5      src/contrib/sendmail/src/sendmail.8