Version bumped, bug #248450.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

6 files changed, 199 insertions, 100 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index 1320b8f8b3bf..cccc08540cc0 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/broadcom-sta
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.4 2009/04/25 01:31:44 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.5 2009/05/03 01:25:18 matsuu Exp $
+
+*broadcom-sta-5.10.91.9 (03 May 2009)
+
+  03 May 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -broadcom-sta-5.10.79.10.ebuild, -broadcom-sta-5.10.79.10-r1.ebuild,
+  -broadcom-sta-5.10.79.10-r2.ebuild, +broadcom-sta-5.10.91.9.ebuild,
+  +files/broadcom-sta-5.10.91.9-linux-2.6.29.patch:
+  Version bumped, bug #248450.
 
 *broadcom-sta-5.10.79.10-r3 (25 Apr 2009)
 
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index c8b557aa78e7..c0ac8a72ff5c 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -3,11 +3,12 @@ AUX broadcom-sta-5.10.79.10-linux-2.6.29.patch 4355 RMD160 7260e5b9a794cc53971bf
 AUX broadcom-sta-5.10.79.10-linux-2.6.30.patch 468 RMD160 307b1fc4ff9d77b0bbb0cb3c92b981675952a04d SHA1 834e7a832793b77dff5f82b3af2c0092b74fea15 SHA256 f2d449b420275bd473c636eb8650d568c3960ee60bb8242562331561cd305499
 AUX broadcom-sta-5.10.79.10-wl_iw.patch 544 RMD160 1b4447496c8982ba2e9c4c253c36271084edeef2 SHA1 da94de7769f867ef0eb01563432f9f77d270b4da SHA256 59b0b11a1cb98b5619986bd806fe03fff223eff762484f1d6fcce4b3d87195aa
 AUX broadcom-sta-5.10.79.10-wl_iw_v2.patch 719 RMD160 1744b2f19ae294f86b0aa37f5115243ff59126ea SHA1 c25d1aafb2f04ff27965b184dca371086311d2a6 SHA256 97dac57c79de53ec8afd01442e82e158551b25098700b204af2c260604b5547c
+AUX broadcom-sta-5.10.91.9-linux-2.6.29.patch 4668 RMD160 ec31ba4121cc9102b38da17ed06ed0b9624c51a1 SHA1 d103d610a69102d1d1c04737640ba1e3f76817cd SHA256 de0314451a9b24816b63beb10e1410ef23a26b151d949f0875209add77c5722d
 DIST hybrid-portsrc-x86_32-v5_10_79_10.tar.gz 697799 RMD160 3a91a8b91d7b062f3ce8ceb55435ca7c1362effa SHA1 f5f2650395dd18b6403a456877ddb55e89b72eba SHA256 f9084cc1393f48d9ca546448e5a5caf49f8f25614353596256039144d2bb5f25
+DIST hybrid-portsrc-x86_32-v5_10_91_9.tar.gz 605561 RMD160 3b7acf00fde619655da92baea2e947089749cefb SHA1 ae2c3798ed1864af9b0801332e95590cb66b1602 SHA256 8bb063e5c3b2ff4b8f6623a2a48f616b420f6ad5a13ac1fbf56ce94845d2e3d1
 DIST hybrid-portsrc-x86_64-v5_10_79_10.tar.gz 694247 RMD160 75b7e5c74957bc6bf5fbdeb28ec2c68f1d835f1a SHA1 f7bcfd6990d273b7af9f6fd7764f5359a3fbebc7 SHA256 1815cb78ddebd4d21243d83ef073f799707dd7908e64456e81be4a4d45bedc02
-EBUILD broadcom-sta-5.10.79.10-r1.ebuild 1216 RMD160 db4ad9ae8772216c303b22f8f661aaf7ce64e9b3 SHA1 09052d49139f260026027c94b14c399e7096b59b SHA256 ad1ed7ea884a27bcb563ca3afc605672580920829488674a899699387bbb411a
-EBUILD broadcom-sta-5.10.79.10-r2.ebuild 1219 RMD160 c267a9022df42a25c16b423fb18e0aa0de810f12 SHA1 a0b4a6e3db3ac7d772ea2f7da9daec7dc1b355f6 SHA256 94e50f66833528b6c569f4a152541f3e976d08868264236c00fb3c4a605f79ab
+DIST hybrid-portsrc-x86_64-v5_10_91_9.tar.gz 602794 RMD160 58205c27754c8f45b8b033c2f611299ba360f803 SHA1 6a80be30749d31c6dff90e562dd37cce6abde390 SHA256 9ac8db79daa95f4ff3b64f997fe8d3b3979231973905ef7fcecc04cf4ba5d805
 EBUILD broadcom-sta-5.10.79.10-r3.ebuild 1261 RMD160 f389d436392c1abe7a0b0c357f5aa4ef0cb438cf SHA1 aa67c54b783263d4a6cf3f05734b248fd4616f17 SHA256 2014f2510e4204ad1da691a60787bfc0297202a28f1ed22db7ab8b8d3577fc37
-EBUILD broadcom-sta-5.10.79.10.ebuild 1181 RMD160 4f2aa84774f661aae175c1623d4c593b106fba8e SHA1 b582b0b1d0bcdfeca8ff291b43aedcfffec6ade5 SHA256 9da9f3b0345e45ad0ab709ab9058a57c18da7922edf3c8cc3802968891e5a7e7
-MISC ChangeLog 1126 RMD160 4469b5359fe24e23b73ae6b1b8c5b8e8f0d33fb7 SHA1 b3273a0044becde9ff1198a787fc1a9d8a64b9b7 SHA256 0174ff716b95a997dfc6bdfbdd4b3603eda956f0e4b3e66c6abd2b10aa05660b
+EBUILD broadcom-sta-5.10.91.9.ebuild 1243 RMD160 71c5ef393c076fcaa41c57a384f9cfadc815d382 SHA1 4ebf14ccf94dec8dd150bd36e041f774169b90ac SHA256 16ad27912fb8d6caef15829d147a25b4a7aae21e17a2c3e8449e0a05c5895e64
+MISC ChangeLog 1439 RMD160 1fd63b2693dced4d37f2d0cad05c09e28786d31e SHA1 b6fb281cf3b68936030adcb77075d8cffb71d18c SHA256 bd55d8658fe961a2645a44152ea3c579fa6326b0ee747a28ad23b47273eb0d8f
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r2.ebuild
deleted file mode 100644
index 0f717896e8fc..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r2.ebuild,v 1.1 2009/04/07 16:01:49 matsuu Exp $
-
-inherit eutils linux-mod versionator
-
-MY_PV="$(replace_all_version_separators _)"
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver."
-HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
-SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_"
-SRC_URI="x86? ( ${SRC_BASE}32-v${MY_PV}.tar.gz )
-	amd64? ( ${SRC_BASE}64-v${MY_PV}.tar.gz )"
-
-LICENSE="Broadcom"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="mirror"
-
-DEPEND=">=virtual/linux-sources-2.6.22"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_setup() {
-	if kernel_is ge 2 6 29; then
-		CONFIG_CHECK="LIB80211"
-	else
-		CONFIG_CHECK="IEEE80211 IEEE80211_CRYPT_TKIP"
-	fi
-	linux-mod_pkg_setup
-	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
-	BUILD_TARGETS="wl.ko"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch \
-		"${FILESDIR}/${P}-hidden-essid.patch" \
-		"${FILESDIR}/${P}-linux-2.6.29.patch" \
-		"${FILESDIR}/${P}-wl_iw_v2.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10.ebuild
deleted file mode 100644
index 5082f5f1d02f..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10.ebuild,v 1.1 2009/03/10 17:27:12 matsuu Exp $
-
-inherit eutils linux-mod versionator
-
-MY_PV="$(replace_all_version_separators _)"
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver."
-HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
-SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86"
-SRC_URI="
-	x86?	( ${SRC_BASE}_32-v${MY_PV}.tar.gz )
-	amd64?	( ${SRC_BASE}_64-v${MY_PV}.tar.gz )"
-
-LICENSE="Broadcom"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="mirror"
-
-DEPEND=">=virtual/linux-sources-2.6.22"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_setup() {
-	if kernel_is ge 2 6 29; then
-		CONFIG_CHECK="LIB80211"
-	else
-		CONFIG_CHECK="IEEE80211 IEEE80211_CRYPT_TKIP"
-	fi
-	linux-mod_pkg_setup
-	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
-	BUILD_TARGETS="wl.ko"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch \
-		"${FILESDIR}/${P}-hidden-essid.patch" \
-		"${FILESDIR}/${P}-linux-2.6.29.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.ebuild
index 169c8562d955..d7b83aefa853 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r1.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r1.ebuild,v 1.1 2009/03/25 14:47:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.ebuild,v 1.1 2009/05/03 01:25:18 matsuu Exp $
 
 inherit eutils linux-mod versionator
 
@@ -40,7 +40,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch \
-		"${FILESDIR}/${P}-hidden-essid.patch" \
+		"${FILESDIR}/${PN}-5.10.79.10-hidden-essid.patch" \
 		"${FILESDIR}/${P}-linux-2.6.29.patch" \
-		"${FILESDIR}/${P}-wl_iw.patch"
+		"${FILESDIR}/${PN}-5.10.79.10-linux-2.6.30.patch"
 }
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.29.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.29.patch
new file mode 100644
index 000000000000..979a63b4570d
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-linux-2.6.29.patch
@@ -0,0 +1,182 @@
+diff -Naur a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c
+--- a/src/wl/sys/wl_iw.c	2009-04-23 02:51:58.000000000 +0900
++++ b/src/wl/sys/wl_iw.c	2009-05-03 09:13:38.000000000 +0900
+@@ -610,7 +610,11 @@
+ 	char *extra
+ )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 	struct sockaddr *addr = (struct sockaddr *) extra;
+ 	int i;
+ 
+@@ -635,7 +639,11 @@
+ 	char *extra
+ )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 	struct sockaddr *addr = (struct sockaddr *) extra;
+ 	struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num];
+ 	int i;
+@@ -1110,7 +1118,11 @@
+ 	char *extra
+ )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 
+ 	WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
+ 
+@@ -1134,7 +1146,11 @@
+ 	char *extra
+ )
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 
+ 	WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
+ 
+@@ -1790,7 +1806,11 @@
+ 	int paramid;
+ 	int paramval;
+ 	int val = 0;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 
+ 	WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
+ 
+@@ -1921,7 +1941,11 @@
+ 	int paramid;
+ 	int paramval = 0;
+ 	int val;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl_iw_t *iw = netdev_priv(dev);
++#else
+ 	wl_iw_t *iw = dev->priv;
++#endif
+ 
+ 	WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
+ 
+diff -Naur a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+--- a/src/wl/sys/wl_linux.c	2009-04-23 02:52:08.000000000 +0900
++++ b/src/wl/sys/wl_linux.c	2009-05-03 09:13:38.000000000 +0900
+@@ -53,6 +53,9 @@
+ #include <linux/pci_ids.h>
+ #define WLC_MAXBSSCFG		1	
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++#include <net/lib80211.h>
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+ #include <net/ieee80211.h>
+ #endif
+@@ -130,7 +133,11 @@
+ 	u8 rx_hdr[16], tx_hdr[16];
+ };
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++#define	WL_DEV_IF(dev)		((wl_if_t*)netdev_priv(dev))
++#else
+ #define	WL_DEV_IF(dev)		((wl_if_t*)(dev)->priv)			
++#endif
+ #define	WL_INFO(dev)		((wl_info_t*)(WL_DEV_IF(dev)->wl))	
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+@@ -282,6 +289,9 @@
+ 	dev = wlif->dev;
+ 	wl->dev = dev;
+ 	wl_if_setup(dev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wlif = netdev_priv(dev);
++#endif
+ 
+ 	dev->base_addr = regs;
+ 
+@@ -359,10 +369,19 @@
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
++#else
+ 	wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
++#endif
+ 	if (wl->tkipmodops == NULL) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++		request_module("lib80211");
++		wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
++#else
+ 		request_module("ieee80211_crypt_tkip");
+ 		wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
++#endif
+ 	}
+ #endif 
+ #ifdef CONFIG_WIRELESS_EXT
+@@ -666,7 +685,11 @@
+ 	}
+ 
+ 	if (wl->monitor) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++		wl_free_if(wl, (wl_if_t *)netdev_priv(wl->monitor));
++#else
+ 		wl_free_if(wl, (wl_if_t *)(wl->monitor->priv));
++#endif
+ 		wl->monitor = NULL;
+ 	}
+ 
+@@ -834,6 +857,9 @@
+ #else
+ 
+ 	dev = alloc_netdev(0, name, ether_setup);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	wlif = netdev_priv(dev);
++#endif
+ 	if (!dev) {
+ 		MFREE(wl->osh, wlif, sizeof(wl_if_t));
+ 		WL_ERROR(("wl%d: wl_alloc_if: out of memory, alloc_netdev\n",
+@@ -847,7 +873,9 @@
+ 	wlif->wl = wl;
+ 	wlif->wlcif = wlcif;
+ 	wlif->subunit = subunit;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+ 	dev->priv = wlif;
++#endif
+ 
+ 	if (iftype != WL_IFTYPE_MON && wl->dev && netif_queue_stopped(wl->dev))
+ 		netif_stop_queue(dev);
+diff -Naur a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h
+--- a/src/wl/sys/wl_linux.h	2009-04-23 02:52:13.000000000 +0900
++++ b/src/wl/sys/wl_linux.h	2009-05-03 10:14:47.000000000 +0900
+@@ -85,10 +85,16 @@
+ 	bool		resched;	
+ 	uint32		pci_psstate[16];	
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
++	struct lib80211_crypto_ops *tkipmodops;
++	struct lib80211_tkip_data  *tkip_ucast_data;
++	struct lib80211_tkip_data  *tkip_bcast_data;
++#else
+ 	struct ieee80211_crypto_ops *tkipmodops;	
+ 	struct ieee80211_tkip_data  *tkip_ucast_data;
+ 	struct ieee80211_tkip_data  *tkip_bcast_data;
+ #endif
++#endif
+ 
+ 	uint	stats_id;		
+