[arch-commits] CVS update of extra/network/zd1211-suspend2 (3 files)

[Thomas Baechler]

    Date: Tuesday, May 8, 2007 @ 17:48:20
  Author: thomas
    Path: /home/cvs-extra/extra/network/zd1211-suspend2

   Added: kernel-2.6.20.patch (1.1)
Modified: PKGBUILD (1.1 -> 1.2) zd1211.install (1.1 -> 1.2)

upgpkg: zd1211-suspend2 r83-2


---------------------+
 PKGBUILD            |   15 +++++++++------
 kernel-2.6.20.patch |   13 +++++++++++++
 zd1211.install      |    6 +++---
 3 files changed, 25 insertions(+), 9 deletions(-)


Index: extra/network/zd1211-suspend2/PKGBUILD
diff -u extra/network/zd1211-suspend2/PKGBUILD:1.1 extra/network/zd1211-suspend2/PKGBUILD:1.2
--- extra/network/zd1211-suspend2/PKGBUILD:1.1	Sat Dec 16 20:23:45 2006
+++ extra/network/zd1211-suspend2/PKGBUILD	Tue May  8 17:48:20 2007
@@ -1,22 +1,26 @@
-#$Id: PKGBUILD,v 1.1 2006/12/17 01:23:45 james Exp $
+#$Id: PKGBUILD,v 1.2 2007/05/08 21:48:20 thomas Exp $
 # Maintainer: James Rayner <james at archlinux.org>
 #Contributor: linfocito <dududa - gmail com>
 pkgname=zd1211-suspend2
 pkgver=r83
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for ZyDAS ZD1211 and ZD1211b USB wireless lan chipsets."
 url="http://zd1211.ath.cx"
 license="GPL"
 depends=(kernel26suspend2)
 install=zd1211.install
-source=(http://zd1211.ath.cx/download/zd1211-driver-$pkgver.tgz kernel-2.6.19.patch)
-md5sums=(a5751f0e6f1f368689077fa7758a4932)
-_kernver=2.6.19-suspend2
+source=(http://zd1211.ath.cx/download/zd1211-driver-$pkgver.tgz kernel-2.6.19.patch
+        kernel-2.6.20.patch)
+md5sums=('a5751f0e6f1f368689077fa7758a4932' '6cac79544f2bed3a86b0c3d260f30d16'\
+         '3d7f2f28d91fa67a57ac663d528e6465')
+_kernver=2.6.21-suspend2
+arch=('i686')
 
 build() {
   
   cd $startdir/src/zd1211-driver-$pkgver
   patch -Np0 -i ../kernel-2.6.19.patch || return 1
+  patch -Np1 -i ../kernel-2.6.20.patch || return 1
   sed -i "s|^KERNEL_|##KERNEL_|" Makefile
   sed -i "s|#KERNEL_|KERNEL_|" Makefile
   sed -i "s|linux$|linux-$_kernver|" Makefile
@@ -31,4 +35,3 @@
   install -m644 zd1211b.ko $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/
   sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
 }
-md5sums=('a5751f0e6f1f368689077fa7758a4932' '6cac79544f2bed3a86b0c3d260f30d16')
Index: extra/network/zd1211-suspend2/kernel-2.6.20.patch
diff -u /dev/null extra/network/zd1211-suspend2/kernel-2.6.20.patch:1.1
--- /dev/null	Tue May  8 17:48:20 2007
+++ extra/network/zd1211-suspend2/kernel-2.6.20.patch	Tue May  8 17:48:20 2007
@@ -0,0 +1,13 @@
+--- zd1211-driver-r83/src/zd1211.c~	2006-06-16 12:35:59.000000000 +0200
++++ zd1211-driver-r83/src/zd1211.c	2007-02-04 23:23:53.000000000 +0100
+@@ -1801,8 +1801,8 @@
+         spin_lock_init(&(macp->q_lock));
+         spin_lock_init(&(macp->cs_lock));
+ 
+-        INIT_WORK(&macp->kevent, kevent, macp);
+-        INIT_WORK(&macp->scan_tout_event, kevent, macp);
++        INIT_WORK(&macp->kevent, kevent);
++        INIT_WORK(&macp->scan_tout_event, kevent);
+ 
+         macp->numTcb = NUM_TCB;
+         macp->numTbd = NUM_TBD;
Index: extra/network/zd1211-suspend2/zd1211.install
diff -u extra/network/zd1211-suspend2/zd1211.install:1.1 extra/network/zd1211-suspend2/zd1211.install:1.2
--- extra/network/zd1211-suspend2/zd1211.install:1.1	Sat Dec 16 20:23:46 2006
+++ extra/network/zd1211-suspend2/zd1211.install	Tue May  8 17:48:20 2007
@@ -1,7 +1,7 @@
 # arg 1:  the new package version
 post_install()
 {
-  KERNEL_VERSION='2.6.19-suspend2'
+  KERNEL_VERSION='2.6.21-suspend2'
   depmod -v $KERNEL_VERSION > /dev/null 2>&1 
   /bin/true
 }
@@ -10,7 +10,7 @@
 # arg 2:  the old package version
 post_upgrade()
 {
-  KERNEL_VERSION='2.6.19-suspend2'
+  KERNEL_VERSION='2.6.21-suspend2'
   depmod -v $KERNEL_VERSION > /dev/null 2>&1 
   /bin/true
 }
@@ -24,7 +24,7 @@
 # arg 1:  the old package version
 post_remove()
 {
-  KERNEL_VERSION='2.6.19-suspend2'
+  KERNEL_VERSION='2.6.21-suspend2'
   depmod -v $KERNEL_VERSION > /dev/null 2>&1 	 
  
   /bin/true