Add 2.6.24 support, bug#198394, thanks to elschner.net

Package-Manager: portage-2.1.4_rc10

4 files changed, 34 insertions, 10 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 89657d2c72d8..6ac38d8cd1dd 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.26 2007/11/02 06:50:13 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.27 2007/12/15 18:33:50 alonbl Exp $
+
+  15 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/truecrypt-4.3a-2.6.24.patch, truecrypt-4.3a.ebuild:
+  Add 2.6.24 support, bug#198394, thanks to elschner.net
 
   02 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> truecrypt-4.3a.ebuild:
   Remove requirement to unload modules, test not use the modules anyway,
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index 935499103a14..c2829431b236 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -2,19 +2,23 @@ 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-stop.sh 308 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 SHA1 7139ba403e482a4746e1d545115b74760b1438ea SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c
 MD5 08ed8b975b45574ced5b99319ee09a15 files/truecrypt-stop.sh 308
 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 files/truecrypt-stop.sh 308
 SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c files/truecrypt-stop.sh 308
 DIST truecrypt-4.3a-source-code.tar.gz 1110554 RMD160 1a24ae6132b43876161a090751c19afed7c5c996 SHA1 30c91901171c3c8290d4d0de856774cdf7ee4ed6 SHA256 d5515cfeb1bb328ad6f13ef347cd9422b4bb15bf849aabc4cd4f2f69a3e0c74a
-EBUILD truecrypt-4.3a.ebuild 3052 RMD160 79a637434e8880707b33692a88f6a8a7f09dcfdd SHA1 058f43add1e9026545e3169272443a848bf196e8 SHA256 d29f4d553f27e9f0e1699198467a8d635db12523b3871c3f0b0db08c3763e508
-MD5 1426fca267fe6590d789d3109f1ccfaa truecrypt-4.3a.ebuild 3052
-RMD160 79a637434e8880707b33692a88f6a8a7f09dcfdd truecrypt-4.3a.ebuild 3052
-SHA256 d29f4d553f27e9f0e1699198467a8d635db12523b3871c3f0b0db08c3763e508 truecrypt-4.3a.ebuild 3052
-MISC ChangeLog 4541 RMD160 164c8ae30ec2a7cd1e715998191dd582e955fb78 SHA1 9ca777d1cc21d9a45f05b6c232c418689a75f177 SHA256 355265ce078f9b0739b0837dd9c095b70020d6f35014574e211bcb338d37da92
-MD5 53051e3216f6234c74b1d29aae43424c ChangeLog 4541
-RMD160 164c8ae30ec2a7cd1e715998191dd582e955fb78 ChangeLog 4541
-SHA256 355265ce078f9b0739b0837dd9c095b70020d6f35014574e211bcb338d37da92 ChangeLog 4541
+EBUILD truecrypt-4.3a.ebuild 3092 RMD160 40a13fd5bd619f87b21f199f11a70c2f64dc6b93 SHA1 4995db75c00642921d84270604b1c9b0d68e2401 SHA256 b815d54e344efcc6eed990d85957c074e2177e1de3568c57d3e637a90b63d820
+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 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
new file mode 100644
index 000000000000..55b0c5a1c477
--- /dev/null
+++ b/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.24.patch
@@ -0,0 +1,15 @@
+--- 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 
+ 	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);
++#endif
++
+ 	mempool_free (bc, tc->bio_ctx_pool);
+ }
+ 
diff --git a/app-crypt/truecrypt/truecrypt-4.3a.ebuild b/app-crypt/truecrypt/truecrypt-4.3a.ebuild
index 212e8e2f5103..21572af82473 100644
--- a/app-crypt/truecrypt/truecrypt-4.3a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-4.3a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.3a.ebuild,v 1.5 2007/11/02 06:50:13 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.3a.ebuild,v 1.6 2007/12/15 18:33:50 alonbl Exp $
 
 #
 # NOTES:
@@ -44,6 +44,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-2.6.23.patch"
+	epatch "${FILESDIR}/${P}-2.6.24.patch"
 }
 
 src_compile() {