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

[Thomas Baechler]

    Date: Tuesday, May 8, 2007 @ 17:22:42
  Author: thomas
    Path: /home/cvs-extra/extra/network/fcpci-suspend2

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

upgpkg: fcpci-suspend2 31107-3


---------------------+
 PKGBUILD            |   11 +++++-----
 fcpci.install       |    4 +--
 kernel-2.6.20.patch |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 7 deletions(-)


Index: extra/network/fcpci-suspend2/PKGBUILD
diff -u extra/network/fcpci-suspend2/PKGBUILD:1.2 extra/network/fcpci-suspend2/PKGBUILD:1.3
--- extra/network/fcpci-suspend2/PKGBUILD:1.2	Sat Dec  2 10:36:38 2006
+++ extra/network/fcpci-suspend2/PKGBUILD	Tue May  8 17:22:41 2007
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD,v 1.2 2006/12/02 15:36:38 thomas Exp $
+# $Id: PKGBUILD,v 1.3 2007/05/08 21:22:41 thomas Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=fcpci-suspend2
 pkgver=31107
-pkgrel=2
-_kernver=2.6.19-suspend2
+pkgrel=3
+_kernver=2.6.21-suspend2
 pkgdesc="AVM ISDN driver for FRITZ PCI isdn cards. For kernel26suspend2."
 arch=(i686 x86_64)
 url="http://www.avm.de"
 depends=('capi4k-utils' 'kernel26suspend2')
 source=(ftp://ftp.avm.de/cardware/fritzcrd.pci/linux/suse.93/fcpci-suse93-3.11-07.tar.gz atomic.patch \
-        kernel-2.6.19.patch)
+        kernel-2.6.19.patch kernel-2.6.20.patch)
 install=fcpci.install
 md5sums=('3ee301b5d0e8df9e4b915af58b725556' '258b13bb2ac46960b9c91635f02cd080'\
-         '5c63dc9df0810bb1ba85f3425abaa0ed')
+         '5c63dc9df0810bb1ba85f3425abaa0ed' '890ec6e1219a3a4bae77f5815c3ed40d')
 
 build() {
   cd $startdir/src/fritz/src
   patch -Np0 -i ../../atomic.patch || return 1
   patch -Np0 -i ../../kernel-2.6.19.patch || return 1
+  patch -Np0 -i ../../kernel-2.6.20.patch || return 1
   cd $startdir/src/fritz
   make LIBDIR=$startdir/pkg/var/lib/fritz KDIR=/lib/modules/${_kernver}/build all || return 1
   mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
Index: extra/network/fcpci-suspend2/fcpci.install
diff -u extra/network/fcpci-suspend2/fcpci.install:1.2 extra/network/fcpci-suspend2/fcpci.install:1.3
--- extra/network/fcpci-suspend2/fcpci.install:1.2	Sat Dec  2 10:36:38 2006
+++ extra/network/fcpci-suspend2/fcpci.install	Tue May  8 17:22:41 2007
@@ -7,7 +7,7 @@
   sed -i -e 's/#fcpci		-	-	-	-	-	-/fcpci		-	-	-	-	-	-/g' /etc/capi.conf
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.19-suspend2
+  KERNEL_VERSION=2.6.21-suspend2
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
@@ -22,7 +22,7 @@
   sed -i -e 's/fcpci		-	-	-	-	-	-/#fcpci		-	-	-	-	-	-/g' /etc/capi.conf
     # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.19-suspend2
+  KERNEL_VERSION=2.6.21-suspend2
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
Index: extra/network/fcpci-suspend2/kernel-2.6.20.patch
diff -u /dev/null extra/network/fcpci-suspend2/kernel-2.6.20.patch:1.1
--- /dev/null	Tue May  8 17:22:42 2007
+++ extra/network/fcpci-suspend2/kernel-2.6.20.patch	Tue May  8 17:22:41 2007
@@ -0,0 +1,55 @@
+--- driver.c~	2005-07-07 00:00:00.000000000 +0200
++++ driver.c	2007-01-08 22:33:51.000000000 +0100
+@@ -901,10 +901,10 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-int driver_init (void) {
++int avm_init (void) {
+ 
+ 	return (NULL != (capi_lib = link_library (NULL)));
+-} /* driver_init */
++} /* avm_init */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+--- main.c~	2007-01-08 22:18:57.000000000 +0100
++++ main.c	2007-01-08 22:34:33.000000000 +0100
+@@ -204,7 +204,7 @@
+ 	NOTE(PRODUCT_LOGO " found: port 0x%04x, irq %u\n", pars.port, pars.irq);
+ 
+ 	NOTE("Loading...\n");
+-	if (!driver_init ()) {
++	if (!avm_init ()) {
+ 		ERROR("Error: Driver library not available.\n");
+ 		ERROR("Not loaded.\n");
+ 		return res;
+@@ -269,7 +269,7 @@
+ 	NOTE (PRODUCT_LOGO " found: port 0x%04x, irq %u\n", pars.port, pars.irq);
+ 
+ 	NOTE("Loading...\n");
+-	if (!driver_init ()) {
++	if (!avm_init ()) {
+ 		ERROR("Error: Driver library not available.\n");
+ 		ERROR("Not loaded.\n");
+ 		return -EBUSY;
+@@ -377,7 +377,7 @@
+ 	}
+ 	return err;
+ #elif defined (__fcpcmcia__) || defined (__fcclassic__)
+-	if (!driver_init ()) {
++	if (!avm_init ()) {
+ 		ERROR("Error: Driver library not available.\n");
+ 		ERROR("Not loaded.\n");
+ 		return -EBUSY;
+--- driver.h~	2007-01-08 22:18:57.000000000 +0100
++++ driver.h	2007-01-08 22:34:12.000000000 +0100
+@@ -97,7 +97,7 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-extern int driver_init (void);
++extern int avm_init (void);
+ extern void driver_exit (void);
+ 
+ /*---------------------------------------------------------------------------*\