diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-02-10 08:16:58 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-02-10 08:16:58 +0000 |
| commit | 0801f27826076c28805b0d4a5f97999872689b1c (patch) | |
| tree | af15a386aa75358c42346b064167e318775a73aa /net-misc | |
| parent | Cleanup masked package (diff) | |
| download | gentoo-2-0801f27826076c28805b0d4a5f97999872689b1c.tar.gz gentoo-2-0801f27826076c28805b0d4a5f97999872689b1c.tar.bz2 gentoo-2-0801f27826076c28805b0d4a5f97999872689b1c.zip | |
Cleanup masked package
Diffstat (limited to 'net-misc')
18 files changed, 0 insertions, 2130 deletions
diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog deleted file mode 100644 index 7fc32d2f5266..000000000000 --- a/net-misc/cisco-vpnclient-3des/ChangeLog +++ /dev/null @@ -1,436 +0,0 @@ -# ChangeLog for net-misc/cisco-vpnclient-3des -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.69 2012/07/12 15:33:59 axs Exp $ - - 12 Jul 2012; Ian Stakenvicius <axs@gentoo.org> - cisco-vpnclient-3des-4.8.00.0490-r1.ebuild, - cisco-vpnclient-3des-4.8.02.0030.ebuild: - added GPL-2 to LICENSE per bug 426052 - -*cisco-vpnclient-3des-4.8.02.0030 (12 Feb 2012) - - 12 Feb 2012; Pacho Ramos <pacho@gentoo.org> - +cisco-vpnclient-3des-4.8.02.0030.ebuild, +files/4.8.02.0030-GenDefs.h.patch, - +files/4.8.02.0030-Makefile.patch, +files/4.8.02.0030-autoconf.patch, - +files/4.8.02.0030-frag.c.patch, +files/4.8.02.0030-interceptor.c.patch, - +files/4.8.02.0030-linuxcniapi.c.patch, - +files/4.8.02.0030-linuxcniapi.h.patch, - +files/4.8.02.0030-linuxkernelapi.c.patch, - -cisco-vpnclient-3des-4.8.01.0640.ebuild: - Version bump, thanks a lot to Rolando J. Zappacosta, Andreas Simon, Andrea - Postiglione, Matthew Schultz, JTRiley. Drop old. - - 06 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> - cisco-vpnclient-3des-4.8.00.0490-r1.ebuild: - Linux-3.0 changes. - - 23 Aug 2009; Jeremy Olexa <darkside@gentoo.org> -files/2.6.19.patch, - -files/4.7.00.0640-2.6.14.patch, - -cisco-vpnclient-3des-4.6.03.0190-r1.ebuild, - -files/4.6.02.0030-supported_device.patch, - -files/4.6.02.0030-2.6.14.patch, -files/4.6.03.0190-2.6.14.patch, - -files/4.7.00.0640-2.6.22.patch, - -cisco-vpnclient-3des-4.7.00.0640-r1.ebuild, -files/driver_build_CC.patch: - cleanup, remove old ebuild and old patches - - 07 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org> - cisco-vpnclient-3des-4.8.01.0640.ebuild: - Use elog for fetch error. - - 28 Jul 2008; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml: - Change to maintainer-needed. - - 02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild, - cisco-vpnclient-3des-4.7.00.0640-r1.ebuild, - cisco-vpnclient-3des-4.8.00.0490-r1.ebuild: - QA Cleanup: Fix quoting. - - 02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.8.01.0640.ebuild: - Removing unused TARBALL variable. - - 02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.8.01.0640.ebuild: - Fix a bug in the move code in pkg_postinst. - - 02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> - -cisco-vpnclient-3des-4.6.02.0030.ebuild, - -cisco-vpnclient-3des-4.7.00.0640.ebuild, - cisco-vpnclient-3des-4.7.00.0640-r1.ebuild, - -cisco-vpnclient-3des-4.8.00.0490.ebuild: - Removing older ebuilds and marking 4.7.00.0640-r1 stable for the 4.7 - series, since there've been no bug reports and it works fine for me. - - 02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.8.01.0640.ebuild: - Add back the RESTRICT=fetch code and adding RESTRICT=mirror. - - 02 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> - +files/4.8.01.0640-2.6.24.patch, +files/4.8.01.0640-amd64.patch: - Version bump to 4.8.01.0640 for bug #202415. This ebuild has been - re-worked to not use the Cisco driver_build.sh shell script and instead - uses the Makefile provided to build the module. - - 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: - Stable on amd64/x86 for 2.6.24 compatibility. - -*cisco-vpnclient-3des-4.8.00.0490-r1 (02 Feb 2008) - - 02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> +files/2.6.24.patch, - +cisco-vpnclient-3des-4.8.00.0490-r1.ebuild: - Added a patch for 2.6.24 support. Closing bug #207536. - - 07 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> - +files/4.7.00.0640-2.6.22.patch, - cisco-vpnclient-3des-4.7.00.0640-r1.ebuild: - Added a patch from Antti Mäkelä <zarhan@cs.tut.fi> for 2.6.22 support. - Closing bug #191572. - -*cisco-vpnclient-3des-4.7.00.0640-r1 (04 Sep 2007) - - 04 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> - +cisco-vpnclient-3des-4.7.00.0640-r1.ebuild: - Added a new revision of the 4.7 ebuild to update to the latest patch for - 2.6.22 support for bug #183713. - - 28 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> +files/2.6.22.patch, - cisco-vpnclient-3des-4.8.00.0490.ebuild: - Added a 2.6.22 patch from bug #183713 and closing the bug. - - 14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml: - add <herd>no-herd</herd> - - 28 Apr 2007; Sven Wegener <swegener@gentoo.org> - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild, - cisco-vpnclient-3des-4.7.00.0640.ebuild, - cisco-vpnclient-3des-4.8.00.0490.ebuild: - Fix *initd, *confd and *envd calls (#17388, #174266) - - 07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild, - cisco-vpnclient-3des-4.7.00.0640.ebuild: - Change all instances of [ to [[. - - 06 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> - -files/4.6.00.0045-2.6.14.patch, -files/4.0.1a-linux26-gentoo.patch, - -files/4.6.00.0045-supported_device.patch, -files/4.0.5-2.6.14.patch, - -files/atheros.patch, -files/register_netdevice.patch, - -cisco-vpnclient-3des-4.0.1a-r1.ebuild, - -cisco-vpnclient-3des-4.0.3b-r4.ebuild, - -cisco-vpnclient-3des-4.0.5-r1.ebuild, - -cisco-vpnclient-3des-4.6.00.0045-r1.ebuild: - As painful as this is for me, I'm removing older versions of this ebuild. - This is due to my lack of access to the distfiles for the older ebuilds, and - bug #164344. If you use these older ebuilds and want to see them back in - portage, you'll need to contact me directly so we can work out arrangements - to make that possible. I apologize for any inconvenience this may cause. - - 12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/vpnclient.rc: - Changed exit 1 to eend 1 for bug #157596. - - 12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> +files/2.6.19.patch, - cisco-vpnclient-3des-4.7.00.0640.ebuild, - cisco-vpnclient-3des-4.8.00.0490.ebuild: - Added 2.6.19 patch and closing bug #155837. - - 04 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, - cisco-vpnclient-3des-4.0.5-r1.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild, - cisco-vpnclient-3des-4.7.00.0640.ebuild, - cisco-vpnclient-3des-4.8.00.0490.ebuild: - Added QA_* variables for bug #131633 and removed RESTRICT=stricter. If you - have any problems with this, please reply to that bug report. - - 04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild, - cisco-vpnclient-3des-4.7.00.0640.ebuild, - cisco-vpnclient-3des-4.8.00.0490.ebuild: - We were installing too much to the modules directories. Thanks to Michael - Sterret <Mr_Bones_@gentoo.org> for pointing it out. - - 14 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, - cisco-vpnclient-3des-4.0.5-r1.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild, - cisco-vpnclient-3des-4.7.00.0640.ebuild, - cisco-vpnclient-3des-4.8.00.0490.ebuild: - Added stricter to RESTRICT and closing bug #143047. - - 19 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/vpnclient.rc: - Moved check for the vpnclient executable and added a sleep 1. Closing bug - #141065. - - 30 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, - cisco-vpnclient-3des-4.0.5-r1.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild, - cisco-vpnclient-3des-4.7.00.0640.ebuild, - cisco-vpnclient-3des-4.8.00.0490.ebuild: - Updated to use linux-mod eclass. Patch provided by Mike Auty - <ikelos@gentoo.org>. Closing bug #130523. - - 11 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - +files/4.6.00.0045-2.6.14.patch, +files/4.6.02.0030-2.6.14.patch, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild: - Copied patch from 4.7.00 to 4.6.* ebuilds and closing bug #128045. - - 24 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, - cisco-vpnclient-3des-4.0.5-r1.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild, - cisco-vpnclient-3des-4.7.00.0640.ebuild, - cisco-vpnclient-3des-4.8.00.0490.ebuild: - Fixed a build error where we were not finding the proper kernel directory to - compile against. Thanks to Anno v. Heimburg <anno@vonheimburg.de> for the - patch. Closing bug #119057. - -*cisco-vpnclient-3des-4.0.5-r1 (24 Mar 2006) - - 24 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> - +files/4.0.5-2.6.14.patch, -cisco-vpnclient-3des-4.0.5.ebuild, - +cisco-vpnclient-3des-4.0.5-r1.ebuild: - Added patch from 4.6.03.0190 to 4.0.5 and closing bug #120127. - -*cisco-vpnclient-3des-4.8.00.0490 (10 Feb 2006) - - 10 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> - +cisco-vpnclient-3des-4.8.00.0490.ebuild: - Version bump to 4.8.00.0490 and closing bug #120534. - - 20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> - -cisco-vpnclient-3des-4.6.03.0190.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild, - cisco-vpnclient-3des-4.7.00.0640.ebuild: - Removing problem version, marking stable on amd64/x86 and making sure -* is - in KEYWORDS on all versions. - -*cisco-vpnclient-3des-4.7.00.0640 (28 Nov 2005) - - 28 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - +files/4.7.00.0640-2.6.14.patch, +cisco-vpnclient-3des-4.7.00.0640.ebuild: - Version bumped to latest upstream version and closing bug #110613. - - 20 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - 0->KV for bug #112817. - - 15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - KV_MINOR->KV_PATCH - - 14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - Fixing my overzealous sed call earlier. - - 14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - Changed conditions to match all kernels from 2.6.14 up. - - 14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - Changed SLOT to 0. - - 13 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - Forcing to stable since 2.6.14 has gone stable in the tree and this patch is - required to compile against 2.6.14 successfully. - -*cisco-vpnclient-3des-4.6.03.0190-r1 (13 Nov 2005) - - 13 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - +files/4.6.03.0190-2.6.14.patch, - +cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - Added patch to resolve bug #107208. - - 29 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild: - kernel-mod -> linux-info for kernel team. - - 06 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190.ebuild: - Fix bug #98070. - - 28 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190.ebuild: - Changed dolib.so to doins to fix problems loading library on amd64. Closing - bug #97269. - -*cisco-vpnclient-3des-4.6.03.0190 (02 Jun 2005) - - 02 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.02.0030.ebuild, - +cisco-vpnclient-3des-4.6.03.0190.ebuild: - Added information about rp_filter for bug #90693. Version bumped to version - 4.5.03.0190, and closing bug #94755. - -*cisco-vpnclient-3des-4.6.02.0030 (14 Apr 2005) - - 14 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> - +files/4.6.00.0045-supported_device.patch, - +files/4.6.02.0030-supported_device.patch, -files/supported_device.patch, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - +cisco-vpnclient-3des-4.6.02.0030.ebuild: - Renamed supported_device.patch to 4.6.00.0045-supported_device.patch. Added - 4.6.02.0030 ebuild provided by Stefan Skotte <sfs@steflo.dk> and closing bug - #88408. - - 08 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild: - Marking stable on x86 and removing amd64 KEYWORDS, which were accidentally - added by me in testing and were never removed. - -*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) - - 03 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild, - +cisco-vpnclient-3des-4.6.00.0045.ebuild: - Version bumped to latest version and updated all ebuilds to use the - kernel-mod eclass rather than kmod eclass. This should resolve bugs #68738, - #68449, and #69870. - - 24 Aug 2004; Mike Frysinger <vapier@gentoo.org> files/vpnclient.rc, - cisco-vpnclient-3des-4.0.5.ebuild: - Rewrite the vpnclient script to make it flow better (eerror/exit is not the - way to go; eend/return is). - -*cisco-vpnclient-3des-4.0.5 (11 Aug 2004) - - 11 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org> - +cisco-vpnclient-3des-4.0.5.ebuild: - Bumped to latest version. - - 01 Jul 2004; Jon Hood <squinky86@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild: - change virtual/glibc to virtual/libc - - 26 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> - -cisco-vpnclient-3des-4.0.3b-r3.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild: - Removing old ebuild and changing HOMEPAGE. - - 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild: - Add inherit eutils - -*cisco-vpnclient-3des-4.0.3b-r4 (24 Apr 2004) - - 24 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> +files/atheros.patch, - +cisco-vpnclient-3des-4.0.3b-r4.ebuild: - Adding atheros patch, submitted by Dominic Battre and closing bug #48680. - - 12 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r2.ebuild, - cisco-vpnclient-3des-4.0.3b-r3.ebuild: - Adding empty IUSE, removing old 4.0.3b-r2 ebuild, and marking 4.0.3b-r3 stable - on x86. - - 16 Mar 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r2.ebuild: - Added inherit eutils since we use epatch. - -*cisco-vpnclient-3des-4.0.3b-r3 (25 Feb 2004) - - 25 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r3.ebuild, files/register_netdevice.patch: - Adding patch to allow cisco_ipsec module to work with kernel 2.6.x, submitted - by Kent Skaar <skaar@aol.net> to bugzilla and originally submitted to LMKL by - by Gertjan van Wingerde <gwingerde@home.nl>. Closing bug #40730. - - 14 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org> files/vpnclient.rc: - Removing -qs from insmod line to allow proper support with newer - module-init-tools. Closing bug #37678. - - 13 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r1.ebuild, cisco-vpnclient-3des-4.0.3b.ebuild: - Removing older revisions. - -*cisco-vpnclient-3des-4.0.3b-r2 (13 Jan 2004) - - 13 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r2.ebuild, files/vpnclient.rc: - Updated vpnclient init script for proper 2.6 kernel handling and also to - remove console messages at boot. Closing Bug #37678. - -*cisco-vpnclient-3des-4.0.3b-r1 (08 Jan 2004) - - 08 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r1.ebuild, files/vpnclient.rc: - Updated init script to make it compatible with /sbin/runscript.sh. The script - was provided by Lars Corzilius (gentoo@flowsterritory.de) and updated by me. - Closing bug #36419. - -*cisco-vpnclient-3des-4.0.3b (12 Dec 2003) - - 12 Dec 2003; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, cisco-vpnclient-3des-4.0.1a.ebuild, - cisco-vpnclient-3des-4.0.3b.ebuild, metadata.xml, - files/4.0.1a-linux26-gentoo.patch, files/4.0.1a-linux26.patch, - files/driver_build_CC.patch: - Added driver_build_CC.patch by Jesse Becker (jbecker@speakeasy.net) and - version bumped to newest version. Closing bugs #33488 and #35617. - -*cisco-vpnclient-3des-4.0.1a-r1 (19 Nov 2003) - - 19 Nov 2003; Mike Frysinger <vapier@gentoo.org> : - Fix typo in patch #33848. - -*cisco-vpnclient-3des-4.0.1a (05 JUL 2003) - - 27 Oct 2003; Mike Frysinger <vapier@gentoo.org> : - Small patch so it'll work in linux-2.6.x. - - 09 Jul 2003; Mike Frysinger <vapier@gentoo.org> : - Cleaned up ebuild, made it use $KV properly. - - 05 JUL 2003; Bart Lauwers <blauwers@gentoo.org> : - Initial import. diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest deleted file mode 100644 index 3df9310bb901..000000000000 --- a/net-misc/cisco-vpnclient-3des/Manifest +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX 2.6.22.patch 12897 SHA256 ce86c1391ade1118c84331224974278356663dda4612a443f067fc6b1bcc5633 SHA512 7691ff06c3c8b7e0a76935af1c9c2e5c2244b9af158b0968b0d5ae4625ad7eb3f09624b3fcfa26d040252fa46bb9799716cec75d34844c75006399a49bfca506 WHIRLPOOL ebfa02a5d44940e978076a467458e168f89f780a4b6f854d5a27cb252076c48f486a82c79866cb9d8f63fd77a31af422d2ee697b6d961fb85662b1b4f86c6746 -AUX 2.6.24.patch 4651 SHA256 51b2178a65c26d9900012b7871d19f5e1179d162fd7293accc04d5b4905dbe3f SHA512 c662060a611b17b3801575edaba8e224305715ca86992c3a0d535aaaef9dc5dc9620738f5b4f3d3a1796d5f32b8eb1d6d2647e8e5381cb50af305a7ff3f4cd1d WHIRLPOOL 633f19a2931cc1706882d111dcdcbc55f08c16f3c6fbbbfc327e4356e1a24cdcec4c7cf3f8e0c52fdd7d784bbd6689b739812a64a77ed4229a1f2ab0f3fd9ff7 -AUX 4.8.01.0640-2.6.24.patch 7352 SHA256 45afb8f72caaff7c79e39c9854780504a4dcd09cb3ae5ccdf230fc318d1067fb SHA512 956cc95f7a58cab582a94bff75fb1ab7eb07493d0389d767d352a028ed2a49d8c8ddde9b744cb57f92c27c1e2725ebfe86d6a8aaacabb04be7fe37d8d62021b4 WHIRLPOOL d3e621dba73998a673c23111dc11a95967a3315ceb7e3f35b35aa5a371c0bb30c8d83fd99898d6ac464e5efa4374282c3aea910594f75d87b1adab882bc69608 -AUX 4.8.01.0640-amd64.patch 4402 SHA256 dc9853c106025ea506c6bba3d3f3d691971df06b971ce7b64ac30a6fb77582ac SHA512 b292ac4f3e8bbbe75016d6e663ae9cc36645920b6bdabc38ab2589700ee206dbbd6ae6b1cf33b6a5b78685d1a5902fbf9ed09721480045b8dd63fa04c97f7e83 WHIRLPOOL 7b1cf86481ac8838366917ad8283f0b4950c37987c1925b29682cdcf507cb59f3f33e4ed530cafef5dbe513b861c67a275dc84627d836f85fdb9a7e431b01afa -AUX 4.8.02.0030-GenDefs.h.patch 573 SHA256 a899e116e0714b8b4e3435cd97013f19dbd023b098d2c4deb7cddedb7ea6a397 SHA512 8b54014972e3094bbb9c61112e6f08d6bb1dc7d3280b9abb0971c9031e65da4d93a8c2b2a0dc91111c4197bd18052dbe5e1703461bca02b3349a9355baa3b306 WHIRLPOOL 0cdedc9a2a4e1cbaab3726b625c8920de32a176cba24f395021ccc406b20e6dc0e21811dfa6daa62dc5f30d300b655d9f8c27cb2f04178d80c5f3cbd2caa66d9 -AUX 4.8.02.0030-Makefile.patch 873 SHA256 b4b46a83e21b1b266f1deb93777ae217115a4c882e6cf3cb58e5fb9a97bf3307 SHA512 9ed85490dfc88eb3dd6bde5f5de62bb3b55f6a064b4be84beae683ba9c10f6e6abafa3a048be9ad67e1c9f28400a2b93f3d9c325ac963810c5ded200bd13c216 WHIRLPOOL 5af2c02577e5ded1f6787b1e6d9d60efcdc951ab121e0bbd63aa3b13b49c2aa4037318cb2344396082d5ff7fcdcec3431d64cd116fdc03bedfb5d5024a80b87f -AUX 4.8.02.0030-autoconf.patch 2252 SHA256 044099bbcd55b21e9bec3b29161b00a00a40f5b1fb9f1f1240285f80819767b2 SHA512 c5eb75b1c52865f5d7e955bb315e620befb545a73f875f3e174141076631cba4d0c4521dc184034307bc2e57f96c4f3dba6cf39d1deaa6c89154adc960b9131e WHIRLPOOL dd426344848ace1e47fa88a5a128cca7cba5d7f6ec18732133a43e07c7cd3f0e2a6ab69692afdb34e260816ef53a09fbc75dc272d7433a7ae7b2242514f74a77 -AUX 4.8.02.0030-frag.c.patch 459 SHA256 a4b3ffa4ba82d73e2604fadcab06f099eccccf86458ff2459d78cd57ac3ef89c SHA512 109fda84a99e627d5b5ad74f7ffaebb52067b62c1d6ba9e50343adcec681e6442cb15bcdd295895d76732f929a7c86b2551ecb25d97b1e9c921de53b965098c8 WHIRLPOOL b2ba22174ade37034a7c9fa85ba649d5aa7851b2e0cbfcd8af3e169c1b3123ea55237c84d7e3ba8fd7f937d635514f1382b0025ba9ee3d9681d00b21dea97d4e -AUX 4.8.02.0030-interceptor.c.patch 7273 SHA256 0d5b5e92e6bd4111314abc6f4fdd523971d2eded0a302810fb0b35a0afdf3ca2 SHA512 a081e9be28ef61104f2c62849c5c9b4660d742dbaa114cbb4df314bdf82518fbe53b62bac08429f35e3f7d65ce21f48baf10e8e66c150a108a95d54197f12093 WHIRLPOOL a4e358ee9224653fac61f4cdfa3484135dc344553ea29dddd34e210d792c3a510aa2737785a1d3b69249b0ca0ee701e4f6954a1f681532b27972a7655b87478a -AUX 4.8.02.0030-linuxcniapi.c.patch 2353 SHA256 59c40a407e4a9a2a5b9736ac67091d5275c5fe535689133beee1c5745b522400 SHA512 d04fee164d47282c0de0ce2141bad99825fc4af7636cf6b759eef26500a337178661b4fd8b392151abaa32cb44233615ac1d6ecb366d22b5e761caf2f834b237 WHIRLPOOL 0d3938769fe0c97c90ba1f9e6a660acfd4ee216547ff5225ccacdf65556a01a16fbd5ad163846567344736d4bab21da0e4e5cbf7dc358e4e522b23222ccf58c5 -AUX 4.8.02.0030-linuxcniapi.h.patch 456 SHA256 a7dd70421561a0c954794bd6b82f469ecfd9c34d5b0f863fbe3c70a8d204054c SHA512 56ca50fd617072db81f0d6d6cf2e0942d7cc5f755fb55c17ba1ade68743f9d23376e83dd6ab735aafe22b2341c5d072a50d7ea0273c4fb9770a27777c13bcf77 WHIRLPOOL e05f0bccfc224f29be4350d3a94f80f166ec57d1c20006caf0c4b049352f16a99dc51f8957f89c11b095220f0577bb7e8db1a25009073327204c53d4d86f1b18 -AUX 4.8.02.0030-linuxkernelapi.c.patch 466 SHA256 d893a3ab6d9876f40683d2f4b8fa7079214064f3d3677873a82d062e850c443c SHA512 03adfc42f17e5bf4b9c25e048da3e734cec10125aaab85a9694e090dc21193b9248f4337a5f423df625e0e46c83ff47f60dd266eba7fc33668b56abca83e61e0 WHIRLPOOL ba530612d1d451f1ccd8fa3d18596a362957e2ac7fbe8d3859e06d12caad6df06c46d02ee0ec563ebeb3f9490c4827587f78c66a2df8a285dcd522d3e390a42d -AUX vpnclient.rc 2318 SHA256 a4ed3b575a7b5431895c2f01b68eede21adbf98555ff125bd3f131872a5cc792 SHA512 4777bf64cf82ddaf1137838bfb6acbcfa3c191aaa29794edb9daa96c55d57967812de6be71042f3626a42ee448e11473292dfef45667221522474b3a1a352d67 WHIRLPOOL 75c0c7d07068f32849a01031d7e6f07b6a8fde1eff88e7d0ca69e28a795476d36cf694ef8b521cdb38afe8aa4fcc8e880494dfb941f5f8290678f1dee6185046 -DIST vpnclient-linux-x86_64-4.8.00.0490-k9.tar.gz 2045213 RMD160 e38e5d937c9d47abb2484c052212cc02aaf84088 SHA1 d3fe2a0dd44c956ee66a51f0a7011b647e06dafb SHA256 cd9c3a73f9f818608b42edab534d7a75d6c5f01874eed012b05f9932a61f1287 -DIST vpnclient-linux-x86_64-4.8.02.0030-k9.tar.gz 2050024 RMD160 7591f8b2666547b5a764815acf6ff1e198c086e6 SHA1 9918b5f6c1a1d516d70476c211e3985062abcefe SHA256 7d7440195b81802c24407f88b95002f54bd91223ad7833b03658de1888ad3e85 -EBUILD cisco-vpnclient-3des-4.8.00.0490-r1.ebuild 2178 SHA256 ddbf55bbb7746a9b94fb0549d7c60d2f8043524b38834c1844df846fc53a27d9 SHA512 fc56d13aa76cc35d6a84d20f57c99959289dc2caa365aab2d0236fa950539118297368a2596a63452e212fea16088efdb6ae2aa38e3723bad3bbda8c49b0b78c WHIRLPOOL c4857dda538a21f5426559e9aac1ac5396538e439a90617192c034c4b4a4739067e8db51d999a655a37d36b50aa505173777c08dd4ec71eb5181d07644f1119f -EBUILD cisco-vpnclient-3des-4.8.02.0030.ebuild 2906 SHA256 3538fe2a29fffa9dd03016295eada9b5b925c958190a29993076ec6dbfa51326 SHA512 3afdf792442a5e8bfdf10fe47b5cb6c5954f1b990c3c469c5a485e4aec54a2877aae9eb1c755066b063c9acf790133fef8db93de61ec7dec8ca9b5bf664cd324 WHIRLPOOL 7e3102c09df070a7e39643ac038fc240468908c34f565989824f614a9085bb06c8247889c9ca870cc28bd09cebe06209cc7bba3dbafc88a3e40fed9ef8b96ea0 -MISC ChangeLog 17985 SHA256 c83f0bf5212e138faa10ec6fbcd5d5a99f48a7f221327a1318af9dcc3c255594 SHA512 ea541f33fb34af7678e49939e36f8e09f1be386c999b146234fac406e8956179101315c66cb4552f7132e1b44ceac7d663e5b85e8ef296e359f18350ffeea1c9 WHIRLPOOL 354e304aace82a0b9701770d28b3eda187a0c2f709d7d3ecb234b8bd4d6f838a9f72213face1f6c91fabf5aa429008ad764bc5866f9b6145a35bac3181ebad5b -MISC metadata.xml 878 SHA256 f78d50219cd911cd10877e11199f0fcab69f6dd590506d1b20be656a4f6d2c76 SHA512 17b0eee6dff9fe76e37bf6eb24e08c62802fa7530cb54d5e4d0d773a1ab5dd99d25f8245b473b202aa8bb1645ba926ff69aa70b0f5e2c2bb4acdb9e502bfe271 WHIRLPOOL 069c01b8de807303ffb765bf1dfbe57256f9f2662f6821dce888448727f26e53578174de933f3ecf1aabfcc2cc8047ae141e9fbbd72722309e5d367ae2645dcc ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iF4EAREIAAYFAk/+7nEACgkQ2ugaI38ACPBFKAEAk7/hI/aUOdn4BDrEc3L8L2Rb -6QAWcuCjHpnWlqKP/XcBAKFgu0AMS6KI3DoRhT3ohlVJDQRDI8y183MI/8rDhxMf -=AaFk ------END PGP SIGNATURE----- diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.00.0490-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.00.0490-r1.ebuild deleted file mode 100644 index a709634aceae..000000000000 --- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.00.0490-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2012 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.8.00.0490-r1.ebuild,v 1.5 2012/07/12 15:33:59 axs Exp $ - -inherit eutils linux-mod - -MY_PV=${PV}-k9 -DESCRIPTION="Cisco VPN Client (3DES)" -HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html" -SRC_URI="vpnclient-linux-x86_64-${MY_PV}.tar.gz" - -LICENSE="cisco-vpn-client GPL-2" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="" -RESTRICT="fetch strip" # stricter" - -QA_TEXTRELS="opt/cisco-vpnclient/lib/libvpnapi.so" -QA_EXECSTACK="opt/cisco-vpnclient/lib/libvpnapi.so - opt/cisco-vpnclient/bin/vpnclient - opt/cisco-vpnclient/bin/cvpnd - opt/cisco-vpnclient/bin/cisco_cert_mgr - opt/cisco-vpnclient/bin/ipseclog" - -S=${WORKDIR}/vpnclient - -VPNDIR="/etc/opt/cisco-vpnclient/" - -pkg_nofetch() { - einfo "Please visit:" - einfo " ${HOMEPAGE}" - einfo "and download ${A} to ${DISTDIR}" -} - -src_unpack () { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/2.6.22.patch - epatch "${FILESDIR}"/2.6.24.patch -} - -src_compile () { - unset ARCH - sh ./driver_build.sh ${KV_DIR} - [ ! -f ./cisco_ipsec -a ! -f ./cisco_ipsec.ko ] \ - && die "Failed to make module 'cisco_ipsec'" - sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init - sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient.ini -} - -src_install() { - newinitd "${FILESDIR}"/vpnclient.rc vpnclient - - exeinto /opt/cisco-vpnclient/bin - exeopts -m0711 - doexe vpnclient - exeopts -m4711 - doexe cvpnd - into /opt/cisco-vpnclient/ - dobin ipseclog cisco_cert_mgr - insinto /opt/cisco-vpnclient/lib - doins 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_is -ge 2 6; then - doins cisco_ipsec.ko - else - doins cisco_ipsec - fi - - insinto ${VPNDIR} - doins vpnclient.ini - insinto ${VPNDIR}/Profiles - doins *.pcf - dodir ${VPNDIR}/Certificates -} - -pkg_postinst() { - linux-mod_pkg_postinst - einfo "You must run \`/etc/init.d/vpnclient start\` before using the client." - echo - ewarn "Configuration directory has moved to ${VPNDIR}!" - echo -} diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.02.0030.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.02.0030.ebuild deleted file mode 100644 index 053388051b54..000000000000 --- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.02.0030.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2012 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.8.02.0030.ebuild,v 1.2 2012/07/12 15:33:59 axs Exp $ - -EAPI="4" -inherit eutils linux-mod - -MY_PV=${PV}-k9 - -DESCRIPTION="Cisco VPN Client (3DES)" -HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html" -SRC_URI="vpnclient-linux-x86_64-${MY_PV}.tar.gz" - -LICENSE="cisco-vpn-client GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" -RESTRICT="fetch mirror strip" - -S=${WORKDIR}/vpnclient - -VPNDIR="/opt/cisco-vpnclient" -CFGDIR="/etc/${VPNDIR}" -OLDCFG="/etc/CiscoSystemsVPNClient" - -QA_TEXTRELS="${VPNDIR:1}/lib/libvpnapi.so" -QA_EXECSTACK="${VPNDIR:1}/lib/libvpnapi.so - ${VPNDIR:1}/bin/vpnclient - ${VPNDIR:1}/bin/cvpnd - ${VPNDIR:1}/bin/cisco_cert_mgr - ${VPNDIR:1}/bin/ipseclog" - -MODULE_NAMES="cisco_ipsec(CiscoVPN)" -BUILD_TARGETS="clean default" - -pkg_nofetch() { - elog "Please visit:" - elog " ${HOMEPAGE}" - elog "and download ${A} to ${DISTDIR}" -} - -src_prepare() { - epatch "${FILESDIR}"/${PV}-frag.c.patch - epatch "${FILESDIR}"/${PV}-GenDefs.h.patch - epatch "${FILESDIR}"/${PV}-interceptor.c.patch - epatch "${FILESDIR}"/${PV}-linuxcniapi.c.patch - epatch "${FILESDIR}"/${PV}-linuxcniapi.h.patch - epatch "${FILESDIR}"/${PV}-linuxkernelapi.c.patch - epatch "${FILESDIR}"/${PV}-Makefile.patch - epatch "${FILESDIR}"/${PV}-autoconf.patch - sed -i "s:^MODULE_DIR.*$:MODULE_DIR=/lib/modules/${KV_FULL}:" Makefile -} - -src_install() { - local binaries="vpnclient ipseclog cisco_cert_mgr" - linux-mod_src_install - - # Binaries - exeinto /opt/cisco-vpnclient/bin - exeopts -m0111 - doexe ${binaries} - exeopts -m4111 - doexe cvpnd - # Libraries - insinto /opt/cisco-vpnclient/lib - doins libvpnapi.so - # Includes - insinto /opt/cisco-vpnclient/include - doins vpnapi.h - - # Configuration files/profiles/etc - insinto ${CFGDIR} - doins vpnclient.ini - insinto ${CFGDIR}/Profiles - doins *.pcf - dodir ${CFGDIR}/Certificates - - # Create some symlinks - dodir /usr/bin - for filename in ${binaries} - do - dosym ${VPNDIR}/bin/${filename} /usr/bin/${filename} - done - - # Make sure we keep these, even if they're empty. - keepdir ${CFGDIR}/Certificates - keepdir ${CFGDIR}/Profiles -} - -pkg_postinst() { - linux-mod_pkg_postinst - if [ -e "${OLDCFG}" ] - then - elog "Found an old ${OLDCFG} configuration directory." - elog "Moving ${OLDCFG} files to ${CFGDIR}." - cp -pPR ${OLDCFG}/* ${CFGDIR} && rm -rf ${OLDCFG} - fi - if [ -e "/etc/init.d/vpnclient" ] - then - elog "Removing /etc/init.d/vpnclient, which is no longer needed." - rm -f /etc/init.d/vpnclient - fi - runlevels=`rc-update show | grep vpnclient | cut -d\| -f2` - if [ -n "$runlevels" ] - then - elog "Removing 'vpnclient' from all runlevels." - rc-update del vpnclient - fi - elog "You will need to load the cisco_ipsec module before using the Cisco" - elog "VPN Client (vpnclient) application." -} diff --git a/net-misc/cisco-vpnclient-3des/files/2.6.22.patch b/net-misc/cisco-vpnclient-3des/files/2.6.22.patch deleted file mode 100644 index a94cdbbcec31..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/2.6.22.patch +++ /dev/null @@ -1,383 +0,0 @@ -diff -Nur vpnclient.orig/frag.c vpnclient/frag.c ---- vpnclient.orig/frag.c 2005-11-22 10:52:00.000000000 +0100 -+++ vpnclient/frag.c 2007-05-29 16:03:42.000000000 +0200 -@@ -1,4 +1,18 @@ --#include <linux/config.h> -+/************************************************************************** -+ * Copyright (c) 2001, Cisco Systems, All Rights Reserved -+ *************************************************************************** -+ * -+ * File: frag.c -+ * Date: 22/03/01 -+ * -+ * Updated to work with Linux kernels >=2.6.19 (including 2.6.22) by -+ * Alexander Griesser 29/05/07 <cisco@tuxx-home.at> -+ * -+ *************************************************************************** -+ * This module does some really cool stuff only Cisco knows about -+ ***************************************************************************/ -+ -+#include <linux/autoconf.h> - #include <linux/version.h> - #include <linux/netdevice.h> - #include <linux/etherdevice.h> -@@ -37,9 +51,10 @@ - int ret=FALSE; - struct frag_queue_entry *cur=NULL,*n=NULL,*prev=NULL; - -- id = ntohs(skb->nh.iph->id); -+ id = ntohs(CISCOVPN_SKB_NH_ID(skb)); -+ - /* look for an entry with the same id as this packet*/ -- if (frag_queue_head && id != ntohs(frag_queue_head->skb->nh.iph->id)) -+ if (frag_queue_head && id != ntohs(CISCOVPN_SKB_NH_ID(frag_queue_head->skb))) - { - printk(KERN_INFO "%s: incomplete fragment set destroyed",__FUNCTION__); - cleanup_frag_queue(); -@@ -57,10 +72,13 @@ - cur = frag_queue_head; - - prev = NULL; -- skb_offset = ntohs(skb->nh.iph->frag_off) & IP_OFFSET; -+ -+ skb_offset = ntohs(CISCOVPN_SKB_NH_FRAGOFF(skb)) & IP_OFFSET; -+ - while (cur) - { -- cur_offset = ntohs(cur->skb->nh.iph->frag_off) & IP_OFFSET; -+ cur_offset = ntohs(CISCOVPN_SKB_NH_FRAGOFF(cur->skb)) & IP_OFFSET; -+ - /*sanity check*/ - if (cur_offset < prev_offset) - { -@@ -112,8 +130,9 @@ - goto done_with_tests; - } - cur = frag_queue_head; -+ - /*first in queue must be first frag.*/ -- if ((ntohs(cur->skb->nh.iph->frag_off) & IP_OFFSET) != 0) -+ if ((ntohs(CISCOVPN_SKB_NH_FRAGOFF(cur->skb)) & IP_OFFSET) != 0) - { - goto done_with_tests; - } -@@ -121,19 +140,22 @@ - by comparing adjacent offset values and packet lengths*/ - while (cur) - { -- cur_offset = (ntohs(cur->skb->nh.iph->frag_off) & IP_OFFSET)*8; -- if (cur_offset != prev_end_offset) -+ cur_offset = (ntohs(CISCOVPN_SKB_NH_FRAGOFF(cur->skb)) & IP_OFFSET)*8; -+ -+ if (cur_offset != prev_end_offset) - { - goto done_with_tests; - } - prev = cur; - prev_offset = cur_offset; -- prev_end_offset = prev_offset + ntohs(prev->skb->nh.iph->tot_len) -- - (prev->skb->nh.iph->ihl*4); -+ -+ prev_end_offset = prev_offset + ntohs(CISCOVPN_SKB_NH_TOTLEN(prev->skb)) -+ - (CISCOVPN_SKB_NH_IHL(prev->skb)*4); - cur = cur->next; - } - /*last in queue must not have more frags set*/ -- if (ntohs(prev->skb->nh.iph->frag_off) & IP_MF) -+ -+ if (ntohs(CISCOVPN_SKB_NH_FRAGOFF(prev->skb)) & IP_MF) - { - goto done_with_tests; - } -@@ -185,10 +207,12 @@ - /*not an IP packet*/ - goto done_with_tests; - } -- iph = skb->nh.iph; -+ -+ iph = CISCOVPN_SKB_IPHEADER(skb); -+ - if (!iph) - { -- printk(KERN_DEBUG "%s: skb->nh is NULL.", __FUNCTION__); -+ printk(KERN_DEBUG "%s: iph (IP Header) is NULL.", __FUNCTION__); - goto done_with_tests; - } - offset = ntohs(iph->frag_off); -diff -Nur vpnclient.orig/interceptor.c vpnclient/interceptor.c ---- vpnclient.orig/interceptor.c 2005-11-22 10:52:00.000000000 +0100 -+++ vpnclient/interceptor.c 2007-05-29 16:08:57.000000000 +0200 -@@ -5,10 +5,13 @@ - * File: interceptor.c - * Date: 04/10/2001 - * -+* Updated to work with Linux kernels >=2.6.19 (including 2.6.22) by -+* Alexander Griesser 29/05/07 <cisco@tuxx-home.at> -+* - *************************************************************************** - * This module implements the linux driver. - ***************************************************************************/ --#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/version.h> - #include <linux/module.h> - #include <linux/init.h> -@@ -339,13 +342,18 @@ - - dp = NULL; - num_target_devices = 0; -- for (dp = dev_base; dp != NULL; dp = dp->next) -- { -+ -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ for_each_netdev(dp) -+ #else -+ for (dp = dev_base; dp != NULL; dp = dp->next) -+ #endif -+ { - if (add_netdev(dp) == 0) - { - num_target_devices++; - } -- } -+ } - - if (num_target_devices == 0) - { -@@ -550,13 +558,13 @@ - goto exit_gracefully; - } - -- if (skb->ip_summed == CHECKSUM_HW) -+ if (CHECK_IP_SUMMED(skb->ip_summed)) - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7) - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) -- if (skb_checksum_help(skb,1)) -+ if (SKB_CHECKSUM_HELP(skb,1)) - #else -- if (skb_checksum_help(&skb,1)) -+ if (SKB_CHECKSUM_HELP(&skb,1)) - #endif // LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) - { - dev_kfree_skb(skb); -@@ -569,9 +577,10 @@ - } - - reset_inject_status(&pBinding->recv_stat); -- if (skb->mac.raw) -+ -+ if (CISCOVPN_SKB_MACHEADER(skb)) - { -- hard_header_len = skb->data - skb->mac.raw; -+ hard_header_len = skb->data - CISCOVPN_SKB_MACHEADER(skb); - if ((hard_header_len < 0) || (hard_header_len > skb_headroom(skb))) - { - printk(KERN_DEBUG "bad hh len %d\n", hard_header_len); -@@ -588,7 +597,7 @@ - switch (hard_header_len) - { - case ETH_HLEN: -- CniNewFragment(ETH_HLEN, skb->mac.raw, &MacHdr, CNI_USE_BUFFER); -+ CniNewFragment(ETH_HLEN, CISCOVPN_SKB_MACHEADER(skb), &MacHdr, CNI_USE_BUFFER); - break; - case IPPP_MAX_HEADER: - case 0: -@@ -677,14 +686,14 @@ - tmp_InjectSend = NULL; - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) -- if (skb->ip_summed == CHECKSUM_HW) -+ if (CHECK_IP_SUMMED(skb->ip_summed)) - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) -- if (skb_checksum_help(skb,0)) -+ if (SKB_CHECKSUM_HELP(skb,0)) - #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7) -- if (skb_checksum_help(&skb,0)) -+ if (SKB_CHECKSUM_HELP(&skb,0)) - #else -- if ((skb = skb_checksum_help(skb)) == NULL) -+ if ((skb = SKB_CHECKSUM_HELP(skb)) == NULL) - #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7) - { - goto exit_gracefully; -@@ -692,7 +701,8 @@ - } - #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) - reset_inject_status(&pBinding->send_stat); -- hard_header_len = skb->nh.raw - skb->data; -+ -+ hard_header_len = CISCOVPN_SKB_NETWORKHEADER(skb) - skb->data; - pBinding->send_real_hh_len = hard_header_len; - switch (hard_header_len) - { -diff -Nur vpnclient.orig/IPSecDrvOS_linux.c vpnclient/IPSecDrvOS_linux.c ---- vpnclient.orig/IPSecDrvOS_linux.c 2005-11-22 10:52:00.000000000 +0100 -+++ vpnclient/IPSecDrvOS_linux.c 2007-05-29 13:42:39.000000000 +0200 -@@ -11,7 +11,7 @@ - * - * - ***************************************************************************/ --#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/version.h> - #include <linux/vmalloc.h> - #include <linux/sched.h> -diff -Nur vpnclient.orig/linuxcniapi.c vpnclient/linuxcniapi.c ---- vpnclient.orig/linuxcniapi.c 2005-11-22 10:52:00.000000000 +0100 -+++ vpnclient/linuxcniapi.c 2007-05-29 13:56:57.000000000 +0200 -@@ -5,11 +5,14 @@ - * File: linuxcniapi.c - * Date: 22/03/01 - * -+ * Updated to work with Linux kernels >=2.6.19 (including 2.6.22) by -+ * Alexander Griesser 29/05/07 <cisco@tuxx-home.at> -+ * - *************************************************************************** - * This module implements a translation layer between the CNI API and the - * Linux Interceptor driver. - ***************************************************************************/ --#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/version.h> - #include <linux/netdevice.h> - #include <linux/if.h> -@@ -292,9 +295,19 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) - { - struct timeval timestamp; -- - do_gettimeofday(×tamp); -- skb_set_timestamp(skb,×tamp); -+ /* With Linux 2.6.22 skb_set_timestamp has been dropped. -+ * Additionally, the attribute tstamp now is in ktime_t -+ * where it prior to 2.6.22 was in skb_timeval. -+ * -+ * As a proprietary module, we may not use ktime_get_real, -+ * so we need to do it this way -+ */ -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ skb->tstamp = timeval_to_ktime(timestamp); -+ #else -+ skb_set_timestamp(skb,×tamp); -+ #endif - } - #else - do_gettimeofday(&skb->stamp); -@@ -328,8 +341,13 @@ - - skb->ip_summed = CHECKSUM_UNNECESSARY; - -- skb->nh.iph = (struct iphdr *) skb->data; -- skb->mac.raw = pMac; -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ skb_reset_network_header(skb); -+ skb_reset_mac_header(skb); -+ #else -+ skb->nh.iph = (struct iphdr *) skb->data; -+ skb->mac.raw = pMac; -+ #endif - - pBinding->recv_stat.called = TRUE; - -@@ -441,9 +459,19 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) - { - struct timeval timestamp; -- - do_gettimeofday(×tamp); -- skb_set_timestamp(skb,×tamp); -+ /* With Linux 2.6.22 skb_set_timestamp has been dropped. -+ * Additionally, the attribute tstamp now is in ktime_t -+ * where it prior to 2.6.22 was in skb_timeval. -+ * -+ * As a proprietary module, we may not use ktime_get_real, -+ * so we need to do it this way -+ */ -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ skb->tstamp = timeval_to_ktime(timestamp); -+ #else -+ skb_set_timestamp(skb,×tamp); -+ #endif - } - #else - do_gettimeofday(&skb->stamp); -@@ -451,11 +479,21 @@ - - skb->dev = pBinding->pDevice; - -- skb->mac.raw = pMac; -- skb->nh.raw = pIP; -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ skb_reset_mac_header(skb); -+ skb_reset_network_header(skb); -+ #else -+ skb->mac.raw = pMac; -+ skb->nh.raw = pIP; -+ #endif - - /*ip header length is in 32bit words */ -- skb->h.raw = pIP + (skb->nh.iph->ihl * 4); -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ skb->transport_header = skb->network_header + (ip_hdr(skb)->ihl * 4); -+ #else -+ skb->h.raw = pIP + (skb->nh.iph->ihl * 4); -+ #endif -+ - skb->protocol = htons(ETH_P_IP); - - /* send this packet up the NIC driver */ -diff -Nur vpnclient.orig/linux_os.h vpnclient/linux_os.h ---- vpnclient.orig/linux_os.h 2005-11-22 10:52:00.000000000 +0100 -+++ vpnclient/linux_os.h 2007-05-29 16:05:44.000000000 +0200 -@@ -5,6 +5,9 @@ - * File: linux_os.h - * Date: 04/25/2001 - * -+* Updated to work with Linux kernels >=2.6.19 (including 2.6.22) by -+* Alexander Griesser 29/05/07 <cisco@tuxx-home.at> -+* - *************************************************************************** - * - * Macros for handling differences in the linux kernel api. -@@ -30,6 +33,39 @@ - #define PACKET_TYPE_NEXT(pt) ((pt)->next) - #endif - -+/* With linux 2.6.19, CHECKSUM_HW was split into CHECKSUM_COMPLETE -+ * and CHECKSUM_PARTIAL -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) -+ #define CHECK_IP_SUMMED(n) \ -+ (((n) == CHECKSUM_COMPLETE) || ((n) == CHECKSUM_PARTIAL)) -+ #define SKB_CHECKSUM_HELP(a,b) skb_checksum_help((a)) -+#else -+ #define CHECK_IP_SUMMED(n) ((n) == CHECKSUM_HW) -+ #define SKB_CHECKSUM_HELP(a,b) skb_checksum_help((a),(b)) -+#endif -+ -+ -+/* With linux 2.6.22, the sk_buff struct has changed -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ #define CISCOVPN_SKB_NH_ID(a) (ip_hdr(a)->id) -+ #define CISCOVPN_SKB_NH_FRAGOFF(a) (ip_hdr(a)->frag_off) -+ #define CISCOVPN_SKB_NH_TOTLEN(a) (ip_hdr(a)->tot_len) -+ #define CISCOVPN_SKB_NH_IHL(a) (ip_hdr(a)->ihl) -+ #define CISCOVPN_SKB_IPHEADER(a) (ip_hdr(a)) -+ #define CISCOVPN_SKB_MACHEADER(a) (skb_mac_header(a)) -+ #define CISCOVPN_SKB_NETWORKHEADER(a) (skb_network_header(a)) -+#else -+ #define CISCOVPN_SKB_NH_ID(a) (a->nh.iph->id) -+ #define CISCOVPN_SKB_NH_FRAGOFF(a) (a->nh.iph->frag_off) -+ #define CISCOVPN_SKB_NH_TOTLEN(a) (a->nh.iph->tot_len) -+ #define CISCOVPN_SKB_NH_IHL(a) (a->nh.iph->ihl) -+ #define CISCOVPN_SKB_IPHEADER(a) (a->nh.iph) -+ #define CISCOVPN_SKB_MACHEADER(a) (a->mac.raw) -+ #define CISCOVPN_SKB_NETWORKHEADER(a) (a->nh.raw) -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,5) - #include <asm/uaccess.h> - #else diff --git a/net-misc/cisco-vpnclient-3des/files/2.6.24.patch b/net-misc/cisco-vpnclient-3des/files/2.6.24.patch deleted file mode 100644 index 16680bcf2397..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/2.6.24.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff -Nur vpnclient/GenDefs.h vpnclient.new/GenDefs.h ---- 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 - -+/* uintptr_t has been defined in include/linux/types.h in 2.6.24. -+ * No need to define it here again (will only lead to compile errors) -+ * -+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 -+ */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - #ifndef _UINTPTR_T_DEFINED - #if defined(_LP64) - #warning 64 bit -@@ -114,6 +120,7 @@ - #endif - #define _UINTPTR_T_DEFINED - #endif -+#endif - - - 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 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> - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+#include <net/net_namespace.h> -+#endif -+ - #include "linux_os.h" - - #include "vpn_ioctl_linux.h" -@@ -47,7 +51,13 @@ - unsigned long rx_bytes; - - /*methods of the cipsec network device*/ --static int 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); -@@ -91,15 +101,33 @@ - - BINDING Bindings[MAX_INTERFACES]; - -+/* 2.6.24 handles net_devices a little bit different -+ * -+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+static struct net_device* interceptor_dev; -+#else - static struct net_device interceptor_dev = { - .name = interceptor_name, - .init = interceptor_init - }; -+#endif -+ - static struct notifier_block interceptor_notifier = { - .notifier_call = handle_netdev_event, - }; - -+#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) - { - 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 * -@@ -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 -@@ -843,15 +876,29 @@ - - rc = CniPluginLoad(&pcDeviceName, &PCNICallbackTable); - -+/* 2.6.24 needs to allocate each netdevice before registering it, otherwise -+ * the kernel BUG()s. -+ * -+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+ if(! (interceptor_dev = alloc_netdev(sizeof(struct net_device), interceptor_name, interceptor_init))) -+ return 0; -+#endif -+ - if (CNI_IS_SUCCESS(rc)) - { - - CNICallbackTable = *PCNICallbackTable; - CniPluginDeviceCreated(); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+ if ((status = register_netdev(interceptor_dev)) != 0) -+#else - if ((status = register_netdev(&interceptor_dev)) != 0) -+#endif - { - printk(KERN_INFO "%s: error %d registering device \"%s\".\n", -- LINUX_VPN_IFNAME, status, interceptor_dev.name); -+ LINUX_VPN_IFNAME, status, interceptor_name); - CniPluginUnload(); - - } -@@ -871,7 +918,11 @@ - cleanup_frag_queue(); - CniPluginUnload(); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+ unregister_netdev(interceptor_dev); -+#else - unregister_netdev(&interceptor_dev); -+#endif - unregister_netdevice_notifier(&interceptor_notifier); - - return; diff --git a/net-misc/cisco-vpnclient-3des/files/4.8.01.0640-2.6.24.patch b/net-misc/cisco-vpnclient-3des/files/4.8.01.0640-2.6.24.patch deleted file mode 100644 index 15402881341e..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.8.01.0640-2.6.24.patch +++ /dev/null @@ -1,241 +0,0 @@ -diff -r 469eaa76099e GenDefs.h ---- a/GenDefs.h Mon Apr 28 10:40:53 2008 +0200 -+++ b/GenDefs.h Mon Apr 28 10:47:51 2008 +0200 -@@ -105,6 +105,12 @@ typedef int32 intptr_t; - #define _INTPTR_T_DEFINED - #endif - -+/* uintptr_t has been defined in include/linux/types.h in 2.6.24. -+ * No need to define it here again (will only lead to compile errors) -+ * -+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 -+ */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - #ifndef _UINTPTR_T_DEFINED - #if defined(_LP64) - #warning 64 bit -@@ -113,6 +119,7 @@ typedef uint32 uintptr_t; - typedef uint32 uintptr_t; - #endif - #define _UINTPTR_T_DEFINED -+#endif - #endif - - -diff -r 469eaa76099e Makefile ---- a/Makefile Mon Apr 28 10:40:53 2008 +0200 -+++ b/Makefile Mon Apr 28 10:47:51 2008 +0200 -@@ -12,7 +12,7 @@ SOURCE_OBJS := linuxcniapi.o frag.o IPSe - 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 -r 469eaa76099e interceptor.c ---- a/interceptor.c Mon Apr 28 10:40:53 2008 +0200 -+++ b/interceptor.c Mon Apr 28 10:47:51 2008 +0200 -@@ -28,6 +28,10 @@ - #include <linux/udp.h> - #include <net/protocol.h> - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+#include <net/net_namespace.h> -+#endif -+ - #include "linux_os.h" - - #include "vpn_ioctl_linux.h" -@@ -39,7 +43,7 @@ - - static uint8_t interceptor_eth_addr[] = { 0x00, 0x0b, 0xfc, 0xf8, 0x01, 0x8f }; - --// packet statistics -+// packet statistics - static unsigned long tx_packets; - static unsigned long tx_dropped; - static unsigned long tx_bytes; -@@ -48,7 +52,13 @@ unsigned long rx_bytes; - unsigned long rx_bytes; - - /*methods of the cipsec network device*/ --static int 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); -@@ -82,12 +92,12 @@ struct packet_type_funcs - { - struct packet_type *pt; - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) -- int (*orig_handler_func) (struct sk_buff *, -+ int (*orig_handler_func) (struct sk_buff *, - struct net_device *, - struct packet_type *, - struct net_device *); - #else -- int (*orig_handler_func) (struct sk_buff *, -+ int (*orig_handler_func) (struct sk_buff *, - struct net_device *, - struct packet_type *); - #endif -@@ -107,16 +117,30 @@ static char interceptor_name[] = LINUX_V - - BINDING Bindings[MAX_INTERFACES]; - -+/* 2.6.24 handles net_devices a little bit different -+ * -+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+static struct net_device* interceptor_dev; -+#else - static struct net_device interceptor_dev = { - .name = interceptor_name, - .init = interceptor_init - }; -+#endif -+ - static struct notifier_block interceptor_notifier = { - .notifier_call = handle_netdev_event, - }; - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) --static int -+static -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+void -+#else -+int -+#endif - #else - static int __init - #endif -@@ -133,8 +157,9 @@ interceptor_init(struct net_device *dev) - 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 * -@@ -270,7 +295,7 @@ add_netdev(struct net_device *dev) - Bindings[i].InjectReceive = original_ip_handler.orig_handler_func; - Bindings[i].pPT = original_ip_handler.pt; - -- rc = 0; -+ rc = 0; - - exit_gracefully: - return rc; -@@ -284,7 +309,7 @@ remove_netdev(struct net_device *dev) - b = getbindingbydev(dev); - - if (b) -- { -+ { - rc = 0; - dev->hard_start_xmit = b->InjectSend; - kernel_memset(b, 0, sizeof(BINDING)); -@@ -326,7 +351,7 @@ handle_vpnup(void) - } - /* find the handler for inbound IP packets by adding a dummy handler - * for that packet type into the kernel. Because the packet handlers -- * are stored in a hash table, we'll be able to pull the original -+ * are stored in a hash table, we'll be able to pull the original - * ip packet handler out of the list that dummy_pt was inserted into.*/ - kernel_memset(&dummy_pt, 0, sizeof(dummy_pt)); - dummy_pt.type = htons(ETH_P_IP); -@@ -363,7 +388,11 @@ handle_vpnup(void) - dp = NULL; - 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 -@@ -494,7 +523,7 @@ getbindingbydev(struct net_device *dev) - getbindingbydev(struct net_device *dev) - { - int i; -- -+ - for (i=0; i <= MAX_INTERFACES; i++) - { - BINDING *b = &Bindings[i]; -@@ -522,13 +551,13 @@ build_ppp_fake_mac_frag(struct ethhdr *d - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) - static int - recv_ip_packet_handler(struct sk_buff *skb, -- struct net_device *dev, -+ struct net_device *dev, - struct packet_type *type, - struct net_device *orig_dev) - #else - static int - recv_ip_packet_handler(struct sk_buff *skb, -- struct net_device *dev, -+ struct net_device *dev, - struct packet_type *type) - #endif - { -@@ -932,15 +961,29 @@ interceptor_mod_init(void) - - rc = CniPluginLoad(&pcDeviceName, &PCNICallbackTable); - -+/* 2.6.24 needs to allocate each netdevice before registering it, otherwise -+ * the kernel BUG()s. -+ * -+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+ if(! (interceptor_dev = alloc_netdev(sizeof(struct net_device), interceptor_name, interceptor_init))) -+ return 0; -+#endif -+ - if (CNI_IS_SUCCESS(rc)) - { - - CNICallbackTable = *PCNICallbackTable; - CniPluginDeviceCreated(); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+ if ((status = register_netdev(interceptor_dev)) != 0) -+#else - if ((status = register_netdev(&interceptor_dev)) != 0) -+#endif - { - printk(KERN_INFO "%s: error %d registering device \"%s\".\n", -- LINUX_VPN_IFNAME, status, interceptor_dev.name); -+ LINUX_VPN_IFNAME, status, interceptor_name); - CniPluginUnload(); - - } -@@ -960,7 +1003,11 @@ interceptor_mod_cleanup(void) - cleanup_frag_queue(); - CniPluginUnload(); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+ unregister_netdev(interceptor_dev); -+#else - unregister_netdev(&interceptor_dev); -+#endif - unregister_netdevice_notifier(&interceptor_notifier); - - return; diff --git a/net-misc/cisco-vpnclient-3des/files/4.8.01.0640-amd64.patch b/net-misc/cisco-vpnclient-3des/files/4.8.01.0640-amd64.patch deleted file mode 100644 index 015dc7b37311..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.8.01.0640-amd64.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -u -x '*.ko*' -x '*.o*' vpnclient/frag.c vpnclient_modified/frag.c ---- vpnclient/frag.c 2007-08-22 15:30:31.000000000 -0400 -+++ vpnclient_modified/frag.c 2008-01-11 01:41:19.000000000 -0500 -@@ -22,7 +22,11 @@ - #include "frag.h" - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+#ifdef NET_SKBUFF_DATA_USES_OFFSET -+#define SKB_IPHDR(skb) ((struct iphdr*)(skb->head + skb->network_header)) -+#else - #define SKB_IPHDR(skb) ((struct iphdr*)skb->network_header) -+#endif - #else - #define SKB_IPHDR(skb) skb->nh.iph - #endif -diff -u -x '*.ko*' -x '*.o*' vpnclient/interceptor.c vpnclient_modified/interceptor.c ---- vpnclient/interceptor.c 2007-08-22 15:30:31.000000000 -0400 -+++ vpnclient_modified/interceptor.c 2008-01-11 02:04:01.000000000 -0500 -@@ -636,7 +636,11 @@ - #endif - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ #ifdef NET_SKBUFF_DATA_USES_OFFSET -+ hard_header_len = skb->data - (skb->head + skb->mac_header); -+ #else - hard_header_len = skb->data - skb->mac_header; -+ #endif - #else - hard_header_len = skb->data - skb->mac.raw; - #endif -@@ -657,7 +661,11 @@ - { - case ETH_HLEN: - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ #ifdef NET_SKBUFF_DATA_USES_OFFSET -+ CniNewFragment(ETH_HLEN, skb->head + skb->mac_header, &MacHdr, CNI_USE_BUFFER); -+ #else - CniNewFragment(ETH_HLEN, skb->mac_header, &MacHdr, CNI_USE_BUFFER); -+ #endif - #else - CniNewFragment(ETH_HLEN, skb->mac.raw, &MacHdr, CNI_USE_BUFFER); - #endif -@@ -667,7 +675,7 @@ - MacHdr = build_ppp_fake_mac_frag(&ppp_dummy_buf); - break; - default: -- printk(KERN_DEBUG "unknown mac header length (%d)\n", hard_header_len); -+ printk(KERN_DEBUG "unknown mac header length (%d) CniNewFragment\n", hard_header_len); - dev_kfree_skb(skb); - skb = NULL; - goto exit_gracefully; -@@ -775,7 +783,12 @@ - #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) - reset_inject_status(&pBinding->send_stat); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- hard_header_len = skb->network_header - skb->data; -+ #ifdef NET_SKBUFF_DATA_USES_OFFSET -+ hard_header_len = -+ (skb->head + skb->network_header) - skb->data; -+ #else -+ hard_header_len = skb->network_header - skb->data; -+ #endif - #else - hard_header_len = skb->nh.raw - skb->data; - #endif -diff -u -x '*.ko*' -x '*.o*' vpnclient/linuxcniapi.c vpnclient_modified/linuxcniapi.c ---- vpnclient/linuxcniapi.c 2007-08-22 15:30:31.000000000 -0400 -+++ vpnclient_modified/linuxcniapi.c 2008-01-11 01:41:19.000000000 -0500 -@@ -338,8 +338,13 @@ - skb->ip_summed = CHECKSUM_UNNECESSARY; - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- skb->network_header = (sk_buff_data_t) skb->data; -- skb->mac_header = (sk_buff_data_t)pMac; -+ #ifdef NET_SKBUFF_DATA_USES_OFFSET -+ skb->network_header = (sk_buff_data_t) (skb->data - skb->head); -+ skb->mac_header = (sk_buff_data_t) (pMac - skb->head); -+ #else -+ skb->network_header = (sk_buff_data_t) skb->data; -+ skb->mac_header = (sk_buff_data_t)pMac; -+ #endif - #else - skb->nh.iph = (struct iphdr *) skb->data; - skb->mac.raw = pMac; -@@ -478,8 +483,13 @@ - skb->dev = pBinding->pDevice; - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- skb->mac_header = (sk_buff_data_t)pMac; -- skb->network_header = (sk_buff_data_t)pIP; -+ #ifdef NET_SKBUFF_DATA_USES_OFFSET -+ skb->mac_header = (sk_buff_data_t)(pMac - skb->head); -+ skb->network_header = (sk_buff_data_t)(pIP - skb->head); -+ #else -+ skb->mac_header = (sk_buff_data_t)pMac; -+ skb->network_header = (sk_buff_data_t)pIP; -+ #endif - #else - skb->mac.raw = pMac; - skb->nh.raw = pIP; -@@ -487,8 +497,13 @@ - - /*ip header length is in 32bit words */ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- skb->transport_header = (sk_buff_data_t) -- (pIP + (((struct iphdr*)(skb->network_header))->ihl * 4)); -+ #ifdef NET_SKBUFF_DATA_USES_OFFSET -+ skb->transport_header = (sk_buff_data_t) -+ ((pIP + (((struct iphdr*)(skb->head + skb->network_header))->ihl * 4)) - skb->head); -+ #else -+ skb->transport_header = (sk_buff_data_t) -+ (pIP + (((struct iphdr*)(skb->network_header))->ihl * 4)); -+ #endif - #else - skb->h.raw = pIP + (skb->nh.iph->ihl * 4); - #endif diff --git a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-GenDefs.h.patch b/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-GenDefs.h.patch deleted file mode 100644 index a9e72328a4fa..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-GenDefs.h.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- vpnclient-orig/GenDefs.h 2008-06-23 11:59:12.000000000 -0500 -+++ vpnclient/GenDefs.h 2009-11-12 15:16:46.235673252 -0600 -@@ -105,6 +105,15 @@ - #define _INTPTR_T_DEFINED - #endif - -+/* uintptr_t has been defined in include/linux/types.h in 2.6.24. -+ * No need to define it here again (will only lead to compile errors) -+ * -+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+#define _UINTPTR_T_DEFINED -+#endif -+ - #ifndef _UINTPTR_T_DEFINED - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - #if defined(_LP64) diff --git a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-Makefile.patch b/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-Makefile.patch deleted file mode 100644 index 6e505063bbcc..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-Makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Makefile b/Makefile -index 5e7c1be..c183b3d 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,10 @@ - # - # KBUILD build parameters. - # --KERNEL_SOURCES ?= /lib/modules/$(shell uname -r)/build -+MODULE_DIR = /lib/modules/$(shell uname -r) -+KERNEL_SOURCES ?= $(MODULE_DIR)/build - KERNEL_HEADERS := -I$(KERNEL_SOURCES)/include --MODULE_ROOT ?= /lib/modules/$(shell uname -r)/CiscoVPN -+MODULE_ROOT ?= $(MODULE_DIR)/CiscoVPN - SUBARCH := $(shell uname -m) - - -@@ -12,7 +13,9 @@ MODULE_NAME := cisco_ipsec - SOURCE_OBJS := linuxcniapi.o frag.o IPSecDrvOS_linux.o interceptor.o linuxkernelapi.o - - ifeq ($(SUBARCH),x86_64) --CFLAGS += -mcmodel=kernel -mno-red-zone -+# Must NOT fiddle with CFLAGS -+# 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 --git a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-autoconf.patch b/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-autoconf.patch deleted file mode 100644 index 7e865074677b..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-autoconf.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN vpnclient/frag.c vpnclient-new/frag.c ---- vpnclient/frag.c 2008-06-23 12:59:12.000000000 -0400 -+++ vpnclient-new/frag.c 2010-05-23 23:53:10.000000000 -0400 -@@ -1,5 +1,7 @@ - #include <linux/version.h> --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include <generated/autoconf.h> -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) - #include <linux/autoconf.h> - #else - #include <linux/config.h> -diff -urN vpnclient/interceptor.c vpnclient-new/interceptor.c ---- vpnclient/interceptor.c 2008-06-23 12:59:12.000000000 -0400 -+++ vpnclient-new/interceptor.c 2010-05-23 23:53:36.000000000 -0400 -@@ -9,7 +9,9 @@ - * This module implements the linux driver. - ***************************************************************************/ - #include <linux/version.h> --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include <generated/autoconf.h> -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) - #include <linux/autoconf.h> - #else - #include <linux/config.h> -diff -urN vpnclient/IPSecDrvOS_linux.c vpnclient-new/IPSecDrvOS_linux.c ---- vpnclient/IPSecDrvOS_linux.c 2008-06-23 12:59:12.000000000 -0400 -+++ vpnclient-new/IPSecDrvOS_linux.c 2010-05-23 23:53:44.000000000 -0400 -@@ -12,7 +12,9 @@ - * - ***************************************************************************/ - #include <linux/version.h> --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include <generated/autoconf.h> -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) - #include <linux/autoconf.h> - #else - #include <linux/config.h> -diff -urN vpnclient/linuxcniapi.c vpnclient-new/linuxcniapi.c ---- vpnclient/linuxcniapi.c 2008-06-23 12:59:12.000000000 -0400 -+++ vpnclient-new/linuxcniapi.c 2010-05-23 23:52:43.000000000 -0400 -@@ -10,7 +10,9 @@ - * Linux Interceptor driver. - ***************************************************************************/ - #include <linux/version.h> --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+#include <generated/autoconf.h> -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) - #include <linux/autoconf.h> - #else - #include <linux/config.h> diff --git a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-frag.c.patch b/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-frag.c.patch deleted file mode 100644 index 04bbc5a01d4c..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-frag.c.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- vpnclient-orig/frag.c 2008-06-23 11:59:12.000000000 -0500 -+++ vpnclient/frag.c 2009-11-12 15:15:50.915673034 -0600 -@@ -22,7 +22,9 @@ - #include "frag.h" - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) --#define SKB_IPHDR(skb) ((struct iphdr*)skb->network_header) -+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. -+ */ -+#define SKB_IPHDR(skb) ((struct iphdr*)skb_network_header) - #else - #define SKB_IPHDR(skb) skb->nh.iph - #endif diff --git a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-interceptor.c.patch b/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-interceptor.c.patch deleted file mode 100644 index c933084190aa..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-interceptor.c.patch +++ /dev/null @@ -1,227 +0,0 @@ ---- vpnclient-orig/interceptor.c 2009-05-20 08:16:34.000000000 -0500 -+++ vpnclient/interceptor.c 2009-11-12 16:54:57.323674809 -0600 -@@ -28,6 +28,10 @@ - #include <linux/udp.h> - #include <net/protocol.h> - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -+#include <net/net_namespace.h> -+#endif -+ - #include "linux_os.h" - - #include "vpn_ioctl_linux.h" -@@ -48,7 +52,7 @@ - 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 struct net_device_stats *interceptor_stats(struct net_device *dev); - static int interceptor_ioctl(struct net_device *dev, struct ifreq *ifr, - int cmd); -@@ -120,26 +124,44 @@ - .notifier_call = handle_netdev_event, - }; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) -+static const struct net_device_ops interceptor_netdev_ops = { -+ .ndo_start_xmit = interceptor_tx, -+ .ndo_get_stats = interceptor_stats, -+ .ndo_do_ioctl = interceptor_ioctl, -+}; -+static const struct net_device_ops replacement_netdev_ops = { -+ .ndo_start_xmit = replacement_dev_xmit, -+ .ndo_get_stats = interceptor_stats, -+ .ndo_do_ioctl = interceptor_ioctl, -+}; -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) --static int -+static void - #else --static int __init -+static void __init - #endif - interceptor_init(struct net_device *dev) - { - ether_setup(dev); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) -+ /* -+ * The new netops have to be used. -+ */ -+ dev->netdev_ops = &interceptor_netdev_ops; -+#else - dev->hard_start_xmit = interceptor_tx; - dev->get_stats = interceptor_stats; - dev->do_ioctl = interceptor_ioctl; -+#endif - - dev->mtu = ETH_DATA_LEN-MTU_REDUCTION; - kernel_memcpy(dev->dev_addr, interceptor_eth_addr,ETH_ALEN); - dev->flags |= IFF_NOARP; - dev->flags &= ~(IFF_BROADCAST | IFF_MULTICAST); - kernel_memset(dev->broadcast, 0xFF, ETH_ALEN); -- -- return 0; - } - - static struct net_device_stats * -@@ -268,8 +290,13 @@ - Bindings[i].original_mtu = dev->mtu; - - /*replace the original send function with our send function */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) -+ Bindings[i].Inject_ops = dev->netdev_ops; -+ dev->netdev_ops = &replacement_netdev_ops; -+#else - Bindings[i].InjectSend = dev->hard_start_xmit; - dev->hard_start_xmit = replacement_dev_xmit; -+#endif - - /*copy in the ip packet handler function and packet type struct */ - Bindings[i].InjectReceive = original_ip_handler.orig_handler_func; -@@ -291,7 +318,12 @@ - if (b) - { - rc = 0; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) -+ dev->netdev_ops = b->Inject_ops; -+ dev->mtu = b->original_mtu; -+#else - dev->hard_start_xmit = b->InjectSend; -+#endif - kernel_memset(b, 0, sizeof(BINDING)); - } - else -@@ -637,19 +669,31 @@ - - reset_inject_status(&pBinding->recv_stat); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- if (skb->mac_header) -+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. -+ */ -+ if (skb_mac_header_was_set(skb)) - #else - if (skb->mac.raw) - #endif - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- hard_header_len = skb->data - skb->mac_header; -+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. -+ */ -+ hard_header_len = skb->data - skb_mac_header(skb); - #else - hard_header_len = skb->data - skb->mac.raw; - #endif - if ((hard_header_len < 0) || (hard_header_len > skb_headroom(skb))) - { -- printk(KERN_DEBUG "bad hh len %d\n", hard_header_len); -+ printk(KERN_DEBUG "bad hh len %d, mac: %p, data: %p, head: %p\n", -+ hard_header_len, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -+ skb->mac_header, /* actualy ptr in 32-bit */ -+#else -+ skb->mac.raw, -+#endif -+ skb->data, -+ skb->head); - hard_header_len = 0; - } - } -@@ -664,7 +708,9 @@ - { - case ETH_HLEN: - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- CniNewFragment(ETH_HLEN, skb->mac_header, &MacHdr, CNI_USE_BUFFER); -+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. -+ */ -+ CniNewFragment(ETH_HLEN, skb_mac_header(skb), &MacHdr, CNI_USE_BUFFER); - #else - CniNewFragment(ETH_HLEN, skb->mac.raw, &MacHdr, CNI_USE_BUFFER); - #endif -@@ -718,8 +764,13 @@ - - break; - case CNI_DISCARD: -- dev_kfree_skb(skb); -- rx_dropped++; -+ /* patch found on ubuntuforums.org, written by aranoyas */ -+ /* override local LAN access */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) -+ rc2 = original_ip_handler.orig_handler_func(skb, dev, type, dev); -+#else -+ rc2 = original_ip_handler.orig_handler_func(skb, dev, type); -+#endif - break; - default: - printk(KERN_DEBUG "RECV: Unhandled case in %s rc was %x\n", -@@ -782,7 +833,9 @@ - #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) - reset_inject_status(&pBinding->send_stat); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- hard_header_len = skb->network_header - skb->data; -+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. -+ */ -+ hard_header_len = skb_network_header(skb) - skb->data; - #else - hard_header_len = skb->nh.raw - skb->data; - #endif -@@ -840,12 +893,21 @@ - /* packet dropped */ - else - { -- dev_kfree_skb(skb); -- tx_dropped++; -+ /* patch found on ubuntuforums.org, originally written by aranoyas */ -+ /* override local LAN access */ -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) -+ rc2 = pBinding->Inject_ops->ndo_start_xmit(skb, dev); -+ #else -+ rc2 = pBinding->InjectSend(skb, dev); -+ #endif - } - break; - case CNI_CHAIN: -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) -+ rc2 = pBinding->Inject_ops->ndo_start_xmit(skb, dev); -+#else - rc2 = pBinding->InjectSend(skb, dev); -+#endif - break; - default: - printk(KERN_DEBUG "Unhandled case in %s rc was %x\n", __FUNCTION__, -@@ -896,7 +958,11 @@ - //only need to handle IP packets. - if (skb->protocol != htons(ETH_P_IP)) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) -+ rc2 = pBinding->Inject_ops->ndo_start_xmit(skb, dev); -+#else - rc2 = pBinding->InjectSend(skb, dev); -+#endif - goto exit_gracefully; - } - -@@ -924,10 +990,17 @@ - PCNI_CHARACTERISTICS PCNICallbackTable; - CNISTATUS rc = CNI_SUCCESS; - -+ rc = CniPluginLoad(&pcDeviceName, &PCNICallbackTable); -+ -+/* 2.6.24 needs to allocate each netdevice before registering it, otherwise -+ * the kernel BUG()s. -+ * -+ * by Alexander Griesser <work@tuxx-home.at>, 2008-01-11 -+ */ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) -- interceptor_dev= alloc_netdev( 0, interceptor_name, (void *)interceptor_init); -+ if(! (interceptor_dev = alloc_netdev(sizeof(struct net_device), interceptor_name, interceptor_init))) -+ return 0; - #endif -- rc = CniPluginLoad(&pcDeviceName, &PCNICallbackTable); - - if (CNI_IS_SUCCESS(rc)) - { diff --git a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-linuxcniapi.c.patch b/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-linuxcniapi.c.patch deleted file mode 100644 index b98e8d998f44..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-linuxcniapi.c.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- vpnclient-orig/linuxcniapi.c 2008-06-23 11:59:12.000000000 -0500 -+++ vpnclient/linuxcniapi.c 2009-11-12 15:33:52.135669168 -0600 -@@ -338,8 +338,12 @@ - skb->ip_summed = CHECKSUM_UNNECESSARY; - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- skb->network_header = (sk_buff_data_t) skb->data; -- skb->mac_header = (sk_buff_data_t)pMac; -+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. -+ * We have to use (pMac - skb->data) to get an offset. -+ * We need to cast ptrs to byte ptrs and take the difference. -+ */ -+ skb_reset_network_header(skb); -+ skb_set_mac_header(skb, (int)((void *)pMac - (void *)skb->data)); - #else - skb->nh.iph = (struct iphdr *) skb->data; - skb->mac.raw = pMac; -@@ -478,8 +482,12 @@ - skb->dev = pBinding->pDevice; - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- skb->mac_header = (sk_buff_data_t)pMac; -- skb->network_header = (sk_buff_data_t)pIP; -+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. -+ * We have to use (pIP/pMac - skb->data) to get an offset. -+ * We need to cast ptrs to byte ptrs and take the difference. -+ */ -+ skb_set_mac_header(skb, (int)((void *)pMac - (void *)skb->data)); -+ skb_set_network_header(skb, (int)((void *)pIP - (void *)skb->data)); - #else - skb->mac.raw = pMac; - skb->nh.raw = pIP; -@@ -487,8 +495,13 @@ - - /*ip header length is in 32bit words */ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) -- skb->transport_header = (sk_buff_data_t) -- (pIP + (((struct iphdr*)(skb->network_header))->ihl * 4)); -+/* 2.6.22 added an inline function for 32-/64-bit usage here, so use it. -+ * We have to use (pIP - skb->data) to get an offset. -+ * We need to cast ptrs to byte ptrs and take the difference. -+ */ -+ skb_set_transport_header(skb, -+ ((int)((void *)pIP - (void *)skb->data) + -+ (((struct iphdr*)(skb_network_header(skb)))->ihl * 4))); - #else - skb->h.raw = pIP + (skb->nh.iph->ihl * 4); - #endif -@@ -496,7 +509,11 @@ - - /* send this packet up the NIC driver */ - // May need to call dev_queue_xmit(skb) instead -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) -+ tmp_rc = pBinding->Inject_ops->ndo_start_xmit(skb, skb->dev); -+#else - tmp_rc = pBinding->InjectSend(skb, skb->dev); -+#endif - - #ifdef VIRTUAL_ADAPTER - pVABinding = CniGetVABinding(); diff --git a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-linuxcniapi.h.patch b/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-linuxcniapi.h.patch deleted file mode 100644 index 17de49d863d5..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-linuxcniapi.h.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- vpnclient-orig/linuxcniapi.h 2008-06-23 11:59:12.000000000 -0500 -+++ vpnclient/linuxcniapi.h 2009-11-12 15:34:34.555673500 -0600 -@@ -30,7 +30,11 @@ - #else - struct packet_type *); - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29) -+ const struct net_device_ops *Inject_ops; -+#else - int (*InjectSend) (struct sk_buff * skb, struct net_device * dev); -+#endif - - int recv_real_hh_len; - int send_real_hh_len; diff --git a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-linuxkernelapi.c.patch b/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-linuxkernelapi.c.patch deleted file mode 100644 index 7f184c400e43..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.8.02.0030-linuxkernelapi.c.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- vpnclient-orig/linuxkernelapi.c 2008-06-23 11:59:12.000000000 -0500 -+++ vpnclient/linuxkernelapi.c 2009-11-12 15:35:04.947674515 -0600 -@@ -9,7 +9,10 @@ - void*rc = kmalloc(size, GFP_ATOMIC); - if(NULL == rc) - { -- printk("<1> os_malloc size %d failed\n",size); -+/* Allow for 32- or 64-bit size -+ * printk("<1> os_malloc size %d failed\n",size); -+ */ -+ printk("<1> os_malloc size %ld failed\n", (long)size); - } - - return rc; diff --git a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc deleted file mode 100644 index fb63de0fc28e..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc +++ /dev/null @@ -1,116 +0,0 @@ -#!/sbin/runscript -# 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/files/vpnclient.rc,v 1.8 2006/12/12 15:08:12 wolf31o2 Exp $ - -opts="start stop status" - -VPNCLIENT="/usr/bin/vpnclient" -VPNDEV="cipsec0" - -depend() { - need net -} - -checkconfig() { - export KV="$(uname -r)" - - export VPNMOD="cisco_ipsec" - case "${KV}" in - 2.6.*|2.5.*) VPNMOD_FILE="${VPNMOD}.ko";; - 2.4.*|2.2.*|2.0.*) VPNMOD_FILE="${VPNMOD}.o";; - *) - eerror "Kernel version '${KV}' is not supported" - return 1;; - esac - export VPNMOD_FILE - return 0 -} - -start() { - checkconfig || return 1 - - local PC="" - - ebegin "Starting Cisco VPN Client" - - if [ -f /etc/resolv.conf.vpnbackup ]; then - einfo "restoring /etc/resolv.conf" - mv /etc/resolv.conf.vpnbackup /etc/resolv.conf - fi - - if [ -d /lib/modules/preferred ]; then - PC="/lib/modules/preferred/CiscoVPN" - else - PC="/lib/modules/${KV}/CiscoVPN" - fi - - if [ -d "${PC}" ] ; then - /sbin/insmod ${PC}/${VPNMOD_FILE} >/dev/null 2>&1 - if [ "$?" != "0" ] ; then - eend 1 "Failed to load module '${VPNMOD}'" - return 1 - fi - else - eend 1 "module directory '$PC' not found" - return 1 - fi - - if [ "${KV:0:3}" == "2.0" ] ; then - # This is only needed due to a bug in 2.0.x kernels that affects - # arp lookups. - ifconfig $VPNDEV 222.222.222.222 ; - if [ "$?" != "0" ] ; then - eerror "Failed (ifconfig)" - /sbin/rmmod ${VPNMOD} - eend 1 - fi - fi - - eend 0 -} - -stop() { - checkconfig || return 1 - - ebegin "Stopping Cisco VPN Client" - - /sbin/lsmod | grep -q "${VPNMOD}" - if [ "$?" != "0" ] ; then - eend 1 "Failed: module ${VPNMOD} is not running" - return 1 - fi - if [ -x $VPNCLIENT ]; then - $VPNCLIENT disconnect > /dev/null 2>&1 - sleep 1 - fi - /sbin/ifconfig $VPNDEV down - if [ "$?" != "0" ] ; then - eend 1 "Failed (ifconfig)" - return 1 - fi - /sbin/rmmod ${VPNMOD} - if [ "$?" != "0" ] ; then - eend 1 "Failed (rmmod)" - return 1 - fi - - eend 0 -} - -status() { - checkconfig || return 1 - - /sbin/lsmod | egrep "${VPNMOD}" - if [ "$?" != "0" ] ; then - eerror "Failed (lsmod ${VPNMOD}): the VPN module is not loaded" - return 1 - fi - echo - /sbin/ifconfig $VPNDEV - if [ "$?" != "0" ] ; then - echo - eerror "Failed (ifconfig ${VPNDEV}): the virtual interface is not present" - return 1 - fi -} diff --git a/net-misc/cisco-vpnclient-3des/metadata.xml b/net-misc/cisco-vpnclient-3des/metadata.xml deleted file mode 100644 index 64e842c12bae..000000000000 --- a/net-misc/cisco-vpnclient-3des/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer> - <email>maintainer-needed@gentoo.org</email> -</maintainer> -<longdescription> -This is the Cisco VPN Client, which is used to connect to Cisco VPN hardware, such as a VPN Concentrator, VPN Accelerator, or a PIX Firewall. This client is bound by export restrictions. -</longdescription> -<longdescription lang="ja"> -ãã㯠Cisco 社㮠VPN ConcentratorãVPN AcceleratorãPIX Firewall ã¨ãã£ã VPN -製åã¨æ¥ç¶ããã®ã«ä½¿ããã VPN ã¯ã©ã¤ã¢ã³ãã§ãããã®ã¯ã©ã¤ã¢ã³ãã¯è¼¸åºå¶éã®ç¯å²ã«ããã¾ãã -</longdescription> -</pkgmetadata> |