Date: Fri, 27 May 2005 12:41:50 +0200 (CEST) From: Christian Lackas <delta@lackas.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: delta@lackas.net, le@FreeBSD.org, daniel@roe.ch Subject: ports/81550: [maintainer-update] security/vpnc Message-ID: <200505271041.j4RAfo8s081513@zel726.zel.kfa-juelich.de> Resent-Message-ID: <200505271050.j4RAo2HE002748@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81550 >Category: ports >Synopsis: [maintainer-update] security/vpnc >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri May 27 10:50: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: fix for connect script removed obsolete fulltunnel script added disconnect script >How-To-Repeat: >Fix: Apply attached patch. Patch file is also downloadable from http://www.lackas.net/freebsd/vpnc-0.3.3_1.patch diff -urN /usr/ports/security/vpnc/Makefile vpnc/Makefile --- /usr/ports/security/vpnc/Makefile Tue May 17 11:57:59 2005 +++ vpnc/Makefile Fri May 27 12:35:07 2005 @@ -7,10 +7,10 @@ PORTNAME= vpnc PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= security -MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/:source \ - http://dragon.roe.ch/mirrors/distfiles/vpnc/:script -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source ${STARTSCRIPT}:script +MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= delta@lackas.net @@ -37,12 +37,10 @@ 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} -m 751 ${WRKSRC}/vpnc-disconnect ${PREFIX}/sbin/vpnc-disconnect @${INSTALL_SCRIPT} ${FILESDIR}/vpnc.sh ${WRKDIR} @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKDIR}/vpnc.sh @${INSTALL_SCRIPT} -m 755 ${WRKDIR}/vpnc.sh ${PREFIX}/etc/rc.d/vpnc.sh.sample - @${INSTALL_SCRIPT} -m 755 ${WRKDIR}/vpnc.sh-fulltunnel ${PREFIX}/etc/rc.d/vpnc.sh.sample-fulltunnel @${INSTALL_DATA} -m 600 ${WRKSRC}/vpnc.conf ${PREFIX}/etc/vpnc.conf.sample .if !defined(NO_INSTALL_MANPAGES) @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/vpnc.8 diff -urN /usr/ports/security/vpnc/files/patch-config.c vpnc/files/patch-config.c --- /usr/ports/security/vpnc/files/patch-config.c Tue May 17 11:57:59 2005 +++ vpnc/files/patch-config.c Fri May 27 11:24:55 2005 @@ -1,5 +1,14 @@ ---- config.c.orig Sat May 14 13:20:11 2005 -+++ config.c Sat May 14 13:20:51 2005 +--- config.c.bak Sun May 15 15:06:20 2005 ++++ config.c Sun May 15 15:06:52 2005 +@@ -125,7 +125,7 @@ + + static const char *config_def_script(void) + { +- return "/etc/vpnc/vpnc-script"; ++ return "%%PREFIX%%/sbin/vpnc-script"; + } + + static const char *config_def_pid_file(void) @@ -520,8 +520,8 @@ } diff -urN /usr/ports/security/vpnc/files/patch-vpnc-disconnect vpnc/files/patch-vpnc-disconnect --- /usr/ports/security/vpnc/files/patch-vpnc-disconnect Thu Jan 1 01:00:00 1970 +++ vpnc/files/patch-vpnc-disconnect Fri May 27 12:29:29 2005 @@ -0,0 +1,10 @@ +--- vpnc-disconnect.orig Fri May 27 12:27:48 2005 ++++ vpnc-disconnect Fri May 27 12:28:02 2005 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-pid=/var/run/vpnc/pid ++pid=/var/run/vpnc.pid + + if [ $# -ne 0 ]; then + echo "Usage: $0" 1>&2 diff -urN /usr/ports/security/vpnc/files/patch-vpnc-script vpnc/files/patch-vpnc-script --- /usr/ports/security/vpnc/files/patch-vpnc-script Thu Jan 1 01:00:00 1970 +++ vpnc/files/patch-vpnc-script Fri May 27 12:29:29 2005 @@ -0,0 +1,54 @@ +--- vpnc-script.orig Thu May 5 19:05:18 2005 ++++ vpnc-script Fri May 27 12:21:50 2005 +@@ -19,8 +19,8 @@ + #set -x + + OS="`uname -s`" +-DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute +-RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup ++DEFAULT_ROUTE_FILE=/var/run/vpnc.defaultroute ++RESOLV_CONF_BACKUP=/var/run/vpnc.resolv.conf-backup + + IPROUTE="`which ip 2> /dev/null`" + +@@ -117,7 +117,7 @@ + } + else + get_default_gw() { +- netstat -r -n | grep '^0.0.0.0' | awk '{print $2}' ++ netstat -r -n | grep '^default' | awk '{print $2}' + } + + set_vpngateway_route() { +@@ -219,11 +219,14 @@ + do_ifconfig + set_vpngateway_route + if [ -n "$CISCO_SPLIT_INC" ]; then +- for ((i = 0 ; i < CISCO_SPLIT_INC ; i++ )) ; do ++ # for ((i = 0 ; i < CISCO_SPLIT_INC ; i++ )) ; do ++ i=0 ++ while [ $i -lt ${CISCO_SPLIT_INC} ]; do + eval NETWORK="\${CISCO_SPLIT_INC_${i}_ADDR}" + eval NETMASK="\${CISCO_SPLIT_INC_${i}_MASK}" + eval NETMASKLEN="\${CISCO_SPLIT_INC_${i}_MASKLEN}" + set_network_route "$NETWORK" "$NETMASK" "$NETMASKLEN" ++ i=`expr $i + 1` + done + for i in $INTERNAL_IP4_DNS ; do + set_network_route "$i" "255.255.255.255" "32" +@@ -239,11 +242,14 @@ + + do_disconnect() { + if [ -n "$CISCO_SPLIT_INC" ]; then +- for ((i = 0 ; i < CISCO_SPLIT_INC ; i++ )) ; do ++ # for ((i = 0 ; i < CISCO_SPLIT_INC ; i++ )) ; do ++ i=0 ++ while [ $i -lt ${CISCO_SPLIT_INC} ]; do + eval NETWORK="\${CISCO_SPLIT_INC_${i}_ADDR}" + eval NETMASK="\${CISCO_SPLIT_INC_${i}_MASK}" + eval NETMASKLEN="\${CISCO_SPLIT_INC_${i}_MASKLEN}" + del_network_route "$NETWORK" "$NETMASK" "$NETMASKLEN" ++ i=`expr $i + 1` + done + for i in $INTERNAL_IP4_DNS ; do + del_network_route "$i" "255.255.255.255" "32" diff -urN /usr/ports/security/vpnc/pkg-plist vpnc/pkg-plist --- /usr/ports/security/vpnc/pkg-plist Tue May 17 11:57:59 2005 +++ vpnc/pkg-plist Fri May 27 12:30:53 2005 @@ -1,8 +1,8 @@ sbin/vpnc sbin/vpnc-script +sbin/vpnc-disconnect etc/vpnc.conf.sample etc/rc.d/vpnc.sh.sample -etc/rc.d/vpnc.sh.sample-fulltunnel %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/TODO >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505271041.j4RAfo8s081513>