From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 14 11:40:03 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A1B916A4CE for ; Sat, 14 May 2005 11:40:03 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D55F143D5C for ; Sat, 14 May 2005 11:40:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4EBe2HD010456 for ; Sat, 14 May 2005 11:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4EBe2UB010455; Sat, 14 May 2005 11:40:02 GMT (envelope-from gnats) Resent-Date: Sat, 14 May 2005 11:40:02 GMT Resent-Message-Id: <200505141140.j4EBe2UB010455@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, Christian Lackas Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E7CA16A4CE for ; Sat, 14 May 2005 11:37:35 +0000 (GMT) Received: from zam151.fz-juelich.de (zam151.fz-juelich.de [134.94.100.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECD2943D1D for ; Sat, 14 May 2005 11:37:34 +0000 (GMT) (envelope-from c.lackas@fz-juelich.de) Received: by zam151.fz-juelich.de (Postfix, from userid 65534) id 70BFC72F1F; Sat, 14 May 2005 13:37:33 +0200 (CEST) Received: from zel726.zel.kfa-juelich.de (localhost [127.0.0.1]) by zam151.fz-juelich.de (Postfix) with ESMTP id 0543D73018; Sat, 14 May 2005 13:37:33 +0200 (CEST) Received: from zel726.zel.kfa-juelich.de (localhost [127.0.0.1]) j4EBbWCF003348; Sat, 14 May 2005 13:37:32 +0200 (CEST) (envelope-from lackas@zel726.zel.kfa-juelich.de) Received: (from lackas@localhost) by zel726.zel.kfa-juelich.de (8.13.3/8.13.1/Submit) id j4EBbWrZ003347; Sat, 14 May 2005 13:37:32 +0200 (CEST) (envelope-from lackas) Message-Id: <200505141137.j4EBbWrZ003347@zel726.zel.kfa-juelich.de> Date: Sat, 14 May 2005 13:37:32 +0200 (CEST) From: Christian Lackas To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: delta@lackas.net Subject: ports/81008: [maintainer-update] security/vpnc: new version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Christian Lackas List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 May 2005 11:40:03 -0000 >Number: 81008 >Category: ports >Synopsis: [maintainer-update] security/vpnc: new version >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: Sat May 14 11:40:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Christian Lackas >Release: FreeBSD 5.4-STABLE i386 >Organization: Delta Consulting >Environment: System: FreeBSD zel726.zel.kfa-juelich.de 5.4-STABLE FreeBSD 5.4-STABLE #34: Mon May 2 14:22:38 CEST 2005 root@zel726.zel.kfa-juelich.de:/usr/obj/usr/src/sys/KERNEL.ZEL726 i386 >Description: update to 0.3.3 # vpnc-0.3.3.tar.gz Sat May 14 12:23:27 CEST 2005 * ignore \r in config files * (hopefuly) fixed 64bit bugs (Nicolas Boichat and Zach Brown) * added support for "Split-Net" Routing * introduced vpnc-script and removed vpnc-connect * always search for configfiles in /etc/vpnc/ expect if the filename contains at least one "/" * only read /etc/vpnc/default.conf and /etc/vpnc.conf if no other configfiles are provided * various other fixes contributed by Anton Altaparmakov, Randy Chou, "krabat", Andre Vanha and Nikolay Sturm >How-To-Repeat: >Fix: Apply attached patch. The patch is also available at http://www.lackas.net/freebsd/vpnc-0.3.3.patch diff -urN /usr/ports/security/vpnc/Makefile vpnc/Makefile --- /usr/ports/security/vpnc/Makefile Mon Apr 18 12:37:09 2005 +++ vpnc/Makefile Sat May 14 13:34:42 2005 @@ -6,7 +6,7 @@ # PORTNAME= vpnc -PORTVERSION= 0.3.2 +PORTVERSION= 0.3.3 PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/:source \ @@ -28,10 +28,6 @@ .include -.if ${ARCH} == "amd64" -IGNORE= "Crashes on startup" -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/config.c @@ -41,6 +37,7 @@ do-install: @${INSTALL_PROGRAM} -m 751 ${WRKSRC}/vpnc ${PREFIX}/sbin/vpnc + @${INSTALL_SCRIPT} -m 751 ${WRKSRC}/vpnc-script ${PREFIX}/sbin/vpnc-script @${INSTALL_SCRIPT} ${DISTDIR}/${STARTSCRIPT} ${WRKDIR}/vpnc.sh-fulltunnel @${REINPLACE_CMD} -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|' ${WRKDIR}/vpnc.sh-fulltunnel @${INSTALL_SCRIPT} ${FILESDIR}/vpnc.sh ${WRKDIR} diff -urN /usr/ports/security/vpnc/distinfo vpnc/distinfo --- /usr/ports/security/vpnc/distinfo Mon Apr 18 12:37:09 2005 +++ vpnc/distinfo Sat May 14 13:29:58 2005 @@ -1,4 +1,4 @@ -MD5 (vpnc-0.3.2.tar.gz) = aaccdffc5656095a45dfe87c5bf612cb -SIZE (vpnc-0.3.2.tar.gz) = 56669 +MD5 (vpnc-0.3.3.tar.gz) = e7518cff21326fe7eb9795b60c25ae6a +SIZE (vpnc-0.3.3.tar.gz) = 59939 MD5 (vpnc-wrapper-1.25) = 8c4a0dfc6053ec180cfcf11fc2ab04c7 SIZE (vpnc-wrapper-1.25) = 12484 diff -urN /usr/ports/security/vpnc/files/patch-config.c vpnc/files/patch-config.c --- /usr/ports/security/vpnc/files/patch-config.c Thu Nov 18 13:22:50 2004 +++ vpnc/files/patch-config.c Sat May 14 13:29:59 2005 @@ -1,13 +1,13 @@ ---- config.c.dist Wed Nov 17 15:07:24 2004 -+++ config.c Wed Nov 17 15:07:33 2004 -@@ -479,8 +479,8 @@ - } +--- config.c.orig Sat May 14 13:20:11 2005 ++++ config.c Sat May 14 13:20:51 2005 +@@ -520,8 +520,8 @@ } -- 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); + 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); + } if (!print_config) { - for (i = 0; config_names[i].name != NULL; i++) diff -urN /usr/ports/security/vpnc/pkg-plist vpnc/pkg-plist --- /usr/ports/security/vpnc/pkg-plist Thu Apr 29 15:41:55 2004 +++ vpnc/pkg-plist Sat May 14 13:29:58 2005 @@ -1,4 +1,5 @@ sbin/vpnc +sbin/vpnc-script etc/vpnc.conf.sample etc/rc.d/vpnc.sh.sample etc/rc.d/vpnc.sh.sample-fulltunnel >Release-Note: >Audit-Trail: >Unformatted: