From 94a3ad03c0666397630c0ef579628730ae9e7d7f Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Mon, 24 Oct 2011 00:43:18 +0000 Subject: [PATCH] Version bumped, bug #388053. Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- net-wireless/broadcom-sta/ChangeLog | 9 +++- net-wireless/broadcom-sta/Manifest | 26 ++++++--- .../broadcom-sta-5.100.82.111.ebuild | 53 +++++++++++++++++++ .../broadcom-sta-5.100.82.111-linux-3.0.patch | 21 ++++++++ 4 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild create mode 100644 net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog index 60b1ceb9780c..b5dbf95cda1f 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.37 2011/07/13 19:42:36 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.38 2011/10/24 00:43:18 matsuu Exp $ + +*broadcom-sta-5.100.82.111 (24 Oct 2011) + + 24 Oct 2011; MATSUU Takuto + +broadcom-sta-5.100.82.111.ebuild, + +files/broadcom-sta-5.100.82.111-linux-3.0.patch: + Version bumped, bug #388053. 13 Jul 2011; Markus Meier broadcom-sta-5.100.82.38-r1.ebuild: diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest index 84e8ad738980..545f20d1d52b 100644 --- a/net-wireless/broadcom-sta/Manifest +++ b/net-wireless/broadcom-sta/Manifest @@ -1,26 +1,38 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX broadcom-sta-5.10.91.9-license.patch 716 RMD160 f4af0c36ec10d5fd4500af94c3864f6a352883e0 SHA1 0f2458882656dbf73035e566e53b902bc22c37f4 SHA256 53544703c15eb5e7f35721c436bfd0acf7db3de1df83b2e344bfc7090cb14cf1 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.100.82.111-linux-3.0.patch 935 RMD160 a41d650fe6fa49906380b9223753c09251260478 SHA1 cda888b879c8c9386650c05dde358925160c4281 SHA256 cd349fef72bb33025e59105fefa69c3e60066985707f396e03235102ca938137 AUX broadcom-sta-5.100.82.38-gcc.patch 417 RMD160 aa1b67ace50a513d0ed1d04e14b21afb8cba51da SHA1 1c0095b3b4a79f3d036719f7c7a38d7e889c9ea1 SHA256 82ad7a047e8e384fe4a571e054fabb0f629c81012f035f3525fa51eb611cc736 AUX broadcom-sta-5.100.82.38-linux-2.6.37.patch 530 RMD160 e8f4612fc6d48d32603a7168a07dd62713e90614 SHA1 bc044b663f69f8eb8886a5886213031212be144c SHA256 a1b75ee09bb2a372a5d35c0309042abc6b47cfbaf18a413e5171926696f882e8 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_100_82_111.tar.gz 1138574 RMD160 9678c12779802ef92098de518b2d5db2e0c03972 SHA1 af23f31679973a1bcacea79b65d10dbe231f8862 SHA256 30aae0c44260dacb2cbddf9f3669bc0de484516c80322628b56367cde436b0b8 DIST hybrid-portsrc_x86_32-v5_100_82_38.tar.gz 1195817 RMD160 020c3b76aa50e1f911288b28e656a0524620311a SHA1 3062830f86c5f1f41d8a4b26d6e0072dc989c7ba SHA256 f736af1da2fa05fb65d8e919b3eb0116eb5ef47e4acc14f5a2adc4bac1b4fb37 +DIST hybrid-portsrc_x86_64-v5_100_82_111.tar.gz 1407430 RMD160 20dde858a21e96a2f105534916fa4b852b18e952 SHA1 8028950609631106c7844bb039a29f78e92baae7 SHA256 e8340c500be8e52b58479286c28a84eb6c6fc22d4f49ae27d257e2efb01b84bf DIST hybrid-portsrc_x86_64-v5_100_82_38.tar.gz 1150253 RMD160 5f1937e997446de015c49f1ced1bc7864cb07791 SHA1 6076de3bd8206b3e7b8bfc2eadbe3a97eec4e735 SHA256 1c165b26a9d736d07c0912577134414d8742242521f313e3830afb44524d35a7 +EBUILD broadcom-sta-5.100.82.111.ebuild 1674 RMD160 ccc38c2e42f17e08205d499f71409c6333196ac9 SHA1 ce5782df39037f772bd17c9c92e5d2921a4a806d SHA256 8726273d9f1c508bda6497058c437d99c09af5d72512e235355ada362fb0169a EBUILD broadcom-sta-5.100.82.38-r1.ebuild 1926 RMD160 12b4ee60e945a9820e3620406abc1f7e66cee7e8 SHA1 021cc8c5733169ef60458368aac9877733bda8a3 SHA256 3628b0161db5ae0cf702e3502b44e90f40c19f1d8be1243d837e8bc6f07f76ac EBUILD broadcom-sta-5.100.82.38.ebuild 1907 RMD160 c6c32daa1f09559b694723c5f1e96959d30864d9 SHA1 63903d97276ea45d30e1406544be77377ded38d1 SHA256 bfbec5bc3258f9759a04d2e4f4a7c798ae78757a1b9aea24edd45f72aff3410b -MISC ChangeLog 8920 RMD160 5005ce0fc208df634c17d13382dc6eefab189bde SHA1 89a10aa6265cf5e72b6ac4ff715de6239749b77c SHA256 6a00b99f745609c3765dbc9bb88b6273cc2ea33d0ac12e62a615a7f8fe91e802 +MISC ChangeLog 9132 RMD160 225c8680c8506a01bdb454787262c9a062e7d332 SHA1 a728a8917bf30fca6f3be53bcb3e32222247b9d8 SHA256 2ddebfe039794e71cab79b7f5ebfa5b382a5d6d6769e4497b7f6c4e7623a822e MISC metadata.xml 200 RMD160 397a9fbaf0e2d458f8d95d2415a47a671d5dda58 SHA1 714cb7b31fb311633bb0cc8ca2f24155891e342d SHA256 bb8d57cfa8edd3743459c30d264cc37cc5e20d71dca61651939a965274f23b20 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk59rwcACgkQfXuS5UK5QB339QP8Cg/KcUzia39Uy3xeoA1V88dp -xACQUz5oZIQv7a7/Udt25AJNr344IGHKFCul3gm9zq5a9wiLv3yCK3zFNzb6tj5b -apIW8hbrKHzU1DdAb07GJz95DavUnpzmy3ZFiGApqscW5eanRtxsFxKgW93GqAwC -h1l3uURWNWDZZxBudwE= -=QzwZ +iQIcBAEBAgAGBQJOpLSvAAoJECaGw+YFKA1pJQ0P/ip9tOf2db3h5TR73zMCEetk +V0GXYiKOV454RvIED6/k+Tq9FMBAxC+Ah9U15uuUB8e68ZIzjtxEPRqSgPV8NWCb +hmn+AUHKXgJmyu3SIIM5eGgk7mHzLKaJPMUHAP5RwlqwE976x499mJ68s+iwyyl1 +zGsG68rY8fOx6jD2fRejy5PpSbk0QU02zvuzrp2Wwmo+G5uG/rCqcyULiQHIXMmg +BkzivK9zHLlwa+QeqYZ81SJag35lDlhjcAZNpuwjevOuXuIKjjIhSu06+LY2jRJy +MB3rnJnx4XQmOtMVfsG9WOnJK/AzL6gEl9QCrv+OPm+tJZHRbYyvLNcoV1sIVKqz +bDLH/mhbvV6KEwPuAclmE5dqjqohxPiGQhRlLr9XCb38GmwTqrHcPx2T1yKsR3vx +fo8YNnnsqxbOZX5AXmiWal4b16gx9HRo+00hnBlYpY3m6s4eKT4N2f3Op4msP6Nf +c7MymYAxlsJKx2j1oc0xwKAw9931AOTdSNIRmfralDFeMdnUtpvldE+Td3t9ufQN +RdZGyZa+Ut0sAc6vupWqJmRLcH7seZWig9/sDgd/aWCaC8/7bTyzqloqZRaM9bp+ +Unj4oMLv1OoZlWR2WgZ7UNWjoI652gMarf6KokYKNKU6zKsljT3Won4SLvuvwEE3 +SarENGzCRRTSN18WER4C +=xfQr -----END PGP SIGNATURE----- diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild new file mode 100644 index 000000000000..e850d46c4fcb --- /dev/null +++ b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2011 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.100.82.111.ebuild,v 1.1 2011/10/24 00:43:18 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" +RDEPEND="" + +S="${WORKDIR}" + +MODULE_NAMES="wl(net/wireless)" +MODULESD_WL_ALIASES=("wlan0 wl") + +pkg_setup() { + # bug #300570 + # NOTE: 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 32; then + CONFIG_CHECK="${CONFIG_CHECK} CFG80211 ~!MAC80211" + 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}/${PN}-5.100.82.38-gcc.patch" \ + "${FILESDIR}/${PN}-5.100.82.111-linux-3.0.patch" +} diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch new file mode 100644 index 000000000000..a915aee67fe2 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.100.82.111-linux-3.0.patch @@ -0,0 +1,21 @@ +diff -Naur broadcom-sta-5.100.82.111.orig/Makefile broadcom-sta-5.100.82.111/Makefile +--- broadcom-sta-5.100.82.111.orig/Makefile 2011-10-06 08:16:10.000000000 +0900 ++++ broadcom-sta-5.100.82.111/Makefile 2011-10-24 08:54:26.000000000 +0900 +@@ -16,7 +16,7 @@ + ifneq ($(KERNELRELEASE),) + + LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \ +- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \ ++ if [ "$(VERSION)" -ge "3" -o "$(VERSION)" -eq "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \ + echo TRUE; \ + else \ + echo FALSE; \ +@@ -24,7 +24,7 @@ + )) + + LINUXVER_WEXT_ONLY:=$(strip $(shell \ +- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \ ++ if [ "$(VERSION)" -ge "3" -o "$(VERSION)" -eq "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \ + echo FALSE; \ + else \ + echo TRUE; \ -- 2.26.2