Modify 2.6.24 fix, bug#198394, thanks to elschner.net

Package-Manager: portage-2.1.4_rc11

3 files changed, 54 insertions, 14 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 6ac38d8cd1dd..85aecdf349d5 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.27 2007/12/15 18:33:50 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.28 2007/12/25 21:01:31 alonbl Exp $
+
+  25 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  files/truecrypt-4.3a-2.6.24.patch:
+  Modify 2.6.24 fix, bug#198394, thanks to elschner.net
 
   15 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
   +files/truecrypt-4.3a-2.6.24.patch, truecrypt-4.3a.ebuild:
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index c2829431b236..09fb38d3c8a7 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -2,10 +2,10 @@ AUX truecrypt-4.3a-2.6.23.patch 707 RMD160 fa1221f99cddc9cd4e2c3768f4387d6b17320
 MD5 144cb38da950e8970c38df2d460543fd files/truecrypt-4.3a-2.6.23.patch 707
 RMD160 fa1221f99cddc9cd4e2c3768f4387d6b17320849 files/truecrypt-4.3a-2.6.23.patch 707
 SHA256 199ab45e983203cfe0602175073c0b6fab2a1009e7699ea154613a3398bf3476 files/truecrypt-4.3a-2.6.23.patch 707
-AUX truecrypt-4.3a-2.6.24.patch 531 RMD160 3f32685627a7375944a7afd360b7c94e48e7d320 SHA1 637624d5668535b7330f2edee00554b129475ab3 SHA256 f0bd2618bae3fadd8a46091529ff816b65822cf1faf5f8ff01e00450eacbdbe4
-MD5 dad464da00db2f12ea09ce1dca15f003 files/truecrypt-4.3a-2.6.24.patch 531
-RMD160 3f32685627a7375944a7afd360b7c94e48e7d320 files/truecrypt-4.3a-2.6.24.patch 531
-SHA256 f0bd2618bae3fadd8a46091529ff816b65822cf1faf5f8ff01e00450eacbdbe4 files/truecrypt-4.3a-2.6.24.patch 531
+AUX truecrypt-4.3a-2.6.24.patch 1658 RMD160 c29522d767f96ae01e266fbfd8441ddd37049f71 SHA1 b138b60c5b036243c13d294cf61a2e905f1c4b83 SHA256 d12dd2252daf753f3d56dd504627de0f5f652a67781e930d717d1a86b46e4636
+MD5 5fd25dfacea831a526f793c8d78cc24e files/truecrypt-4.3a-2.6.24.patch 1658
+RMD160 c29522d767f96ae01e266fbfd8441ddd37049f71 files/truecrypt-4.3a-2.6.24.patch 1658
+SHA256 d12dd2252daf753f3d56dd504627de0f5f652a67781e930d717d1a86b46e4636 files/truecrypt-4.3a-2.6.24.patch 1658
 AUX truecrypt-stop.sh 308 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 SHA1 7139ba403e482a4746e1d545115b74760b1438ea SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c
 MD5 08ed8b975b45574ced5b99319ee09a15 files/truecrypt-stop.sh 308
 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 files/truecrypt-stop.sh 308
@@ -15,10 +15,10 @@ EBUILD truecrypt-4.3a.ebuild 3092 RMD160 40a13fd5bd619f87b21f199f11a70c2f64dc6b9
 MD5 b47acd90e6958c4d13fdc103fba1a4d0 truecrypt-4.3a.ebuild 3092
 RMD160 40a13fd5bd619f87b21f199f11a70c2f64dc6b93 truecrypt-4.3a.ebuild 3092
 SHA256 b815d54e344efcc6eed990d85957c074e2177e1de3568c57d3e637a90b63d820 truecrypt-4.3a.ebuild 3092
-MISC ChangeLog 4708 RMD160 58e8734ae5939e2f01bb90587036c73f4a0c2c08 SHA1 1a70309f7ae8c3c46393b70e8eb4ec64f86722a7 SHA256 d0218f7ad6920cf4884c7024c7a3bac0e0a15eb525184b9daebcaf4abc4b3448
-MD5 733edc9948dccb2cebed795bcc2c279c ChangeLog 4708
-RMD160 58e8734ae5939e2f01bb90587036c73f4a0c2c08 ChangeLog 4708
-SHA256 d0218f7ad6920cf4884c7024c7a3bac0e0a15eb525184b9daebcaf4abc4b3448 ChangeLog 4708
+MISC ChangeLog 4850 RMD160 434b19e7e3389cf5e3f97a3da9e5c6d5329fd37d SHA1 48bcaac8416058923aaa0fd9c22e44bfc2a2c167 SHA256 c33beb9994b1f366e132f443db2515e3b8e37e143d3e783ff156a93d31870117
+MD5 8e5172a14cfc4df13c352acd9bbaa8de ChangeLog 4850
+RMD160 434b19e7e3389cf5e3f97a3da9e5c6d5329fd37d ChangeLog 4850
+SHA256 c33beb9994b1f366e132f443db2515e3b8e37e143d3e783ff156a93d31870117 ChangeLog 4850
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
diff --git a/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.24.patch b/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.24.patch
index 55b0c5a1c477..eec4aa8bdb9a 100644
--- a/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.24.patch
+++ b/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.24.patch
@@ -1,15 +1,51 @@
---- truecrypt-4.3a-source-code.org/Linux/Kernel/Dm-target.c	2007-04-24 18:32:06.000000000 +0200
-+++ truecrypt-4.3a-source-code/Linux/Kernel/Dm-target.c	2007-12-15 18:22:39.000000000 +0100
-@@ -375,7 +375,12 @@ static void dereference_bio_ctx (struct 
+diff -Nrup a/Linux/Kernel/Dm-target.c b/Linux/Kernel/Dm-target.c
+--- a/Linux/Kernel/Dm-target.c	2007-04-24 18:32:06.000000000 +0200
++++ b/Linux/Kernel/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->orig_bio->bi_size);
++	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)
+ 	{