Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2624.git;a=commitdiff;h=79ec083f12601cc799126841d3d1b38fcd8fec5b
commit 79ec083f12601cc799126841d3d1b38fcd8fec5b Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Mon Jan 28 00:56:43 2008 +0100 truecrypt-4.3-19-i686 - added truecrypt-4.3a-2.6.24.patch to build with kernel-2.6.24 diff --git a/source/apps-extra/truecrypt/FrugalBuild b/source/apps-extra/truecrypt/FrugalBuild index 5c0293a..777ff93 100644 --- a/source/apps-extra/truecrypt/FrugalBuild +++ b/source/apps-extra/truecrypt/FrugalBuild @@ -4,7 +4,7 @@ pkgname=truecrypt pkgver=4.3 pkgextraver=a -pkgrel=18 +pkgrel=19 pkgdesc="A free open-source disk encryption software" url="http://www.truecrypt.org/" Finclude kernel-module @@ -13,15 +13,16 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.truecrypt.org/downloads.php|grep Stable|sed 's/.* - //;s/$pkgextraver//'" source=(http://www.truecrypt.org/downloads/truecrypt-$pkgver$pkgextraver-source-code.tar.gz \ - truecrypt-4.3a-2.6.23.patch) + truecrypt-4.3a-2.6.24.patch) sha1sums=('30c91901171c3c8290d4d0de856774cdf7ee4ed6' \ - '80e175465c56155c4335cd1f2d88ce11dd864c5d') + 'a99546f70a75c80e60f9dab033e41fe06a7ad459') build() { unset MAKEFLAGS - Fcd truecrypt-$pkgver$pkgextraver-source-code/Linux + Fcd truecrypt-$pkgver$pkgextraver-source-code Fpatchall + cd Linux Fsed 'uname -r' "echo $_F_kernelmod_uname" build.sh Fsed '>/dev/null' '' build.sh ./build.sh || return 1 diff --git a/source/apps-extra/truecrypt/truecrypt-4.3a-2.6.23.patch b/source/apps-extra/truecrypt/truecrypt-4.3a-2.6.23.patch deleted file mode 100644 index e5ee514..0000000 --- a/source/apps-extra/truecrypt/truecrypt-4.3a-2.6.23.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Linux/Kernel/Dm-target.c 2007-04-24 19:32:06.000000000 +0300 -+++ 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/source/apps-extra/truecrypt/truecrypt-4.3a-2.6.24.patch b/source/apps-extra/truecrypt/truecrypt-4.3a-2.6.24.patch new file mode 100644 index 0000000..6f0971f --- /dev/null +++ b/source/apps-extra/truecrypt/truecrypt-4.3a-2.6.24.patch @@ -0,0 +1,24 @@ +diff -Naur truecrypt-4.3a-source-code.orig/Linux/Kernel/Dm-target.c truecrypt-4.3a-source-code/Linux/Kernel/Dm-target.c +--- truecrypt-4.3a-source-code.orig/Linux/Kernel/Dm-target.c 2007-04-24 18:32:06.000000000 +0200 ++++ truecrypt-4.3a-source-code/Linux/Kernel/Dm-target.c 2008-01-28 00:51:49.000000000 +0100 +@@ -375,7 +375,7 @@ + if (!atomic_dec_and_test (&bc->ref_count)) + return; + +- bio_endio (bc->orig_bio, bc->orig_bio->bi_size, bc->error); ++ bio_endio (bc->orig_bio, bc->error); + mempool_free (bc, tc->bio_ctx_pool); + } + +@@ -656,7 +656,11 @@ + 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"); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git