← Back to branch summary

~ubuntu-branches/ubuntu/karmic/vpnc/karmic

« back to all changes in this revision

Viewing changes to debian/patches/04_debianitis.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Eduard Bloch
  • Date: 2007-12-23 15:42:52 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20071223154252-jvgomqxzjc8p22ox
Tags: 0.5.1r275-1
http://bugs.debian.org/454236
* New upstream SVN snapshot with various bugfixes
* A very very very very urgent "fix" from Nicolas Duboc to put cisco-decrypt
  into /usr/lib/vpnc (closes: #454236)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_debianitis.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
 
1
#!/bin/sh /usr/share/dpatch/dpatch-run
2
2
## 04_debianitis.dpatch by Eduard Bloch <blade@debian.org>
3
3
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
4
 
7
5
@DPATCH@
8
 
diff -urNad vpnc~/config.c vpnc/config.c
9
 
--- vpnc~/config.c      2007-02-16 18:22:06.000000000 +0100
10
 
+++ vpnc/config.c       2007-05-23 23:21:23.000000000 +0200
11
 
@@ -264,6 +264,16 @@
 
6
diff -urNad vpnc-0.5.1r275~/config.c vpnc-0.5.1r275/config.c
 
7
--- vpnc-0.5.1r275~/config.c    2007-12-23 15:32:14.000000000 +0100
 
8
+++ vpnc-0.5.1r275/config.c     2007-12-23 16:28:24.000000000 +0100
 
9
@@ -186,6 +186,16 @@
12
10
        return "cisco";
13
11
 }
14
12
 
25
23
 static const struct config_names_s {
26
24
        enum config_enum nm;
27
25
        const int needsArgument;
28
 
@@ -476,7 +486,29 @@
29
 
                NULL,
30
 
                "Don't ask anything, exit on missing options",
31
 
                NULL
 
26
@@ -435,7 +445,27 @@
 
27
                "<directory>",
 
28
                "path of the trusted CA-Directory",
 
29
                config_ca_dir
32
30
-       }, {
33
 
+       }, 
34
 
+    
35
 
+    
36
 
+         {
37
 
+            CONFIG_DNS_UPDATE, 1, 1,
38
 
+            "--dns-update",
39
 
+            "DNSUpdate",
40
 
+            "",
41
 
+            "DEPRECATED extension, see README.Debian for details",
42
 
+            config_def_dns_update
43
 
+        }, 
44
 
+
45
 
+        {
46
 
+            CONFIG_TARGET_NETWORKS, 1, 1,
47
 
+            "--target-networks",
48
 
+            "Target Networks",
49
 
+            NULL,
50
 
+            "DEPRECATED extension, see README.Debian for details",
51
 
+            config_def_networks_list
52
 
+        }, 
53
 
+
54
 
+    
55
 
+    {
 
31
+  }, 
 
32
+    {
 
33
+       CONFIG_DNS_UPDATE, 1, 1,
 
34
+       "--dns-update",
 
35
+       "DNSUpdate",
 
36
+       "",
 
37
+       "DEPRECATED extension, see README.Debian for details",
 
38
+       config_def_dns_update
 
39
+    }, 
 
40
+
 
41
+    {
 
42
+       CONFIG_TARGET_NETWORKS, 1, 1,
 
43
+       "--target-networks",
 
44
+       "Target Networks",
 
45
+       NULL,
 
46
+       "DEPRECATED extension, see README.Debian for details",
 
47
+       config_def_networks_list
 
48
+    }, 
 
49
+
 
50
+
 
51
+     {
56
52
                0, 0, 0, NULL, NULL, NULL, NULL, NULL
57
53
        }
58
54
 };
59
 
diff -urNad vpnc~/config.h vpnc/config.h
60
 
--- vpnc~/config.h      2007-02-08 03:55:55.000000000 +0100
61
 
+++ vpnc/config.h       2007-05-23 23:21:23.000000000 +0200
62
 
@@ -53,6 +53,13 @@
63
 
        CONFIG_VENDOR,
64
 
        CONFIG_NATT_MODE,
65
 
        CONFIG_UDP_ENCAP_PORT,
66
 
+
67
 
+
68
 
+
69
 
+    CONFIG_DNS_UPDATE,
70
 
