Added supported device patch from James Ward <jennyandjamesward@yahoo.com> and closin...

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 1d66967a63722c39f6857417b62c714fbe6b6a75..f89e6279f1d7c6f51b3d2b9dd365c62fe41265c9 100644 (file)
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.20 2004/11/04 01:18:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.21 2004/11/09 20:24:13 wolf31o2 Exp $
+
+*cisco-vpnclient-3des-4.6.00.0045-r1 (09 Nov 2004)
+
+  09 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/supported_device.patch,
+  +cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,
+  -cisco-vpnclient-3des-4.6.00.0045.ebuild:
+  Added supported device patch from James Ward <jennyandjamesward@yahoo.com>
+  and closing bugs #68738, #70365, and #70374.
 
 *cisco-vpnclient-3des-4.6.00.0045 (03 Nov 2004)
 

diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index d0f8ac3c4df8b6f620c1909cb4e578d7ba1176fb..d2dbdab32fba6f53a4eee16ab88d346001eb9d48 100644 (file)
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,15 +1,16 @@
 MD5 e880c1eb732c2c02a0f52dd2fdd6de6a cisco-vpnclient-3des-4.0.5.ebuild 1789
-MD5 a062393ef10d6dd9848fdbcc9bf429fd cisco-vpnclient-3des-4.6.00.0045.ebuild 2004
+MD5 d64f2026129f0dc87f6be2a2ac2fa0e4 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2171
 MD5 b76399024efc481b4dadef25a254c31b cisco-vpnclient-3des-4.0.3b-r4.ebuild 2164
-MD5 79d84348b74721ad24f96847ad2346bc ChangeLog 4411
+MD5 d0ce6a1add4246f3fc5a462904758e0c ChangeLog 4766
 MD5 9ecd26f9a6974c847392926604c68e9b cisco-vpnclient-3des-4.0.1a-r1.ebuild 1795
 MD5 ceed2261b61bf3fd7ae45aed33117100 metadata.xml 460
+MD5 bc0669d18439e508bd493312d307afa4 files/digest-cisco-vpnclient-3des-4.6.00.0045-r1 83
 MD5 0181d77c1dd8b6929b7dd81fb2db45f1 files/atheros.patch 478
 MD5 968b0edd0fc5b128c1c78f03d0b49336 files/4.0.1a-linux26-gentoo.patch 686
 MD5 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
 MD5 43220e6569806f24251abfbb44742532 files/digest-cisco-vpnclient-3des-4.0.5 81
+MD5 5250e93732649bfbea046a13e84ff4a8 files/supported_device.patch 826
 MD5 71958f1bfd76d8fc63b6c5c1a3069b0b files/digest-cisco-vpnclient-3des-4.0.1a-r1 79
 MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r4 79
-MD5 bc0669d18439e508bd493312d307afa4 files/digest-cisco-vpnclient-3des-4.6.00.0045 83
 MD5 ca9acd2b20bd1b92519e520a8ec5a5c2 files/vpnclient.rc 2306
 MD5 fffa4fdd9a7bd0eeae2d4832895ce99f files/driver_build_CC.patch 547

diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild
similarity index 87%
rename from net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045.ebuild
rename to net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild
index a34a70ebbb5528551e0fefd51e00063b216c4374..464ab4c83d2bde54e62c3e2c6369041a19a95966 100644 (file)
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045.ebuild,v 1.1 2004/11/04 01:18:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,v 1.1 2004/11/09 20:24:13 wolf31o2 Exp $
 
 inherit eutils kernel-mod
 
@@ -11,7 +11,7 @@ SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
 SLOT="${KV}"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~x86 ~amd64"
 IUSE=""
 RESTRICT="fetch"
 
@@ -36,6 +36,8 @@ src_unpack() {
        # Patch to allow use of alternate CC.  Patch submitted to bug #33488 by
        # Jesse Becker <jbecker@speakeasy.net>
        epatch ${FILESDIR}/driver_build_CC.patch
+       # Patch submitted to bug #69870 by James Ward <jennyandjamesward@yahoo.com>
+       epatch ${FILESDIR}/supported_device.patch
 }
 
 src_compile () {
@@ -59,11 +61,11 @@ src_install() {
        into /opt/cisco-vpnclient/
        dobin ipseclog cisco_cert_mgr
        dolib.so libvpnapi.so
+       insinto /opt/cisco-vpnclient/include
        doins vpnapi.h
        dodir /usr/bin
        dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient
 
-
        insinto /lib/modules/${KV}/CiscoVPN
        if kernel-mod_is_2_6_kernel; then
                doins cisco_ipsec.ko

diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045-r1
similarity index 100%
rename from net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045
rename to net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045-r1

diff --git a/net-misc/cisco-vpnclient-3des/files/supported_device.patch b/net-misc/cisco-vpnclient-3des/files/supported_device.patch
new file mode 100644 (file)
index 0000000..f21cfc7
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/supported_device.patch
@@ -0,0 +1,51 @@
+--- interceptor.c.orig  2004-11-02 07:27:19.296825440 -0700
++++ interceptor.c       2004-11-02 07:22:46.545289976 -0700
+@@ -100,6 +100,24 @@
+     .notifier_call = handle_netdev_event,
+ };
+
++static int
++inline supported_device(struct net_device* dev)
++{
++    int rc=0;
++
++    if(dev->type == ARPHRD_ETHER)
++    {
++        rc=1;
++    }
++    else if(dev->type == ARPHRD_PPP)
++    {
++        rc=1;
++    }
++
++    return rc;
++}
++
++
+ static int __init
+ interceptor_init(struct net_device *dev)
+ {
+@@ -476,23 +494,6 @@
+     s->rc = 0;
+ }
+
+-static int
+-inline supported_device(struct net_device* dev)
+-{
+-    int rc=0;
+-
+-    if(dev->type == ARPHRD_ETHER)
+-    {
+-        rc=1;
+-    }
+-    else if(dev->type == ARPHRD_PPP)
+-    {
+-        rc=1;
+-    }
+-
+-    return rc;
+-}
+-
+
+ static BINDING *
+ getbindingbydev(struct net_device *dev)

diff --git a/net-misc/pavuk/Manifest b/net-misc/pavuk/Manifest
index 6151f920063a9bba20feabe3a7049d9907be69af..7e2816de994ec6f57611a0096d31d18bbe07c18c 100644 (file)
--- a/net-misc/pavuk/Manifest
+++ b/net-misc/pavuk/Manifest
@@ -1,7 +1,7 @@
 MD5 f84203f0b2cc1f36a18c23084e03c3c8 pavuk-0.9.28-r4.ebuild 1966
-MD5 b8a71485a0f7e4ce9bc65f2a98a694cc ChangeLog 2127
+MD5 9897df3eef88443ee84597ac9da2c0d7 ChangeLog 2217
 MD5 a1457284faaa66902037dcd2eaeab292 metadata.xml 245
-MD5 c9e2ac4fb1c9338e59c8ba8f2cc36c46 pavuk-0.9.31.ebuild 1413
+MD5 7b1b2f3beb516147d52cba2573ffd058 pavuk-0.9.31.ebuild 1412
 MD5 7e864c54e972ae5a1456fa08d6d4e792 files/digest-pavuk-0.9.28-r4 62
 MD5 3ceb6f5a4af6fa6bfb24671fb1c29877 files/pavuk-0.9.28-digest_auth.c.patch 1013
 MD5 0ecaaa14f3190993e307fea1f2d880d3 files/digest-pavuk-0.9.31 65