[arch-commits] CVS update of extra/system/truecrypt (3 files)

[Tobias Powalowski]

    Date: Wednesday, October 10, 2007 @ 17:04:41
  Author: tpowa
    Path: /home/cvs-extra/extra/system/truecrypt

   Added: kernel-2.6.23.patch (1.1)
Modified: PKGBUILD (1.12 -> 1.13) truecrypt.install (1.6 -> 1.7)

'upgpkg: udpate to new major kernel'


---------------------+
 PKGBUILD            |   10 +++++-----
 kernel-2.6.23.patch |   15 +++++++++++++++
 truecrypt.install   |    2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)


Index: extra/system/truecrypt/PKGBUILD
diff -u extra/system/truecrypt/PKGBUILD:1.12 extra/system/truecrypt/PKGBUILD:1.13
--- extra/system/truecrypt/PKGBUILD:1.12	Mon Jul  9 17:27:06 2007
+++ extra/system/truecrypt/PKGBUILD	Wed Oct 10 17:04:41 2007
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD,v 1.12 2007/07/09 21:27:06 thomas Exp $
+# $Id: PKGBUILD,v 1.13 2007/10/10 21:04:41 tpowa Exp $
 # Maintainer: Tom K <tom at archlinux.org>
 
 pkgname=truecrypt
 pkgver=4.3a
-pkgrel=6
+pkgrel=7
 pkgdesc="Free open-source disk encryption software - module for kernel26"
 arch=('i686' 'x86_64')
 depends=('truecrypt-utils' 'kernel26')
-source=(http://www.truecrypt.org/downloads/truecrypt-$pkgver-source-code.tar.gz)
+source=(http://www.truecrypt.org/downloads/truecrypt-$pkgver-source-code.tar.gz kernel-2.6.23.patch)
 md5sums=('8f2536eae16e6044a22b2a82c7003357')
 url="http://www.truecrypt.org/"
 install=truecrypt.install
 license=('custom')
 #options=('force')
 
-_kernver=2.6.22-ARCH
+_kernver=2.6.23-ARCH
 
 build() {
   cd $startdir/src/truecrypt-$pkgver-source-code/Linux/Kernel
-  
+  patch -Np0 -i $startdir/src/kernel-2.6.23.patch || return 1
   make KERNEL_SRC=/lib/modules/$_kernver/build || return 1
   install -Dm600 ../Kernel/truecrypt.ko $startdir/pkg/lib/modules/$_kernver/extra/truecrypt.ko
 
Index: extra/system/truecrypt/kernel-2.6.23.patch
diff -u /dev/null extra/system/truecrypt/kernel-2.6.23.patch:1.1
--- /dev/null	Wed Oct 10 17:04:41 2007
+++ extra/system/truecrypt/kernel-2.6.23.patch	Wed Oct 10 17:04:41 2007
@@ -0,0 +1,15 @@
+$ diff -urN Dm-target.c.asli Dm-target.c
+--- Dm-target.c.asli    2007-04-24 23:32:06 +0700
++++ Dm-target.c 2007-10-05 03:41:00 +0700
+@@ -656,7 +656,11 @@
+ 		goto err;
+ 	}
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+ 	bio_ctx_cache = kmem_cache_create ("truecrypt-bioctx", sizeof (struct bio_ctx), 0, 0, NULL, NULL);
++#else
++	bio_ctx_cache = kmem_cache_create ("truecrypt-bioctx", sizeof (struct bio_ctx), 0, 0, NULL);
++#endif
+ 	if (!bio_ctx_cache)
+ 	{
+ 		error ("kmem_cache_create failed"); 
Index: extra/system/truecrypt/truecrypt.install
diff -u extra/system/truecrypt/truecrypt.install:1.6 extra/system/truecrypt/truecrypt.install:1.7
--- extra/system/truecrypt/truecrypt.install:1.6	Mon Jul  9 17:27:06 2007
+++ extra/system/truecrypt/truecrypt.install	Wed Oct 10 17:04:41 2007
@@ -8,7 +8,7 @@
 post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.22-ARCH
+  KERNEL_VERSION=2.6.23-ARCH
   depmod -a -v $KERNEL_VERSION  > /dev/null 2>&1
 }