Don't fail if no volumes are mounted, bug#168691, thanks to Jakob Truelsen

Package-Manager: portage-2.1.3.3

13 files changed, 21 insertions, 521 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 7c6a3f96b54f..38206447e54f 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,17 @@
 # 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.20 2007/06/07 16:50:20 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.21 2007/08/11 08:47:20 alonbl Exp $
+
+  11 Aug 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/truecrypt-4.2a-2.6.19.patch, -files/truecrypt-4.2a-2.6.20.patch,
+  -files/truecrypt-4.2a-makefile.patch,
+  -files/truecrypt-4.2a_kernel-2.6.18-rc1_fix.patch,
+  files/truecrypt-stop.sh, -truecrypt-4.2a-r1.ebuild,
+  -truecrypt-4.2a-r2.ebuild, -truecrypt-4.2a-r3.ebuild:
+  Cleanup
+
+  11 Aug 2007; Alon Bar-Lev <alonbl@gentoo.org> files/truecrypt-stop.sh:
+  Don't fail if no volumes are mounted, bug#168691, thanks to Jakob Truelsen
 
 *truecrypt-4.3a (07 Jun 2007)
 
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index e265effd14f1..9ea4fa3f8a07 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -1,38 +1,9 @@
-AUX truecrypt-4.2a-2.6.19.patch 1210 RMD160 3636cd13741aa1c07225c2034103400f86b81da3 SHA1 bafe37681e8c81722da69c9d17f5f13e7e290e01 SHA256 a5719e30865166ef7b273abfe05e0a64a530506e8b277ddd3cf82dc27bc321c7
-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
-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
-AUX truecrypt-stop.sh 263 RMD160 43fde724b425caa95eecbdb5f7f5a5172ff9c840 SHA1 190801e87366d878fdd5feb4c049c263014cc1d5 SHA256 b092da91d0329667291396b73b6cb5e57d5a86dbb0de409916fffd5693f75549
-MD5 e0c975cd6c700dd00393bea34085b0b6 files/truecrypt-stop.sh 263
-RMD160 43fde724b425caa95eecbdb5f7f5a5172ff9c840 files/truecrypt-stop.sh 263
-SHA256 b092da91d0329667291396b73b6cb5e57d5a86dbb0de409916fffd5693f75549 files/truecrypt-stop.sh 263
-DIST truecrypt-4.2a-source-code.tar.gz 1088418 RMD160 8d5b142f9cc7de5693b527f8d708d9e1ebd1e2b3 SHA1 915a8771f9a76d06f5071ca07f5fe902a7f26575 SHA256 ba1892584bf52b5a12eef185563705774566a70537d139aef8770477dfe9636f
+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.3-source-code.tar.gz 1085969 RMD160 2ebca8a7dc9674e6af9bff1b7583b354672feb1b SHA1 42754b3c192edb94880c97ca5453558738bf2cb1 SHA256 859ce53e5db517896dbffe4b17d2f0ca0e3bcecf44755ecf69a24e3a1562e409
 DIST truecrypt-4.3a-source-code.tar.gz 1110554 RMD160 1a24ae6132b43876161a090751c19afed7c5c996 SHA1 30c91901171c3c8290d4d0de856774cdf7ee4ed6 SHA256 d5515cfeb1bb328ad6f13ef347cd9422b4bb15bf849aabc4cd4f2f69a3e0c74a
