Add patches for 2.6.20 thanks to redhatter in bug 181845

(Portage version: 2.1.3_rc6)

8 files changed, 106 insertions, 57 deletions

diff --git a/net-wireless/adm8211/ChangeLog b/net-wireless/adm8211/ChangeLog
index f133872a8e70..2604bb525833 100644
--- a/net-wireless/adm8211/ChangeLog
+++ b/net-wireless/adm8211/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/adm8211
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/adm8211/ChangeLog,v 1.6 2007/02/09 05:06:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/adm8211/ChangeLog,v 1.7 2007/07/07 11:08:51 genstef Exp $
+
+  07 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/linux-2.6.17.patch, +files/linux-2.6.19.patch,
+  +files/2.6.20-no-config_h.patch, +files/2.6.20.patch,
+  -adm8211-20050323.ebuild, adm8211-20050620.ebuild:
+  Add patches for 2.6.20 thanks to redhatter in bug 181845
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-wireless/adm8211/adm8211-20050323.ebuild b/net-wireless/adm8211/adm8211-20050323.ebuild
deleted file mode 100644
index 91d6b145859d..000000000000
--- a/net-wireless/adm8211/adm8211-20050323.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/adm8211/adm8211-20050323.ebuild,v 1.3 2005/06/21 12:13:58 genstef Exp $
-
-inherit linux-mod
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="IEEE 802.11 wireless LAN driver for adm8211 based cards"
-HOMEPAGE="http://aluminum.sourmilk.net/adm8211/"
-SRC_URI="http://aluminum.sourmilk.net/adm8211/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-RDEPEND="net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-
-MODULE_NAMES="adm8211(net:)"
-
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is lt 2 6 9; then
-		eerror "${P} requires linux-2.6.9 or later."
-		die "${P} requires linux-2.6.9 or later"
-	fi
-
-	BUILD_PARAMS="KDIR=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	convert_to_m ${S}/Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc Changelog NOTES TODO
-}
diff --git a/net-wireless/adm8211/adm8211-20050620.ebuild b/net-wireless/adm8211/adm8211-20050620.ebuild
index fbdf3e2c139d..434ae474dd02 100644
--- a/net-wireless/adm8211/adm8211-20050620.ebuild
+++ b/net-wireless/adm8211/adm8211-20050620.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/adm8211/adm8211-20050620.ebuild,v 1.2 2005/06/27 17:24:09 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/adm8211/adm8211-20050620.ebuild,v 1.3 2007/07/07 11:08:51 genstef Exp $
 
 inherit linux-mod
 
@@ -21,8 +21,8 @@ BUILD_TARGETS="all"
 
 MODULE_NAMES="adm8211(net:)"
 
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+CONFIG_CHECK="WIRELESS_EXT CRYPTO_ARC4"
+ERROR_WIRELESS_EXT="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions"
 ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
 
 pkg_setup() {
@@ -39,6 +39,12 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
+	epatch ${FILESDIR}/linux-2.6.17.patch
+	epatch ${FILESDIR}/linux-2.6.19.patch
+	epatch ${FILESDIR}/2.6.20.patch
+	epatch ${FILESDIR}/2.6.20-no-config_h.patch
+
 	convert_to_m ${S}/Makefile
 }
 
