Fixing with the proper patch for 4.8.00 and closing bug #207536.

Package-Manager: portage-2.1.4

9 files changed, 157 insertions, 35 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 034677b31238..813907b6aa00 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.56 2008/02/02 14:16:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.57 2008/02/05 02:37:10 wolf31o2 Exp $
+
+  05 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> files/2.6.24.patch:
+  Fixing with the proper patch for 4.8.00 and closing bug #207536.
 
   02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   cisco-vpnclient-3des-4.8.00.0490-r1.ebuild:
diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index 575a239cfb24..a6e929fe552f 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,22 +1,104 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.6.19.patch 3247 RMD160 c3b6dac23c6e297f4a4468a653407b769fb72742 SHA1 bb7d3efa9cfaa1aaf0dcf9811202d651b8aeabd0 SHA256 e6b221751bc87d914b55912304ba0a72536ebc6bd0e3476024b4eb554391e5e5
+MD5 3f4623681d5bcd124174906e9f3a6372 files/2.6.19.patch 3247
+RMD160 c3b6dac23c6e297f4a4468a653407b769fb72742 files/2.6.19.patch 3247
+SHA256 e6b221751bc87d914b55912304ba0a72536ebc6bd0e3476024b4eb554391e5e5 files/2.6.19.patch 3247
 AUX 2.6.22.patch 12897 RMD160 ccb8a185ee36fd6423d58251ae472e711f91143c SHA1 04f6d02906c1fae852ecf5fb4c333bfdd1366349 SHA256 ce86c1391ade1118c84331224974278356663dda4612a443f067fc6b1bcc5633
-AUX 2.6.24.patch 3989 RMD160 3f00c2db59d8b08ca8491952092dd5fb1a0dc251 SHA1 b274c54846c6d2aacdccd9cbd0f6998226f8efef SHA256 b3ecb47d131103faf4472a70fafd5ea73afacac0ea6c0f3e44d68488f0836994
+MD5 416d9b33716c2b22bbf499d9f5b5b179 files/2.6.22.patch 12897
+RMD160 ccb8a185ee36fd6423d58251ae472e711f91143c files/2.6.22.patch 12897
+SHA256 ce86c1391ade1118c84331224974278356663dda4612a443f067fc6b1bcc5633 files/2.6.22.patch 12897
+AUX 2.6.24.patch 4651 RMD160 17d96cfd83859bb68d989f1ad0f477c9361b7725 SHA1 e25e886c9da1f8554ed02178c88f7d962e89117a SHA256 51b2178a65c26d9900012b7871d19f5e1179d162fd7293accc04d5b4905dbe3f
+MD5 33459d6e7fa969c01fab324b058e9aef files/2.6.24.patch 4651
+RMD160 17d96cfd83859bb68d989f1ad0f477c9361b7725 files/2.6.24.patch 4651
+SHA256 51b2178a65c26d9900012b7871d19f5e1179d162fd7293accc04d5b4905dbe3f files/2.6.24.patch 4651
 AUX 4.6.02.0030-2.6.14.patch 1122 RMD160 e6c7860c552548574987932029d0b8df1f4dd09b SHA1 04039e0f6715ab443805074c864c4120e76ca51b SHA256 5067e4f32875972b1b633cb15d9a635c3edcc3ea8f26b58e10b8e57b84803ec4
+MD5 393a6d85fef03bd017fad57cc9917e55 files/4.6.02.0030-2.6.14.patch 1122
+RMD160 e6c7860c552548574987932029d0b8df1f4dd09b files/4.6.02.0030-2.6.14.patch 1122
+SHA256 5067e4f32875972b1b633cb15d9a635c3edcc3ea8f26b58e10b8e57b84803ec4 files/4.6.02.0030-2.6.14.patch 1122
 AUX 4.6.02.0030-supported_device.patch 807 RMD160 751eeac122d6c508ddd1f197b2e82ef026989c8b SHA1 f06bd33c7008c689e3efb8cbcb258fb4320edc6c SHA256 df9aabb51172f6f8b7920b08338ef498a4a9c6ab5ec26b172ee6182c4ce20228
