adding kernel 2.6.17 patch, solving bug #142028.

(Portage version: 2.1.1_pre4-r1)

5 files changed, 129 insertions, 1 deletions

diff --git a/net-wireless/fwlanusb/ChangeLog b/net-wireless/fwlanusb/ChangeLog
index f100da4c22da..9eda09774c98 100644
--- a/net-wireless/fwlanusb/ChangeLog
+++ b/net-wireless/fwlanusb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/fwlanusb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/fwlanusb/ChangeLog,v 1.3 2006/01/11 00:46:04 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/fwlanusb/ChangeLog,v 1.4 2006/08/10 22:55:46 sbriesen Exp $
+
+*fwlanusb-0.09.00_beta-r1 (10 Aug 2006)
+
+  10 Aug 2006; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/fwlanusb-0.09.00_beta-kernel_2.6.17.diff,
+  +fwlanusb-0.09.00_beta-r1.ebuild:
+  adding kernel 2.6.17 patch, solving bug #142028.
 
   11 Jan 2006; Stefan Briesenick <sbriesen@gentoo.org>
   fwlanusb-0.09.00_beta.ebuild:
diff --git a/net-wireless/fwlanusb/files/digest-fwlanusb-0.09.00_beta b/net-wireless/fwlanusb/files/digest-fwlanusb-0.09.00_beta
index b987a8ccb5e3..49d90feb3a19 100644
--- a/net-wireless/fwlanusb/files/digest-fwlanusb-0.09.00_beta
+++ b/net-wireless/fwlanusb/files/digest-fwlanusb-0.09.00_beta
@@ -1 +1,3 @@
 MD5 17a944b5ee2fb499f97ad5e77f22915e fwlanusb-suse10.0-0.09.00-beta.tar.gz 310892
+RMD160 4e9a7df157ba6c56512fcc3b25929f776782a3ef fwlanusb-suse10.0-0.09.00-beta.tar.gz 310892
+SHA256 9992d44e3fbc9931bd847349c99221db1b79f6187cbf12cb7859b34fa488e038 fwlanusb-suse10.0-0.09.00-beta.tar.gz 310892
diff --git a/net-wireless/fwlanusb/files/digest-fwlanusb-0.09.00_beta-r1 b/net-wireless/fwlanusb/files/digest-fwlanusb-0.09.00_beta-r1
new file mode 100644
index 000000000000..49d90feb3a19
--- /dev/null
+++ b/net-wireless/fwlanusb/files/digest-fwlanusb-0.09.00_beta-r1
@@ -0,0 +1,3 @@
+MD5 17a944b5ee2fb499f97ad5e77f22915e fwlanusb-suse10.0-0.09.00-beta.tar.gz 310892
+RMD160 4e9a7df157ba6c56512fcc3b25929f776782a3ef fwlanusb-suse10.0-0.09.00-beta.tar.gz 310892
+SHA256 9992d44e3fbc9931bd847349c99221db1b79f6187cbf12cb7859b34fa488e038 fwlanusb-suse10.0-0.09.00-beta.tar.gz 310892
diff --git a/net-wireless/fwlanusb/files/fwlanusb-0.09.00_beta-kernel_2.6.17.diff b/net-wireless/fwlanusb/files/fwlanusb-0.09.00_beta-kernel_2.6.17.diff
new file mode 100644
index 000000000000..b9ce745a3762
--- /dev/null
+++ b/net-wireless/fwlanusb/files/fwlanusb-0.09.00_beta-kernel_2.6.17.diff
@@ -0,0 +1,52 @@
+--- src/tools.h.orig	2005-12-23 15:12:10.000000000 +0100
++++ src/tools.h	2006-08-10 18:20:38.000000000 +0200
+@@ -25,6 +25,7 @@
+ 
+ #include <asm/atomic.h>
+ #include <linux/types.h>
++#include <linux/version.h>
+ #include <linux/spinlock.h>
+ #include <stdarg.h>
+ #include "defs.h"
+@@ -72,12 +73,14 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
+ static inline unsigned long atomic_xchg (
+ 	volatile atomic_t *	v, 
+ 	unsigned		value
+ ) {
+ 	return __xchg (value, &v->counter, sizeof (unsigned));
+ } /* atomic_xchg */
++#endif
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+--- src/main.c.orig	2006-08-10 17:46:32.000000000 +0200
++++ src/main.c	2006-08-10 18:16:00.000000000 +0200
+@@ -20,6 +20,7 @@
+  * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
+  */
+ 
++#include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+ #include <linux/slab.h>
+@@ -62,11 +63,16 @@
+ 
+ struct usb_driver usb_driver = {
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17))
+ 	.owner =	THIS_MODULE,
++#endif
+ 	.name =		TARGET,
+ 	.id_table =	usb_id_table,
+ 	.probe =	fwlanusb_probe,
+ 	.disconnect =	fwlanusb_disconnect,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17))
++	.no_dynamic_id = 1,
++#endif
+ } ;
+ 
+ MODULE_DEVICE_TABLE (usb, usb_id_table);
diff --git a/net-wireless/fwlanusb/fwlanusb-0.09.00_beta-r1.ebuild b/net-wireless/fwlanusb/fwlanusb-0.09.00_beta-r1.ebuild
new file mode 100644
index 000000000000..5b0d65378e66
--- /dev/null
+++ b/net-wireless/fwlanusb/fwlanusb-0.09.00_beta-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/fwlanusb/fwlanusb-0.09.00_beta-r1.ebuild,v 1.1 2006/08/10 22:55:46 sbriesen Exp $
+
+inherit eutils linux-mod
+
+SUSEVER="10.0"
+MY_PV="${PV//_/-}"
+
+DESCRIPTION="driver for the AVM FRITZ!WLAN USB stick"
+HOMEPAGE="http://www.avm.de"
+SRC_URI="ftp://ftp.avm.de/cardware/fritzwlanusb.stick/linux/suse.${SUSEVER}/${PN}-suse${SUSEVER}-${MY_PV}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+S="${WORKDIR}/fritz"
+
+DEPEND="virtual/linux-sources"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	if ! kernel_is 2 6; then
+		die "This package works only with 2.6 kernel!"
+	fi
+	if ! linux_chkconfig_present NET_WIRELESS; then
+		die "You need a kernel with enabled NET_WIRELESS support!"
+	fi
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src"
+	MODULE_NAMES="fwlanusb(net:${S}/src)"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# apply kernel >= 2.6.17 patch
+	epatch "${FILESDIR}/${P}-kernel_2.6.17.diff"
+
+	# comment out obsolete macro
+	sed -i "s:^\([[:space:]]*\)\(.*URB_ASYNC_UNLINK;.*\):\1/\* \2 \*/:g" src/buffers.c
+	convert_to_m "src/Makefile"
+}
+
+src_install() {
+	linux-mod_src_install
+	dohtml Liesmich.html
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	einfo
+	einfo "This is a *BETA* driver! Expect everything! ;-)"
+	einfo
+	einfo "Current limitations:"
+	einfo " - no WPA/WPA2 support"
+	einfo " - no Stick & Surf function support"
+	einfo " - creation of an ad hoc network isn't possible,"
+	einfo "   you can only join an existing one."
+	einfo
+}