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

(Portage version: 2.1.4)

8 files changed, 73 insertions, 33 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/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