From owner-freebsd-bugs  Sat Mar 15 17:10:18 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 BE6BC37B404
	for <freebsd-bugs@hub.freebsd.org>; Sat, 15 Mar 2003 17:10:16 -0800 (PST)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BAEAE43FBD
	for <freebsd-bugs@hub.freebsd.org>; Sat, 15 Mar 2003 17:10:15 -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 h2G1AFNS074492
	for <freebsd-bugs@freefall.freebsd.org>; Sat, 15 Mar 2003 17:10:15 -0800 (PST)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h2G1AFW3074491;
	Sat, 15 Mar 2003 17:10:15 -0800 (PST)
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
X-Send-Pr-Version: 3.113
Subject: conf/50040: Missing $FreeBSD$ in /etc/ssl/openssl.cnf
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


>Number:         50040
>Category:       conf
>Synopsis:       Missing $FreeBSD$ in /etc/ssl/openssl.cnf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 15 17:10:15 PST 2003
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:

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