Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Chris Gianelloni (wolf31o2)" <wolf31o2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/cisco-vpnclient-3des/files: 2.6.24.patch digest-cisco-vpnclient-3des-4.8.00.0490 digest-cisco-vpnclient-3des-4.6.02.0030 digest-cisco-vpnclient-3des-4.8.00.0490-r1 digest-cisco-vpnclient-3des-4.7.00.0640-r1 digest-cisco-vpnclient-3des-4.7.00.0640 digest-cisco-vpnclient-3des-4.6.03.0190-r1
Date: Tue, 05 Feb 2008 02:37:17
Message-Id: E1JMDgO-00085a-Jg@stork.gentoo.org
1 wolf31o2 08/02/05 02:37:12
2
3 Modified: 2.6.24.patch
4 Added: digest-cisco-vpnclient-3des-4.8.00.0490
5 digest-cisco-vpnclient-3des-4.6.02.0030
6 digest-cisco-vpnclient-3des-4.8.00.0490-r1
7 digest-cisco-vpnclient-3des-4.7.00.0640-r1
8 digest-cisco-vpnclient-3des-4.7.00.0640
9 digest-cisco-vpnclient-3des-4.6.03.0190-r1
10 Log:
11 Fixing with the proper patch for 4.8.00 and closing bug #207536.
12 (Portage version: 2.1.4)
13
14 Revision Changes Path
15 1.2 net-misc/cisco-vpnclient-3des/files/2.6.24.patch
16
17 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/2.6.24.patch?rev=1.2&view=markup
18 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/2.6.24.patch?rev=1.2&content-type=text/plain
19 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/2.6.24.patch?r1=1.1&r2=1.2
20
21 Index: 2.6.24.patch
22 ===================================================================
23 RCS file: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/files/2.6.24.patch,v
24 retrieving revision 1.1
25 retrieving revision 1.2
26 diff -u -r1.1 -r1.2
27 --- 2.6.24.patch 2 Feb 2008 14:15:40 -0000 1.1
28 +++ 2.6.24.patch 5 Feb 2008 02:37:11 -0000 1.2
29 @@ -1,6 +1,6 @@
30 diff -Nur vpnclient/GenDefs.h vpnclient.new/GenDefs.h
31 ---- vpnclient/GenDefs.h 2007-08-22 21:30:31.000000000 +0200
32 -+++ vpnclient.new/GenDefs.h 2008-01-25 08:56:46.000000000 +0100
33 +--- vpnclient/GenDefs.h 2005-11-22 04:43:57.000000000 -0500
34 ++++ vpnclient.new/GenDefs.h 2008-02-03 22:37:16.000000000 -0500
35 @@ -105,6 +105,12 @@
36 #define _INTPTR_T_DEFINED
37 #endif
38 @@ -22,10 +22,22 @@
39
40
41 typedef int BOOL;
42 +diff -Nur vpnclient/Makefile vpnclient.new/Makefile
43 +--- vpnclient/Makefile 2005-11-22 04:43:57.000000000 -0500
44 ++++ vpnclient.new/Makefile 2008-02-03 22:40:31.000000000 -0500
45 +@@ -12,7 +12,7 @@
46 + SOURCE_OBJS := linuxcniapi.o frag.o IPSecDrvOS_linux.o interceptor.o linuxkernelapi.o
47 +
48 + ifeq ($(SUBARCH),x86_64)
49 +-CFLAGS += -mcmodel=kernel -mno-red-zone
50 ++EXTRA_CFLAGS += -mcmodel=kernel -mno-red-zone
51 + NO_SOURCE_OBJS := libdriver64.so
52 + else
53 + NO_SOURCE_OBJS := libdriver.so
54 diff -Nur vpnclient/interceptor.c vpnclient.new/interceptor.c
55 ---- vpnclient/interceptor.c 2007-08-22 21:30:31.000000000 +0200
56 -+++ vpnclient.new/interceptor.c 2008-01-25 09:50:52.000000000 +0100
57 -@@ -28,6 +28,10 @@
58 +--- vpnclient/interceptor.c 2008-02-03 22:39:23.000000000 -0500
59 ++++ vpnclient.new/interceptor.c 2008-02-03 22:37:16.000000000 -0500
60 +@@ -27,6 +27,10 @@
61 #include <linux/udp.h>
62 #include <net/protocol.h>
63
64 @@ -36,16 +48,22 @@
65 #include "linux_os.h"
66
67 #include "vpn_ioctl_linux.h"
68 -@@ -48,7 +52,7 @@
69 +@@ -47,7 +51,13 @@
70 unsigned long rx_bytes;
71
72 /*methods of the cipsec network device*/
73 -static int interceptor_init(struct net_device *);
74 -+static void interceptor_init(struct net_device *);
75 ++static
76 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
77 ++void
78 ++#else
79 ++int
80 ++#endif
81 ++interceptor_init(struct net_device *);
82 static struct net_device_stats *interceptor_stats(struct net_device *dev);
83 static int interceptor_ioctl(struct net_device *dev, struct ifreq *ifr,
84 int cmd);
85 -@@ -107,18 +111,27 @@
86 +@@ -91,15 +101,33 @@
87
88 BINDING Bindings[MAX_INTERFACES];
89
90 @@ -66,40 +84,45 @@
91 .notifier_call = handle_netdev_event,
92 };
93
94 - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
95 --static int
96 -+static void
97 - #else
98 --static int __init
99 -+static void __init
100 - #endif
101 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
102 ++static
103 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
104 ++void
105 ++#else
106 ++int
107 ++#endif
108 ++#else
109 + static int __init
110 ++#endif
111 interceptor_init(struct net_device *dev)
112 {
113 -@@ -133,8 +146,6 @@
114 + ether_setup(dev);
115 +@@ -113,8 +141,9 @@
116 dev->flags |= IFF_NOARP;
117 dev->flags &= ~(IFF_BROADCAST | IFF_MULTICAST);
118 kernel_memset(dev->broadcast, 0xFF, ETH_ALEN);
119 -
120 - return 0;
121 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
122 ++ return 0;
123 ++#endif
124 }
125
126 static struct net_device_stats *
127 -@@ -362,8 +373,13 @@
128 -
129 - dp = NULL;
130 +@@ -344,7 +373,11 @@
131 num_target_devices = 0;
132 -+
133 - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
134 -- for_each_netdev(dp)
135 -+ for_each_netdev(
136 -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
137 -+ &init_net,
138 -+#endif
139 -+ dp)
140 - #else
141 - for (dp = dev_base; dp != NULL; dp = dp->next)
142 - #endif
143 -@@ -919,15 +935,29 @@
144 +
145 + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
146 +- for_each_netdev(dp)
147 ++ for_each_netdev(
148 ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
149 ++ &init_net,
150 ++ #endif
151 ++ dp)
152 + #else
153 + for (dp = dev_base; dp != NULL; dp = dp->next)
154 + #endif
155 +@@ -843,15 +876,29 @@
156
157 rc = CniPluginLoad(&pcDeviceName, &PCNICallbackTable);
158
159 @@ -130,7 +153,7 @@
160 CniPluginUnload();
161
162 }
163 -@@ -947,7 +977,11 @@
164 +@@ -871,7 +918,11 @@
165 cleanup_frag_queue();
166 CniPluginUnload();
167
168
169
170
171 1.3 net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490
172
173 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490?rev=1.3&view=markup
174 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490?rev=1.3&content-type=text/plain
175 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490?r1=1.2&r2=1.3
176
177
178
179
180 1.4 net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030
181
182 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030?rev=1.4&view=markup
183 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030?rev=1.4&content-type=text/plain
184 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030?r1=1.3&r2=1.4
185
186
187
188
189 1.1 net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490-r1
190
191 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490-r1?rev=1.1&view=markup
192 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490-r1?rev=1.1&content-type=text/plain
193
194 Index: digest-cisco-vpnclient-3des-4.8.00.0490-r1
195 ===================================================================
196 MD5 0f366eafd3a73823766e14b081591c0b vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213
197 RMD160 e38e5d937c9d47abb2484c052212cc02aaf84088 vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213
198 SHA256 cd9c3a73f9f818608b42edab534d7a75d6c5f01874eed012b05f9932a61f1287 vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213
199
200
201
202 1.3 net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640-r1
203
204 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640-r1?rev=1.3&view=markup
205 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640-r1?rev=1.3&content-type=text/plain
206 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640-r1?r1=1.2&r2=1.3
207
208
209
210
211 1.4 net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640
212
213 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640?rev=1.4&view=markup
214 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640?rev=1.4&content-type=text/plain
215 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640?r1=1.3&r2=1.4
216
217
218
219
220 1.4 net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.03.0190-r1
221
222 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.03.0190-r1?rev=1.4&view=markup
223 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.03.0190-r1?rev=1.4&content-type=text/plain
224 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.03.0190-r1?r1=1.3&r2=1.4
225
226
227
228
229 --
230 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups