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

Tobias Powalowski tpowa at archlinux.org
Fri Jan 25 17:48:42 UTC 2008


    Date: Friday, January 25, 2008 @ 12:48:42
  Author: tpowa
    Path: /home/cvs-extra/extra/system/truecrypt

   Added: kernel-2.6.24.patch (1.1)
Modified: PKGBUILD (1.17 -> 1.18) truecrypt.install (1.7 -> 1.8)

'upgpkg: update to new .24 kernel series'


---------------------+
 PKGBUILD            |   11 +++++-----
 kernel-2.6.24.patch |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 truecrypt.install   |    2 -
 3 files changed, 58 insertions(+), 6 deletions(-)


Index: extra/system/truecrypt/PKGBUILD
diff -u extra/system/truecrypt/PKGBUILD:1.17 extra/system/truecrypt/PKGBUILD:1.18
--- extra/system/truecrypt/PKGBUILD:1.17	Mon Nov 26 11:25:08 2007
+++ extra/system/truecrypt/PKGBUILD	Fri Jan 25 12:48:42 2008
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD,v 1.17 2007/11/26 16:25:08 tpowa Exp $
+# $Id: PKGBUILD,v 1.18 2008/01/25 17:48:42 tpowa Exp $
 # Maintainer: Tom K <tom at archlinux.org>
 
 pkgname=truecrypt
 pkgver=4.3a
-pkgrel=11
+pkgrel=12
 pkgdesc="Free open-source disk encryption software - module for kernel26"
 arch=('i686' 'x86_64')
-depends=('truecrypt-utils' 'kernel26>=2.6.23.8-2')
-source=(http://www.truecrypt.org/downloads/truecrypt-$pkgver-source-code.tar.gz kernel-2.6.23.patch)
+depends=('truecrypt-utils' 'kernel26')
+source=(http://www.truecrypt.org/downloads/truecrypt-$pkgver-source-code.tar.gz kernel-2.6.23.patch kernel-2.6.24.patch)
 md5sums=('8f2536eae16e6044a22b2a82c7003357')
 url="http://www.truecrypt.org/"
 install=truecrypt.install
 license=('custom')
 #options=('force')
 
-_kernver=2.6.23-ARCH
+_kernver=2.6.24-ARCH
 
 build() {
   cd $startdir/src/truecrypt-$pkgver-source-code/Linux/Kernel
   patch -Np0 -i $startdir/src/kernel-2.6.23.patch || return 1
+  patch -Np0 -i $startdir/src/kernel-2.6.24.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.24.patch
diff -u /dev/null extra/system/truecrypt/kernel-2.6.24.patch:1.1
--- /dev/null	Fri Jan 25 12:48:42 2008
+++ extra/system/truecrypt/kernel-2.6.24.patch	Fri Jan 25 12:48:42 2008
@@ -0,0 +1,51 @@
+diff -Nrup a/Linux/Kernel/Dm-target.c b/Linux/Kernel/Dm-target.c
+--- Dm-target.c	2007-04-24 18:32:06.000000000 +0200
++++ Dm-target.c	2007-12-22 15:07:56.000000000 +0100
+@@ -375,7 +375,11 @@ static void dereference_bio_ctx (struct 
+ 	if (!atomic_dec_and_test (&bc->ref_count))
+ 		return;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ 	bio_endio (bc->orig_bio, bc->orig_bio->bi_size, bc->error);
++#else
++	bio_endio (bc->orig_bio, bc->error);
++#endif
+ 	mempool_free (bc, tc->bio_ctx_pool);
+ }
+ 
+@@ -417,24 +421,35 @@ static void work_process (void *qdata)
+ }
+ 
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ static int truecrypt_endio (struct bio *bio, unsigned int bytes_done, int error)
++#else
++static int truecrypt_endio (struct bio *bio, int error)
++#endif
+ {
+ 	struct bio_ctx *bc = (struct bio_ctx *) bio->bi_private;
+ 	struct target_ctx *tc = (struct target_ctx *) bc->target->private;
+ 	struct bio_vec *bv;
+ 	int seg_no;
+ 	
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ 	trace (1, "end: sc=%llu fl=%ld rw=%ld sz=%d ix=%hd vc=%hd dn=%d er=%d\n",
+ 		(unsigned long long) bio->bi_sector, bio->bi_flags, bio->bi_rw, bio->bi_size, bio->bi_idx, bio->bi_vcnt, bytes_done, error);
++#else
++	trace (1, "end: sc=%llu fl=%ld sz=%ld rw=%ld ix=%hd vc=%hd er=%d\n",
++		(unsigned long long) bio->bi_sector, bio->bi_flags, bio->bi_size, bio->bi_rw, bio->bi_idx, bio->bi_vcnt, error);
++#endif
+ 
+ 	if (error != 0)
+ 		bc->error = error;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ 	if (bio->bi_size)
+ 	{
+ 		trace (2, "Outstanding IO: %d\n", bio->bi_size);
+ 		return 1;
+ 	}
++#endif
+ 
+ 	if (bio_data_dir (bio) == READ)
+ 	{
Index: extra/system/truecrypt/truecrypt.install
diff -u extra/system/truecrypt/truecrypt.install:1.7 extra/system/truecrypt/truecrypt.install:1.8
--- extra/system/truecrypt/truecrypt.install:1.7	Wed Oct 10 17:04:41 2007
+++ extra/system/truecrypt/truecrypt.install	Fri Jan 25 12:48:42 2008
@@ -8,7 +8,7 @@
 post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.23-ARCH
+  KERNEL_VERSION=2.6.24-ARCH
   depmod -a -v $KERNEL_VERSION  > /dev/null 2>&1
 }
 




More information about the arch-commits mailing list