Fixed 2.6.34 issue, bug #343025.

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

4 files changed, 104 insertions, 16 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index 1afbc614390b..2ac69a96ec26 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/broadcom-sta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.26 2010/10/27 15:56:35 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.27 2010/10/30 06:44:15 matsuu Exp $
+
+*broadcom-sta-5.60.246.2-r1 (30 Oct 2010)
+
+  30 Oct 2010; MATSUU Takuto <matsuu@gentoo.org>
+  +broadcom-sta-5.60.246.2-r1.ebuild,
+  +files/broadcom-sta-5.60.246.2-linux-2.6.34.patch:
+  Fixed 2.6.34 issue, bug #343025.
 
 *broadcom-sta-5.60.246.2 (27 Oct 2010)
 
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 94cf5e5926bb..1e1892eac90c 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -5,30 +5,32 @@ AUX broadcom-sta-5.10.91.9-license.patch 716 RMD160 f4af0c36ec10d5fd4500af94c386
 AUX broadcom-sta-5.10.91.9.3-linux-2.6.32.patch 576 RMD160 17d1f0e2ea7e507bc7c7522f7dee8d667c04c131 SHA1 3b13b5d10b199da0590f7b9fed6694e23369596d SHA256 55ef2c1f7be8414b2df89d9f118affa9650c94e95491ad7f9c112f06debdf5d6
 AUX broadcom-sta-5.10.91.9.3-linux-2.6.33.patch 551 RMD160 2e0385d005127de53d040df3a079a6facff6eb2e SHA1 3aad38866d5e5239f0b12c891db4372d679ed57b SHA256 08b2b9e401118be918e02634707120cf926677e7ae6fabc69158eb8b7a8cbfb2
 AUX broadcom-sta-5.60.246.2-gcc.patch 417 RMD160 aa1b67ace50a513d0ed1d04e14b21afb8cba51da SHA1 1c0095b3b4a79f3d036719f7c7a38d7e889c9ea1 SHA256 82ad7a047e8e384fe4a571e054fabb0f629c81012f035f3525fa51eb611cc736
+AUX broadcom-sta-5.60.246.2-linux-2.6.34.patch 889 RMD160 c3ac4c5e5a4511c2a6774180c90041d4809ecd80 SHA1 e19d3bf4734882053ab273db5c3babfb814463d9 SHA256 e8ce64fee738e1aeae08320b788d2e6547d5efcbfc0833c2eb129f8eee0da3d2
 AUX broadcom-sta-5.60.48.36-linux-2.6.35.patch 1670 RMD160 66ed871880630e65e509af96586646589b8f0c08 SHA1 6173cb1442ba0cda520082bdb79ba7089b2e4538 SHA256 4ec98dc9395c117d5dbe0f0cb5ce2add82f2cf1892c833d79689889596b5152e
 DIST hybrid-portsrc-x86_32-v5.60.48.36.tar.gz 886115 RMD160 b3901897e50419d704d6ca5ece12c4def0dce3d5 SHA1 07d955afe599466b0e25bcc507186f5b50f1a171 SHA256 ef3f101190aafb19a720306086bd3eda1180dcf602cb150ddbf6a98b2d544c6a
 DIST hybrid-portsrc-x86_64-v5.60.48.36.tar.gz 884584 RMD160 5a0d6df5513b2218b5e06ef894c59b665e412267 SHA1 1174a4d3102aa0ed45003556e03842668ef698b9 SHA256 dfd6c4616dd6e99032f6515eb2a79b6a6e15356f62b0db93b5a986064919836f
 DIST hybrid-portsrc_x86-32_v5.60.246.2.tar.gz 886200 RMD160 0bccfb4b0eed8777f170f336f336a83be8468b8d SHA1 53d0a3cbc7c7f5b0b75f8da0480a4069dfc66281 SHA256 fc3078bf48b5933f71baa219d492def1f69a6398a7b111a736450a27bd183857
 DIST hybrid-portsrc_x86-64_v5.60.246.2.tar.gz 884707 RMD160 1d9eb5060b979eed80330871328c152d2c69049d SHA1 6d82434d8087aba9cbea6b46bcf97f14c4e6c1f0 SHA256 64c9a096e26402d956f7e4b335bbf28d25893bbc248a57565915c7eaac381cea
