diff options
author | Dane Smith <c1pher@gentoo.org> | 2010-10-13 23:10:59 +0000 |
---|---|---|
committer | Dane Smith <c1pher@gentoo.org> | 2010-10-13 23:10:59 +0000 |
commit | f6e39e9c4ae59d76754f22d2ab00d1e23f368c68 (patch) | |
tree | e8db577a6c92916708c87454de03e5bb1943a7e4 /app-crypt/truecrypt/files | |
parent | Stable on amd64 wrt bug #340741 (diff) | |
download | gentoo-2-f6e39e9c4ae59d76754f22d2ab00d1e23f368c68.tar.gz gentoo-2-f6e39e9c4ae59d76754f22d2ab00d1e23f368c68.tar.bz2 gentoo-2-f6e39e9c4ae59d76754f22d2ab00d1e23f368c68.zip |
Version bump for truecrypt wrt bug 329075. Removed all old versions as upstream will no longer provide sources for any of them.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/truecrypt/files')
-rw-r--r-- | app-crypt/truecrypt/files/truecrypt-4.3a-2.6.23.patch | 15 | ||||
-rw-r--r-- | app-crypt/truecrypt/files/truecrypt-4.3a-2.6.24.patch | 51 | ||||
-rw-r--r-- | app-crypt/truecrypt/files/truecrypt-4.3a-2.6.29.patch | 19 |
3 files changed, 0 insertions, 85 deletions
diff --git a/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.23.patch b/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.23.patch deleted file mode 100644 index cfa54bf19adc..000000000000 --- a/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.23.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urNp truecrypt-4.3a-source-code.org/Linux/Kernel/Dm-target.c truecrypt-4.3a-source-code/Linux/Kernel/Dm-target.c ---- truecrypt-4.3a-source-code.org/Linux/Kernel/Dm-target.c 2007-04-24 19:32:06.000000000 +0300 -+++ truecrypt-4.3a-source-code/Linux/Kernel/Dm-target.c 2007-10-10 23:18:24.000000000 +0200 -@@ -656,7 +656,11 @@ int __init dm_truecrypt_init(void) - goto err; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) - bio_ctx_cache = kmem_cache_create ("truecrypt-bioctx", sizeof (struct bio_ctx), 0, 0, NULL, NULL); -+#else -+ bio_ctx_cache = kmem_cache_create ("truecrypt-bioctx", sizeof (struct bio_ctx), 0, 0, NULL); -+#endif - if (!bio_ctx_cache) - { - error ("kmem_cache_create failed"); 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 deleted file mode 100644 index eec4aa8bdb9a..000000000000 --- a/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.24.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nrup a/Linux/Kernel/Dm-target.c b/Linux/Kernel/Dm-target.c ---- a/Linux/Kernel/Dm-target.c 2007-04-24 18:32:06.000000000 +0200 -+++ b/Linux/Kernel/Dm-target.c 2007-12-22 15:07:56.000000000 +0100 -@@ -375,7 +375,11 @@ 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->error); -+#endif - mempool_free (bc, tc->bio_ctx_pool); - } - -@@ -417,24 +421,35 @@ static void work_process (void *qdata) - } - - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - static int truecrypt_endio (struct bio *bio, unsigned int bytes_done, int error) -+#else -+static int truecrypt_endio (struct bio *bio, int error) -+#endif - { - struct bio_ctx *bc = (struct bio_ctx *) bio->bi_private; - struct target_ctx *tc = (struct target_ctx *) bc->target->private; - struct bio_vec *bv; - int seg_no; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - trace (1, "end: sc=%llu fl=%ld rw=%ld sz=%d ix=%hd vc=%hd dn=%d er=%d\n", - (unsigned long long) bio->bi_sector, bio->bi_flags, bio->bi_rw, bio->bi_size, bio->bi_idx, bio->bi_vcnt, bytes_done, error); -+#else -+ trace (1, "end: sc=%llu fl=%ld sz=%ld rw=%ld ix=%hd vc=%hd er=%d\n", -+ (unsigned long long) bio->bi_sector, bio->bi_flags, bio->bi_size, bio->bi_rw, bio->bi_idx, bio->bi_vcnt, error); -+#endif - - if (error != 0) - bc->error = error; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - if (bio->bi_size) - { - trace (2, "Outstanding IO: %d\n", bio->bi_size); - return 1; - } -+#endif - - if (bio_data_dir (bio) == READ) - { 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 deleted file mode 100644 index 1ce09f666bb1..000000000000 --- a/app-crypt/truecrypt/files/truecrypt-4.3a-2.6.29.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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); |