From owner-cvs-all@FreeBSD.ORG  Mon Feb 14 02:39:15 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 5A07D16A4D0; Mon, 14 Feb 2005 02:39:15 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 337A843D2D; Mon, 14 Feb 2005 02:39:15 +0000 (GMT)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1E2dFhH063514;
	Mon, 14 Feb 2005 02:39:15 GMT
	(envelope-from gshapiro@repoman.freebsd.org)
Received: (from gshapiro@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1E2dFMx063513;
	Mon, 14 Feb 2005 02:39:15 GMT
	(envelope-from gshapiro)
Message-Id: <200502140239.j1E2dFMx063513@repoman.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Mon, 14 Feb 2005 02:39:15 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/sendmail/libsm vsscanf.c
 src/contrib/sendmail/mail.local
 mail.local.c src/contrib/sendmail/makemap makemap.c
 src/contrib/sendmail/smrsh smrsh.8 smrsh.c
 src/contrib/sendmail/src conf.c headers.c mci.c savemail.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
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, 14 Feb 2005 02:39:15 -0000

gshapiro    2005-02-14 02:39:15 UTC

  FreeBSD src repository

  Modified files:
    contrib/sendmail/mail.local mail.local.c 
    contrib/sendmail/makemap makemap.c 
    contrib/sendmail/smrsh smrsh.8 smrsh.c 
    contrib/sendmail/src conf.c headers.c mci.c savemail.c 
  Removed files:
    contrib/sendmail/libsm vsscanf.c 
  Log:
  Resolve conflicts from sendmail 8.13.3 import
  
  MFC after:      4 days
  
  Revision  Changes    Path
  1.2       +0 -88     src/contrib/sendmail/libsm/vsscanf.c (dead)
  1.26      +35 -18    src/contrib/sendmail/mail.local/mail.local.c
  1.13      +5 -3      src/contrib/sendmail/makemap/makemap.c
  1.13      +5 -5      src/contrib/sendmail/smrsh/smrsh.8
  1.19      +7 -5      src/contrib/sendmail/smrsh/smrsh.c
  1.27      +22 -8     src/contrib/sendmail/src/conf.c
  1.21      +3 -3      src/contrib/sendmail/src/headers.c
  1.18      +3 -3      src/contrib/sendmail/src/mci.c
  1.17      +4 -1      src/contrib/sendmail/src/savemail.c