+EBUILD broadcom-sta-5.60.246.2-r1.ebuild 1940 RMD160 248f0685ddb001d48b7f151676825cc8f927584a SHA1 33e12a802f6670efb9ee905313fb4c6725ad4952 SHA256 98de3494ad7d8da8a889df9623215f348dc6c7b22bc09b66b456e52ceceedbcd
 EBUILD broadcom-sta-5.60.246.2.ebuild 1895 RMD160 a8c46732c0152988f87779f7bb875112a1e1ab9b SHA1 65e565a16b661228fff60fd0ac2255c844b932dd SHA256 662b22266eee363cad4163380b9aa758f513c268e4ad12323b7758c46c28cc3b
 EBUILD broadcom-sta-5.60.48.36-r1.ebuild 1962 RMD160 bb6f8aaf40a5ccced29ed1f3bc5106ec746259be SHA1 2a43c85478c8a900cb18a3c3d6a3c4186ab521d6 SHA256 d33bf6854ad57e4363d5359d3420569b5e998eba9107c3b6f3f4eaf53cdf750d
 EBUILD broadcom-sta-5.60.48.36.ebuild 1851 RMD160 e818a344971c86ce2b55c3567fb7b8d0cdf65238 SHA1 9d715a0806d09653e0bb63226b5ba378bbff9098 SHA256 f00d89f0ece01f8e6b35f2837f1ced252491c0fe4ac029f46e44206cf851ca27
