Added 2.6.20 support, bug#165454, thanks to Patrick

Package-Manager: portage-2.1.2-r8

5 files changed, 162 insertions, 5 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 355572fbff4b..6e55a50c2d85 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2007/02/05 00:40:24 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.14 2007/02/06 20:46:30 alonbl Exp $
+
+*truecrypt-4.2a-r2 (06 Feb 2007)
+
+  06 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/truecrypt-4.2a-2.6.20.patch, +truecrypt-4.2a-r2.ebuild:
+  Added 2.6.20 support, bug#165454, thanks to Patrick
 
   05 Feb 2007; Steve Dibb <beandog@gentoo.org> truecrypt-4.2a-r1.ebuild:
   amd64 stable, bug 164077
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index 037d997333a1..c6088d190773 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -2,6 +2,10 @@ AUX truecrypt-4.2a-2.6.19.patch 1210 RMD160 3636cd13741aa1c07225c2034103400f86b8
 MD5 30024fe076ec948d512b34a291618ff4 files/truecrypt-4.2a-2.6.19.patch 1210
 RMD160 3636cd13741aa1c07225c2034103400f86b81da3 files/truecrypt-4.2a-2.6.19.patch 1210
 SHA256 a5719e30865166ef7b273abfe05e0a64a530506e8b277ddd3cf82dc27bc321c7 files/truecrypt-4.2a-2.6.19.patch 1210
+AUX truecrypt-4.2a-2.6.20.patch 945 RMD160 5c9253eb03407cb1cd7b491002fb4b847a770bd5 SHA1 55cf60b7f8c07879751f661169ecd56c11821ade SHA256 2fd643f007e1e74083484214f03c0e700798f27ae7ea8bb34c94d966ffc61667
+MD5 128f6c9d1be389122704b380414f3175 files/truecrypt-4.2a-2.6.20.patch 945
+RMD160 5c9253eb03407cb1cd7b491002fb4b847a770bd5 files/truecrypt-4.2a-2.6.20.patch 945
+SHA256 2fd643f007e1e74083484214f03c0e700798f27ae7ea8bb34c94d966ffc61667 files/truecrypt-4.2a-2.6.20.patch 945
 AUX truecrypt-4.2a-makefile.patch 1646 RMD160 31343f923d8807bb8eb2482e0a01822b012c9bed SHA1 c9ca37521e0861c3ccc24550f862eacb14bc6242 SHA256 714f9670aff535a4c5b698b87e17006cb1d735312edd2dcbe42c04bee6a2daf2
 MD5 18bc8dafc18102ceb3d725f60d6efa05 files/truecrypt-4.2a-makefile.patch 1646
 RMD160 31343f923d8807bb8eb2482e0a01822b012c9bed files/truecrypt-4.2a-makefile.patch 1646
@@ -15,10 +19,14 @@ EBUILD truecrypt-4.2a-r1.ebuild 2950 RMD160 8b5d11d86b4526833e3b747183f37e3c0da3
 MD5 cee640a73d6d00bf0ec1a6fc9a0ae3d6 truecrypt-4.2a-r1.ebuild 2950
 RMD160 8b5d11d86b4526833e3b747183f37e3c0da31ce7 truecrypt-4.2a-r1.ebuild 2950
 SHA256 56a5436df3b69627a16884dfd7652831962e0f1e7bce36da413785a3bce19f42 truecrypt-4.2a-r1.ebuild 2950
