From owner-cvs-src@FreeBSD.ORG  Sat Feb 14 13:58:09 2004
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 0C5BC16A4CE; Sat, 14 Feb 2004 13:58:09 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0886843D1F; Sat, 14 Feb 2004 13:58:09 -0800 (PST)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1ELw8Ge031488;
	Sat, 14 Feb 2004 13:58:08 -0800 (PST)
	(envelope-from gshapiro@repoman.freebsd.org)
Received: (from gshapiro@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1ELw8xi031487;
	Sat, 14 Feb 2004 13:58:08 -0800 (PST)
	(envelope-from gshapiro)
Message-Id: <200402142158.i1ELw8xi031487@repoman.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Sat, 14 Feb 2004 13:58:08 -0800 (PST)
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.m4src/contrib/sendmail/smrsh
	smrsh.8 smrsh.c src/contrib/sendmail/src conf.c headers.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: Sat, 14 Feb 2004 21:58:09 -0000

gshapiro    2004/02/14 13:58:08 PST

  FreeBSD src repository

  Modified files:
    contrib/sendmail/cf/m4 cfhead.m4 
    contrib/sendmail/smrsh smrsh.8 smrsh.c 
    contrib/sendmail/src conf.c headers.c sendmail.8 
  Log:
  Fix sendmail 8.12.11 import conflicts
  
  Revision  Changes    Path
  1.16      +1 -1      src/contrib/sendmail/cf/m4/cfhead.m4
  1.11      +8 -3      src/contrib/sendmail/smrsh/smrsh.8
  1.17      +4 -3      src/contrib/sendmail/smrsh/smrsh.c
  1.25      +12 -1     src/contrib/sendmail/src/conf.c
  1.19      +10 -4     src/contrib/sendmail/src/headers.c
  1.12      +27 -6     src/contrib/sendmail/src/sendmail.8