+    CONFIG_TARGET_NETWORKS,
71
 
+
 
55
diff -urNad vpnc-0.5.1r275~/config.h vpnc-0.5.1r275/config.h
 
56
--- vpnc-0.5.1r275~/config.h    2007-12-23 15:32:14.000000000 +0100
 
57
+++ vpnc-0.5.1r275/config.h     2007-12-23 16:28:24.000000000 +0100
 
58
@@ -57,6 +57,11 @@
 
59
        CONFIG_AUTH_MODE,
 
60
        CONFIG_CA_FILE,
 
61
        CONFIG_CA_DIR,
 
62
+
 
63
+
 
64
+  CONFIG_DNS_UPDATE,
 
65
+  CONFIG_TARGET_NETWORKS,
72
66
+
73
67
        LAST_CONFIG
74
68
 };
75
69
 
76
 
diff -urNad vpnc~/vpnc-script vpnc/vpnc-script
77
 
--- vpnc~/vpnc-script   2007-02-18 12:52:03.000000000 +0100
78
 
+++ vpnc/vpnc-script    2007-05-23 23:23:07.000000000 +0200
79
 
@@ -74,8 +74,9 @@
 
70
diff -urNad vpnc-0.5.1r275~/pcf2vpnc vpnc-0.5.1r275/pcf2vpnc
 
71
--- vpnc-0.5.1r275~/pcf2vpnc    2007-12-23 15:32:14.000000000 +0100
 
72
+++ vpnc-0.5.1r275/pcf2vpnc     2007-12-23 16:28:24.000000000 +0100
 
73
@@ -24,6 +24,8 @@
 
74
 use strict;
 
75
 use warnings;
 
76
 
 
77
+$ENV{"PATH"}.=":/usr/lib/vpnc";
 
78
+
 
79
 my %authmode = ( 1 => 'psk', 3 => 'cert', 5 => 'hybrid' );
 
80
 my $needs_cert = 0;
 
81
 my $no_decrypt = 0;
 
82
diff -urNad vpnc-0.5.1r275~/vpnc-script.in vpnc-0.5.1r275/vpnc-script.in
 
83
--- vpnc-0.5.1r275~/vpnc-script.in      2007-12-23 15:32:14.000000000 +0100
 
84
+++ vpnc-0.5.1r275/vpnc-script.in       2007-12-23 16:29:13.000000000 +0100
 
85
@@ -84,7 +84,7 @@
 
86
 # =========== tunnel interface handling ====================================
 
87
 
 
88
 do_ifconfig() {
 
89
-       ifconfig "$TUNDEV" inet "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask ${INTERNAL_IP4_NETMASK:-255.255.255.255} mtu 1412 up
 
90
+       /sbin/ifconfig "$TUNDEV" inet "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask ${INTERNAL_IP4_NETMASK:-255.255.255.255} mtu 1390 up
 
91
 }
 
92
 
 
93
 destroy_tun_device() {
 
94
@@ -384,8 +384,9 @@
80
95
                else # can't open /dev/net/tun
81
96
                        test -e /proc/sys/kernel/modprobe && `cat /proc/sys/kernel/modprobe` tun 2>/dev/null
82
97
                        # fix for broken devfs in kernel 2.6.x
88
103
                                ln -sf /dev/misc/net/tun /dev/net/tun
89
104
                        fi
90
105
                        # make sure tun device exists
91
 
@@ -107,7 +108,7 @@
92
 
 }
93
 
 
94
 
 do_ifconfig() {
95
 
-       ifconfig "$TUNDEV" inet "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask 255.255.255.255 mtu 1412 up
96
 
+       /sbin/ifconfig "$TUNDEV" inet "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask 255.255.255.255 mtu 1390 up
97
 
 }