-MISC ChangeLog 2423 RMD160 1f2f4d42ca8416c10c31b123389c976e48730f4d SHA1 7f4236d87b3b324811ff9aa12827e4399f814bf2 SHA256 a8c0307c8477448140fb9779e30c2c126b4fbc5a8cb9397f13916830187906e9
-MD5 08fc0a4cd135593fe93bb2ad3c652cad ChangeLog 2423
-RMD160 1f2f4d42ca8416c10c31b123389c976e48730f4d ChangeLog 2423
-SHA256 a8c0307c8477448140fb9779e30c2c126b4fbc5a8cb9397f13916830187906e9 ChangeLog 2423
+EBUILD truecrypt-4.2a-r2.ebuild 2992 RMD160 98aa2aed5c117c39fae7983532de15ba22b7eed0 SHA1 720470cc8fcc08c6c333007c0d5ba48f8a38fac0 SHA256 6ff3b7db769c7b72d9b5c8ffb6ef2448b92d145369acf77d0e6de332c54be21c
+MD5 b2db8c9d5f34534ae2cdf4137db8abe7 truecrypt-4.2a-r2.ebuild 2992
+RMD160 98aa2aed5c117c39fae7983532de15ba22b7eed0 truecrypt-4.2a-r2.ebuild 2992
+SHA256 6ff3b7db769c7b72d9b5c8ffb6ef2448b92d145369acf77d0e6de332c54be21c truecrypt-4.2a-r2.ebuild 2992
+MISC ChangeLog 2624 RMD160 1110eaa89fe4f35231b988c9bf9005f1fcf8b14f SHA1 0a8e1da288ab1ea17f5ad66250556ebbaf91676d SHA256 7d735f705cf875b0a6a610ad78a96a8dce25b94d721fb72787184896ce8382e5
+MD5 7a57cdfd350588e7e37fdfccd60a268b ChangeLog 2624
+RMD160 1110eaa89fe4f35231b988c9bf9005f1fcf8b14f ChangeLog 2624
+SHA256 7d735f705cf875b0a6a610ad78a96a8dce25b94d721fb72787184896ce8382e5 ChangeLog 2624
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
@@ -26,3 +34,6 @@ SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86 metadata
 MD5 a99bad1b52e32e9cd558e789e2fe1454 files/digest-truecrypt-4.2a-r1 283
 RMD160 1d9b3feac90fb5546a1d6fc89c493bc7e89f41f8 files/digest-truecrypt-4.2a-r1 283
 SHA256 cd3851eb2af9bac302c5f4c005182d63300cf2031178fef1a1aef525b23209f8 files/digest-truecrypt-4.2a-r1 283