+MD5 e9039147fbc74c136f4cc34f1b8baaf1 files/4.6.02.0030-supported_device.patch 807
+RMD160 751eeac122d6c508ddd1f197b2e82ef026989c8b files/4.6.02.0030-supported_device.patch 807
+SHA256 df9aabb51172f6f8b7920b08338ef498a4a9c6ab5ec26b172ee6182c4ce20228 files/4.6.02.0030-supported_device.patch 807
 AUX 4.6.03.0190-2.6.14.patch 584 RMD160 1571949fb116774a3784f1623809872559d14e06 SHA1 16a8913037eb7b664788ae67661750f336ba0520 SHA256 99b50667afb2fc20a1d12a568de9c63d9a0a4ab4497962fd48b9ef1dd0296a39
+MD5 85b413dbfb35dc1d790002409df1bb1f files/4.6.03.0190-2.6.14.patch 584
+RMD160 1571949fb116774a3784f1623809872559d14e06 files/4.6.03.0190-2.6.14.patch 584
+SHA256 99b50667afb2fc20a1d12a568de9c63d9a0a4ab4497962fd48b9ef1dd0296a39 files/4.6.03.0190-2.6.14.patch 584
 AUX 4.7.00.0640-2.6.14.patch 1122 RMD160 e6c7860c552548574987932029d0b8df1f4dd09b SHA1 04039e0f6715ab443805074c864c4120e76ca51b SHA256 5067e4f32875972b1b633cb15d9a635c3edcc3ea8f26b58e10b8e57b84803ec4
+MD5 393a6d85fef03bd017fad57cc9917e55 files/4.7.00.0640-2.6.14.patch 1122
+RMD160 e6c7860c552548574987932029d0b8df1f4dd09b files/4.7.00.0640-2.6.14.patch 1122
+SHA256 5067e4f32875972b1b633cb15d9a635c3edcc3ea8f26b58e10b8e57b84803ec4 files/4.7.00.0640-2.6.14.patch 1122
 AUX 4.7.00.0640-2.6.22.patch 11658 RMD160 ee2fefab1a9dd10e62c13afb91b9656a754b4301 SHA1 aafd920f408b188ff0f8b65f362ab28186ba2b46 SHA256 2eec130f3f00d9eae019fd6236d4039a59197ec5626b8ac27f61205d72e11dba
+MD5 ccec3bfd38484b5208be59334cc1b0ef files/4.7.00.0640-2.6.22.patch 11658
+RMD160 ee2fefab1a9dd10e62c13afb91b9656a754b4301 files/4.7.00.0640-2.6.22.patch 11658
+SHA256 2eec130f3f00d9eae019fd6236d4039a59197ec5626b8ac27f61205d72e11dba files/4.7.00.0640-2.6.22.patch 11658
 AUX driver_build_CC.patch 547 RMD160 9de233256381d54c6168b0ce1bc5d84fe8048506 SHA1 352f32eac28165efd0de6f0b74694b62910df67f SHA256 4b32234c8a259cac99da8ec0aef0dff673558b1b198688b0fbcd5a712e54bfec
+MD5 fffa4fdd9a7bd0eeae2d4832895ce99f files/driver_build_CC.patch 547
+RMD160 9de233256381d54c6168b0ce1bc5d84fe8048506 files/driver_build_CC.patch 547
+SHA256 4b32234c8a259cac99da8ec0aef0dff673558b1b198688b0fbcd5a712e54bfec files/driver_build_CC.patch 547
 AUX vpnclient.rc 2318 RMD160 8d957f90366567ba755263dda232f1b26bbd5f67 SHA1 86ac5ddd34546796b4be4efe8a40bac628bac624 SHA256 a4ed3b575a7b5431895c2f01b68eede21adbf98555ff125bd3f131872a5cc792
