From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 4 16:50:07 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D798B16A405 for ; Sun, 4 Mar 2007 16:50:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id B2F9B13C441 for ; Sun, 4 Mar 2007 16:50:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l24Go7EP058011 for ; Sun, 4 Mar 2007 16:50:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l24Go7Bk058010; Sun, 4 Mar 2007 16:50:07 GMT (envelope-from gnats) Resent-Date: Sun, 4 Mar 2007 16:50:07 GMT Resent-Message-Id: <200703041650.l24Go7Bk058010@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Andree Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6A43E16A403 for ; Sun, 4 Mar 2007 16:47:46 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.freebsd.org (Postfix) with SMTP id CC11613C474 for ; Sun, 4 Mar 2007 16:47:45 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: (qmail invoked by alias); 04 Mar 2007 16:47:44 -0000 Received: from localhost (localhost [127.0.0.1]) by merlin.emma.line.org (Postfix) with ESMTP id A4019200EFD for ; Sun, 4 Mar 2007 17:47:40 +0100 (CET) Received: from m2a2.dyndns.org ([127.0.0.1]) by localhost (m2a2.dyndns.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qaCHk-h+V9HR for ; Sun, 4 Mar 2007 17:47:40 +0100 (CET) Received: from libertas.emma.line.org (libertas.emma.line.org [192.168.1.2]) by merlin.emma.line.org (Postfix) with ESMTP id 48583200DB3 for ; Sun, 4 Mar 2007 17:47:40 +0100 (CET) Received: by libertas.emma.line.org (Postfix, from userid 1001) id DF1801C; Sun, 4 Mar 2007 17:47:35 +0100 (CET) Message-Id: <20070304164735.DF1801C@libertas.emma.line.org> Date: Sun, 4 Mar 2007 17:47:35 +0100 (CET) From: Matthias Andree To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/109856: [MAINTAINER] security/openvpn: rcfile fixes for older releases X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Mar 2007 16:50:07 -0000 >Number: 109856 >Category: ports >Synopsis: [MAINTAINER] security/openvpn: rcfile fixes for older releases >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Mar 04 16:50:05 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 6.2-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD libertas.emma.line.org 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #0: Tue Feb 27 22:41:06 UTC 2007 >Description: rcfile: - fix for FreeBSD releases before rcorder integration - update copyright notice - replace shell backticks by $(). Port: - bump revision - reformat comment Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- openvpn-2.0.6_7.patch begins here --- diff -ruN --exclude=CVS /usr/ports/security/openvpn/Makefile /usr/home/emma/ports/security/openvpn/Makefile --- /usr/ports/security/openvpn/Makefile Sun Feb 25 20:42:55 2007 +++ /usr/home/emma/ports/security/openvpn/Makefile Tue Feb 27 10:30:26 2007 @@ -7,13 +7,13 @@ PORTNAME= openvpn # ----------------------------------------------------- -# DO NOT BOTHER TO SEND NOTICES ABOUT 2.0.9 AS IT FIXES -# WINDOWS-ONLY BUGS THAT DON'T AFFECT *BSD AND THUS -# DOES NOT WARRANT A PORT UPGRADE! AND UPGRADE REQUESTS -# WILL BE DROPPED. +# DO NOT BOTHER TO SEND NOTICES ABOUT OPENVPN 2.0.9 +# AS IT FIXES WINDOWS-ONLY BUGS THAT DON'T AFFECT *BSD +# AND THUS DOES NOT WARRANT A PORT UPGRADE! +# UPGRADE REQUESTS WILL BE DROPPED UNLESS BSD-RELATED. # ----------------------------------------------------- PORTVERSION= 2.0.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security net # MASTER_SITES points to hosts in distinct data centers, # so just one MASTER_SITES entry should be OK. diff -ruN --exclude=CVS /usr/ports/security/openvpn/files/openvpn.sh.in /usr/home/emma/ports/security/openvpn/files/openvpn.sh.in --- /usr/ports/security/openvpn/files/openvpn.sh.in Sun Feb 25 20:42:55 2007 +++ /usr/home/emma/ports/security/openvpn/files/openvpn.sh.in Tue Feb 27 10:53:05 2007 @@ -2,10 +2,10 @@ # # openvpn.sh - load tun/tap driver and start OpenVPN daemon # -# (C) Copyright 2005 by Matthias Andree +# (C) Copyright 2005 - 2007 by Matthias Andree # based on suggestions by Matthias Grimm and Dirk Gouders -# -# Made in Northrhine-Westphalia, Germany +# with multi-instance contribution from Denis Shaposhnikov, Gleb Kozyrev +# and Vasil Dimov # # $FreeBSD: ports/security/openvpn/files/openvpn.sh.in,v 1.7 2007/02/25 19:42:55 vd Exp $ # @@ -64,17 +64,17 @@ . %%RC_SUBR%% case "$0" in - /etc/rc*) +/etc/rc*) # during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown), # so get the name of the script from $_file - name=$(basename "$_file") + name=$(basename "$_file" .sh) ;; - *) - name=$(basename "$0") +*) + name=$(basename "$0" .sh) ;; esac -rcvar=`set_rcvar` +rcvar=$(set_rcvar) prefix="%%PREFIX%%" @@ -122,9 +122,9 @@ eval ": \${${name}_configfile:=\"${prefix}/etc/openvpn/${name}.conf\"}" eval ": \${${name}_dir:=\"${prefix}/etc/openvpn\"}" -configfile="`eval echo \\${${name}_configfile}`" -dir="`eval echo \\${${name}_dir}`" -interfaces="`eval echo \\${${name}_if}`" +configfile="$(eval echo \${${name}_configfile})" +dir="$(eval echo \${${name}_dir})" +interfaces="$(eval echo \${${name}_if})" required_files=${configfile} command_args="--cd ${dir} --daemon --config ${configfile} --writepid ${pidfile}" --- openvpn-2.0.6_7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: