From owner-freebsd-bugs  Mon Mar 17  0:20:15 2003
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6055437B401
	for <freebsd-bugs@hub.freebsd.org>; Mon, 17 Mar 2003 00:20:12 -0800 (PST)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0E11943F75
	for <freebsd-bugs@hub.freebsd.org>; Mon, 17 Mar 2003 00:20:12 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h2H8K9NS003258
	for <freebsd-bugs@freefall.freebsd.org>; Mon, 17 Mar 2003 00:20:09 -0800 (PST)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h2H8K8O4003257;
	Mon, 17 Mar 2003 00:20:08 -0800 (PST)
Date: Mon, 17 Mar 2003 00:20:08 -0800 (PST)
Message-Id: <200303170820.h2H8K8O4003257@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
Cc: 
From: Mark Murray <mark@grondar.org>
Subject: Re: conf/50040: Missing $FreeBSD$ in /etc/ssl/openssl.cnf 
Reply-To: Mark Murray <mark@grondar.org>
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.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%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org

The following reply was made to PR conf/50040; it has been noted by GNATS.

From: Mark Murray <mark@grondar.org>
To: Doug Barton <DougB@freebsd.org>
Cc: Giorgos Keramidas <keramida@freebsd.org>,
	freebsd-gnats-submit@freebsd.org
Subject: Re: conf/50040: Missing $FreeBSD$ in /etc/ssl/openssl.cnf 
Date: Mon, 17 Mar 2003 08:14:05 +0000

 Doug Barton writes:
 > >  I think the original intent of markm was to avoid conflicts during
 > >  future imports of openssl.  Mark, do you think that the behavior of
 > >  mergemaster described above makes taking this file off the vendor
 > >  branch worthy of the conflicts?
 > 
 > I'm fairly sure that this file is already off the vendor branch.
 
 Hmm. I think it is OK for this file to re-get the $FreeBSD$ tag.
 
 M
 --
 Mark Murray
 iumop ap!sdn w,I idlaH

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