Merge branch 'testing' of gitorious.org:chakra-packages/core into testing

broadcom-wl-lts/PKGBUILD

@@ -6,8 +6,8 @@ _extramodules=extramodules-3.2-CHAKRA-LTS
 _kernver="3.2.51-1-lts"
 
 pkgname=broadcom-wl-lts
-pkgver=5.100.82.112
-pkgrel=7
+pkgver=6.30.223.141
+pkgrel=1
 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
 arch=('x86_64')
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
@@ -17,32 +17,23 @@ makedepends=('linux-lts-headers')
 backup=('etc/modprobe.d/broadcom-wl-lts.conf')
 install=install
 
-source=("http://ftp.de.debian.org/debian/pool/non-free/b/broadcom-sta/broadcom-sta_5.100.82.112.orig.tar.gz" #"http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${ARCH}-v${pkgver//./_}.tar.gz" we need the debian version, because upstream URL doesn't exist anymore
+source=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz"
         'modprobe.d'
-        'linux3.patch'
-        'license.patch'
-        'semaphore.patch'
-        'linux-3.2.0.patch')
-sha1sums=('e51da1ca8f7b200f0760eafe321f710e1805d7e0'
+        'license.patch')
+sha1sums=('3a2453c71a07030f41a8fc613c87badf8452848c'
           '89bf92286ede30dd85304c6c4e42e89cfdc0f60a'
-          '3e18f905bbe5e8b99a53d6ecb3b80a919f3531f2'
-          'ea7b67982ddc0f56fd3becb9914fd4458fe7d373'
-          '105f8e1d48ebe1f25d53859e5ab9326a27435c66'
-          '78bdb9da6df583a766cd3edb9c35b181400ba79c')
+          'ea7b67982ddc0f56fd3becb9914fd4458fe7d373')
 
 build() {
-	cd "${srcdir}/broadcom-sta-${pkgver}/amd64"
+	cd "${srcdir}"
 
-	patch -p1 -i ${srcdir}/linux3.patch
-	patch -p2 -i ${srcdir}/linux-3.2.0.patch
 	patch -p1 -i ${srcdir}/license.patch
-	patch -p1 -i ${srcdir}/semaphore.patch
 
 	make -C /lib/modules/"${_kernver}"/build M=`pwd`
 }
 
 package() {
-	cd "${srcdir}/broadcom-sta-${pkgver}/amd64"
+	cd "${srcdir}"
 
 	install -D -m 755 wl.ko "${pkgdir}/lib/modules/${_extramodules}/wl.ko"
 	gzip "${pkgdir}/lib/modules/${_extramodules}/wl.ko"

broadcom-wl-lts/linux-3.2.0.patch

@@ -1,20 +0,0 @@
-Description: Enable compilation with 3.2 kernels
-Author: Cyril Lacoux <clacoux@easter-eggs.com>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656600
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657049
-Last-Update: 2012-01-20
-
---- a/amd64/src/wl/sys/wl_linux.c
-+++ b/amd64/src/wl/sys/wl_linux.c
-@@ -387,7 +387,11 @@
- #endif
- 	.ndo_get_stats = wl_get_stats,
- 	.ndo_set_mac_address = wl_set_mac_address,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+	.ndo_set_rx_mode = wl_set_multicast_list,
-+#else
- 	.ndo_set_multicast_list = wl_set_multicast_list,
-+#endif
- 	.ndo_do_ioctl = wl_ioctl
- };
- 

broadcom-wl-lts/linux3.patch

@@ -1,21 +0,0 @@
-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 "0$(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 "0$(SUBLEVEL)" -ge "17" ]; then \
-       echo FALSE; \
-     else \
-       echo TRUE; \

broadcom-wl-lts/semaphore.patch

@@ -1,11 +0,0 @@
-diff -aur old/src/wl/sys/wl_iw.h new/src/wl/sys/wl_iw.h
---- old/src/wl/sys/wl_iw.h	2010-12-15 02:58:07.000000000 +0100
-+++ new/src/wl/sys/wl_iw.h	2010-12-25 18:17:01.826676379 +0100
-@@ -15,6 +15,7 @@
- #ifndef _wl_iw_h_
- #define _wl_iw_h_
- 
-+#include <linux/semaphore.h>
- #include <linux/wireless.h>
- 
- #include <typedefs.h>