Update to 6.30.223.271-38

1 files changed, 21 insertions, 27 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 52e254b5c8db..830bf522a8da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,33 @@
 # Maintainer: graysky <graysky AT archlinux DOT org>
-# Maintainer: Armin K. <krejzi at email dot com>
+# Contributor: Johannes Löthberg <johannes@kyriasis.com>
+# Contributor: Armin K. <krejzi at email dot com>
 # Contributor: Austin ( doorknob60 [at] gmail [dot] com )
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: USA-RedDragon (AUR)
 
 pkgname=broadcom-wl-ck
 pkgver=6.30.223.271
-pkgrel=37
+pkgrel=38
 _pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver for linux-ck.'
-_extramodules="extramodules-4.9-ck"
+_extramodules="extramodules-4.10-ck"
 _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 pkgdesc="${_pkgdesc}"
 arch=('i686' 'x86_64')
 url='https://www.broadcom.com/support/802.11'
 license=('custom')
-depends=('linux-ck>=4.8' 'linux-ck<4.10')
-makedepends=('linux-ck-headers>=4.9' 'linux-ck-headers<4.10')
+depends=('linux-ck>=4.10' 'linux-ck<4.11')
+makedepends=('linux-ck-headers>=4.10' 'linux-ck-headers<4.11')
 #replaces=()
 #groups=('ck-generic')
 source=('modprobe.d'
 'license.patch'
-'001-null-pointer-fix.patch'
-'002-rdtscl.patch'
-'003-linux47.patch'
+'wl_linux.c.patch'
+'linux47.patch'
 'linux48.patch')
-source_i686+=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-${pkgver//./_}.tar.gz")
-source_x86_64+=("http://www.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
+source_i686=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-${pkgver//./_}.tar.gz")
+source_x86_64=("http://www.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
 sha256sums=('b4aca51ac5ed20cb79057437be7baf3650563b7a9d5efc515f0b9b34fbb9dc32'
             '2f70be509aac743bec2cc3a19377be311a60a1c0e4a70ddd63ea89fae5df08ac'
-            '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f'
-            '29929989d86fde903f98419ce52dbb1d862cd4a11b0b13b2432886eeb6daabea'
+            '583335a6edb2ed1094977c401643d3e60471c6bc5c3ea81f45910a9cccb06032'
             '30ce1d5e8bf78aee487d0f3ac76756e1060777f70ed1a9cf95215c3a52cfbe2e'
             '833af3b209d6a101d9094db16480bda2ad9a85797059b0ae0b13235ad3818e9c')
 sha256sums_i686=('4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd')
@@ -39,26 +37,22 @@ install=readme.install
 
 prepare() {
   patch -p1 -i license.patch
-  patch -p1 -i 001-null-pointer-fix.patch
-	patch -p1 -i 003-linux47.patch
-	patch -p1 -i linux48.patch
-
-	sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" -i src/wl/sys/wl_linux.c
-
-	# linux 4.3 on i686 needs this to build
-	[[ $CARCH = "i686" ]] && patch -p1 -i 002-rdtscl.patch || return 0
+  patch -p1 -i wl_linux.c.patch
+  patch -p1 -i linux47.patch
+  patch -p1 -i linux48.patch
+  sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" -i src/wl/sys/wl_linux.c
 }
 
 
 build() {
-	make -C /usr/lib/modules/"${_kernver}"/build M=`pwd`
+  make -C /usr/lib/modules/"${_kernver}"/build M=`pwd`
 }
 
 package() {
-	install -Dm644 wl.ko "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko"
+  install -Dm644 wl.ko "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko"
 
-	# makepkg does not do this automatically for this pkg so do it here
-	gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko"
-	install -Dm644 lib/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 modprobe.d "${pkgdir}/usr/lib/modprobe.d/broadcom-wl_ck.conf"
+  # makepkg does not do this automatically for this pkg so do it here
+  gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko"
+  install -Dm644 lib/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 modprobe.d "${pkgdir}/usr/lib/modprobe.d/broadcom-wl_ck.conf"
 }