98
 
 
99
 
 destroy_tun_device() {
100
 
@@ -212,6 +213,26 @@
101
 
 fi
102
 
 
103
 
 write_resolvconf() {
104
 
+
105
 
+   case "$DNS_UPDATE" in
106
 
+      *no|*NO|*No|*nO)
107
 
+      return;
108
 
+      ;;
109
 
+   esac
110
 
+
111
 
+   if [ -x /sbin/resolvconf ] ; then
112
 
+      ( 
113
 
+      if [ "$CISCO_DEF_DOMAIN" ] ; then
114
 
+         echo domain "$CISCO_DEF_DOMAIN"
115
 
+         echo search "$CISCO_DEF_DOMAIN"
116
 
+      fi
117
 
+      for ip in "$INTERNAL_IP4_DNS" ; do
118
 
+         echo nameserver $ip
119
 
+      done
120
 
+      ) | /sbin/resolvconf -a $TUNDEV
121
 
+      return
122
 
+   fi
123
 
+
124
 
        grep '^#@VPNC_GENERATED@' /etc/resolv.conf > /dev/null 2>&1 || cp -- /etc/resolv.conf "$RESOLV_CONF_BACKUP"
125
 
        NEW_RESOLVCONF="#@VPNC_GENERATED@ -- this file is generated by vpnc
126
 
 # and will be overwritten by vpnc
127
 
@@ -306,6 +327,19 @@
128
 
 }
129
 
 
130
 
 reset_resolvconf() {
131
 
+
132
 
+   if [ -x /sbin/resolvconf ] ; then
133
 
+      /sbin/resolvconf -d "$TUNDEV"
134
 
+      return
135
 
+   fi
136
 
+
137
 
+   case "$DNS_UPDATE" in
138
 
+      *no|*NO|*No|*nO)
139
 
+      return
140
 
+      ;;
141
 
+   esac
142
 
+
143
 
+
144
 
        if [ ! -e "$RESOLV_CONF_BACKUP" ]; then
145
 
                return
146
 
        fi
147
 
@@ -331,6 +365,26 @@
 
106
@@ -421,6 +422,27 @@
148
107
 }
149
108
 
150
109
 do_connect() {
151
 
+    # Debian specific, insert your code there to avoid modification of
152
 
+    # conffiles like this script
153
 
+    if [ -r /etc/vpnc/vpnc-script-connect-action ] ; then
154
 
+        . /etc/vpnc/vpnc-script-connect-action
155
 
+    fi
156
 
+    # backwards compatibility mapping for old extensions
157
 
+    if test "$TARGET_NETWORKS" ; then
158
 
+       i=0
159
 
+       for network in $TARGET_NETWORKS ; do
160
 
+          eval CISCO_SPLIT_INC_${i}_ADDR=`echo $network | cut -f1 -d/`
161
 
+          eval CISCO_SPLIT_INC_${i}_MASKLEN=`echo $network | cut -f2 -d/`
162
 
+          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 )
163
 
+          eval CISCO_SPLIT_INC_${i}_PROTOCOL=0
164
 
+          eval CISCO_SPLIT_INC_${i}_SPORT=0
165
 
+          eval CISCO_SPLIT_INC_${i}_DPORT=0
166
 
+          i=`expr $i + 1`
167
 
+       done
168
 
+       CISCO_SPLIT_INC=$i
169
 
+    fi
 
110
+      # Debian specific, insert your code there to avoid modification of
 
111
+      # conffiles like this script
 
112
+      if [ -r /etc/vpnc/vpnc-script-connect-action ] ; then
 
113
+        . /etc/vpnc/vpnc-script-connect-action
 
114
+      fi
 
115
+      # backwards compatibility mapping for old extensions
 
116
+      if test "$TARGET_NETWORKS" ; then
 
117
+        i=0
 
118
+        for network in $TARGET_NETWORKS ; do
 
119
+           eval CISCO_SPLIT_INC_${i}_ADDR=`echo $network | cut -f1 -d/`
 
120
+           eval CISCO_SPLIT_INC_${i}_MASKLEN=`echo $network | cut -f2 -d/`
 
121
+           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 )
 
122
+           eval CISCO_SPLIT_INC_${i}_PROTOCOL=0
 
123
+           eval CISCO_SPLIT_INC_${i}_SPORT=0
 
124
+           eval CISCO_SPLIT_INC_${i}_DPORT=0
 
125
+           i=`expr $i + 1`
 
126
+        done
 
127
+        CISCO_SPLIT_INC=$i
 
128
+      fi
 
129
+      ## end Debian specific
170
130
+
171
131
        if [ -n "$CISCO_BANNER" ]; then
172
132
                echo "Connect Banner:"
173
133
                echo "$CISCO_BANNER" | while read LINE ; do echo "|" "$LINE" ; done
