[arch-commits] Commit in fcpcmcia/trunk (3 files)

[Thomas Baechler]

    Date: Friday, October 10, 2008 @ 11:31:30
  Author: thomas
Revision: 14756

upgpkg: fcpcmcia 31107-43

Added:
  fcpcmcia/trunk/kernel-2.6.27.patch
Modified:
  fcpcmcia/trunk/PKGBUILD
  fcpcmcia/trunk/fcpcmcia.install

---------------------+
 PKGBUILD            |   21 ++++++++++++---------
 fcpcmcia.install    |    4 ++--
 kernel-2.6.27.patch |   11 +++++++++++
 3 files changed, 25 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-10 15:31:16 UTC (rev 14755)
+++ PKGBUILD	2008-10-10 15:31:30 UTC (rev 14756)
@@ -3,32 +3,34 @@
 
 pkgname=fcpcmcia
 pkgver=31107
-pkgrel=42
-_kernver=2.6.26-ARCH
+pkgrel=43
+_kernver=2.6.27-ARCH
 pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For stock arch 2.6 kernel"
 arch=(i686 x86_64)
 license=('custom:"AVM"' 'LPGL')
 url="http://www.avm.de"
-depends=('capi4k-utils' 'kernel26>=2.6.26-1' 'kernel26<2.6.27')
-if [ "$CARCH" = "i686" ]; then 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 kernel-2.6.22.patch kernel-2.6.24.patch)
+depends=('capi4k-utils' 'kernel26>=2.6.27' 'kernel26<2.6.28')
+if [ "$CARCH" = "i686" ]; then 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 kernel-2.6.22.patch kernel-2.6.24.patch kernel-2.6.27.patch)
  md5sums=('96fc3e72afdc2087b4dafe41c069ec18'
          'ec21dee3a5a09203dc55b399c29bc58c'
          '258b13bb2ac46960b9c91635f02cd080'
          '5c63dc9df0810bb1ba85f3425abaa0ed'
          '890ec6e1219a3a4bae77f5815c3ed40d'
          '4f4f03630ed994b16b4cd167f090a116'
- 	 '21bfa466b1fb94663ed1f265948dba5e')
+ 	 '21bfa466b1fb94663ed1f265948dba5e'
+ 	 'e32439084b62ee7975ae45a443b6eba9')
 fi
-if [ "$CARCH" = "x86_64" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.10.0/fcpcmcia-suse10.0-64bit-3.11-07.tar.gz \
-	pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch)
+if [ "$CARCH" = "x86_64" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.10.0/fcpcmcia-suse10.0-64bit-3.11-07.tar.gz
+	pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch kernel-2.6.27.patch)
 md5sums=('4f461710cf57ebf50b3c4f2842288752'
          'ec21dee3a5a09203dc55b399c29bc58c'
          '258b13bb2ac46960b9c91635f02cd080'
          '5c63dc9df0810bb1ba85f3425abaa0ed'
          '890ec6e1219a3a4bae77f5815c3ed40d'
          '4f4f03630ed994b16b4cd167f090a116'
-         '21bfa466b1fb94663ed1f265948dba5e')
+         '21bfa466b1fb94663ed1f265948dba5e'
+         'e32439084b62ee7975ae45a443b6eba9')
 fi
 install=(fcpcmcia.install)
 options=(!makeflags)
@@ -40,6 +42,7 @@
   patch -Np0 -i ../../kernel-2.6.20.patch || return 1
   patch -Np0 -i ../../kernel-2.6.22.patch || return 1
   patch -Np0 -i ../../kernel-2.6.24.patch || return 1
+  patch -Np2 -i ../../kernel-2.6.27.patch || return 1
 
   cd ..
   # fix from Karsten Keil <kkeil at suse.de>

Modified: fcpcmcia.install
===================================================================
--- fcpcmcia.install	2008-10-10 15:31:16 UTC (rev 14755)
+++ fcpcmcia.install	2008-10-10 15:31:30 UTC (rev 14756)
@@ -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.26-ARCH
+  KERNEL_VERSION=2.6.27-ARCH
   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.26-ARCH
+  KERNEL_VERSION=2.6.27-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 

Added: kernel-2.6.27.patch
===================================================================
--- kernel-2.6.27.patch	                        (rev 0)
+++ kernel-2.6.27.patch	2008-10-10 15:31:30 UTC (rev 14756)
@@ -0,0 +1,11 @@
+diff -Nur fritz.orig/src/fcpcmcia_cs.c fritz/src/fcpcmcia_cs.c
+--- fritz.orig/src/fcpcmcia_cs.c	2006-01-05 00:00:00.000000000 +0100
++++ fritz/src/fcpcmcia_cs.c	2008-10-10 16:13:35.000000000 +0200
+@@ -26,7 +26,6 @@
+ #include <asm/io.h>
+ #include <asm/system.h>
+ 
+-#include <pcmcia/version.h>
+ #include <pcmcia/cs_types.h>
+ #include <pcmcia/cs.h>
+ #include <pcmcia/cistpl.h>