From owner-freebsd-bugs  Sun Mar 16 17:30: 9 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 8DB4237B401
	for <freebsd-bugs@hub.freebsd.org>; Sun, 16 Mar 2003 17:30:08 -0800 (PST)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3867B43FD7
	for <freebsd-bugs@hub.freebsd.org>; Sun, 16 Mar 2003 17:30:08 -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 h2H1U8NS097072
	for <freebsd-bugs@freefall.freebsd.org>; Sun, 16 Mar 2003 17:30:08 -0800 (PST)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h2H1U8U9097071;
	Sun, 16 Mar 2003 17:30:08 -0800 (PST)
Date: Sun, 16 Mar 2003 17:30:08 -0800 (PST)
Message-Id: <200303170130.h2H1U8U9097071@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
Cc: 
From: Giorgos Keramidas <keramida@FreeBSD.org>
Subject: Re: conf/50040: Missing $FreeBSD$ in /etc/ssl/openssl.cnf
Reply-To: Giorgos Keramidas <keramida@FreeBSD.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: Giorgos Keramidas <keramida@FreeBSD.org>
To: Dimitry Andric <dim@xs4all.nl>
Cc: markm@FreeBSD.org, bug-followup@FreeBSD.org
Subject: Re: conf/50040: Missing $FreeBSD$ in /etc/ssl/openssl.cnf
Date: Mon, 17 Mar 2003 01:33:36 +0200

 On 2003-03-16 02:09, Dimitry Andric <dim@xs4all.nl> wrote:
 > >Description:
 > In revision 1.4 of /etc/ssl/openssl.cnf, imported from the last
 > OpenSSL upgrade, the $FreeBSD$ keyword disappeared. This causes
 > mergemaster to keep asking to replace/merge the file, if you edit
 > it.  Please put the keyword back.
 
 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?
 

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