+MD5 c710c446577ffcfb0e4808e86905a032 files/vpnclient.rc 2318
+RMD160 8d957f90366567ba755263dda232f1b26bbd5f67 files/vpnclient.rc 2318
+SHA256 a4ed3b575a7b5431895c2f01b68eede21adbf98555ff125bd3f131872a5cc792 files/vpnclient.rc 2318
 DIST vpnclient-linux-4.6.02.0030-k9.tar.gz 1671443 RMD160 1024682f7e55737149587ab6601d279e6312d46d SHA1 2a0695a575aa9141dd703791619d386eed1c1d0d SHA256 b5129c738b754d2f3e59bff6af2861ddfd8b2c6a0ade69ca9404dee21f2c25fa
 DIST vpnclient-linux-x86_64-4.6.03.0190-k9.tar.gz 1839683 RMD160 a4c099484bd85b4dcc2fa5584ce83a732f6ae847 SHA1 63bdb37e68ba91a0b91b355d40792aa962efa32f SHA256 5567d1254c395ddebf981deafa302b179393c1db2b2b0e5797aa2d10a94c7a2d
 DIST vpnclient-linux-x86_64-4.7.00.0640-k9.tar.gz 2043002 RMD160 d237f79993536aa8604ad358d87281a767594d3e SHA1 224a6f6f72a1ad9b23767dcd437f1c15d3069a25 SHA256 7249cc6835db4b100d5551e1eeaacca18999c7af692e660e8e2787b60a074ff0
 DIST vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213 RMD160 e38e5d937c9d47abb2484c052212cc02aaf84088 SHA1 d3fe2a0dd44c956ee66a51f0a7011b647e06dafb SHA256 cd9c3a73f9f818608b42edab534d7a75d6c5f01874eed012b05f9932a61f1287
 EBUILD cisco-vpnclient-3des-4.6.02.0030.ebuild 2681 RMD160 c42b35035a08c00ec10923fe78bcf20666e8c7a5 SHA1 5cc91857b835479753f7d51bdbf05a4249ff6a00 SHA256 23c0b6afdf4604ef1a033e7ca8fa0e876302d11b0c9884a3060e9a789d450984
+MD5 f163fe35498a186ccffedeb97dc269e2 cisco-vpnclient-3des-4.6.02.0030.ebuild 2681
+RMD160 c42b35035a08c00ec10923fe78bcf20666e8c7a5 cisco-vpnclient-3des-4.6.02.0030.ebuild 2681
+SHA256 23c0b6afdf4604ef1a033e7ca8fa0e876302d11b0c9884a3060e9a789d450984 cisco-vpnclient-3des-4.6.02.0030.ebuild 2681
 EBUILD cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 2243 RMD160 dfbadc8be22cab1cbab08100c7491f3add136138 SHA1 cf7b1b9d6e54f697f8a21ed73a9e9e5414794d07 SHA256 8d6a14215d5a7cc10ccc3ac22cfca55132c98d4fb9f3f1b85a50279811f4b290
+MD5 edf4292e623ee867817577031bcaf6c0 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 2243
+RMD160 dfbadc8be22cab1cbab08100c7491f3add136138 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 2243
+SHA256 8d6a14215d5a7cc10ccc3ac22cfca55132c98d4fb9f3f1b85a50279811f4b290 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 2243
 EBUILD cisco-vpnclient-3des-4.7.00.0640-r1.ebuild 2283 RMD160 7f143807c2381553adf2e4caee52e21944036d17 SHA1 f895b1e7ae8d75abf6d3d2410a7c1660e80ae0ea SHA256 5939f8402b213c175f245b41cf740b81af570e13b9f91697b4613a31548e64ff