-EBUILD truecrypt-4.2a-r1.ebuild 2950 RMD160 8b5d11d86b4526833e3b747183f37e3c0da31ce7 SHA1 7e2a1daee47a6b89bc952a7c17223eeaa684971b SHA256 56a5436df3b69627a16884dfd7652831962e0f1e7bce36da413785a3bce19f42
-MD5 cee640a73d6d00bf0ec1a6fc9a0ae3d6 truecrypt-4.2a-r1.ebuild 2950
-RMD160 8b5d11d86b4526833e3b747183f37e3c0da31ce7 truecrypt-4.2a-r1.ebuild 2950
-SHA256 56a5436df3b69627a16884dfd7652831962e0f1e7bce36da413785a3bce19f42 truecrypt-4.2a-r1.ebuild 2950
-EBUILD truecrypt-4.2a-r2.ebuild 2994 RMD160 be907f640f3bc5752908587e98c1d440328973dc SHA1 ca38c2f9930cf5e4c16b21439e578288d77c898c SHA256 b06cb53e9c723d61920e1c933ad3da6647688f392f1abaee89176a49cbafada7
-MD5 292ca44f6a5b70fc1525ab5367fe237f truecrypt-4.2a-r2.ebuild 2994
-RMD160 be907f640f3bc5752908587e98c1d440328973dc truecrypt-4.2a-r2.ebuild 2994
-SHA256 b06cb53e9c723d61920e1c933ad3da6647688f392f1abaee89176a49cbafada7 truecrypt-4.2a-r2.ebuild 2994
-EBUILD truecrypt-4.2a-r3.ebuild 3093 RMD160 4b31755165428ae3b8f9d3616f1eff68373a2eec SHA1 9f29ab1070f49435fd99f6252e088d41a8c471dc SHA256 22da1170c65850d61385492d0c9122d56ffcf8e83f73da97958bb2b7454dc382
-MD5 339bb117997df1924d20f2e4c56cea70 truecrypt-4.2a-r3.ebuild 3093
-RMD160 4b31755165428ae3b8f9d3616f1eff68373a2eec truecrypt-4.2a-r3.ebuild 3093
-SHA256 22da1170c65850d61385492d0c9122d56ffcf8e83f73da97958bb2b7454dc382 truecrypt-4.2a-r3.ebuild 3093
 EBUILD truecrypt-4.3.ebuild 3159 RMD160 535896a15edd2cb2b07fc3adf094a74554f4e3b0 SHA1 fe091cb3398dbf215b4a7553fde627ff6906d3d6 SHA256 fa34010a87a5a21ea073ca6b44e02ab28a1198d0ac6b5dafa7e8dd6c4fa8bb3e
 MD5 058cd16af66fe9cf3f99568c288a077a truecrypt-4.3.ebuild 3159
 RMD160 535896a15edd2cb2b07fc3adf094a74554f4e3b0 truecrypt-4.3.ebuild 3159
@@ -41,23 +12,14 @@ EBUILD truecrypt-4.3a.ebuild 3161 RMD160 3ab8ea09be167214832e6183d09053b99248aa4
 MD5 9eac02ba228085dab67235d9ff5ef91e truecrypt-4.3a.ebuild 3161
 RMD160 3ab8ea09be167214832e6183d09053b99248aa43 truecrypt-4.3a.ebuild 3161
 SHA256 cb9052134302d5ade97468254745c44cdf7ea1b7d3916bcd7533628c6570378c truecrypt-4.3a.ebuild 3161
-MISC ChangeLog 3412 RMD160 0b532ad0f04e75e15618d97e4440ce62b662eaf6 SHA1 6038572806ece2267187363554ed5e8639d16aa2 SHA256 343eab1186755a59a7d7854b37a00011cd80e1a1275a16c543f1571eb7546e22
-MD5 8daba608d385622fc053b1f97ff15cb3 ChangeLog 3412
-RMD160 0b532ad0f04e75e15618d97e4440ce62b662eaf6 ChangeLog 3412
-SHA256 343eab1186755a59a7d7854b37a00011cd80e1a1275a16c543f1571eb7546e22 ChangeLog 3412
+MISC ChangeLog 3899 RMD160 3d094f65ae277fe098ffb6bd56797c506554c905 SHA1 f01dbaa665c13e92501c2be75d3cf53ec4377f3a SHA256 9cee8a643404a713e77d357c6f16622ad84932814e0105fb0c6c5db032628fdc
+MD5 860ab0c46225cb62e3879dd9d3b72665 ChangeLog 3899
+RMD160 3d094f65ae277fe098ffb6bd56797c506554c905 ChangeLog 3899
+SHA256 9cee8a643404a713e77d357c6f16622ad84932814e0105fb0c6c5db032628fdc ChangeLog 3899
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86 metadata.xml 224
-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
-MD5 a99bad1b52e32e9cd558e789e2fe1454 files/digest-truecrypt-4.2a-r3 283
-RMD160 1d9b3feac90fb5546a1d6fc89c493bc7e89f41f8 files/digest-truecrypt-4.2a-r3 283
-SHA256 cd3851eb2af9bac302c5f4c005182d63300cf2031178fef1a1aef525b23209f8 files/digest-truecrypt-4.2a-r3 283
 MD5 c442817c8d5e10d0029d93d1b7196127 files/digest-truecrypt-4.3 280
 RMD160 8a4e0a5f9900f43b1604296f91067e6b94fb6b49 files/digest-truecrypt-4.3 280
 SHA256 f81a38fe3bba9b1887bfdf8b426fe7e23891758be7f36981de95859905deac28 files/digest-truecrypt-4.3 280