+MD5 a99bad1b52e32e9cd558e789e2fe1454 files/digest-truecrypt-4.2a-r2 283
+RMD160 1d9b3feac90fb5546a1d6fc89c493bc7e89f41f8 files/digest-truecrypt-4.2a-r2 283
+SHA256 cd3851eb2af9bac302c5f4c005182d63300cf2031178fef1a1aef525b23209f8 files/digest-truecrypt-4.2a-r2 283
diff --git a/app-crypt/truecrypt/files/digest-truecrypt-4.2a-r2 b/app-crypt/truecrypt/files/digest-truecrypt-4.2a-r2
new file mode 100644
index 000000000000..6aac1268b685
--- /dev/null
+++ b/app-crypt/truecrypt/files/digest-truecrypt-4.2a-r2
@@ -0,0 +1,3 @@
+MD5 6e60ead403fe23355f61341ccce68ff1 truecrypt-4.2a-source-code.tar.gz 1088418
+RMD160 8d5b142f9cc7de5693b527f8d708d9e1ebd1e2b3 truecrypt-4.2a-source-code.tar.gz 1088418
+SHA256 ba1892584bf52b5a12eef185563705774566a70537d139aef8770477dfe9636f truecrypt-4.2a-source-code.tar.gz 1088418
diff --git a/app-crypt/truecrypt/files/truecrypt-4.2a-2.6.20.patch b/app-crypt/truecrypt/files/truecrypt-4.2a-2.6.20.patch
new file mode 100644
index 000000000000..fed9d5558089
--- /dev/null
+++ b/app-crypt/truecrypt/files/truecrypt-4.2a-2.6.20.patch
@@ -0,0 +1,31 @@
+--- Linux/Kernel/Dm-target.c.orig	2007-02-05 20:40:09.000000000 +0200
++++ Linux/Kernel/Dm-target.c	2007-02-05 20:54:11.000000000 +0200
+@@ -383,9 +383,16 @@
+ }
+ 
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
++static void work_process (struct work_struct *work)
++{
++	struct bio_ctx *bc = container_of(work, struct bio_ctx, work);
++	void *qdata = (void *)bc;
++#else
+ static void work_process (void *qdata)
+ {
+ 	struct bio_ctx *bc = (struct bio_ctx *) qdata;
++#endif
+ 	struct target_ctx *tc = (struct target_ctx *) bc->target->private;
+ 	struct bio_vec *bv;
+ 	u64 sec_no = bc->crypto_sector;
+@@ -441,7 +448,11 @@
+ 		bio_put (bio);
+ 
+ 		// Queue decryption to leave completion interrupt ASAP
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
++		INIT_WORK (&bc->work, work_process);
++#else
+ 		INIT_WORK (&bc->work, work_process, bc);
++#endif
+ 		trace (3, "queue_work (%p)\n", work_queue);
+ 		queue_work (work_queue, &bc->work);
+ 		return error;
diff --git a/app-crypt/truecrypt/truecrypt-4.2a-r2.ebuild b/app-crypt/truecrypt/truecrypt-4.2a-r2.ebuild
new file mode 100644
index 000000000000..c090c29b379a
--- /dev/null
+++ b/app-crypt/truecrypt/truecrypt-4.2a-r2.ebuild
@@ -0,0 +1,106 @@
+# 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.2a-r2.ebuild,v 1.1 2007/02/06 20:46:30 alonbl Exp $
+
+inherit linux-mod toolchain-funcs
+
+DESCRIPTION="Free open-source disk encryption software"
+HOMEPAGE="http://www.truecrypt.org/"
+SRC_URI="http://www.truecrypt.org/downloads/truecrypt-${PV}-source-code.tar.gz"
+
+LICENSE="truecrypt-collective-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/linux-sources
+	sys-fs/device-mapper"
+
+RDEPEND="sys-fs/device-mapper"
+
+BUILD_PARAMS="KERNEL_SRC=${KERNEL_DIR} NO_WARNINGS=1"
+BUILD_TARGETS="truecrypt"
+MODULE_NAMES="truecrypt(block:${S}/Linux/Kernel)"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	dmcrypt_check
+	kernel_is lt 2 6 5 && die 'requires at least 2.6.5 kernel version'
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}_kernel-2.6.18-rc1_fix.patch"
+	epatch "${FILESDIR}/${P}-2.6.19.patch"
+	epatch "${FILESDIR}/${P}-2.6.20.patch"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	linux-mod_pkg_setup
+}
+
+src_compile() {
+	linux-mod_src_compile || die "Truecrypt module compilation failed."
+	cd "${S}/Linux/Cli"
+	einfo "Building truecrypt utility"
+	tc-export CC
+	# remove kernel linked crypt stuff
+	emake clean || die "make clean failed"
+	emake truecrypt NO_STRIP=1 || die "Compile and/or linking of TrueCrypt Linux CLI application failed."
+}
+
+src_test() {
+	"${S}/Linux/Cli/truecrypt" --test
+}
+
+pkg_preinst() {
+	# unload truecrypt modules if already loaded
+	/sbin/rmmod truecrypt >&- 2>&-
+	if grep -q "^truecrypt" /proc/modules
+	then
+		die "Please dismount all mounted TrueCrypt volumes"
+	fi
+}
+
+src_install() {
+	# installing files
+	dobin Linux/Cli/truecrypt
+	doman Linux/Cli/Man/truecrypt.1
+	dodoc Readme.txt 'Release/Setup Files/TrueCrypt User Guide.pdf'
+
+	# installing kernel module
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog " For TrueCrypt 4.2 to work you have to load a "
+	elog " kernel module. This can be done in three ways: "
+	elog
+	elog " 1. Loading the module automatically by the running kernel. "
+	elog "    For this 'Automatic kernel module loading' needs to be "
+	elog "    enabled (CONFIG_KMOD=y). "
+	elog " 2. Loading the module manually before mounting the volume. "
+	elog "    Try 'modprobe truecrypt' as root to load the module. "
+	elog " 3. Load the module during boot by listing it in "
+	elog "    '/etc/modules.autoload.d/kernel-2.6' "
+}
+
+dmcrypt_check() {
+	ebegin "Checking for Device mapper support (BLK_DEV_DM)"
+	linux_chkconfig_present BLK_DEV_DM
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		ewarn "TrueCrypt requires Device mapper support!"
+		ewarn "Please enable Device mapper support in your kernel config, found at:"
+		ewarn "(for 2.6 kernels)"
+		ewarn
+		ewarn "  Device Drivers"
+		ewarn "    Multi-Device Support"
+		ewarn "      <*> Device mapper support"
+		ewarn
+		ewarn "and recompile your kernel if you want this package to work."
+		epause 10
+	fi
+}
+