+MD5 1f6ff0299246b81378bcc8654eb86d7d cisco-vpnclient-3des-4.7.00.0640-r1.ebuild 2283
+RMD160 7f143807c2381553adf2e4caee52e21944036d17 cisco-vpnclient-3des-4.7.00.0640-r1.ebuild 2283
+SHA256 5939f8402b213c175f245b41cf740b81af570e13b9f91697b4613a31548e64ff cisco-vpnclient-3des-4.7.00.0640-r1.ebuild 2283
 EBUILD cisco-vpnclient-3des-4.7.00.0640.ebuild 2273 RMD160 90af189a1bf8effd88cfaf6d3e07dc764ed1da13 SHA1 7f8d4bf416c37b94af8d98908debbd8c8bbd1f8c SHA256 1992d39efc92aa2df5e465ea1093ec62f5e9e9f43bee2bcb1d2d3060e56a7317
+MD5 292faba9762582d4a1d3bf280e29e305 cisco-vpnclient-3des-4.7.00.0640.ebuild 2273
+RMD160 90af189a1bf8effd88cfaf6d3e07dc764ed1da13 cisco-vpnclient-3des-4.7.00.0640.ebuild 2273
+SHA256 1992d39efc92aa2df5e465ea1093ec62f5e9e9f43bee2bcb1d2d3060e56a7317 cisco-vpnclient-3des-4.7.00.0640.ebuild 2273
 EBUILD cisco-vpnclient-3des-4.8.00.0490-r1.ebuild 2167 RMD160 2ab250b51e2083bb98f2605460fb2b8fb7ad6255 SHA1 0bd94f17df6823da2d47079b7234c79b699ee23d SHA256 1ad5c2f302f1667f8c988ccc20d1a4db90d94a7d8cd7570f474b2451b763d267
+MD5 6388f25e1302dee3a04181d755ac781c cisco-vpnclient-3des-4.8.00.0490-r1.ebuild 2167
+RMD160 2ab250b51e2083bb98f2605460fb2b8fb7ad6255 cisco-vpnclient-3des-4.8.00.0490-r1.ebuild 2167
+SHA256 1ad5c2f302f1667f8c988ccc20d1a4db90d94a7d8cd7570f474b2451b763d267 cisco-vpnclient-3des-4.8.00.0490-r1.ebuild 2167
 EBUILD cisco-vpnclient-3des-4.8.00.0490.ebuild 2131 RMD160 a4783083c30beaee1fb2df27abb01040b730a0f2 SHA1 e838f1025bdef27df1bd359f194896d9e63e5741 SHA256 e35aa6c68ec416cfaf0b4b7a2bac9227c17e078bb90e4285f7d7c19805c99148
-MISC ChangeLog 14923 RMD160 986de8f5e45f714c9567c806f7c4f63368f8c137 SHA1 f0ba086fe61a63523ebaf2b1ccdd6c3fd36c04d2 SHA256 975a83b94a271675cda196ed8828307965e9d861c1172851e00c0435bce06e47
+MD5 0182db4b4a73ffe282d8dd5fd8d60d83 cisco-vpnclient-3des-4.8.00.0490.ebuild 2131
+RMD160 a4783083c30beaee1fb2df27abb01040b730a0f2 cisco-vpnclient-3des-4.8.00.0490.ebuild 2131
+SHA256 e35aa6c68ec416cfaf0b4b7a2bac9227c17e078bb90e4285f7d7c19805c99148 cisco-vpnclient-3des-4.8.00.0490.ebuild 2131
+MISC ChangeLog 15065 RMD160 d57d9eed03eec6af0ddff30c16b9618342e425ad SHA1 34d1931e854377c609577750d26e48fe11904abf SHA256 89f2921dbe17ae2833706d351a0e222139ea66951b922e0829bc03200eb813d2
+MD5 41d587fdd9752348560e980aa19171c0 ChangeLog 15065
+RMD160 d57d9eed03eec6af0ddff30c16b9618342e425ad ChangeLog 15065
+SHA256 89f2921dbe17ae2833706d351a0e222139ea66951b922e0829bc03200eb813d2 ChangeLog 15065
 MISC metadata.xml 757 RMD160 60c81426ce38824eb2302520f55c204e6d35c4fe SHA1 170b258b21c5260d39f9b24151a85895c4557763 SHA256 51156c87787b5b5c034cf46843c2d09e15c6c889699ec6df47bf4760d116e01a