174
 
@@ -358,9 +412,21 @@
175
 
        if [ -n "$INTERNAL_IP4_DNS" ]; then
176
 
                write_resolvconf
177
 
        fi
178
 
+
179
 
+  if [ -r /etc/vpnc/vpnc-script-post-connect-action ] ; then
180
 
+     . /etc/vpnc/vpnc-script-post-connect-action
181
 
+  fi
 
134
@@ -448,13 +470,31 @@
 
135
        else
 
136
                set_default_route
 
137
        fi
 
138
-       
 
139
-       if [ -n "$INTERNAL_IP4_DNS" ]; then
 
140
-               $MODIFYRESOLVCONF
 
141
+
 
142
+       case "$DNS_UPDATE" in
 
143
+          *no|*NO|*No|*nO)
 
144
+          ;;
 
145
+          *)
 
146
+          if [ -n "$INTERNAL_IP4_DNS" ]; then
 
147
+             $MODIFYRESOLVCONF
 
148
+          fi
 
149
+          ;;
 
150
+       esac
 
151
+
 
152
+       if [ -r /etc/vpnc/vpnc-script-post-connect-action ] ; then
 
153
+          . /etc/vpnc/vpnc-script-post-connect-action
 
154
        fi
182
155
+
183
156
 }
184
157
 
185
158
 do_disconnect() {
186
159
+
187
 
+     # Debian specific, insert your code there to avoid modification of
188
 
+     # conffiles like this script
189
 
+     if [ -r /etc/vpnc/vpnc-script-disconnect-action ] ; then
190
 
+         . /etc/vpnc/vpnc-script-disconnect-action
191
 
+     fi
 
160
+       # Debian specific, insert your code there to avoid modification of
 
161
+       # conffiles like this script
 
162
+       if [ -r /etc/vpnc/vpnc-script-disconnect-action ] ; then
 
163
+          . /etc/vpnc/vpnc-script-disconnect-action
 
164
+       fi
192
165
+
193
166
        destroy_tun_device
194
167
        if [ -n "$CISCO_SPLIT_INC" ]; then
195
168
                i=0
196
 
@@ -386,6 +452,9 @@
197
 
        if [ -n "$INTERNAL_IP4_DNS" ]; then
198
 
                reset_resolvconf
 
169
@@ -480,8 +520,17 @@
 
170
        
 
171
        del_vpngateway_route
 
172
        
 
173
-       if [ -n "$INTERNAL_IP4_DNS" ]; then
 
174
-               $RESTORERESOLVCONF
 
175
+       case "$DNS_UPDATE" in
 
176
+          *no|*NO|*No|*nO)
 
177
+          ;;
 
178
+          *)
 
179
+          if [ -n "$INTERNAL_IP4_DNS" ]; then
 
180
+             $RESTORERESOLVCONF
 
181
+          fi
 
182
+          ;;
 
183
+       esac
 
184
+       if [ -r /etc/vpnc/vpnc-script-post-disconnect-action ] ; then
 
185
+          . /etc/vpnc/vpnc-script-post-disconnect-action
199
186
        fi
200
 
+  if [ -r /etc/vpnc/vpnc-script-post-disconnect-action ] ; then
201
 
+     . /etc/vpnc/vpnc-script-post-disconnect-action
202
 
+  fi
203
187
 }
204
188
 
205
 
 ####
206
 
diff -urNad vpnc~/vpnc.c vpnc/vpnc.c
207
 
--- vpnc~/vpnc.c        2007-02-19 21:49:51.000000000 +0100
208
 
+++ vpnc/vpnc.c 2007-05-23 23:21:23.000000000 +0200
209
 
@@ -157,6 +157,9 @@
 
189
diff -urNad vpnc-0.5.1r275~/vpnc.c vpnc-0.5.1r275/vpnc.c
 
190
--- vpnc-0.5.1r275~/vpnc.c      2007-12-23 15:32:14.000000000 +0100
 
191
+++ vpnc-0.5.1r275/vpnc.c       2007-12-23 16:28:24.000000000 +0100
 
192
@@ -264,6 +264,9 @@
210
193
 {
211
194
        setenv("VPNGATEWAY", inet_ntoa(s->dst), 1);
212
195
        setenv("reason", "connect", 1);