← Back to branch summary

~ubuntu-branches/ubuntu/breezy/vpnc/breezy

« back to all changes in this revision

Viewing changes to debian/patches/06_vpnc_connect.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Søren Hansen
  • Date: 2005-09-20 22:52:41 UTC
  • mfrom: (1.1.2 upstream) (2.1.1 sarge)
  • Revision ID: james.westby@ubuntu.com-20050920225241-sdtmrhk0xw7k5mcv
Tags: 0.3.3-0ubuntu2
Fixed reference to vpnc-script

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_vpnc_connect.dpatch
23
23
exit 0
24
24
 
25
25
@DPATCH@
26
 
diff -urNad vpnc/vpnc-connect /tmp/dpep.AVvEzc/vpnc/vpnc-connect
27
 
--- vpnc/vpnc-connect   2004-11-13 16:00:17.000000000 +0100
28
 
+++ /tmp/dpep.AVvEzc/vpnc/vpnc-connect  2004-11-23 19:06:46.000000000 +0100
 
26
diff -urNad vpnc/vpnc-connect /tmp/dpep.0Wak12/vpnc/vpnc-connect
 
27
--- vpnc/vpnc-connect   2005-03-26 10:58:32.000000000 +0100
 
28
+++ /tmp/dpep.0Wak12/vpnc/vpnc-connect  2005-05-05 19:50:33.612805288 +0200
29
29
@@ -8,6 +8,67 @@
30
30
 #* CISCO_DEF_DOMAIN       -- default domain name
31
31
 #* CISCO_BANNER           -- banner from server
44
44
+       ( grep -q " tun_init" /proc/k*syms || test -e /sys/class/misc/tun || grep -q CONFIG_TUN=y /boot/config-`uname -r` ) 2>/dev/null || echo -e "WARNING: failed to load the tun module\n"
45
45
+fi
46
46
+
47
 
+if [ -f "$1" ]; then
48
 
+config="$1"
 
47
+if [ -f "$1" ] && echo "$1" | grep -q "/" ; then
 
48
+  config="$1"
49
49
+elif [ -f "/etc/vpnc/$1.conf" ]; then
50
50
+       config="/etc/vpnc/$1.conf"
51
51
+elif [ -f /etc/vpnc/default.conf ]; then
94
94
 fix_ip_get_output () {
95
95
        sed 's/cache//;s/metric[0-9]\+ [0-9]\+//g' | xargs echo
96
96
 }
97
 
@@ -15,6 +76,7 @@
 
97
@@ -15,9 +76,11 @@
98
98
 defr=/var/run/vpnc/defaultroute
99
99
 gateway=/var/run/vpnc/gateway
100
100
 pid=/var/run/vpnc/pid
101
101
+dnsdev=/var/run/vpnc/dev
102
102
 
103
103
 if [ -z "$VPNGATEWAY" ]; then
104
 
        if [ -x "`which vpnc`" ]; then
105
 
@@ -30,7 +92,7 @@
 
104
-       for i in "$(dirname $0)/vpnc" /usr/local/sbin/vpnc /usr/sbin/vpnc ; do
 
105
+
 
106
+       for i in /usr/local/sbin/vpnc /usr/sbin/vpnc "$(dirname $0)/vpnc" ; do
 
107
                if [ -x "$i" ]; then
 
108
                        break
 
109
                fi
 
110
@@ -29,7 +92,7 @@
106
111
                exit 1
107
112
        fi
108
113
        
111
116
                mkdir -p $(dirname "$i")
112
117
        done
113
118
        
114
 
@@ -43,18 +105,50 @@
 
119
@@ -42,18 +105,50 @@
115
120
                fi
116
121
        fi
117
122