+MD5 d73f09763957ef63c1fd72fbce7f5163 metadata.xml 757
+RMD160 60c81426ce38824eb2302520f55c204e6d35c4fe metadata.xml 757
+SHA256 51156c87787b5b5c034cf46843c2d09e15c6c889699ec6df47bf4760d116e01a metadata.xml 757
+MD5 396968a162b34135dc0f9513fd00b2e2 files/digest-cisco-vpnclient-3des-4.6.02.0030 212
+RMD160 110f2e35db5c73d5788e394a166437f8a2e0eedb files/digest-cisco-vpnclient-3des-4.6.02.0030 212
+SHA256 8e00d29d4c7e371eedc3439c63d363c49b047600d28e6fcc46b16899f24bb03d files/digest-cisco-vpnclient-3des-4.6.02.0030 212
+MD5 f9a58e7f1d5bc90599dcdb2b0858d18f files/digest-cisco-vpnclient-3des-4.6.03.0190-r1 226
+RMD160 537b518d8fc3c69945aa3b6d3b1d335b4d6cc691 files/digest-cisco-vpnclient-3des-4.6.03.0190-r1 226
+SHA256 24cfef86d2c3f9bc070c84e94cefe884d215dd5dd5ab9081d4a630ed05eddfee files/digest-cisco-vpnclient-3des-4.6.03.0190-r1 226
+MD5 90f0190384047df7c8fa7991032fa6cf files/digest-cisco-vpnclient-3des-4.7.00.0640 226
+RMD160 740843570a2edd7df03c9710bf88a10eff475935 files/digest-cisco-vpnclient-3des-4.7.00.0640 226
+SHA256 0def08b8c8d0be4a45872474d768276b7909466883f220fdb6bba5a31729222e files/digest-cisco-vpnclient-3des-4.7.00.0640 226
+MD5 90f0190384047df7c8fa7991032fa6cf files/digest-cisco-vpnclient-3des-4.7.00.0640-r1 226
+RMD160 740843570a2edd7df03c9710bf88a10eff475935 files/digest-cisco-vpnclient-3des-4.7.00.0640-r1 226
+SHA256 0def08b8c8d0be4a45872474d768276b7909466883f220fdb6bba5a31729222e files/digest-cisco-vpnclient-3des-4.7.00.0640-r1 226
+MD5 b629ca886d55951825a39b009bb4f624 files/digest-cisco-vpnclient-3des-4.8.00.0490 316
+RMD160 ebed3d7aa111ac70849fab7c39e108bf98cf062e files/digest-cisco-vpnclient-3des-4.8.00.0490 316
+SHA256 a3e015b55bb71f18f8fef4a6e76b9086a3e6f86aec3bab193884d1e8bbf015a4 files/digest-cisco-vpnclient-3des-4.8.00.0490 316
+MD5 b629ca886d55951825a39b009bb4f624 files/digest-cisco-vpnclient-3des-4.8.00.0490-r1 316
+RMD160 ebed3d7aa111ac70849fab7c39e108bf98cf062e files/digest-cisco-vpnclient-3des-4.8.00.0490-r1 316
+SHA256 a3e015b55bb71f18f8fef4a6e76b9086a3e6f86aec3bab193884d1e8bbf015a4 files/digest-cisco-vpnclient-3des-4.8.00.0490-r1 316
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeny9cACgkQkT4lNIS36YHV/ACZAQgtrHlb30Njb1SPNDxOOiwR
+DiEAoMGpYrFuwYS3QG90+TUuxA2xLHYi
+=w682
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cisco-vpnclient-3des/files/2.6.24.patch b/net-misc/cisco-vpnclient-3des/files/2.6.24.patch
index 14f7485c38bb..16680bcf2397 100644
--- a/net-misc/cisco-vpnclient-3des/files/2.6.24.patch
+++ b/net-misc/cisco-vpnclient-3des/files/2.6.24.patch
@@ -1,6 +1,6 @@
 diff -Nur vpnclient/GenDefs.h vpnclient.new/GenDefs.h
