summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-04-20 00:07:24 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-04-20 00:07:24 +0000
commitba2d20a881234244f8dd9c124f50c93388f5c6f5 (patch)
treece662f64da7d0ab3d8d83fc440b841fefadce5fb /app-crypt/truecrypt
parent2.2_rc31 bump. This fixes bug #259994 (new --deselect[=n] option/action), (diff)
downloadgentoo-2-ba2d20a881234244f8dd9c124f50c93388f5c6f5.tar.gz
gentoo-2-ba2d20a881234244f8dd9c124f50c93388f5c6f5.tar.bz2
gentoo-2-ba2d20a881234244f8dd9c124f50c93388f5c6f5.zip
Fix building with Linux 2.6.29 (bug #264450).
(Portage version: 13375-svn/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/truecrypt')
-rw-r--r--app-crypt/truecrypt/ChangeLog6
-rw-r--r--app-crypt/truecrypt/files/truecrypt-4.3a-2.6.29.patch19
-rw-r--r--app-crypt/truecrypt/truecrypt-4.3a.ebuild3
3 files changed, 26 insertions, 2 deletions
diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 48dcacef0e19..88fb930f9aea 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/truecrypt
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.41 2009/04/10 16:28:05 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.42 2009/04/20 00:07:22 arfrever Exp $
+
+ 20 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ +files/truecrypt-4.3a-2.6.29.patch, truecrypt-4.3a:
+ Fix building with Linux 2.6.29 (bug #264450).
10 Apr 2009; Caleb Tennis <caleb@gentoo.org> truecrypt-4.3a.ebuild:
fix device-mapper dep for lvm2, see #265599
diff --git a/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.29.patch b/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.29.patch
new file mode 100644
index 000000000000..1ce09f666bb1
--- /dev/null
+++ b/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.29.patch
@@ -0,0 +1,19 @@
+--- Linux/Kernel/Dm-target.c
++++ Linux/Kernel/Dm-target.c
+@@ -703,12 +703,16 @@
+
+ void __exit dm_truecrypt_exit(void)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ int r;
+
+ r = dm_unregister_target (&truecrypt_target);
+
+ if (r < 0)
+ error ("unregister failed %d", r);
++#else
++ dm_unregister_target (&truecrypt_target);
++#endif
+
+ destroy_workqueue (work_queue);
+ kmem_cache_destroy (bio_ctx_cache);
diff --git a/app-crypt/truecrypt/truecrypt-4.3a.ebuild b/app-crypt/truecrypt/truecrypt-4.3a.ebuild
index 08ea70e6b355..9d4984fc520c 100644
--- a/app-crypt/truecrypt/truecrypt-4.3a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-4.3a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.8 2009/04/10 16:28:05 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.3a.ebuild,v 1.9 2009/04/20 00:07:22 arfrever Exp $
#
# NOTES:
@@ -47,6 +47,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}/${P}-2.6.23.patch"
epatch "${FILESDIR}/${P}-2.6.24.patch"
+ epatch "${FILESDIR}/${P}-2.6.29.patch"
}
src_compile() {