diff --git a/net-wireless/adm8211/files/2.6.20-no-config_h.patch b/net-wireless/adm8211/files/2.6.20-no-config_h.patch
new file mode 100644
index 000000000000..d565eccca047
--- /dev/null
+++ b/net-wireless/adm8211/files/2.6.20-no-config_h.patch
@@ -0,0 +1,20 @@
+--- adm8211/wep.c.old	2007-06-13 11:06:07.778330430 +1000
++++ adm8211/wep.c	2007-06-13 11:06:16.442008732 +1000
+@@ -10,7 +10,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+--- adm8211/adm8211_hw.c.old	2007-06-13 11:10:12.949927966 +1000
++++ adm8211/adm8211_hw.c	2007-06-13 11:10:23.838266881 +1000
+@@ -29,7 +29,6 @@
+  */
+ 
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
diff --git a/net-wireless/adm8211/files/2.6.20.patch b/net-wireless/adm8211/files/2.6.20.patch
new file mode 100644
index 000000000000..10081fbcecbb
--- /dev/null
+++ b/net-wireless/adm8211/files/2.6.20.patch
@@ -0,0 +1,27 @@
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: package/.../adm8211/2.6.20.patch
+# Copyright (C) 2007 The T2 SDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- T2-COPYRIGHT-NOTE-END ---
+
+--- adm8211/wep.c.vanilla	2007-03-30 09:36:24.446241003 +0200
++++ adm8211/wep.c	2007-03-30 09:44:01.860307546 +0200
+@@ -22,6 +22,8 @@
+ #include <linux/crc32.h>
+ #include <asm/string.h>
+ #include <asm/scatterlist.h>
++#include <asm/page.h>
++#include <linux/mm.h>
+ 
+ #ifndef CONFIG_CRYPTO
+ #error CONFIG_CRYPTO required to build
diff --git a/net-wireless/adm8211/files/digest-adm8211-20050323 b/net-wireless/adm8211/files/digest-adm8211-20050323
deleted file mode 100644
index 5c2fc42b7274..000000000000
--- a/net-wireless/adm8211/files/digest-adm8211-20050323
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4c5607c2197401f8411e0b9d88833fa3 adm8211-20050323.tar.bz2 41076
-RMD160 5498031d6463d6f73cc5cdcad49da56e9c0f9f82 adm8211-20050323.tar.bz2 41076
-SHA256 5b5ec35b3d4b0385c3189babce0b141b4daa2591c9cb34e6603f278d472f095f adm8211-20050323.tar.bz2 41076
diff --git a/net-wireless/adm8211/files/linux-2.6.17.patch b/net-wireless/adm8211/files/linux-2.6.17.patch
new file mode 100644
index 000000000000..f3a65428363d
--- /dev/null
+++ b/net-wireless/adm8211/files/linux-2.6.17.patch
@@ -0,0 +1,10 @@
+--- adm8211/adm8211_hw.c.vanilla	2006-07-01 17:17:45.000000000 +0000
++++ adm8211/adm8211_hw.c	2006-07-01 17:20:10.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <linux/etherdevice.h>
+ #include <linux/ioport.h>
+ #include <linux/pci.h>
++#include <linux/dma-mapping.h>
+ #include <linux/if_arp.h>
+ #include <linux/delay.h>
+ #include <linux/crc32.h>
diff --git a/net-wireless/adm8211/files/linux-2.6.19.patch b/net-wireless/adm8211/files/linux-2.6.19.patch
new file mode 100644
index 000000000000..9a3f2e57d0a2
--- /dev/null
+++ b/net-wireless/adm8211/files/linux-2.6.19.patch
@@ -0,0 +1,32 @@
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: package/.../adm8211/linux-2.6.19.patch
+# Copyright (C) 2007 The T2 SDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- T2-COPYRIGHT-NOTE-END ---
+
+--- adm8211/adm8211_hw.c.orig	2005-03-23 12:12:02.000000000 +0100
++++ adm8211/adm8211_hw.c	2007-01-02 16:54:08.000000000 +0100
+@@ -2468,9 +2468,13 @@
+ 	dev->set_mac_address = adm8211_set_mac_address;
+ 	dev->hard_start_xmit = adm8211_hard_start_xmit;
+ 
++#if WIRELESS_EXT >= 12
++#if WIRELESS_EXT < 20
+ 	dev->get_wireless_stats = adm8211_get_wireless_stats;
++#endif
+ 	dev->wireless_handlers =
+ 		(struct iw_handler_def *) &adm8211_iw_handler_def;
++#endif
+ 
+ 	init_timer(&priv->timer);
+ 	priv->timer.data = (unsigned long) dev;