diff --git a/app-crypt/truecrypt/files/digest-truecrypt-4.2a-r1 b/app-crypt/truecrypt/files/digest-truecrypt-4.2a-r1
deleted file mode 100644
index 6aac1268b685..000000000000
--- a/app-crypt/truecrypt/files/digest-truecrypt-4.2a-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-truecrypt-4.2a-r2 b/app-crypt/truecrypt/files/digest-truecrypt-4.2a-r2
deleted file mode 100644
index 6aac1268b685..000000000000
--- a/app-crypt/truecrypt/files/digest-truecrypt-4.2a-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-truecrypt-4.2a-r3 b/app-crypt/truecrypt/files/digest-truecrypt-4.2a-r3
deleted file mode 100644
index 6aac1268b685..000000000000
--- a/app-crypt/truecrypt/files/digest-truecrypt-4.2a-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-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.19.patch b/app-crypt/truecrypt/files/truecrypt-4.2a-2.6.19.patch
deleted file mode 100644
index ea81d2cfadb5..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-4.2a-2.6.19.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Linux/Kernel/Dm-target.c.orig	2006-06-28 12:36:28.000000000 +0200
-+++ Linux/Kernel/Dm-target.c	2006-10-23 00:05:33.000000000 +0200
-@@ -29,6 +29,7 @@
- int trace_level = 0;
- 
- #define MSG_PREFIX "truecrypt: "
-+#define DM_MSG_PREFIX MSG_PREFIX
- #define error(fmt, args...) printk(KERN_ERR MSG_PREFIX fmt, ## args)
- #define trace(level, fmt, args...) level <= trace_level && printk(KERN_DEBUG MSG_PREFIX fmt, ## args)
- #define dbg(fmt, args...) printk(KERN_DEBUG MSG_PREFIX fmt, ## args)
-@@ -124,8 +125,13 @@
- 		if (p)
- 			return p;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+		trace (3, "congestion_wait\n");
-+		congestion_wait (direction, HZ / 50);
-+#else
- 		trace (3, "blk_congestion_wait\n");
- 		blk_congestion_wait (direction, HZ / 50);
-+#endif
- 	}
- }
- 
-@@ -496,8 +502,13 @@
- 	trace (3, "bio_alloc (%hd)\n", bio_segments (bio));
- 	while (!(bion = bio_alloc (GFP_NOIO | __GFP_NOMEMALLOC, bio_segments (bio))))
- 	{
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+		trace (3, "congestion_wait\n");
-+		congestion_wait (bio_data_dir (bio), HZ / 50);
-+#else
- 		trace (3, "blk_congestion_wait\n");
- 		blk_congestion_wait (bio_data_dir (bio), HZ / 50);
-+#endif
- 	}
- 
- 	bion->bi_bdev = tc->dev->bdev;
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
deleted file mode 100644
index fed9d5558089..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-4.2a-2.6.20.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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/files/truecrypt-4.2a-makefile.patch b/app-crypt/truecrypt/files/truecrypt-4.2a-makefile.patch
deleted file mode 100644
index 92b458d439df..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-4.2a-makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- Linux/Cli/Makefile.orig	2006-06-27 06:18:32.000000000 +1000
-+++ Linux/Cli/Makefile	2006-07-11 21:24:07.000000000 +1000
-@@ -9,22 +9,13 @@
- -include ../Common/.platform
- endif
- 
--ifdef NO_WARNINGS
--CFLAGS := -w
--else
--CFLAGS := -W
--endif
- CFLAGS += -I../../Crypto -I../../Common -I../Kernel
- CFLAGS += -D_cdecl="" -DBOOL=int -DTRUE=1 -DFALSE=0 -DMAX_PATH=260
- CFLAGS += $(TYPES)
- 
--ifndef DEBUG
- # Do not enable strict aliasing
--CFLAGS += -O2 -fno-strict-aliasing
--else
--CFLAGS += -ggdb
-+CFLAGS += -fno-strict-aliasing
- NO_STRIP := 1
--endif
- 
- KERNEL_OBJS_F := ../.kernel-objs
- USER_OBJS_F := ../.user-objs
-@@ -60,11 +51,11 @@
- OBJS += $(TC_COMMON)/Tests.o
- OBJS += Cli.o 
- 
--%.o: %.c
-+%.o: %.c $(USER_OBJS_F)
- 	@echo Compiling $(<F)
--	@$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MMD -o $@ -c $<
-+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MMD -o $@ -c $<
- 
--all: objclean truecrypt
-+all: $(USER_OBJS_F) truecrypt
- 	@echo Done.
- 
- ../Common/.platform: ../Common/Platform.c
-@@ -75,7 +66,7 @@
- 
- truecrypt: $(OBJS)
- 	@echo Linking $@
--	@$(CC) -o $@ $(OBJS)
-+	$(CC) -o $@ $(OBJS)
- ifndef NO_STRIP
- 	@strip $@
- endif
-@@ -85,9 +76,11 @@
- truecrypt.1: objclean truecrypt
- 	help2man -N -i Man/help2man.inc ./truecrypt >Man/truecrypt.1
- 	
--objclean:
--	@if [ -f $(KERNEL_OBJS_F) ]; then rm -f ${OBJS} $(KERNEL_OBJS_F); fi
-+$(USER_OBJS_F):
-+	@if [ -f $(KERNEL_OBJS_F) ]; then rm -f $(OBJS) $(KERNEL_OBJS_F); fi
- 	@>$(USER_OBJS_F)
- 
- clean:
--	-rm -f truecrypt ${OBJS} *.d $(TC_COMMON)/*.d $(TC_CRYPTO)/*.d ../Common/platform ../Common/.platform
-+	-rm -f truecrypt $(OBJS) *.d $(TC_COMMON)/*.d $(TC_CRYPTO)/*.d ../Common/platform ../Common/.platform
-+
-+.PHONY: man clean all
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
deleted file mode 100644
index e43dd5c5637d..000000000000
--- a/app-crypt/truecrypt/files/truecrypt-4.2a_kernel-2.6.18-rc1_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/files/truecrypt-stop.sh b/app-crypt/truecrypt/files/truecrypt-stop.sh
index 1cd8a2d5e3d9..50bb0b749fb0 100644
--- a/app-crypt/truecrypt/files/truecrypt-stop.sh
+++ b/app-crypt/truecrypt/files/truecrypt-stop.sh
@@ -4,6 +4,6 @@
 # Try to remove any dm-crypt mappings
 if [ -x /usr/bin/truecrypt ]; then
 	ebegin "Removing truecrypt mappings"
-	/usr/bin/truecrypt -d
+	! /usr/bin/truecrypt -l > /dev/null 2>&1  || /usr/bin/truecrypt -d
 	eend $?
 fi
diff --git a/app-crypt/truecrypt/truecrypt-4.2a-r1.ebuild b/app-crypt/truecrypt/truecrypt-4.2a-r1.ebuild
deleted file mode 100644
index 3070499ea05f..000000000000
--- a/app-crypt/truecrypt/truecrypt-4.2a-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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-r1.ebuild,v 1.5 2007/02/05 00:40:24 beandog 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}-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
-}
diff --git a/app-crypt/truecrypt/truecrypt-4.2a-r2.ebuild b/app-crypt/truecrypt/truecrypt-4.2a-r2.ebuild
deleted file mode 100644
index 7e560aefc008..000000000000
--- a/app-crypt/truecrypt/truecrypt-4.2a-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.2 2007/07/13 21:47:34 mr_bones_ 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
-}
diff --git a/app-crypt/truecrypt/truecrypt-4.2a-r3.ebuild b/app-crypt/truecrypt/truecrypt-4.2a-r3.ebuild
deleted file mode 100644
index e10c07c62b8d..000000000000
--- a/app-crypt/truecrypt/truecrypt-4.2a-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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-r3.ebuild,v 1.3 2007/07/13 21:47:34 mr_bones_ 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"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	dmcrypt_check
-	kernel_is lt 2 6 5 && die 'requires at least 2.6.5 kernel version'
-
-	BUILD_PARAMS="KERNEL_SRC=${KERNEL_DIR} NO_WARNINGS=1"
-	BUILD_TARGETS="truecrypt"
-	MODULE_NAMES="truecrypt(block:${S}/Linux/Kernel)"
-
-}
-
-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'
-	insinto "/$(get_libdir)/rcscripts/addons"
-	newins "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh"
-
-	# 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
-}