---- vpnclient/GenDefs.h	2007-08-22 21:30:31.000000000 +0200
-+++ vpnclient.new/GenDefs.h	2008-01-25 08:56:46.000000000 +0100
+--- vpnclient/GenDefs.h	2005-11-22 04:43:57.000000000 -0500
++++ vpnclient.new/GenDefs.h	2008-02-03 22:37:16.000000000 -0500
 @@ -105,6 +105,12 @@
  #define _INTPTR_T_DEFINED
  #endif
@@ -22,10 +22,22 @@ diff -Nur vpnclient/GenDefs.h vpnclient.new/GenDefs.h
  
  
  typedef int 	BOOL;
+diff -Nur vpnclient/Makefile vpnclient.new/Makefile
+--- vpnclient/Makefile	2005-11-22 04:43:57.000000000 -0500
++++ vpnclient.new/Makefile	2008-02-03 22:40:31.000000000 -0500
+@@ -12,7 +12,7 @@
+ SOURCE_OBJS := linuxcniapi.o frag.o IPSecDrvOS_linux.o interceptor.o linuxkernelapi.o
+ 
+ ifeq ($(SUBARCH),x86_64)
+-CFLAGS += -mcmodel=kernel -mno-red-zone
++EXTRA_CFLAGS += -mcmodel=kernel -mno-red-zone
+ NO_SOURCE_OBJS := libdriver64.so
+ else
+ NO_SOURCE_OBJS := libdriver.so
 diff -Nur vpnclient/interceptor.c vpnclient.new/interceptor.c
---- vpnclient/interceptor.c	2007-08-22 21:30:31.000000000 +0200
-+++ vpnclient.new/interceptor.c	2008-01-25 09:50:52.000000000 +0100
-@@ -28,6 +28,10 @@
+--- vpnclient/interceptor.c	2008-02-03 22:39:23.000000000 -0500
++++ vpnclient.new/interceptor.c	2008-02-03 22:37:16.000000000 -0500
+@@ -27,6 +27,10 @@
  #include <linux/udp.h>
  #include <net/protocol.h>
  
@@ -36,16 +48,22 @@ diff -Nur vpnclient/interceptor.c vpnclient.new/interceptor.c
  #include "linux_os.h"
  
  #include "vpn_ioctl_linux.h"
-@@ -48,7 +52,7 @@
+@@ -47,7 +51,13 @@
  unsigned long rx_bytes;
  
  /*methods of the cipsec network device*/
 -static int interceptor_init(struct net_device *);
-+static void interceptor_init(struct net_device *);
++static
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
++void 
++#else
++int
++#endif
++interceptor_init(struct net_device *);
  static struct net_device_stats *interceptor_stats(struct net_device *dev);
  static int interceptor_ioctl(struct net_device *dev, struct ifreq *ifr,
                               int cmd);
-@@ -107,18 +111,27 @@
+@@ -91,15 +101,33 @@
  
  BINDING Bindings[MAX_INTERFACES];
  
@@ -66,40 +84,45 @@ diff -Nur vpnclient/interceptor.c vpnclient.new/interceptor.c
      .notifier_call = handle_netdev_event,
  };
  
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
--static int
-+static void
- #else
--static int __init
-+static void __init
- #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++static
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
++void
++#else
++int
++#endif
++#else
+ static int __init
++#endif
  interceptor_init(struct net_device *dev)
  {
-@@ -133,8 +146,6 @@
+     ether_setup(dev);
+@@ -113,8 +141,9 @@
      dev->flags |= IFF_NOARP;
      dev->flags &= ~(IFF_BROADCAST | IFF_MULTICAST);
      kernel_memset(dev->broadcast, 0xFF, ETH_ALEN);
 -
 -    return 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
++	 return 0;
++#endif
  }
  
  static struct net_device_stats *
