added fix for 2.6.18 kernels as per bug #140387

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 35 insertions, 13 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 67a13b7cf413..ce9cc8664d70 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.5 2006/07/12 13:11:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.6 2006/07/15 07:19:57 dragonheart Exp $
+
+  15 Jul 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/truecrypt-4.2a_kernel-2.6.18-rc1_fix.patch, truecrypt-4.2a.ebuild:
+  added fix for 2.6.18 kernels as per bug #140387 thanks to Fredrik Smedberg
 
   12 Jul 2006; Daniel Black <dragonheart@gentoo.org> truecrypt-4.2a.ebuild:
   correct license name bug #140083 thanks to Alex Tarkovsky
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index 7af56f1456ff..3f73ee218e6d 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -13,20 +13,24 @@ AUX truecrypt-4.2a-makefile.patch 1646 RMD160 31343f923d8807bb8eb2482e0a01822b01
 MD5 18bc8dafc18102ceb3d725f60d6efa05 files/truecrypt-4.2a-makefile.patch 1646
 RMD160 31343f923d8807bb8eb2482e0a01822b012c9bed files/truecrypt-4.2a-makefile.patch 1646
 SHA256 714f9670aff535a4c5b698b87e17006cb1d735312edd2dcbe42c04bee6a2daf2 files/truecrypt-4.2a-makefile.patch 1646
+AUX truecrypt-4.2a_kernel-2.6.18-rc1_fix.patch 393 RMD160 c4bfaf2c763bac1d483769c3c6e971a9809877cb SHA1 094c0f365718b46c3f6c5f14da4525891d28a6dc SHA256 32ffd3652af1bbeeb7e036d5f8a6979dbec24760792afcce214ec792813ae134
+MD5 7f400f6e0c4235bd385eb4e53c4117d6 files/truecrypt-4.2a_kernel-2.6.18-rc1_fix.patch 393
+RMD160 c4bfaf2c763bac1d483769c3c6e971a9809877cb files/truecrypt-4.2a_kernel-2.6.18-rc1_fix.patch 393
+SHA256 32ffd3652af1bbeeb7e036d5f8a6979dbec24760792afcce214ec792813ae134 files/truecrypt-4.2a_kernel-2.6.18-rc1_fix.patch 393
 DIST truecrypt-4.2-source-code.tar.gz 1076093 RMD160 74ba185bad9952ea9b3b0e358e9fee6f2080e6b9 SHA1 603bac50891c49b051f7a9bcc15b1196168bff2a SHA256 54f54cd68c99efe3fd2c0899174b38d4cfe1ad576112672aabd2ac64e336cd1f
 DIST truecrypt-4.2a-source-code.tar.gz 1088418 RMD160 8d5b142f9cc7de5693b527f8d708d9e1ebd1e2b3 SHA1 915a8771f9a76d06f5071ca07f5fe902a7f26575 SHA256 ba1892584bf52b5a12eef185563705774566a70537d139aef8770477dfe9636f
 EBUILD truecrypt-4.2-r1.ebuild 2915 RMD160 2308c8db56a0e66eeb8db82a0295a61288d02084 SHA1 139016965b2010ae880b0323724e8b1b1e2199a1 SHA256 8b9380f43e727dcc992363c111fd5152c6e951cab99abb7a97d8a7e7ebef6bbb
 MD5 68a91f3966a56b1039da4d94eb160eed truecrypt-4.2-r1.ebuild 2915
 RMD160 2308c8db56a0e66eeb8db82a0295a61288d02084 truecrypt-4.2-r1.ebuild 2915
 SHA256 8b9380f43e727dcc992363c111fd5152c6e951cab99abb7a97d8a7e7ebef6bbb truecrypt-4.2-r1.ebuild 2915
