[pkgsrc/trunk]: pkgsrc/net/vpnc Re-add hunks that got lost in last commit to ...

[hans <hans%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/77d1e316a9fa
branches:  trunk
changeset: 587761:77d1e316a9fa
user:      hans <hans%pkgsrc.org@localhost>
date:      Thu Apr 14 21:27:39 2011 +0000

description:
Re-add hunks that got lost in last commit to patch-aa and patch-ac.

diffstat:

 net/vpnc/distinfo         |   6 +++---
 net/vpnc/patches/patch-aa |  28 ++++++++++++++++++++++++----
 net/vpnc/patches/patch-ac |  38 ++++++++++++++++++++++++++++++++++++--
 3 files changed, 63 insertions(+), 9 deletions(-)

diffs (112 lines):

diff -r 9b5b0ae1f05c -r 77d1e316a9fa net/vpnc/distinfo
--- a/net/vpnc/distinfo Thu Apr 14 20:38:09 2011 +0000
+++ b/net/vpnc/distinfo Thu Apr 14 21:27:39 2011 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2011/03/05 17:46:41 cegger Exp $
+$NetBSD: distinfo,v 1.15 2011/04/14 21:27:39 hans Exp $
 
 SHA1 (vpnc-0.5.3.tar.gz) = 321527194e937371c83b5e7c38e46fca4f109304
 RMD160 (vpnc-0.5.3.tar.gz) = 6f3926901e75dc98762f6ef45782930f2fb76a2f
 Size (vpnc-0.5.3.tar.gz) = 98740 bytes
-SHA1 (patch-aa) = e482839f8419e2fc10ba2a19dfd7a7ca79e4e827
+SHA1 (patch-aa) = d1ebdb0cc695001f0d5d7a88db332e0e5cc5c3b9
 SHA1 (patch-ab) = 14aa011b36fcf1da54d506fd5398cfc55cb11748
-SHA1 (patch-ac) = 0b3fa6f10e26e418aa74c18bc43dad043d0fad6f
+SHA1 (patch-ac) = 75054f68e601f8883870f5bfa174c836bb1a9516
 SHA1 (patch-ad) = 7e31f1804541eb4de9924edcc517304487aad0f2
 SHA1 (patch-ae) = ae3e4be379965911dec27b6bb407ae1af017d88e
 SHA1 (patch-af) = d41aaab81061db058c4b38013f07815e1e8cf506
diff -r 9b5b0ae1f05c -r 77d1e316a9fa net/vpnc/patches/patch-aa
--- a/net/vpnc/patches/patch-aa Thu Apr 14 20:38:09 2011 +0000
+++ b/net/vpnc/patches/patch-aa Thu Apr 14 21:27:39 2011 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2011/03/05 17:46:41 cegger Exp $
+$NetBSD: patch-aa,v 1.8 2011/04/14 21:27:39 hans Exp $
 
---- config.c.orig      2008-11-19 20:36:12.000000000 +0000
-+++ config.c
-@@ -173,12 +173,12 @@ static const char *config_def_app_versio
+--- config.c.orig      2007-09-10 22:39:48.000000000 +0200
++++ config.c   2008-05-28 16:32:56.000000000 +0100
+@@ -267,12 +267,12 @@ static const char *config_def_app_versio
  
  static const char *config_def_script(void)
  {
@@ -56,3 +56,23 @@
                0, 0, 0, NULL, NULL, NULL, NULL, NULL
        }
  };
+@@ -538,7 +538,7 @@ static char *get_config_filename(const c
+ {
+       char *realname;
+       
+-      asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
++      asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "@PKG_SYSCONFDIR@/vpnc/", name, add_dot_conf ? ".conf" : "");
+       return realname;
+ }
+ 
+@@ -757,8 +757,8 @@ void do_config(int argc, char **argv)
+       }
+       
+       if (!got_conffile) {
+-              read_config_file("/etc/vpnc/default.conf", config, 1);
+-              read_config_file("/etc/vpnc.conf", config, 1);
++              read_config_file("@PKG_SYSCONFDIR@/vpnc/default.conf", config, 1);
++              read_config_file("@PKG_SYSCONFDIR@/vpnc.conf", config, 1);
+       }
+       
+       if (!print_config) {
diff -r 9b5b0ae1f05c -r 77d1e316a9fa net/vpnc/patches/patch-ac
--- a/net/vpnc/patches/patch-ac Thu Apr 14 20:38:09 2011 +0000
+++ b/net/vpnc/patches/patch-ac Thu Apr 14 21:27:39 2011 +0000
@@ -1,7 +1,32 @@
-$NetBSD: patch-ac,v 1.8 2011/03/05 17:46:41 cegger Exp $
+$NetBSD: patch-ac,v 1.9 2011/04/14 21:27:39 hans Exp $
 
---- vpnc-script.in.orig        2011-03-01 14:40:25.000000000 +0000
+--- vpnc-script.in.orig        2009-02-04 14:40:43.000000000 +0100
 +++ vpnc-script.in
+@@ -48,18 +48,19 @@ 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"
 @@ -94,7 +94,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))
@@ -11,6 +36,15 @@
        fi
  
        # Point to point interface require a netmask of 255.255.255.255 on some systems
+@@ -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() {
 @@ -440,6 +440,20 @@ do_pre_init() {
  }