adding kernel 2.6.17 patch, solving bug #142028.

Package-Manager: portage-2.1.1_pre4-r1

6 files changed, 154 insertions, 3 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/Manifest b/net-wireless/fwlanusb/Manifest
index 86eb9eb27f9d..7e38f5a264b3 100644
--- a/net-wireless/fwlanusb/Manifest
+++ b/net-wireless/fwlanusb/Manifest
@@ -1,4 +1,27 @@
-MD5 7055f430b6111f01bdb9925769fe332e ChangeLog 623
-MD5 a8c9fe0690a8fbdaab0b9da485551f74 files/digest-fwlanusb-0.09.00_beta 82
+AUX fwlanusb-0.09.00_beta-kernel_2.6.17.diff 1555 RMD160 83a9eb83a2970fdf3795779dfd2f8d666956b55a SHA1 9901d5230c0ee3907f54db23d589e4b47074d09b SHA256 9759831295ad7cd8db72df8f7b1833cf32bfeb4d40fac03118c7167748773a79
+MD5 98dd9ae7325e85bf024fdce64c42a71f files/fwlanusb-0.09.00_beta-kernel_2.6.17.diff 1555
+RMD160 83a9eb83a2970fdf3795779dfd2f8d666956b55a files/fwlanusb-0.09.00_beta-kernel_2.6.17.diff 1555
+SHA256 9759831295ad7cd8db72df8f7b1833cf32bfeb4d40fac03118c7167748773a79 files/fwlanusb-0.09.00_beta-kernel_2.6.17.diff 1555
+DIST fwlanusb-suse10.0-0.09.00-beta.tar.gz 310892 RMD160 4e9a7df157ba6c56512fcc3b25929f776782a3ef SHA1 6f238765c51682be9154d74ee0b3d9921bcd203f SHA256 9992d44e3fbc9931bd847349c99221db1b79f6187cbf12cb7859b34fa488e038
+EBUILD fwlanusb-0.09.00_beta-r1.ebuild 1601 RMD160 f74fb5e3cbc2d731d61e02eec808625137ae3fd9 SHA1 7a5f0dd718c01c638dc4179d50ff8f1406db3fea SHA256 0b440647ddec29feeea5a0ec7a50070fc2e77ac8a9eb8e71dc58f7b80205671a
+MD5 72e2743c1be6a094c804a3fe3651b3c5 fwlanusb-0.09.00_beta-r1.ebuild 1601
+RMD160 f74fb5e3cbc2d731d61e02eec808625137ae3fd9 fwlanusb-0.09.00_beta-r1.ebuild 1601
+SHA256 0b440647ddec29feeea5a0ec7a50070fc2e77ac8a9eb8e71dc58f7b80205671a fwlanusb-0.09.00_beta-r1.ebuild 1601
+EBUILD fwlanusb-0.09.00_beta.ebuild 1627 RMD160 8ea360363408513ce24dd091889c121f4c246f75 SHA1 c2ab63379671847173f50eaf170fdb25c38e6c9b SHA256 d0008b8ec32283fffb4c51b58284ecec4fd4fcf723ea06a63dd59f756bf5ce4e
 MD5 71d981f08178df2fad6205c95ed75ff1 fwlanusb-0.09.00_beta.ebuild 1627
+RMD160 8ea360363408513ce24dd091889c121f4c246f75 fwlanusb-0.09.00_beta.ebuild 1627
+SHA256 d0008b8ec32283fffb4c51b58284ecec4fd4fcf723ea06a63dd59f756bf5ce4e fwlanusb-0.09.00_beta.ebuild 1627
+MISC ChangeLog 858 RMD160 d4687a2ae7b9ee5bde3eab1bc8f428a2be29c1cd SHA1 cba07a9ff427e4ea48d7fbf0dc9f039211fa960f SHA256 623b0638dcdc202510fabab3d2e12593a14c24316a09176739c75ecab240a29c
+MD5 5c74f1671da55f0fb7a5a5ed3cc5aa61 ChangeLog 858
+RMD160 d4687a2ae7b9ee5bde3eab1bc8f428a2be29c1cd ChangeLog 858
+SHA256 623b0638dcdc202510fabab3d2e12593a14c24316a09176739c75ecab240a29c ChangeLog 858
+MISC metadata.xml 355 RMD160 04be52e18954bd08fee631e86230ca8cf3a02edd SHA1 dda94cfbcee59760c3fc77d244e2361dca61f7a9 SHA256 ada38d9fb962bf9f7e4800aa0737d07304384ec646004ca1835d12d531a6e469
 MD5 8a901bb85365cd55103767ce2d39ed22 metadata.xml 355
+RMD160 04be52e18954bd08fee631e86230ca8cf3a02edd metadata.xml 355
+SHA256 ada38d9fb962bf9f7e4800aa0737d07304384ec646004ca1835d12d531a6e469 metadata.xml 355
+MD5 ee84699c4b84788d0ba805885d4327a0 files/digest-fwlanusb-0.09.00_beta 292
+RMD160 9085a3f95d32d29d1185a87f6c537c9bc48ed665 files/digest-fwlanusb-0.09.00_beta 292
+SHA256 2aa9b3c2308c3b8e3e5a1d1aa4f5708610f4d12ab492d0f29f11baeeed3f8faf files/digest-fwlanusb-0.09.00_beta 292
+MD5 ee84699c4b84788d0ba805885d4327a0 files/digest-fwlanusb-0.09.00_beta-r1 292
+RMD160 9085a3f95d32d29d1185a87f6c537c9bc48ed665 files/digest-fwlanusb-0.09.00_beta-r1 292
+SHA256 2aa9b3c2308c3b8e3e5a1d1aa4f5708610f4d12ab492d0f29f11baeeed3f8faf files/digest-fwlanusb-0.09.00_beta-r1 292
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
+}