-EBUILD truecrypt-4.2a.ebuild 2841 RMD160 0a94d44211b8e6ac8d10dcbbc1cfd7ec368f70d2 SHA1 f515c3744bd09f8f099455e11f96f6b090a59709 SHA256 84dcc0146c046ffb147c4a386e6b177e53d2fcd28928a2134c914dbcce87d3fc
-MD5 4923461f78a0068b3de21b1287a10878 truecrypt-4.2a.ebuild 2841
-RMD160 0a94d44211b8e6ac8d10dcbbc1cfd7ec368f70d2 truecrypt-4.2a.ebuild 2841
-SHA256 84dcc0146c046ffb147c4a386e6b177e53d2fcd28928a2134c914dbcce87d3fc truecrypt-4.2a.ebuild 2841
-MISC ChangeLog 1166 RMD160 5636c8a31f7405e889a497cba05f4711ac8a5c3c SHA1 d0c4d790bffc861c2dcc7305d920d9866207b783 SHA256 72f5f53fbb83f2d0d117c8864907c516fb3d13f0dcb29db781f2d2d030e26173
-MD5 ef403e103452a9b11ec54c7d4355a3ce ChangeLog 1166
-RMD160 5636c8a31f7405e889a497cba05f4711ac8a5c3c ChangeLog 1166
-SHA256 72f5f53fbb83f2d0d117c8864907c516fb3d13f0dcb29db781f2d2d030e26173 ChangeLog 1166
+EBUILD truecrypt-4.2a.ebuild 2896 RMD160 921cbe585df63e8a144d2441b1db1ddbd9ff2403 SHA1 81f6b796099946657448477c6551f89c05438f83 SHA256 f1c63ff3b5efe4e66f27cb6da8d555e1dd72d08f840be2aaff93681111c75d5e
+MD5 213fb50dfe197d318cc0ca094954ff1b truecrypt-4.2a.ebuild 2896
+RMD160 921cbe585df63e8a144d2441b1db1ddbd9ff2403 truecrypt-4.2a.ebuild 2896
+SHA256 f1c63ff3b5efe4e66f27cb6da8d555e1dd72d08f840be2aaff93681111c75d5e truecrypt-4.2a.ebuild 2896
+MISC ChangeLog 1373 RMD160 4ae6275229b294edf1d608155bbc410de6b3e159 SHA1 dfadaf0c226edab5986228e7bd370967e673054c SHA256 3d202cbe75278dabec049385a88f0e09ec31f78bf7736fadb23dd96e89f24481
+MD5 80dd2c3428e523aa02c50b8c7e58324d ChangeLog 1373
+RMD160 4ae6275229b294edf1d608155bbc410de6b3e159 ChangeLog 1373
+SHA256 3d202cbe75278dabec049385a88f0e09ec31f78bf7736fadb23dd96e89f24481 ChangeLog 1373
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
@@ -40,7 +44,7 @@ SHA256 cd3851eb2af9bac302c5f4c005182d63300cf2031178fef1a1aef525b23209f8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEtPb/mdTrptrqvGERAjjYAJ9/YvtMO85q2PfsQOuDQ8iIwFaz5ACdHUgM
-BDg/YnunrsE2MO9kWp5kR5c=
-=PrjN
+iD8DBQFEuJgDmdTrptrqvGERAgKNAJ9IxvEfjTcaogtyZgDY+SHNj3YirgCdGyqr
+9otGe9jKV7Mpk5Ua0ek5eAs=
+=29dE
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/truecrypt/files/truecrypt-4.2a_kernel-2.6.18-rc1_fix.patch b/app-crypt/truecrypt/files/truecrypt-4.2a_kernel-2.6.18-rc1_fix.patch
new file mode 100644
index 000000000000..e43dd5c5637d
--- /dev/null
+++ b/app-crypt/truecrypt/files/truecrypt-4.2a_kernel-2.6.18-rc1_fix.patch
@@ -0,0 +1,13 @@
+--- truecrypt-4.2a/Linux/Kernel/Dm-target.c	2006-06-28 12:36:28.000000000 +0200
++++ truecrypt-4.2a_fixed/Linux/Kernel/Dm-target.c	2006-07-14 19:02:40.000000000 +0200
+@@ -26,6 +26,10 @@
+ #error Linux kernel 2.6.5 or later required
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++#define DM_MSG_PREFIX "truecrypt"
++#endif
++
+ int trace_level = 0;
+ 
+ #define MSG_PREFIX "truecrypt: "
diff --git a/app-crypt/truecrypt/truecrypt-4.2a.ebuild b/app-crypt/truecrypt/truecrypt-4.2a.ebuild
index 320f7949e4a5..c2de4aae0145 100644
--- a/app-crypt/truecrypt/truecrypt-4.2a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-4.2a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.2a.ebuild,v 1.2 2006/07/12 13:11:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.2a.ebuild,v 1.3 2006/07/15 07:19:57 dragonheart Exp $
 
 inherit linux-mod toolchain-funcs
 
@@ -30,6 +30,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+	epatch "${FILESDIR}/${P}"_kernel-2.6.18-rc1_fix.patch
 	cd "${S}"
 	linux-mod_pkg_setup
 	epatch "${FILESDIR}/${P}-makefile.patch"