From dim@tensor.xs4all.nl  Sat Mar 15 17:10:01 2003
Return-Path: <dim@tensor.xs4all.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 360BB37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 15 Mar 2003 17:10:01 -0800 (PST)
Received: from tensor.xs4all.nl (tensor.xs4all.nl [194.109.160.97])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A6AE743F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 15 Mar 2003 17:10:00 -0800 (PST)
	(envelope-from dim@tensor.xs4all.nl)
Received: by tensor.xs4all.nl (Postfix, from userid 1000)
	id A1FF5555C; Sun, 16 Mar 2003 02:09:58 +0100 (CET)
Message-Id: <20030316010958.A1FF5555C@tensor.xs4all.nl>
Date: Sun, 16 Mar 2003 02:09:58 +0100 (CET)
From: Dimitry Andric <dim@xs4all.nl>
Reply-To: Dimitry Andric <dim@xs4all.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Missing $FreeBSD$ in /etc/ssl/openssl.cnf
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50040
>Category:       conf
>Synopsis:       Missing $FreeBSD$ in /etc/ssl/openssl.cnf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nectar
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 15 17:10:15 PST 2003
>Closed-Date:    Fri Jan 09 06:46:36 PST 2004
>Last-Modified:  Fri Jan 09 06:46:36 PST 2004
>Originator:     Dimitry Andric <dim@xs4all.nl>
>Release:        FreeBSD 4.8-RC i386
>Organization:
n/a
>Environment:
System: FreeBSD tensor.xs4all.nl 4.8-RC FreeBSD 4.8-RC #0: Mon Mar 10 19:46:03 CET 2003 root@tensor.xs4all.nl:/usr/obj/usr/src/sys/TENSOR i386
>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.
>How-To-Repeat:
cvsup and run mergemaster.
>Fix:
--- src/crypto/openssl/apps/openssl.cnf.orig	Sun Mar 16 02:05:12 2003
+++ src/crypto/openssl/apps/openssl.cnf	Sun Mar 16 02:05:38 2003
@@ -2,6 +2,7 @@
 # OpenSSL example configuration file.
 # This is mostly being used for generation of certificate requests.
 #
+# $FreeBSD$
 
 # This definition stops the following lines choking if HOME isn't
 # defined.
>Release-Note:
>Audit-Trail:

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?
 

From: Doug Barton <DougB@FreeBSD.org>
To: Giorgos Keramidas <keramida@FreeBSD.org>,
	Mark Murray <mark@grondar.za>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: conf/50040: Missing $FreeBSD$ in /etc/ssl/openssl.cnf
Date: Sun, 16 Mar 2003 22:30:13 -0800 (PST)

 On Sun, 16 Mar 2003, Giorgos Keramidas wrote:
 
 > 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?
 
 I'm fairly sure that this file is already off the vendor branch.
 
 Doug
 
 -- 
 
     This .signature sanitized for your protection

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
Responsible-Changed-From-To: freebsd-bugs->nectar 
Responsible-Changed-By: kris 
Responsible-Changed-When: Mon Jul 14 04:34:11 PDT 2003 
Responsible-Changed-Why:  
Assign to openssl maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50040 
State-Changed-From-To: open->closed 
State-Changed-By: nectar 
State-Changed-When: Fri Jan 9 06:43:57 PST 2004 
State-Changed-Why:  
Keyword re-added. 
Sorry for taking so long! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50040 
>Unformatted:
