version bump thanks to frank <skunk@legalise.it> in bug 176562

Package-Manager: portage-2.1.2.7

4 files changed, 175 insertions, 2 deletions

diff --git a/net-wireless/linux-wlan-ng-modules/ChangeLog b/net-wireless/linux-wlan-ng-modules/ChangeLog
index 9dd5e968f5c8..292aa6c55766 100644
--- a/net-wireless/linux-wlan-ng-modules/ChangeLog
+++ b/net-wireless/linux-wlan-ng-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/linux-wlan-ng-modules
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/ChangeLog,v 1.12 2006/12/03 09:39:11 betelgeuse Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/ChangeLog,v 1.13 2007/05/09 16:18:40 genstef Exp $
+
+*linux-wlan-ng-modules-0.2.7 (09 May 2007)
+
+  09 May 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/linux-wlan-ng-0.2.7-kernel-2.6.20.patch,
+  +linux-wlan-ng-modules-0.2.7.ebuild:
+  version bump thanks to frank <skunk@legalise.it> in bug 176562
 
 *linux-wlan-ng-modules-0.2.5-r1 (03 Dec 2006)
 
diff --git a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.7 b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.7
new file mode 100644
index 000000000000..d68706d62fa9
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.7
@@ -0,0 +1,3 @@
+MD5 b2b0ffd11d27c72a9c01b8a9ef3832b7 linux-wlan-ng-0.2.7.tar.bz2 456941
+RMD160 8c9e065a5038aed3750d4b7e0085e461a5ec19b1 linux-wlan-ng-0.2.7.tar.bz2 456941
+SHA256 9dbd0f6c92b33ae8b96c5a045a341a00b2454492c2229839d056e4fd1488bca5 linux-wlan-ng-0.2.7.tar.bz2 456941
diff --git a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.7-kernel-2.6.20.patch b/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.7-kernel-2.6.20.patch
new file mode 100644
index 000000000000..4c88ad1b2432
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.7-kernel-2.6.20.patch
@@ -0,0 +1,72 @@
+diff -rU2 linux-wlan-ng-0.2.7/src/prism2/driver/hfa384x.c linux-wlan-ng-0.2.7.new/src/prism2/driver/hfa384x.c
+--- linux-wlan-ng-0.2.7/src/prism2/driver/hfa384x.c	2006-11-10 15:28:33.000000000 +0100
++++ linux-wlan-ng-0.2.7.new/src/prism2/driver/hfa384x.c	2007-04-30 12:47:05.000000000 +0200
+@@ -353,7 +353,7 @@
+ 	skb_queue_head_init(&hw->authq);
+ 
+-	INIT_WORK(&hw->link_bh, prism2sta_processing_defer, hw);
++	INIT_WORK2(&hw->link_bh, prism2sta_processing_defer);
+ 
+-        INIT_WORK(&hw->commsqual_bh, prism2sta_commsqual_defer, hw);
++        INIT_WORK2(&hw->commsqual_bh, prism2sta_commsqual_defer);
+ 
+ 	init_timer(&hw->commsqual_timer);
+diff -rU2 linux-wlan-ng-0.2.7/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-0.2.7.new/src/prism2/driver/hfa384x_usb.c
+--- linux-wlan-ng-0.2.7/src/prism2/driver/hfa384x_usb.c	2006-11-02 16:56:40.000000000 +0100
++++ linux-wlan-ng-0.2.7.new/src/prism2/driver/hfa384x_usb.c	2007-04-30 12:11:57.000000000 +0200
+@@ -712,6 +712,6 @@
+ 	             hfa384x_usbctlx_completion_task,
+ 	             (unsigned long)hw);
+-	INIT_WORK(&hw->link_bh, prism2sta_processing_defer, hw);
+-	INIT_WORK(&hw->usb_work, hfa384x_usb_defer, hw);
++	INIT_WORK2(&hw->link_bh, prism2sta_processing_defer);
++	INIT_WORK2(&hw->usb_work, hfa384x_usb_defer);
+ 
+ 	init_timer(&hw->throttle);
+@@ -734,5 +734,5 @@
+ 	hw->state = HFA384x_STATE_INIT;
+ 
+-        INIT_WORK(&hw->commsqual_bh, prism2sta_commsqual_defer, hw);
++        INIT_WORK2(&hw->commsqual_bh, prism2sta_commsqual_defer);
+ 	init_timer(&hw->commsqual_timer);
+ 	hw->commsqual_timer.data = (unsigned long) hw;
+diff -rU2 linux-wlan-ng-0.2.7/src/prism2/driver/prism2sta.c linux-wlan-ng-0.2.7.new/src/prism2/driver/prism2sta.c
+--- linux-wlan-ng-0.2.7/src/prism2/driver/prism2sta.c	2006-11-02 16:56:40.000000000 +0100
++++ linux-wlan-ng-0.2.7.new/src/prism2/driver/prism2sta.c	2007-04-30 12:44:37.000000000 +0200
+@@ -1439,7 +1439,7 @@
+ }
+ 
+-void prism2sta_processing_defer(void *data)
++void prism2sta_processing_defer(struct work_struct *data)
+ {
+-	hfa384x_t		*hw = (hfa384x_t *) data;
++	hfa384x_t               *hw = container_of(data, struct hfa384x, link_bh);
+ 	wlandevice_t            *wlandev = hw->wlandev;
+ 	hfa384x_bytestr32_t ssid;
+@@ -1541,5 +1541,5 @@
+ 
+ 			/* Get the ball rolling on the comms quality stuff */
+-			prism2sta_commsqual_defer(hw);
++			prism2sta_commsqual_defer(&hw->commsqual_bh);
+ 		}
+ 		break;
+@@ -2414,5 +2414,5 @@
+ #endif
+ 
+-void prism2sta_commsqual_defer(void *data)
++void prism2sta_commsqual_defer(struct work_struct *data)
+ {
+         hfa384x_t               *hw = (hfa384x_t *) data;
+diff -rU2 linux-wlan-ng-0.2.7/src/prism2/include/prism2/prism2mgmt.h linux-wlan-ng-0.2.7.new/src/prism2/include/prism2/prism2mgmt.h
+--- linux-wlan-ng-0.2.7/src/prism2/include/prism2/prism2mgmt.h	2005-04-26 17:43:07.000000000 +0200
++++ linux-wlan-ng-0.2.7.new/src/prism2/include/prism2/prism2mgmt.h	2007-04-30 12:08:14.000000000 +0200
+@@ -169,7 +169,7 @@
+ int prism2mgmt_get_grpaddr_index( UINT32 did );
+ 
+-void prism2sta_processing_defer(void *data);
++void prism2sta_processing_defer(struct work_struct *data);
+ 
+-void prism2sta_commsqual_defer(void *data);
++void prism2sta_commsqual_defer(struct work_struct *data);
+ void prism2sta_commsqual_timer(unsigned long data);
+ 
diff --git a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.7.ebuild b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.7.ebuild
new file mode 100644
index 000000000000..82292b5551aa
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.7.ebuild,v 1.1 2007/05/09 16:18:40 genstef Exp $
+
+inherit eutils linux-mod
+
+MY_PN=${PN/-modules/}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Kernel modules for Prism2/2.5/3 based 802.11b USB wireless LAN products"
+HOMEPAGE="http://linux-wlan.org"
+SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="debug"
+
+BUILD_TARGETS="default"
+BUILD_PARAMS="WLAN_SRC=${S}/src"
+
+DEPEND="!<net-wireless/linux-wlan-ng-0.2.2"
+
+pkg_setup() {
+	# We have to put this to the global scope inside the function or it will be
+	# reset between functions because the ebuild is sourced many times.
+
+	MODULE_NAMES="p80211(net/wireless:${S}/src/p80211)"
+	MODULE_NAMES="${MODULE_NAMES} prism2_usb(net/wireless:${S}/src/prism2/driver)"
+
+	linux-mod_pkg_setup
+}
+
+config_by_usevar() {
+	local config=${3}
+	[[ -z ${config} ]] && config=${S}/default.config
+
+	if use ${2}; then
+		echo "${1}=y" >> ${config}
+	else
+		echo "${1}=n" >> ${config}
+	fi
+}
+
+src_unpack() {
+	local config=${S}/default.config
+
+	unpack ${A}
+
+	cd ${S}
+	epatch "${FILESDIR}/${MY_PN}-0.2.7-kernel-2.6.20.patch"
+	epatch "${FILESDIR}/${MY_PN}-0.2.5-sandbox.patch"
+
+	cp ${S}/config.in ${config}
+
+	echo "TARGET_ROOT_ON_HOST=${D}" >> ${config}
+	echo "LINUX_SRC=${KERNEL_DIR}"  >> ${config}
+	echo "FIRMWARE_DIR=/lib/firmware/" >> ${config}
+	echo "PRISM2_PCI=n" >> ${config}
+	echo "PRISM2_PLX=n" >> ${config}
+	echo "PRISM2_PCMCIA=n" >> ${config}
+	echo "PRISM2_USB=y" >> ${config}
+
+	config_by_usevar WLAN_DEBUG debug
+
+	sed -i -e "s:dep modules:modules:" ${S}/src/p80211/Makefile
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake default_config || die "emake default_config failed"
+	set_arch_to_portage
+
+	cd ${S}/src/mkmeta
+	emake || die "emake mkmeta failed"
+
+	linux-mod_src_compile
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo "Support for pci, plx and pcmcia drivers has been removed in"
+	einfo "revision. For pci, plx and pcmcia drivers try for example"
+	einfo "the hostap-driver or orinoco drivers. They both work with the"
+	einfo "standard wireless tools."
+	einfo ""
+	einfo "If they do not work, please report this to betelgeuse@gentoo.org."
+}