[arch-commits] Commit in ndiswrapper/trunk (2.6.29.patch PKGBUILD ndiswrapper.install)

[Tobias Powalowski]

    Date: Wednesday, March 25, 2009 @ 04:50:45
  Author: tpowa
Revision: 31227

upgpkg: ndiswrapper 1.54-2

Added:
  ndiswrapper/trunk/2.6.29.patch
Modified:
  ndiswrapper/trunk/PKGBUILD
  ndiswrapper/trunk/ndiswrapper.install

---------------------+
 2.6.29.patch        |   11 +++++++++++
 PKGBUILD            |   15 ++++++++-------
 ndiswrapper.install |    6 +++---
 3 files changed, 22 insertions(+), 10 deletions(-)

Added: 2.6.29.patch
===================================================================
--- 2.6.29.patch	                        (rev 0)
+++ 2.6.29.patch	2009-03-25 08:50:45 UTC (rev 31227)
@@ -0,0 +1,11 @@
+--- wrapndis.c~	2009-03-25 09:48:29.000000000 +0100
++++ wrapndis.c	2009-03-25 09:48:29.000000000 +0100
+@@ -1744,7 +1744,7 @@
+ 	.ndo_set_mac_address = ndis_set_mac_address,
+ 	.ndo_get_stats = ndis_get_stats,
+ #ifdef CONFIG_NET_POLL_CONTROLLER
+-	.poll_controller = ndis_poll_controller;
++	.ndo_poll_controller = ndis_poll_controller,
+ #endif
+ };
+ #endif

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-25 08:41:27 UTC (rev 31226)
+++ PKGBUILD	2009-03-25 08:50:45 UTC (rev 31227)
@@ -2,21 +2,23 @@
 #Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=ndiswrapper
-_kernver=2.6.28-ARCH
+_kernver=2.6.29-ARCH
 pkgver=1.54
-pkgrel=1
+pkgrel=2
 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.28' 'kernel26<2.6.29')
-source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz)
-md5sums=('fc9ebd3985967727da494ec298ad4487')
-
+depends=("ndiswrapper-utils=$pkgver" 'kernel26>=2.6.29' 'kernel26<2.6.30')
+source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz
+        2.6.29.patch)
+md5sums=('fc9ebd3985967727da494ec298ad4487'
+         'dac17893de1ac41488c9ae9c2dcfbfad')
 build()
 {
   cd $srcdir/ndiswrapper-$pkgver/driver
+  patch -Np0 -i ../../2.6.29.patch || return 1
   make KVERS=$_kernver || return 1
   make DESTDIR=$pkgdir KVERS=$_kernver install || return 1
   rm $pkgdir/lib/modules/$_kernver/modules.* #wtf?
@@ -27,4 +29,3 @@
   mv $pkgdir/lib/modules/$_kernver/misc/* $pkgdir/lib/modules/$_kernver/kernel/drivers/net/wireless/ndiswrapper/
   rm -r $pkgdir/lib/modules/$_kernver/misc/
 }
-

Modified: ndiswrapper.install
===================================================================
--- ndiswrapper.install	2009-03-25 08:41:27 UTC (rev 31226)
+++ ndiswrapper.install	2009-03-25 08:50:45 UTC (rev 31227)
@@ -2,7 +2,7 @@
 post_install()
 {
   ndiswrapper -m
-  KERNEL_VERSION='2.6.28-ARCH'
+  KERNEL_VERSION='2.6.29-ARCH'
   depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 
 }
 
@@ -11,14 +11,14 @@
 post_upgrade()
 {
   ndiswrapper -m
-  KERNEL_VERSION='2.6.28-ARCH'
+  KERNEL_VERSION='2.6.29-ARCH'
   depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 
 }
 
 # arg 1:  the old package version
 post_remove()
 {
-  KERNEL_VERSION='2.6.28-ARCH'
+  KERNEL_VERSION='2.6.29-ARCH'
   depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1
 }