head 1.12; access; symbols pkgsrc-2026Q2:1.12.0.114 pkgsrc-2026Q2-base:1.12 pkgsrc-2026Q1:1.12.0.112 pkgsrc-2026Q1-base:1.12 pkgsrc-2025Q4:1.12.0.110 pkgsrc-2025Q4-base:1.12 pkgsrc-2025Q3:1.12.0.108 pkgsrc-2025Q3-base:1.12 pkgsrc-2025Q2:1.12.0.106 pkgsrc-2025Q2-base:1.12 pkgsrc-2025Q1:1.12.0.104 pkgsrc-2025Q1-base:1.12 pkgsrc-2024Q4:1.12.0.102 pkgsrc-2024Q4-base:1.12 pkgsrc-2024Q3:1.12.0.100 pkgsrc-2024Q3-base:1.12 pkgsrc-2024Q2:1.12.0.98 pkgsrc-2024Q2-base:1.12 pkgsrc-2024Q1:1.12.0.96 pkgsrc-2024Q1-base:1.12 pkgsrc-2023Q4:1.12.0.94 pkgsrc-2023Q4-base:1.12 pkgsrc-2023Q3:1.12.0.92 pkgsrc-2023Q3-base:1.12 pkgsrc-2023Q2:1.12.0.90 pkgsrc-2023Q2-base:1.12 pkgsrc-2023Q1:1.12.0.88 pkgsrc-2023Q1-base:1.12 pkgsrc-2022Q4:1.12.0.86 pkgsrc-2022Q4-base:1.12 pkgsrc-2022Q3:1.12.0.84 pkgsrc-2022Q3-base:1.12 pkgsrc-2022Q2:1.12.0.82 pkgsrc-2022Q2-base:1.12 pkgsrc-2022Q1:1.12.0.80 pkgsrc-2022Q1-base:1.12 pkgsrc-2021Q4:1.12.0.78 pkgsrc-2021Q4-base:1.12 pkgsrc-2021Q3:1.12.0.76 pkgsrc-2021Q3-base:1.12 pkgsrc-2021Q2:1.12.0.74 pkgsrc-2021Q2-base:1.12 pkgsrc-2021Q1:1.12.0.72 pkgsrc-2021Q1-base:1.12 pkgsrc-2020Q4:1.12.0.70 pkgsrc-2020Q4-base:1.12 pkgsrc-2020Q3:1.12.0.68 pkgsrc-2020Q3-base:1.12 pkgsrc-2020Q2:1.12.0.64 pkgsrc-2020Q2-base:1.12 pkgsrc-2020Q1:1.12.0.44 pkgsrc-2020Q1-base:1.12 pkgsrc-2019Q4:1.12.0.66 pkgsrc-2019Q4-base:1.12 pkgsrc-2019Q3:1.12.0.62 pkgsrc-2019Q3-base:1.12 pkgsrc-2019Q2:1.12.0.60 pkgsrc-2019Q2-base:1.12 pkgsrc-2019Q1:1.12.0.58 pkgsrc-2019Q1-base:1.12 pkgsrc-2018Q4:1.12.0.56 pkgsrc-2018Q4-base:1.12 pkgsrc-2018Q3:1.12.0.54 pkgsrc-2018Q3-base:1.12 pkgsrc-2018Q2:1.12.0.52 pkgsrc-2018Q2-base:1.12 pkgsrc-2018Q1:1.12.0.50 pkgsrc-2018Q1-base:1.12 pkgsrc-2017Q4:1.12.0.48 pkgsrc-2017Q4-base:1.12 pkgsrc-2017Q3:1.12.0.46 pkgsrc-2017Q3-base:1.12 pkgsrc-2017Q2:1.12.0.42 pkgsrc-2017Q2-base:1.12 pkgsrc-2017Q1:1.12.0.40 pkgsrc-2017Q1-base:1.12 pkgsrc-2016Q4:1.12.0.38 pkgsrc-2016Q4-base:1.12 pkgsrc-2016Q3:1.12.0.36 pkgsrc-2016Q3-base:1.12 pkgsrc-2016Q2:1.12.0.34 pkgsrc-2016Q2-base:1.12 pkgsrc-2016Q1:1.12.0.32 pkgsrc-2016Q1-base:1.12 pkgsrc-2015Q4:1.12.0.30 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.12.0.28 pkgsrc-2015Q3-base:1.12 pkgsrc-2015Q2:1.12.0.26 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.24 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.22 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.12.0.20 pkgsrc-2014Q3-base:1.12 pkgsrc-2014Q2:1.12.0.18 pkgsrc-2014Q2-base:1.12 pkgsrc-2014Q1:1.12.0.16 pkgsrc-2014Q1-base:1.12 pkgsrc-2013Q4:1.12.0.14 pkgsrc-2013Q4-base:1.12 pkgsrc-2013Q3:1.12.0.12 pkgsrc-2013Q3-base:1.12 pkgsrc-2013Q2:1.12.0.10 pkgsrc-2013Q2-base:1.12 pkgsrc-2013Q1:1.12.0.8 pkgsrc-2013Q1-base:1.12 pkgsrc-2012Q4:1.12.0.6 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.4 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.2 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.10.0.8 pkgsrc-2012Q1-base:1.10 pkgsrc-2011Q4:1.10.0.6 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q3:1.10.0.4 pkgsrc-2011Q3-base:1.10 pkgsrc-2011Q2:1.10.0.2 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.8.0.2 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.7.0.16 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.14 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.12 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.10 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.8 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.6 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.4 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.2 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.6.0.10 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.8 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.6 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.4 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.2 pkgsrc-2008Q1:1.5.0.2 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.4.0.6 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.4 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.2 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.3.0.6 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.1.0.4 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.2 pkgsrc-2006Q1-base:1.1; locks; strict; comment @# @; 1.12 date 2012.05.24.09.35.54; author hauke; state Exp; branches; next 1.11; 1.11 date 2012.05.23.16.07.51; author hauke; state Exp; branches; next 1.10; 1.10 date 2011.04.14.21.42.42; author hans; state Exp; branches; next 1.9; 1.9 date 2011.04.14.21.27.39; author hans; state Exp; branches; next 1.8; 1.8 date 2011.03.05.17.46.41; author cegger; state Exp; branches; next 1.7; 1.7 date 2009.02.04.21.51.27; author drochner; state Exp; branches; next 1.6; 1.6 date 2008.05.29.20.50.31; author sketch; state Exp; branches; next 1.5; 1.5 date 2008.01.09.11.35.31; author hubertf; state Exp; branches; next 1.4; 1.4 date 2007.04.28.20.17.13; author hubertf; state Exp; branches; next 1.3; 1.3 date 2006.09.27.12.50.29; author hubertf; state Exp; branches; next 1.2; 1.2 date 2006.08.22.08.57.26; author hubertf; state Exp; branches; next 1.1; 1.1 date 2006.01.03.21.48.17; author hubertf; state Exp; branches; next ; desc @@ 1.12 log @Do not create diffs after build. Thanks to Hans Rosenfeld for noticing. @ text @$NetBSD: patch-ac,v 1.10 2011/04/14 21:42:42 hans Exp $ --- vpnc-script.in.orig 2008-11-19 21:55:51.000000000 +0100 +++ vpnc-script.in 2011-04-14 23:33:24.877879829 +0200 @@@@ -48,29 +48,36 @@@@ PATH=/sbin:/usr/sbin:$PATH OS="`uname -s`" -DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute -RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup +STATEDIR=@@VARBASE@@/run/vpnc +DEFAULT_ROUTE_FILE=$STATEDIR/defaultroute +RESOLV_CONF_BACKUP=$STATEDIR/resolv.conf-backup FULL_SCRIPTNAME=@@PREFIX@@/sbin/vpnc SCRIPTNAME=`basename $FULL_SCRIPTNAME` # some systems, eg. Darwin & FreeBSD, prune /var/run on boot -if [ ! -d "/var/run/vpnc" ]; then - mkdir -p /var/run/vpnc +if [ ! -d $STATEDIR ]; then + mkdir -p $STATEDIR fi # stupid SunOS: no blubber in /usr/local/bin ... (on stdout) -IPROUTE="`which ip | grep '^/' 2> /dev/null`" +IPROUTE="`command -v ip | grep '^/' 2> /dev/null`" if [ "$OS" = "Linux" ]; then ifconfig_syntax_ptp="pointopoint" route_syntax_gw="gw" route_syntax_del="del" route_syntax_netmask="netmask" + route_syntax_iface="" else ifconfig_syntax_ptp="" route_syntax_gw="" route_syntax_del="delete" route_syntax_netmask="-netmask" + if [ "$OS" = "SunOS" ]; then + route_syntax_iface="-interface" + else + route_syntax_iface="" + fi fi if [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo @@@@ -93,7 +100,7 @@@@ do_ifconfig() { DEV=$($IPROUTE route | grep ^default | sed 's/^.* dev \([[:alnum:]-]\+\).*$/\1/') MTU=$(($($IPROUTE link show "$DEV" | grep mtu | sed 's/^.* mtu \([[:digit:]]\+\).*$/\1/') - 88)) else - MTU=1412 + MTU=1390 fi # Point to point interface require a netmask of 255.255.255.255 on some systems @@@@ -163,11 +170,11 @@@@ else # use route command # isn't -n supposed to give --numeric output? # apperently not... # Get rid of lines containing IPv6 addresses (':') - netstat -r -n | awk '/:/ { next; } /^(default|0\.0\.0\.0)/ { print $2; }' + netstat -r -n | awk '/:/ { next; } $2 ~ /^link/ { next; } /^(default|0\.0\.0\.0)/ { print $2; }' } set_vpngateway_route() { - route add -host "$VPNGATEWAY" $route_syntax_gw "`get_default_gw`" + route add -host "$VPNGATEWAY" $route_syntax_gw "`get_default_gw`" $route_syntax_iface } del_vpngateway_route() { @@@@ -178,7 +185,7 @@@@ else # use route command DEFAULTGW="`get_default_gw`" echo "$DEFAULTGW" > "$DEFAULT_ROUTE_FILE" route $route_syntax_del default - route add default $route_syntax_gw "$INTERNAL_IP4_ADDRESS" + route add default $route_syntax_gw "$INTERNAL_IP4_ADDRESS" $route_syntax_iface } set_network_route() { @@@@ -186,7 +193,7 @@@@ else # use route command NETMASK="$2" NETMASKLEN="$3" del_network_route "$NETWORK" "$NETMASK" "$NETMASKLEN" - route add -net "$NETWORK" $route_syntax_netmask "$NETMASK" $route_syntax_gw "$INTERNAL_IP4_ADDRESS" + route add -net "$NETWORK" $route_syntax_netmask "$NETMASK" $route_syntax_gw "$INTERNAL_IP4_ADDRESS" $route_syntax_iface } reset_default_route() { @@@@ -439,6 +446,20 @@@@ do_pre_init() { } do_connect() { + if test "$TARGET_NETWORKS" ; then + i=0 + for network in $TARGET_NETWORKS ; do + eval CISCO_SPLIT_INC_${i}_ADDR=`echo $network | cut -f1 -d/` + eval CISCO_SPLIT_INC_${i}_MASKLEN=`echo $network | cut -f2 -d/` + eval CISCO_SPLIT_INC_${i}_MASK=$( @@PERL5@@ -e '$ARGV[0]=~s,.*/,,;$m=(2**$ARGV[0]-1)<<(32-$ARGV[0]);printf "%d.%d.%d.%d\n", $m>>24 & 0xff, $m>>16 & 0xff, $m>>8 & 0xff, $m & 0xff;' $network ) + eval CISCO_SPLIT_INC_${i}_PROTOCOL=0 + eval CISCO_SPLIT_INC_${i}_SPORT=0 + eval CISCO_SPLIT_INC_${i}_DPORT=0 + i=`expr $i + 1` + done + CISCO_SPLIT_INC=$i + fi + if [ -n "$CISCO_BANNER" ]; then echo "Connect Banner:" echo "$CISCO_BANNER" | while read LINE ; do echo "|" "$LINE" ; done @ 1.11 log @Invoke pkgsrc Perl with absolute path. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- vpnc-script.in.orig 2008-11-19 20:55:51.000000000 +0000 +++ vpnc-script.in d11 1 a11 2 -FULL_SCRIPTNAME=@@PREFIX@@/sbin/vpnc +STATEDIR=/var/run/vpnc d14 1 a14 1 +FULL_SCRIPTNAME=/usr/pkg/sbin/vpnc @ 1.10 log @Make this work on SunOS. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2011/03/05 17:46:41 cegger Exp $ d3 2 a4 2 --- vpnc-script.in.orig 2008-11-19 21:55:51.000000000 +0100 +++ vpnc-script.in 2011-04-14 23:33:24.877879829 +0200 d11 2 a12 1 +STATEDIR=@@VARBASE@@/run/vpnc d15 1 a15 1 FULL_SCRIPTNAME=@@PREFIX@@/sbin/vpnc d98 1 a98 1 + eval CISCO_SPLIT_INC_${i}_MASK=$( perl -e '$ARGV[0]=~s,.*/,,;$m=(2**$ARGV[0]-1)<<(32-$ARGV[0]);printf "%d.%d.%d.%d\n", $m>>24 & 0xff, $m>>16 & 0xff, $m>>8 & 0xff, $m & 0xff;' $network ) @ 1.9 log @Re-add hunks that got lost in last commit to patch-aa and patch-ac. @ text @d3 3 a5 3 --- vpnc-script.in.orig 2009-02-04 14:40:43.000000000 +0100 +++ vpnc-script.in @@@@ -48,18 +48,19 @@@@ PATH=/sbin:/usr/sbin:$PATH d30 18 a47 1 @@@@ -94,7 +94,7 @@@@ do_ifconfig() { d56 1 a56 1 @@@@ -163,7 +164,7 @@@@ else # use route command d65 24 a88 1 @@@@ -440,6 +440,20 @@@@ do_pre_init() { @ 1.8 log @Apply patches from debian: - Bug fix: "Disconnect after an hour and loops trying to reconnect" - Additional vpnc functionality (resolvconf, Target Networks, DNSUpdate options) Bump revision @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- vpnc-script.in.orig 2011-03-01 14:40:25.000000000 +0000 d5 25 d39 9 @ 1.7 log @update to 0.5.3, brings some minor fixes approved by both MAINTAINERs, +minor cosmetics and a time_t printf format fix on NetBSD-current (tested against a Cisco VPN 3000 Concentrator with psk) @ text @d3 1 a3 1 --- vpnc-script.in.orig 2009-02-04 14:40:43.000000000 +0100 d5 7 a11 1 @@@@ -48,18 +48,19 @@@@ PATH=/sbin:/usr/sbin:$PATH d13 3 a15 1 OS="`uname -s`" d17 18 a34 30 -DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute -RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup +STATEDIR=@@VARBASE@@/run/vpnc +DEFAULT_ROUTE_FILE=$STATEDIR/defaultroute +RESOLV_CONF_BACKUP=$STATEDIR/resolv.conf-backup FULL_SCRIPTNAME=@@PREFIX@@/sbin/vpnc SCRIPTNAME=`basename $FULL_SCRIPTNAME` # some systems, eg. Darwin & FreeBSD, prune /var/run on boot -if [ ! -d "/var/run/vpnc" ]; then - mkdir -p /var/run/vpnc +if [ ! -d $STATEDIR ]; then + mkdir -p $STATEDIR fi # stupid SunOS: no blubber in /usr/local/bin ... (on stdout) -IPROUTE="`which ip | grep '^/' 2> /dev/null`" +IPROUTE="`command -v ip | grep '^/' 2> /dev/null`" if [ "$OS" = "Linux" ]; then ifconfig_syntax_ptp="pointopoint" @@@@ -163,7 +164,7 @@@@ else # use route command # isn't -n supposed to give --numeric output? # apperently not... # Get rid of lines containing IPv6 addresses (':') - netstat -r -n | awk '/:/ { next; } /^(default|0\.0\.0\.0)/ { print $2; }' + netstat -r -n | awk '/:/ { next; } $2 ~ /^link/ { next; } /^(default|0\.0\.0\.0)/ { print $2; }' } set_vpngateway_route() { @ 1.6 log @Bunch of fixes to get this working for me, including: - support $VARBASE - vpnc.conf was installed in the wrong place, rather than move it use default.conf instead to mirror what vpnc does natively, and install with secure permissions (as it contains passwords) - shell portability Bump PKGREVISION. Ok'd Jukka/Hubert. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2008/01/09 11:35:31 hubertf Exp $ d3 5 a7 5 --- vpnc-script.orig 2007-09-06 21:05:15.000000000 +0100 +++ vpnc-script 2008-05-29 13:32:02.000000000 +0100 @@@@ -56,18 +56,19 @@@@ ;; esac a10 1 -FULL_SCRIPTNAME=/usr/local/sbin/vpnc d14 1 a14 1 +FULL_SCRIPTNAME=@@PREFIX@@/sbin/vpnc d18 1 a18 1 -if ! [ -d "/var/run/vpnc" ]; then d20 1 a20 1 +if ! [ -d $STATEDIR ]; then d30 1 a30 1 @@@@ -157,7 +158,7 @@@@ d34 1 a34 1 - netstat -r -n | sed 's/default/0.0.0.0/' | sed 's/^.*:.*$//' | grep '^0.0.0.0' | awk '{print $2}' @ 1.5 log @Update to 0.5.1, regard PKG_SYSCONFDIR furthermore cisco-decrypt(1) and pcf2vpnc(1) also get installed. Changes in vpnc-0.5.1: * link against -lcrypto instead of -lssl, fix from: Christophe Thil * fixed crashes on 64bit platforms by Tomas Mraz, report by Brian Downing * fixes to keepalive code from Brian Downing * generate options part of the manpage automatically, by Wolfram Sang * fix dead peer detection problems with Sonicwall, by Gerald Hanusch and Wolfgang Astleitner * fix disconnect problems with Sonicwall (please test if it fixes the known problems with Cisco), by Gerald Hanusch and Wolfgang Astleitner * again special thanks Joerg Mayer for handling all patches since the * various other fixes contributed by Scott Rankin, Markus Meschederu Changes in vpnc-0.5.0: * Dead-Peer-Detection support by Kyle McKay * Hybrid-Auth support by Andreas Hoffmann, merged by Chris Walter (depends on OpenSSL, deactivatable at compile-time) * granted Joerg Mayer svn commit privileges, special thanks to him for doing so much work on vpnc during the last month (-: * various other fixes contributed by Kyle McKay, Petr Salinger, Christian Faulhammer, Kyle McKay, Paolo Zarpellon, Joerg Mayer, Marcus Obst, Mika Liljeberg, Eduard Bloch, Wolfram Sang, Jukka Salmi, Gustavo Sverzut Barbieri, Soren Hansen, Mike Javorski. * first round of a general code cleanup (far less global variables / etc) Patch submitted by Jukka Sallmi in PR pkg/37046. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2007/04/28 20:17:13 hubertf Exp $ d3 3 a5 3 --- vpnc-script.orig 2007-09-06 22:05:15.000000000 +0200 +++ vpnc-script 2007-09-14 13:30:59.000000000 +0200 @@@@ -56,14 +56,15 @@@@ case "$OS" in d26 6 a31 1 @@@@ -157,7 +158,7 @@@@ else # use route command @ 1.4 log @Update vpnc to 0.4.0. Changes: * DragonFly BSD support by Hans-Werner Hilse * Solaris 10 fixes by Sunil * support to read obfuscated passwords from .pcf files, based on work from "HAL-9000@@evilscientists.de" * granted Dan Villiom Podlaski Christiansen svn commit privileges * Darwin support by Dan Villiom Podlaski Christiansen * UDP IP keepalive support from FreeBSD port * Juniper/ScreenOS support from Marc Huber * replace "--disable-natt --force-natt --udp" with "--natt-mode" * null cipher support from Simon Lipp * Windows/Cygwin and tap support from Paolo Zarpellon * rekeying support * various other fixes contributed by Joerg Mayer, Heiko Stamer, Plamen Todorov, Asgeir, Jukka Salmi, Wolfram Sang, Laurence MOINDROT, Chris Osicki, Anton Altaparmakov, Adam Simpkins, Ken Bell, Hanno Boeck, Kyle McKay, Dennis Schneider Also, the binary is now in .../sbin instead of .../bin. Patch contributed by Jukka Salmi in private mail. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- vpnc-script.orig 2007-02-18 12:52:03.000000000 +0100 +++ vpnc-script 2007-04-28 11:49:41.000000000 +0200 @@@@ -31,12 +31,13 @@@@ case "$OS" in d11 2 a12 1 +STATEDIR=/var/run/vpnc d15 2 d20 1 a20 1 - mkdir -p /var/run/vpnc d22 1 a22 1 + mkdir -p $STATEDIR d26 1 a26 2 @@@@ -167,7 +168,7 @@@@ else get_default_gw() { d29 3 a31 2 - netstat -r -n | sed 's/default/0.0.0.0/' | grep '^0.0.0.0' | awk '{print $2}' + netstat -r -n | awk '$2 ~ /^link/ { next; } /^(default|0.0.0.0)/ { print $2; }' @ 1.3 log @Fix a problem with ifconfig output on Fedora Core 5, see http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2006-September/001006.html. Noted by Jukka Salmi , OK'd by wiz@@ @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2006/08/22 08:57:26 hubertf Exp $ d3 5 a7 4 --- vpnc-script.orig 2006-01-03 22:36:27.000000000 +0100 +++ vpnc-script @@@@ -19,10 +19,12 @@@@ #set -x a8 1 OS="`uname -s`" d15 6 a20 3 -IPROUTE="`which ip 2> /dev/null`" +# stupid SunOS: no blubber in /usr/local/bin ... (on stdout) +IPROUTE="`which ip | grep '^/' 2> /dev/null`" d22 2 a23 34 if [ "$OS" = "Linux" ]; then ifconfig_syntax_ptp="pointopoint" @@@@ -56,7 +58,9 @@@@ do_pre_init() { fi fi elif [ "$OS" = "FreeBSD" ]; then - : + if [ ! -e /dev/tun ]; then + kldload if_tun + fi elif [ "$OS" = "NetBSD" ]; then : elif [ "$OS" = "OpenBSD" ]; then @@@@ -64,6 +68,8 @@@@ do_pre_init() { elif [ "$OS" = "SunOS" ]; then : fi + + mkdir -p $STATEDIR } do_ifconfig() { @@@@ -72,7 +78,7 @@@@ do_ifconfig() { if [ -n "$IPROUTE" ]; then fix_ip_get_output () { - sed 's/cache//;s/metric[0-9]\+ [0-9]\+//g' + sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' } set_vpngateway_route() { @@@@ -117,7 +123,10 @@@@ if [ -n "$IPROUTE" ]; then } else d25 4 a28 5 - netstat -r -n | grep '^0.0.0.0' | awk '{print $2}' + # Let's assume the first default gateway is IPv4... + # (On NetBSD '-f inet' and on Linux and probably Solaris, + # '-A inet' could be used to make sure... - HF) + netstat -rn | grep -v link | awk '/^(default|0.0.0.0)/{ print $2 ; exit } ' a31 48 @@@@ -131,7 +140,7 @@@@ else set_default_route() { DEFAULTGW="`get_default_gw`" echo "$DEFAULTGW" > "$DEFAULT_ROUTE_FILE" - route $route_syntax_del default + route $route_syntax_del default "$DEFAULTGW" route add default $route_syntax_gw "$INTERNAL_IP4_ADDRESS" } @@@@ -219,11 +228,13 @@@@ do_connect() { do_ifconfig set_vpngateway_route if [ -n "$CISCO_SPLIT_INC" ]; then - 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 +250,13 @@@@ do_connect() { do_disconnect() { if [ -n "$CISCO_SPLIT_INC" ]; then - 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" @@@@ -260,6 +273,8 @@@@ do_disconnect() { if [ -n "$INTERNAL_IP4_DNS" ]; then reset_resolvconf fi + + rm -fr -- $STATEDIR } #### @ 1.2 log @Bump to revision 3: Don't count the 'link level gateway' (or whatever that is(?!) when trying to find the default route: Internet: Destination Gateway Flags Refs Use Mtu Interface default link#2 UC - tlp0 default 132.199.210.131 UGS - tun0 @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2006/01/03 21:48:17 hubertf Exp $ d46 1 a46 1 + sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g' @ 1.1 log @Update vpnc to 0.3.3. Changes: * 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 @ text @d1 1 a1 1 $NetBSD$ d58 1 a58 1 + netstat -rn | awk '/^(default|0.0.0.0)/{ print $2 ; exit } ' @