From hmo@sep.oldach.net  Fri Feb 29 17:28:20 2008
Return-Path: <hmo@sep.oldach.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7EC141065675;
	Fri, 29 Feb 2008 17:28:20 +0000 (UTC)
	(envelope-from hmo@sep.oldach.net)
Received: from rigel.oldach.net (rigel.oldach.net [194.8.96.250])
	by mx1.freebsd.org (Postfix) with ESMTP id 085B38FC25;
	Fri, 29 Feb 2008 17:28:19 +0000 (UTC)
	(envelope-from hmo@sep.oldach.net)
Received: from sep.oldach.net (hmo.in-dsl.de [217.197.85.210])
	by rigel.oldach.net (8.14.2/8.14.2/hmo30jul04) with ESMTP id m1TGpmTl008876
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Fri, 29 Feb 2008 17:51:49 +0100 (CET)
	(envelope-from hmo@sep.oldach.net)
Received: from sep.oldach.net (localhost [127.0.0.1])
	by sep.oldach.net (8.14.2/8.14.2/hmo26jun05) with ESMTP id m1TGpkcU043273
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Fri, 29 Feb 2008 17:51:46 +0100 (CET)
	(envelope-from hmo@sep.oldach.net)
Received: (from hmo@localhost)
	by sep.oldach.net (8.14.2/8.14.2/Submit/hmo26jun05) id m1TGpkhT043272;
	Fri, 29 Feb 2008 17:51:46 +0100 (CET)
	(envelope-from hmo)
Message-Id: <200802291651.m1TGpkhT043272@sep.oldach.net>
Date: Fri, 29 Feb 2008 17:51:46 +0100 (CET)
From: Helge Oldach <ports-security-vpnc-feb08@oldach.net>
Reply-To: Helge Oldach <ports-security-vpnc-feb08@oldach.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ehaupt@freebsd.org
Subject: [patch] ports/security/vpnc incorrect .conf file search
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         121229
>Category:       ports
>Synopsis:       [patch] ports/security/vpnc incorrect .conf file search
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ehaupt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 29 17:30:01 UTC 2008
>Closed-Date:    Fri Feb 29 22:08:47 CET 2008
>Last-Modified:  Fri Feb 29 21:10:00 UTC 2008
>Originator:     Helge Oldach
>Release:        FreeBSD 6.3-1132 i386
>Organization:
>Environment:

System: FreeBSD localhost 6.3-1132 FreeBSD 6.3-1132 #0: Fri Feb 15 19:26:49 CET 2008 toor@localhost:/usr/obj/usr/src/sys/HMO i386

>Description:

The upgrade of ports/security/vpnc to version 0.5.1 introduced
some glitches against the documented behaviour. In particular,
the configuration files are not searched in the documented
locations: /usr/local/etc/vpnc/*.conf is not searched at all, and
/usr/local/etc/vpnc/default.conf is skipped, both in contrast to the
documentation.

>How-To-Repeat:

>Fix:

--- files/patch-config.c.orig	2008-02-27 22:52:01.000000000 +0100
+++ files/patch-config.c	2008-02-29 17:43:38.000000000 +0100
@@ -20,16 +20,17 @@
  	char *realname;
  	
 -	asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
-+	asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "%%PREFIX%%/etc/", name, add_dot_conf ? ".conf" : "");
++	asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "%%PREFIX%%/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
  	return realname;
  }
  
-@@ -757,8 +757,7 @@
+@@ -757,8 +757,8 @@
  	}
  	
  	if (!got_conffile) {
 -		read_config_file("/etc/vpnc/default.conf", config, 1);
 -		read_config_file("/etc/vpnc.conf", config, 1);
++		read_config_file("%%PREFIX%%/etc/vpnc/default.conf", config, 1);
 +		read_config_file("%%PREFIX%%/etc/vpnc.conf", config, 1);
  	}
  	
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ehaupt 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Feb 29 17:30:10 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121229 
State-Changed-From-To: open->closed 
State-Changed-By: ehaupt 
State-Changed-When: Fri Feb 29 22:08:46 CET 2008 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121229 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/121229: commit references a PR
Date: Fri, 29 Feb 2008 21:08:23 +0000 (UTC)

 ehaupt      2008-02-29 21:08:15 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/vpnc        Makefile 
     security/vpnc/files  patch-Makefile patch-config.c 
   Log:
   The upgrade of ports/security/vpnc to version 0.5.1 introduced some glitches
   against the documented behaviour. In particular, the configuration files are
   not searched in the documented locations: /usr/local/etc/vpnc/*.conf is not
   searched at all, and /usr/local/etc/vpnc/default.conf is skipped, both in
   contrast to the documentation.
   
   PR:             121229
   Submitted by:   Helge Oldach <ports-security-vpnc-feb08@oldach.net>
   
   Revision  Changes    Path
   1.30      +1 -1      ports/security/vpnc/Makefile
   1.8       +10 -1     ports/security/vpnc/files/patch-Makefile
   1.8       +3 -2      ports/security/vpnc/files/patch-config.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