-@@ -362,8 +373,13 @@
- 
-     dp = NULL;
+@@ -344,7 +373,11 @@
      num_target_devices = 0;
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
--    for_each_netdev(dp)
-+    for_each_netdev(
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
-+                    &init_net,
-+#endif
-+                    dp)
- #else
-     for (dp = dev_base; dp != NULL; dp = dp->next)
- #endif
-@@ -919,15 +935,29 @@
+ 
+     #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+-      for_each_netdev(dp)
++      for_each_netdev(
++    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
++				          &init_net,
++    #endif
++							 dp)
+     #else
+       for (dp = dev_base; dp != NULL; dp = dp->next)
+     #endif
+@@ -843,15 +876,29 @@
  
      rc = CniPluginLoad(&pcDeviceName, &PCNICallbackTable);
  
@@ -130,7 +153,7 @@ diff -Nur vpnclient/interceptor.c vpnclient.new/interceptor.c
              CniPluginUnload();
  
          }
-@@ -947,7 +977,11 @@
+@@ -871,7 +918,11 @@
      cleanup_frag_queue();
      CniPluginUnload();
  
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030
new file mode 100644
index 000000000000..c466910e44d9
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030
@@ -0,0 +1,2 @@
+RMD160 1024682f7e55737149587ab6601d279e6312d46d vpnclient-linux-4.6.02.0030-k9.tar.gz 1671443
+SHA256 b5129c738b754d2f3e59bff6af2861ddfd8b2c6a0ade69ca9404dee21f2c25fa vpnclient-linux-4.6.02.0030-k9.tar.gz 1671443
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.03.0190-r1 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.03.0190-r1
new file mode 100644
index 000000000000..b10a174c046e
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.03.0190-r1
@@ -0,0 +1,2 @@
+RMD160 a4c099484bd85b4dcc2fa5584ce83a732f6ae847 vpnclient-linux-x86_64-4.6.03.0190-k9.tar.gz 1839683
+SHA256 5567d1254c395ddebf981deafa302b179393c1db2b2b0e5797aa2d10a94c7a2d vpnclient-linux-x86_64-4.6.03.0190-k9.tar.gz 1839683
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640
new file mode 100644
index 000000000000..afc553ed166e
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640
@@ -0,0 +1,2 @@
+RMD160 d237f79993536aa8604ad358d87281a767594d3e vpnclient-linux-x86_64-4.7.00.0640-k9.tar.gz 2043002
+SHA256 7249cc6835db4b100d5551e1eeaacca18999c7af692e660e8e2787b60a074ff0 vpnclient-linux-x86_64-4.7.00.0640-k9.tar.gz 2043002
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640-r1 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640-r1
new file mode 100644
index 000000000000..afc553ed166e
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640-r1
@@ -0,0 +1,2 @@
+RMD160 d237f79993536aa8604ad358d87281a767594d3e vpnclient-linux-x86_64-4.7.00.0640-k9.tar.gz 2043002
+SHA256 7249cc6835db4b100d5551e1eeaacca18999c7af692e660e8e2787b60a074ff0 vpnclient-linux-x86_64-4.7.00.0640-k9.tar.gz 2043002
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490
new file mode 100644
index 000000000000..0f516ebc624a
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490
@@ -0,0 +1,3 @@
+MD5 0f366eafd3a73823766e14b081591c0b vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213
+RMD160 e38e5d937c9d47abb2484c052212cc02aaf84088 vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213
+SHA256 cd9c3a73f9f818608b42edab534d7a75d6c5f01874eed012b05f9932a61f1287 vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490-r1 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490-r1
new file mode 100644
index 000000000000..0f516ebc624a
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.8.00.0490-r1
@@ -0,0 +1,3 @@
+MD5 0f366eafd3a73823766e14b081591c0b vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213
+RMD160 e38e5d937c9d47abb2484c052212cc02aaf84088 vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213
+SHA256 cd9c3a73f9f818608b42edab534d7a75d6c5f01874eed012b05f9932a61f1287 vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213