kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vpmc_script has seen updates, sync patch.

Browse source
This commit is contained in:
Hauke Fath 2013-03-18 20:49:19 +00:00 committed by Thomas Klausner
parent bda9b4901d
commit 3bab8c7980
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vpnc-svn/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.1.1.1 2012/05/23 15:37:12 hfath Exp $
$NetBSD: distinfo,v 1.2 2013/03/18 20:49:19 hfath Exp $
SHA1 (patch-config.c) = 64bc61d440d6cd9ad207690317519ecd1f2a12b6
SHA1 (patch-config.h) = 1e73b3a064cefd4e7dc7816456a664a824cf111e
@ -10,4 +10,4 @@ SHA1 (patch-tunip.c) = 157b8b54f49411da0fe2e9873e7aa1bce2cba31e
SHA1 (patch-vpnc.c) = d637a91e1e3cf0c54af155ed2d9ee38d459b9219
SHA1 (patch-vpnc_8.template) = 92a85838ed052e239116d4cc9ffc5921d25dccc0
SHA1 (patch-vpnc_disconnect) = 4f8896bf56fe70ad0096f3e398f3d1db0bcb65c9
SHA1 (patch-vpnc_script) = e675cd89e4c85b472db182059ffe5cc4a83b17c7
SHA1 (patch-vpnc_script) = dc07f6075640f1ffbadcec5fc5347c471b175af7

23
vpnc-svn/patches/patch-vpnc_script
View file

@ -1,29 +1,22 @@
$NetBSD: patch-vpnc_script,v 1.1.1.1 2012/05/23 15:37:12 hfath Exp $
$NetBSD: patch-vpnc_script,v 1.2 2013/03/18 20:49:19 hfath Exp $
--- vpnc-script.orig 2012-05-23 13:52:36.000000000 +0000
--- vpnc-script.orig 2013-03-12 21:00:57.000000000 +0000
+++ vpnc-script
@@ -56,8 +56,9 @@ PATH=/sbin:/usr/sbin:$PATH
@@ -77,9 +77,10 @@ PATH=/sbin:/usr/sbin:$PATH
OS="`uname -s`"
-HOOKS_DIR=/etc/vpnc
-DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute
-RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup
+HOOKS_DIR=$PKG_SYSCONFDIR/vpnc
+STATEDIR=/var/run/vpnc
+DEFAULT_ROUTE_FILE=$STATEDIR/defaultroute
+RESOLV_CONF_BACKUP=$STATEDIR/resolv.conf-backup
SCRIPTNAME=`basename $0`
# some systems, eg. Darwin & FreeBSD, prune /var/run on boot
@@ -67,7 +68,7 @@ if [ ! -d "/var/run/vpnc" ]; then
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"
@@ -116,7 +117,7 @@ do_ifconfig() {
@@ -162,7 +163,7 @@ do_ifconfig() {
fi
if [ -z "$MTU" ]; then
@ -32,7 +25,7 @@ $NetBSD: patch-vpnc_script,v 1.1.1.1 2012/05/23 15:37:12 hfath Exp $
fi
# Point to point interface require a netmask of 255.255.255.255 on some systems
@@ -235,11 +236,11 @@ else # use route command
@@ -284,11 +285,11 @@ else # use route command
# isn't -n supposed to give --numeric output?
# apperently not...
# Get rid of lines containing IPv6 addresses (':')
@ -46,7 +39,7 @@ $NetBSD: patch-vpnc_script,v 1.1.1.1 2012/05/23 15:37:12 hfath Exp $
}
del_vpngateway_route() {
@@ -557,6 +558,20 @@ do_pre_init() {
@@ -622,6 +623,20 @@ do_pre_init() {
}
do_connect() {