Date: Monday, October 25, 2010 @ 16:35:44 Author: tpowa Revision: 96979
upgpkg: ndiswrapper 1.56-6 bump to kernel 2.6.36 Added: ndiswrapper/trunk/kernel-2.6.36.patch Modified: ndiswrapper/trunk/PKGBUILD ndiswrapper/trunk/ndiswrapper.install ---------------------+ PKGBUILD | 15 +++++++++------ kernel-2.6.36.patch | 27 +++++++++++++++++++++++++++ ndiswrapper.install | 6 +++--- 3 files changed, 39 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-10-25 20:33:34 UTC (rev 96978) +++ PKGBUILD 2010-10-25 20:35:44 UTC (rev 96979) @@ -2,22 +2,24 @@ #Maintainer: Tobias Powalowski <[email protected]> pkgname=ndiswrapper -_kernver=2.6.35-ARCH +_kernver=2.6.36-ARCH pkgver=1.56 -pkgrel=5 +pkgrel=6 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For stock arch 2.6 kernel." license=('GPL') arch=(i686 x86_64) url="http://ndiswrapper.sourceforge.net"; install="ndiswrapper.install" -depends=("ndiswrapper-utils=$pkgver" 'kernel26>=2.6.35' 'kernel26<2.6.36') -makedepends=('kernel26-headers>=2.6.35' 'kernel26-headers<2.6.36') +depends=("ndiswrapper-utils=$pkgver" 'kernel26>=2.6.36' 'kernel26<2.6.37') +makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37') source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz - kernel-2.6.35.patch) + kernel-2.6.35.patch + kernel-2.6.36.patch) build() { cd $srcdir/ndiswrapper-$pkgver/driver patch -Np2 -i $startdir/kernel-2.6.35.patch + patch -Np2 -i $startdir/kernel-2.6.36.patch make KVERS=$_kernver make DESTDIR=$pkgdir KVERS=$_kernver install rm $pkgdir/lib/modules/$_kernver/modules.* #wtf? @@ -30,4 +32,5 @@ } md5sums=('1431f7ed5f8e92e752d330bbb3aed333' - '0a03d613b1fd545a75c5dd1a7c2aaec4') + '0a03d613b1fd545a75c5dd1a7c2aaec4' + 'cc16ed13449f17e90865df688b180b2c') Added: kernel-2.6.36.patch =================================================================== --- kernel-2.6.36.patch (rev 0) +++ kernel-2.6.36.patch 2010-10-25 20:35:44 UTC (rev 96979) @@ -0,0 +1,27 @@ +--- ndiswrapper-1.56.orig/driver/loader.c 2010-02-11 03:09:32.000000000 +0100 ++++ ndiswrapper-1.56/driver/loader.c 2010-10-24 01:38:13.000000000 +0200 +@@ -750,13 +750,13 @@ + } + + /* called with loader_mutex is down */ +-static int wrapper_ioctl(struct inode *inode, struct file *file, ++static long wrapper_unlocked_ioctl(struct file *file, + unsigned int cmd, unsigned long arg) + { + struct load_driver *load_driver; + struct load_device load_device; + struct load_driver_file load_bin_file; +- int ret; ++ long ret; + void __user *addr = (void __user *)arg; + + ENTER1("cmd: %u", cmd); +@@ -831,7 +831,7 @@ + + static struct file_operations wrapper_fops = { + .owner = THIS_MODULE, +- .ioctl = wrapper_ioctl, ++ .unlocked_ioctl = wrapper_unlocked_ioctl, + .release = wrapper_ioctl_release, + }; + Modified: ndiswrapper.install =================================================================== --- ndiswrapper.install 2010-10-25 20:33:34 UTC (rev 96978) +++ ndiswrapper.install 2010-10-25 20:35:44 UTC (rev 96979) @@ -2,7 +2,7 @@ post_install() { ndiswrapper -m - KERNEL_VERSION='2.6.35-ARCH' + KERNEL_VERSION='2.6.36-ARCH' depmod -ae $KERNEL_VERSION > /dev/null 2>&1 } @@ -11,13 +11,13 @@ post_upgrade() { ndiswrapper -m - KERNEL_VERSION='2.6.35-ARCH' + KERNEL_VERSION='2.6.36-ARCH' depmod -ae $KERNEL_VERSION > /dev/null 2>&1 } # arg 1: the old package version post_remove() { - KERNEL_VERSION='2.6.35-ARCH' + KERNEL_VERSION='2.6.36-ARCH' depmod -ae $KERNEL_VERSION > /dev/null 2>&1 }
