Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-wireless
diff options
context:
space:
mode:
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/broadcom-sta/ChangeLog14
-rw-r--r--net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild4
-rw-r--r--net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild (renamed from net-wireless/broadcom-sta/broadcom-sta-5.100.82.38.ebuild)16
-rw-r--r--net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild4
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch13
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch12
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch11
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch21
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch51
9 files changed, 23 insertions, 123 deletions
diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index c093f2e0023e..f93a68d36021 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,18 @@
# 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.39 2011/10/25 14:00:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.40 2011/10/26 23:32:27 matsuu Exp $
+
+*broadcom-sta-5.100.82.112 (26 Oct 2011)
+
+ 26 Oct 2011; MATSUU Takuto <matsuu@gentoo.org>
+ -files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch,
+ -files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch,
+ -files/broadcom-sta-5.60.48.36-linux-2.6.35.patch,
+ -files/broadcom-sta-5.60.246.2-gcc.patch,
+ -files/broadcom-sta-5.60.246.2-linux-2.6.34.patch,
+ -broadcom-sta-5.100.82.38.ebuild, broadcom-sta-5.100.82.38-r1.ebuild,
+ broadcom-sta-5.100.82.111.ebuild, +broadcom-sta-5.100.82.112.ebuild:
+ Version bumped, bug #388547.
25 Oct 2011; MATSUU Takuto <matsuu@gentoo.org>
broadcom-sta-5.100.82.111.ebuild:
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
index 5edec6342fbb..41c99e73c958 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild
@@ -1,6 +1,6 @@
# 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.2 2011/10/25 14:00:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.111.ebuild,v 1.3 2011/10/26 23:32:27 matsuu Exp $
EAPI="2"
inherit eutils linux-mod
@@ -15,7 +15,7 @@ LICENSE="Broadcom"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RESTRICT="mirror"
+RESTRICT="fetch"
DEPEND="virtual/linux-sources"
RDEPEND=""
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild
index 3b5b6964c3c2..8ead820d3a72 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild
@@ -1,6 +1,6 @@
# 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.38.ebuild,v 1.4 2011/04/28 18:57:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112.ebuild,v 1.1 2011/10/26 23:32:27 matsuu Exp $
EAPI="2"
inherit eutils linux-mod
@@ -12,7 +12,7 @@ SRC_URI="x86? ( ${SRC_BASE}32-v${PV//\./_}.tar.gz )
amd64? ( ${SRC_BASE}64-v${PV//\./_}.tar.gz )"
LICENSE="Broadcom"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="mirror"
@@ -25,19 +25,14 @@ 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."
+ if kernel_is ge 2 6 32; then
+ CONFIG_CHECK="${CONFIG_CHECK} CFG80211 LIB80211 ~!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
@@ -53,5 +48,6 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
- "${FILESDIR}/${PN}-5.100.82.38-gcc.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/broadcom-sta-5.100.82.38-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild
index e355403dc0ed..aff9488fb81f 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild
@@ -1,6 +1,6 @@
# 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.38-r1.ebuild,v 1.5 2011/07/13 19:42:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.38-r1.ebuild,v 1.6 2011/10/26 23:32:27 matsuu Exp $
EAPI="2"
inherit eutils linux-mod
@@ -15,7 +15,7 @@ LICENSE="Broadcom"
KEYWORDS="amd64 x86"
IUSE=""
-RESTRICT="mirror"
+RESTRICT="fetch"
DEPEND="virtual/linux-sources"
RDEPEND=""
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch
deleted file mode 100644
index 956cb5c8176c..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rup hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5.10.91.9.3_EDIT/src/wl/sys/wl_linux.c
---- hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c 2009-09-10 20:21:58.000000000 +0200
-+++ hybrid-portsrc-x86_32-v5.10.91.9.3_EDIT/src/wl/sys/wl_linux.c 2009-12-07 12:51:20.000000000 +0100
-@@ -40,6 +40,9 @@
- #include <linux/pci_ids.h>
- #define WLC_MAXBSSCFG 1
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32)
-+#include <linux/sched.h>
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
- #include <net/lib80211.h>
- #endif
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch
deleted file mode 100644
index 54b114171203..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9.3-linux-2.6.33.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur broadcom-sta-5.10.91.9.3.orig/src/include/linuxver.h broadcom-sta-5.10.91.9.3/src/include/linuxver.h
---- broadcom-sta-5.10.91.9.3.orig/src/include/linuxver.h 2009-09-16 07:25:27.000000000 +0900
-+++ broadcom-sta-5.10.91.9.3/src/include/linuxver.h 2010-01-16 08:20:12.000000000 +0900
-@@ -19,6 +19,8 @@
- #include <linux/version.h>
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
- #include <linux/config.h>
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33))
-+#include <generated/autoconf.h>
- #else
- #include <linux/autoconf.h>
- #endif
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch
deleted file mode 100644
index 048565376d75..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h
---- broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h 2010-10-08 07:32:59.000000000 +0900
-+++ broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h 2010-10-28 00:50:57.925351964 +0900
-@@ -15,6 +15,7 @@
- #ifndef _wl_iw_h_
- #define _wl_iw_h_
-
-+#include <linux/semaphore.h>
- #include <linux/wireless.h>
-
- #include <typedefs.h>
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
deleted file mode 100644
index 9ac6b9ec9e8f..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-linux-2.6.34.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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) {
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch
deleted file mode 100644
index a31ba97e7255..000000000000
--- a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.48.36-linux-2.6.35.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_iw.h broadcom-sta-5.60.48.36/src/wl/sys/wl_iw.h
---- broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_iw.h 2010-02-06 10:59:15.000000000 +0900
-+++ broadcom-sta-5.60.48.36/src/wl/sys/wl_iw.h 2010-06-05 09:32:46.000000000 +0900
-@@ -15,6 +15,7 @@
- #ifndef _wl_iw_h_
- #define _wl_iw_h_
-
-+#include <linux/semaphore.h>
- #include <linux/wireless.h>
-
- #include <typedefs.h>
-diff -Naur broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_linux.c broadcom-sta-5.60.48.36/src/wl/sys/wl_linux.c
---- broadcom-sta-5.60.48.36.orig/src/wl/sys/wl_linux.c 2010-02-06 10:59:15.000000000 +0900
-+++ broadcom-sta-5.60.48.36/src/wl/sys/wl_linux.c 2010-06-04 08:25:22.000000000 +0900
-@@ -1416,8 +1416,13 @@
- _wl_set_multicast_list(struct net_device *dev)
- {
- wl_info_t *wl;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+ struct netdev_hw_addr *ha;
-+ int i=0;
-+#else
- struct dev_mc_list *mclist;
- int i;
-+#endif
-
- if (!dev)
- return;
-@@ -1430,14 +1435,22 @@
- if (wl->pub->up) {
- wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+ netdev_for_each_mc_addr(ha, dev) {
-+#else
- for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
- i++, mclist = mclist->next) {
-+#endif
- if (i >= MAXMULTILIST) {
- wl->pub->allmulti = TRUE;
- i = 0;
- break;
- }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+ wl->pub->multicast[i] = *((struct ether_addr*) ha->addr);
-+#else
- wl->pub->multicast[i] = *((struct ether_addr*) mclist->dmi_addr);
-+#endif
- }
- wl->pub->nmulticast = i;
- wlc_set(wl->wlc, WLC_SET_PROMISC, (dev->flags & IFF_PROMISC));