Added user-submitted patch to zd1211 to make it compile properly. Bug #110776.

3 files changed, 83 insertions, 1 deletions

diff --git a/net-wireless/zd1211/ChangeLog b/net-wireless/zd1211/ChangeLog
index 9feca6298910..a5c48216db6d 100644
--- a/net-wireless/zd1211/ChangeLog
+++ b/net-wireless/zd1211/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/zd1211
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1211/ChangeLog,v 1.3 2005/09/09 22:03:44 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1211/ChangeLog,v 1.4 2005/11/05 04:15:57 superlag Exp $
+
+*zd1211-20050822-r1 (05 Nov 2005)
+
+  05 Nov 2005; Aaron Kulbe <superlag@gentoo.org>
+  +files/zd1211-gentoo-20051028.diff, +zd1211-20050822-r1.ebuild:
+  Added patch to make zd1211 compile properly. Bug #110776. Thanks to Cesare
+  Gargano!
 
 *zd1211-20050822 (09 Sep 2005)
 
diff --git a/net-wireless/zd1211/files/zd1211-gentoo-20051028.diff b/net-wireless/zd1211/files/zd1211-gentoo-20051028.diff
new file mode 100644
index 000000000000..0e2ff4b2fbe7
--- /dev/null
+++ b/net-wireless/zd1211/files/zd1211-gentoo-20051028.diff
@@ -0,0 +1,36 @@
+diff -urN zd1211/src/zd1205.c zd1211_patched/src/zd1205.c
+--- zd1211/src/zd1205.c	2005-06-07 23:45:21.000000000 +0200
++++ zd1211_patched/src/zd1205.c	2005-10-28 17:17:44.000000000 +0200
+@@ -4435,7 +4435,7 @@
+ 				{ SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" },
+  			};
+ 
+-			err = verify_area(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab));
++			err = access_ok(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab));
+ 			if (err)
+ 				break;
+ 
+diff -urN zd1211/src/zd1205.h zd1211_patched/src/zd1205.h
+--- zd1211/src/zd1205.h	2005-08-14 13:17:08.000000000 +0200
++++ zd1211_patched/src/zd1205.h	2005-10-28 17:24:05.000000000 +0200
+@@ -76,6 +76,7 @@
+ #define fPROG_FLASH		1
+ #define fPROG_FLASH_BY_FW	1
+ #define fDRV_UPDATE_EEP		1
++#define fVERIFY_FLASH		0
+ 
+ enum zd1205_device_type {
+ 	ZD_1202 = 1,
+diff -urN zd1211/src/zdcompat.h zd1211_patched/src/zdcompat.h
+--- zd1211/src/zdcompat.h	2005-03-27 22:47:36.000000000 +0200
++++ zd1211_patched/src/zdcompat.h	2005-10-28 18:18:54.000000000 +0200
+@@ -108,4 +108,9 @@
+ #define free_netdev(x)	kfree(x) 
+ #endif
+ 
++// mar ott 25 23:39:55 CEST 2005 +kae - blandfix
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
++#define URB_ASYNC_UNLINK 0
++#endif
++
+ #endif
diff --git a/net-wireless/zd1211/zd1211-20050822-r1.ebuild b/net-wireless/zd1211/zd1211-20050822-r1.ebuild
new file mode 100644
index 000000000000..0470a76aad8f
--- /dev/null
+++ b/net-wireless/zd1211/zd1211-20050822-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1211/zd1211-20050822-r1.ebuild,v 1.1 2005/11/05 04:15:57 superlag Exp $
+
+inherit linux-mod eutils
+
+DESCRIPTION="Driver for the zd1211 wireless chipset"
+HOMEPAGE="http://zd1211.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zd1211/sf_${PN}_${PV}_src.tar.gz"
+S=${WORKDIR}/${PN}
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+DEPEND="net-wireless/wireless-tools"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KSRC=${KV_DIR} KDIR=${KV_DIR}"
+	MODULE_NAMES="zd1211_mod(net:${S}:${S}/src/modules-${KV_FULL})"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gentoo-20051028.diff
+}
+
+src_compile() {
+	linux-mod_src_compile
+	emake -C tools
+}
+
+src_install() {
+	linux-mod_src_install
+	dobin tools/apdbg
+	dodoc README CHANGES
+}