[arch-commits] CVS update of extra/network/fcpcmcia (PKGBUILD)

Tobias Powalowski tpowa at archlinux.org
Sat Jan 26 15:48:11 UTC 2008


    Date: Saturday, January 26, 2008 @ 10:48:11
  Author: tpowa
    Path: /home/cvs-extra/extra/network/fcpcmcia

Modified: PKGBUILD (1.35 -> 1.36)

upgpkg: update to new timer stats kernel


----------+
 PKGBUILD |   50 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 9 deletions(-)


Index: extra/network/fcpcmcia/PKGBUILD
diff -u extra/network/fcpcmcia/PKGBUILD:1.35 extra/network/fcpcmcia/PKGBUILD:1.36
--- extra/network/fcpcmcia/PKGBUILD:1.35	Fri Jan 25 12:43:00 2008
+++ extra/network/fcpcmcia/PKGBUILD	Sat Jan 26 10:48:11 2008
@@ -1,22 +1,38 @@
-# $Id: PKGBUILD,v 1.35 2008/01/25 17:43:00 tpowa Exp $
+# $Id: PKGBUILD,v 1.36 2008/01/26 15:48:11 tpowa Exp $
 #Maintainer: Tobias Powalowski <t.powa at gmx.de>
 
 
 
 pkgname=fcpcmcia
 pkgver=31107
-pkgrel=37
+pkgrel=38
 _kernver=2.6.24-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.24-1' 'kernel26<=2.6.25-0')
+depends=('capi4k-utils' 'kernel26>=2.6.24-2' 'kernel26<=2.6.25-0')
 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 string.h)
+	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)
+ md5sums=('96fc3e72afdc2087b4dafe41c069ec18'
+         'ec21dee3a5a09203dc55b399c29bc58c'
+         '258b13bb2ac46960b9c91635f02cd080'
+         '5c63dc9df0810bb1ba85f3425abaa0ed'
+         '890ec6e1219a3a4bae77f5815c3ed40d'
+         '4f4f03630ed994b16b4cd167f090a116'
+         '4be09efb2e81482fdc1d043ad164b2e3'
+ 	 '21bfa466b1fb94663ed1f265948dba5e')
 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 string64.h)
+	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)
+md5sums=('4f461710cf57ebf50b3c4f2842288752'
+         'ec21dee3a5a09203dc55b399c29bc58c'
+         '258b13bb2ac46960b9c91635f02cd080'
+         '5c63dc9df0810bb1ba85f3425abaa0ed'
+         '890ec6e1219a3a4bae77f5815c3ed40d'
+         '4f4f03630ed994b16b4cd167f090a116'
+         'ff330f2d76e82b6e257d9cd76fd4808d'
+	 '21bfa466b1fb94663ed1f265948dba5e')
 fi
 install=(fcpcmcia.install)
 options=(!makeflags)
@@ -28,10 +44,25 @@
   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
-  [ "$CARCH" = "i686" ] && cp $startdir/src/string.h .
-  [ "$CARCH" = "x86_64" ] && cp $startdir/src/string64.h string.h
-  sed -i 's#<linux/string.h>#"string.h"#' driver.c main.c tools.c fcpcmcia_cs.c
-  sed -i 's#tools.h#tools.h string.h#' Makefile
+
+  cd ..
+  # fix from Karsten Keil <kkeil at suse.de>
+  # in refernece to bug: http://bugs.archlinux.org/task/8511
+  OBJ=$(find . -name '*lib.o')
+  for i in $OBJ; do
+    mv $i $i.old
+    objcopy -L memcmp \
+            -L memcpy \
+            -L memmove \
+            -L memset \
+            -L strcat \
+            -L strcmp \
+            -L strcpy \
+            -L strlen \
+            -L strncmp \
+            -L strncpy \
+    $i.old $i
+  done
   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/
@@ -40,3 +71,4 @@
   rm -r $startdir/pkg/var/lib/fritz
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/fcpcmcia.install
 }
+




More information about the arch-commits mailing list