[arch-commits] Commit in ndiswrapper/trunk (PKGBUILD ndiswrapper-1.58-add_taint.patch)

[Tobias Powalowski]

    Date: Wednesday, May 8, 2013 @ 13:06:59
  Author: tpowa
Revision: 90197

upgpkg: ndiswrapper 1.58-8

rebuild against 3.9.1

Added:
  ndiswrapper/trunk/ndiswrapper-1.58-add_taint.patch
Modified:
  ndiswrapper/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   18 +++++++++++++-----
 ndiswrapper-1.58-add_taint.patch |   24 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-08 10:53:45 UTC (rev 90196)
+++ PKGBUILD	2013-05-08 11:06:59 UTC (rev 90197)
@@ -3,23 +3,31 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
-_extramodules=extramodules-3.8-ARCH
+_extramodules=extramodules-3.9-ARCH
 pkgname=ndiswrapper
 pkgver=1.58
-pkgrel=7
+pkgrel=8
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors."
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://ndiswrapper.sourceforge.net"
 install=ndiswrapper.install
-depends=('linux>=3.8' 'linux<3.9' 'wireless_tools' 'perl')
+depends=('linux>=3.9' 'linux<3.10' 'wireless_tools' 'perl')
 makedepends=('linux-headers')
 provides=("$pkgname-utils" "$pkgname-bin")
 replaces=("$pkgname-utils" "$pkgname-bin")
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+        ndiswrapper-1.58-add_taint.patch)
 options=('!strip')
-sha1sums=('a256812b3136648ed93e04146d2276a3ca70957c')
+sha1sums=('a256812b3136648ed93e04146d2276a3ca70957c'
+          'f2c8bd7553f87a647b2e221b01fbd5d0d07eff8c')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # https://bugs.gentoo.org/show_bug.cgi?id=467956 3.9 kernels
+  patch -Np1 -i "$srcdir/ndiswrapper-1.58-add_taint.patch"
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: ndiswrapper-1.58-add_taint.patch
===================================================================
--- ndiswrapper-1.58-add_taint.patch	                        (rev 0)
+++ ndiswrapper-1.58-add_taint.patch	2013-05-08 11:06:59 UTC (rev 90197)
@@ -0,0 +1,24 @@
+diff -ur ndiswrapper-1.58.orig/driver/loader.c ndiswrapper-1.58/driver/loader.c
+--- ndiswrapper-1.58.orig/driver/loader.c	2013-05-01 09:48:34.910000000 +0900
++++ ndiswrapper-1.58/driver/loader.c	2013-05-01 09:48:59.870000000 +0900
+@@ -575,7 +575,7 @@
+ 	} else {
+ 		printk(KERN_INFO "%s: driver %s (%s) loaded\n",
+ 		       DRIVER_NAME, wrap_driver->name, wrap_driver->version);
+-		add_taint(TAINT_PROPRIETARY_MODULE);
++		add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_STILL_OK);
+ 		EXIT1(return 0);
+ 	}
+ }
+diff -ur ndiswrapper-1.58.orig/driver/wrapper.c ndiswrapper-1.58/driver/wrapper.c
+--- ndiswrapper-1.58.orig/driver/wrapper.c	2013-02-20 03:00:37.000000000 +0900
++++ ndiswrapper-1.58/driver/wrapper.c	2013-05-01 09:54:30.140000000 +0900
+@@ -72,7 +72,7 @@
+ static int __init wrapper_init(void)
+ {
+ #ifdef TAINT_OOT_MODULE
+-	add_taint(TAINT_OOT_MODULE);
++	add_taint(TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
+ #endif
+ 	printk(KERN_INFO "%s version %s loaded (smp=%s, preempt=%s)\n",
+ 	       DRIVER_NAME, DRIVER_VERSION,