-MISC ChangeLog 6828 RMD160 0d0815962257dd3ecc68a92f816bf61430438b36 SHA1 cb3d2dd71f40639cdb7f2c50eff9b50ebf1a174f SHA256 a8d7bb3590af189f6abcbf16235ac6767063d9d9f5e3ca9b9ad7e50bc8b330d4
+MISC ChangeLog 7047 RMD160 2ccbf9706b356c02d27952329cc1d4911ec34fc1 SHA1 f9ee6cda0b9f067dce371f65ad138f1cacc98b5a SHA256 904429f64866e9d87ec804c357a09e7dadf72b5f1aa864031f2ac13bfc43e893
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMyEu5AAoJECaGw+YFKA1p0BgP/0G6vS55ZZ5U5ffBaGkz4CUa
-a2MFlIBPDDD9ZP+AYZHgRFYUG0Y887eZBWQa5OxgzID9AMRl35QlqdM62ZrEcMIl
-THJxCD2DLVN9618+n1TUbq7uKhF2lJrKH9v1Q87Js91z4hqVdaWILKuyHOWxlhdm
-1nMOYTua5h+itJfmfmlKqCGwkf/885SjLIHNJFGek5infbaqZ74ZGd1f8emif9CL
-PYq3Lg664LpJDxqcGveyAsUsSRyuTSgk9IsLrp6Yw5L5yACqqbwyia8Xttg4lbzs
-gP+dJ0T1uVb54FG3jAYfLPgrz6iUvjBmfcQQMAdBUX451e34WblMHwyApUbgN2by
-oqoFLMWfeCqmtLXq5s3rWWVRcqQ+3nHdzdLaaXu7ikLu/acDpCZT3UhiIvtQzIrv
-Jj8hHg/gn5ufUW/C4Gat1vWnuJLh1zaidHYVzofjiWRUKNfANhv9Hggl3IPmtVWJ
-YbgE/ayR85vTdxNIy7nSDjYxfLrQNtuWOJvSbyOGfWUksMNshVrzKiCediunW74k
-4RXgDJFKhJaNg9lXQTJswCO00OXeYSoJHhyYp2ocd7X1GdltKdNe3YVlSxVAN0mC
-BMQd5TYK25ZkE6KWCeohy8/aC5BpvWJpV3PraiSa8Wu1JRnNAA0fdKz2C24IF4nA
-hs3/hKiDK5ZQDdXCUMBQ
-=Z13K
+iQIcBAEBAgAGBQJMy77IAAoJECaGw+YFKA1prXkP/3MxIcQtiu+0IJnQIuJZX028
+E8FXG3qSo0N3y+QD6g1Ginz2PcIpgKwL97QpI+KCmLOnk/6IBX7VjazL7HomniAK
+UBiQdMUcsWK4F/mkwakxiRb5eFUVj5qH3vi07qZ80DXP/5j1ofyr2K2CiWJ5mOoy
+ZW/Oy4YQGABpUl+yykX9d6II76DXc9L76Ab5qGNzFSJaKetedukS+bnnKb6nVB+o
+Fy4lvop2QZNJ7ERJs7bq3QTnNS9AgMEDCksrZyfOJDS+b3V32Ie/b/0FHQKCgPw7
+68DfUUpn7ev+dMAjnaQpja4evtWZEfND97E233ZIGkPYn27x6+j6ncPi/9+Wtt5x
+wUrlkEZ8+n8jmGJQ+oU6iid6RsHPaLcIjct/4PyBOjiQ4/8tbnMetnTiXWWNQdoA
+C/3o1sixnFV4NRMM+Ma5e0hZ6BA92hd8jaPVDSzd0Ximm48wJ78fXSC66rrsoBgQ
+aI4mz5IQ7Tp6Q2Cy2eCONdGGM6Qr1Fhv833d2+v+DOTQCeOi70ZntcEQrU0/lSqX
+VJKAKsORLi83D3lj5R0TYiK/sOyxc2aKRUr8PxpOP7+M9ufFksOo1vkMtMM4LZ/U
+eFTvEVMGjWTqm1TF25SKhCPWzIetYuuqULL27vtf39cGrVc3rMiYQkleJ9nsGpah
+yJoFSNEiFCCTIFFCM2ek
+=ZZSK
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2-r1.ebuild
new file mode 100644
index 000000000000..3ebe7600526d
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 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.60.246.2-r1.ebuild,v 1.1 2010/10/30 06:44:15 matsuu Exp $
+
+EAPI="2"
+inherit eutils linux-mod
+
+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${PV}.tar.gz )
+	amd64? ( ${SRC_BASE}64_v${PV}.tar.gz )"
+
+LICENSE="Broadcom"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="mirror"
+
+DEPEND=">=virtual/linux-sources-2.6.22"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+MODULE_NAMES="wl(net/wireless)"
+MODULESD_WL_ALIASES=("wlan0 wl")
+
+PROPERTIES="interactive"
+
+pkg_setup() {
+	check_license
+
+	# bug #300570
+	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
+	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
+	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
+	CONFIG_CHECK="~!B43 ~!SSB"
+	if kernel_is ge 2 6 33; then
+		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT CFG80211_WEXT WEXT_PRIV ~!MAC80211"
+		ERROR_WEXT_PRIV="Starting with 2.6.33, it is not possible to set WEXT_PRIV directly. We recommend to set another symbol selecting WEXT_PRIV, for example, PRISM54, IPW2200 and so on. See Bug #248450 comment#98."
+	elif kernel_is ge 2 6 31; then
+		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211"
+	elif kernel_is ge 2 6 29; then
+		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211 COMPAT_NET_DEV_OPS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
+	fi
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
+	BUILD_TARGETS="wl.ko"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
+		"${FILESDIR}/${P}-gcc.patch" \
+		"${FILESDIR}/${P}-linux-2.6.34.patch"
+}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch
new file mode 100644
index 000000000000..9ac6b9ec9e8f
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch
@@ -0,0 +1,21 @@
+diff -Naur broadcom-sta-5.60.246.2.orig/src/wl/sys/wl_linux.c broadcom-sta-5.60.246.2/src/wl/sys/wl_linux.c
+--- broadcom-sta-5.60.246.2.orig/src/wl/sys/wl_linux.c	2010-10-01 03:53:22.000000000 +0900
++++ broadcom-sta-5.60.246.2/src/wl/sys/wl_linux.c	2010-10-30 15:29:48.000000000 +0900
+@@ -1415,7 +1415,7 @@
+ static void
+ _wl_set_multicast_list(struct net_device *dev)
+ {
+-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 33)
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
+ 	struct dev_mc_list *mclist;
+ #else
+ 	struct netdev_hw_addr   *ha;
+@@ -1435,7 +1435,7 @@
+ 	if (wl->pub->up) {
+ 		wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
+ 
+-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 33)
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
+ 		for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
+ 			i++, mclist = mclist->next) {
+ 			if (i >= MAXMULTILIST) {