[arch-commits] CVS update of extra/network/fcpcmcia-ck (3 files)

[Tom Killian]

    Date: Tuesday, July 24, 2007 @ 05:23:17
  Author: tom
    Path: /home/cvs-extra/extra/network/fcpcmcia-ck

   Added: kernel-2.6.22.patch (1.1)
Modified: PKGBUILD (1.5 -> 1.6) fcpcmcia.install (1.2 -> 1.3)

upgpkg: fcpcmcia-ck 31107-6
update for 2.6.22-ck


---------------------+
 PKGBUILD            |   16 +++++++---------
 fcpcmcia.install    |    4 ++--
 kernel-2.6.22.patch |   11 +++++++++++
 3 files changed, 20 insertions(+), 11 deletions(-)


Index: extra/network/fcpcmcia-ck/PKGBUILD
diff -u extra/network/fcpcmcia-ck/PKGBUILD:1.5 extra/network/fcpcmcia-ck/PKGBUILD:1.6
--- extra/network/fcpcmcia-ck/PKGBUILD:1.5	Sun May 27 09:35:26 2007
+++ extra/network/fcpcmcia-ck/PKGBUILD	Tue Jul 24 05:23:17 2007
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD,v 1.5 2007/05/27 13:35:26 tom Exp $
+# $Id: PKGBUILD,v 1.6 2007/07/24 09:23:17 tom Exp $
 #Maintainer: Tobias Powalowski <t.powa at gmx.de>
 
 
 
 pkgname=fcpcmcia-ck
 pkgver=31107
-pkgrel=5
-_kernver=2.6.21-ck
-pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For kernel26ck."
+pkgrel=6
+_kernver=2.6.22-ck
+pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For kernel26ck"
 arch=(i686 x86_64)
+license=('custom:"AVM"' 'LPGL')
 url="http://www.avm.de"
 depends=('capi4k-utils' 'kernel26ck')
 source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux/suse.93/fcpcmcia-suse93-3.11-07.tar.gz \
-	pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch)
+	pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch)
 install=(fcpcmcia.install)
 build() {
   cd $startdir/src/fritz/src
@@ -20,6 +21,7 @@
   patch -Np0 -i ../../pcmcia-2.6.17.patch || return 1
   patch -Np0 -i ../../kernel-2.6.19.patch || return 1
   patch -Np0 -i ../../kernel-2.6.20.patch || return 1
+  patch -Np0 -i ../../kernel-2.6.22.patch || return 1
   cd $startdir/src/fritz
   make KDIR=/lib/modules/${_kernver}/build LIBDIR=$startdir/pkg/var/lib/fritz all || return 1
   mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
@@ -28,7 +30,3 @@
   rm -r $startdir/pkg/var/lib/fritz
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/fcpcmcia.install
 }
-
-md5sums=('96fc3e72afdc2087b4dafe41c069ec18' 'ec21dee3a5a09203dc55b399c29bc58c'\
-         '258b13bb2ac46960b9c91635f02cd080' '5c63dc9df0810bb1ba85f3425abaa0ed'\
-         '890ec6e1219a3a4bae77f5815c3ed40d')
Index: extra/network/fcpcmcia-ck/fcpcmcia.install
diff -u extra/network/fcpcmcia-ck/fcpcmcia.install:1.2 extra/network/fcpcmcia-ck/fcpcmcia.install:1.3
--- extra/network/fcpcmcia-ck/fcpcmcia.install:1.2	Sat Feb 17 08:52:47 2007
+++ extra/network/fcpcmcia-ck/fcpcmcia.install	Tue Jul 24 05:23:17 2007
@@ -9,7 +9,7 @@
   sed -i -e 's/#fcpcmcia	-	-	-	-	-	-/fcpcmcia	-	-	-	-	-	-/g' /etc/capi.conf
     # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.20-ck
+  KERNEL_VERSION=2.6.22-ck
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
@@ -24,7 +24,7 @@
   sed -i -e 's/fcpcmcia	-	-	-	-	-	-/#fcpcmcia	-	-	-	-	-	-/g' /etc/capi.conf
     # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.20-ck
+  KERNEL_VERSION=2.6.22-ck
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
Index: extra/network/fcpcmcia-ck/kernel-2.6.22.patch
diff -u /dev/null extra/network/fcpcmcia-ck/kernel-2.6.22.patch:1.1
--- /dev/null	Tue Jul 24 05:23:16 2007
+++ extra/network/fcpcmcia-ck/kernel-2.6.22.patch	Tue Jul 24 05:23:17 2007
@@ -0,0 +1,11 @@
+--- main.c~	2005-07-07 00:00:00.000000000 +0200
++++ main.c	2007-06-09 18:41:07.000000000 +0200
+@@ -364,7 +364,7 @@
+ #endif
+ 
+ #if defined (__fcpci__)	
+-	if (0 == (err = pci_module_init (&fcpci_driver))) {
++	if (0 == (err = pci_register_driver (&fcpci_driver))) {
+ 		LOG("PCI driver registered.\n");
+ 		register_capi_driver (&fritz_capi_driver);
+ 		LOG("CAPI driver registered.\n");