From c97149bc7f6e39d2342a462495eab3cc9b8f962b Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 6 Jun 2006 11:46:08 +0000 Subject: [PATCH] fix for 2.6.17 kernels that nolonger define SECTOR_FORMAT as per bug #135741 Package-Manager: portage-2.1_rc4-r2 --- app-crypt/truecrypt/ChangeLog | 6 +- app-crypt/truecrypt/Manifest | 26 ++++--- .../files/truecrypt-4.2-nosectorformat.patch | 77 +++++++++++++++++++ app-crypt/truecrypt/truecrypt-4.2.ebuild | 3 +- 4 files changed, 99 insertions(+), 13 deletions(-) create mode 100644 app-crypt/truecrypt/files/truecrypt-4.2-nosectorformat.patch diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog index 472db985314d..e910db674bd1 100644 --- a/app-crypt/truecrypt/ChangeLog +++ b/app-crypt/truecrypt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/truecrypt # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.1 2006/06/05 08:19:18 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.2 2006/06/06 11:46:08 dragonheart Exp $ + + 06 Jun 2006; Daniel Black + +files/truecrypt-4.2-nosectorformat.patch, truecrypt-4.2.ebuild: + fix for 2.6.17 kernels that nolonger define SECTOR_FORMAT as per bug #135741 *truecrypt-4.2 (05 Jun 2006) diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest index 91a7d2382f79..95c7bcae3150 100644 --- a/app-crypt/truecrypt/Manifest +++ b/app-crypt/truecrypt/Manifest @@ -5,15 +5,19 @@ AUX truecrypt-4.2-makefile.patch 1542 RMD160 7b90440b283ba8effdf926b96f6926f9970 MD5 5ea0f8c902f83757e908e02f121d900f files/truecrypt-4.2-makefile.patch 1542 RMD160 7b90440b283ba8effdf926b96f6926f9970a333a files/truecrypt-4.2-makefile.patch 1542 SHA256 80f878634534d9b72120cd78dfb230b465bc2ef2e75494efc3b6fa5a4693f2de files/truecrypt-4.2-makefile.patch 1542 +AUX truecrypt-4.2-nosectorformat.patch 2849 RMD160 9e8f3ec4f9b8c6766de0f0e613be42df1c66610b SHA1 70dfe8bd136df1267f789b16842ace71ef85a530 SHA256 bdb86c0320a5e9ad37dd1b9abd1d9767a7bf26211ad973104177a530fd6f04e0 +MD5 7d007b2c024dd78d34a8e48887e508c3 files/truecrypt-4.2-nosectorformat.patch 2849 +RMD160 9e8f3ec4f9b8c6766de0f0e613be42df1c66610b files/truecrypt-4.2-nosectorformat.patch 2849 +SHA256 bdb86c0320a5e9ad37dd1b9abd1d9767a7bf26211ad973104177a530fd6f04e0 files/truecrypt-4.2-nosectorformat.patch 2849 DIST truecrypt-4.2-source-code.tar.gz 1076093 RMD160 74ba185bad9952ea9b3b0e358e9fee6f2080e6b9 SHA1 603bac50891c49b051f7a9bcc15b1196168bff2a SHA256 54f54cd68c99efe3fd2c0899174b38d4cfe1ad576112672aabd2ac64e336cd1f -EBUILD truecrypt-4.2.ebuild 2864 RMD160 b7e14e0956b4ca4dfc62e0296b439384714da664 SHA1 fc961e42af02547c43fd8fb25034af36959b39bc SHA256 5055fdb01dc31da5b1f27e962e945af251e689198174d71f32e8647ac26c8014 -MD5 3e20774c8ebd570682bcfb08221a1b02 truecrypt-4.2.ebuild 2864 -RMD160 b7e14e0956b4ca4dfc62e0296b439384714da664 truecrypt-4.2.ebuild 2864 -SHA256 5055fdb01dc31da5b1f27e962e945af251e689198174d71f32e8647ac26c8014 truecrypt-4.2.ebuild 2864 -MISC ChangeLog 454 RMD160 87d41246fb8ab3403e22c668ad91361e91515062 SHA1 8bc8118b85a8f9968f24d82ca008a0aee29bba82 SHA256 ac7ffe8db8e45a7a3337d1155b866d54e4c23c5d9716f6d60e061e4ad427df7d -MD5 119f4f1be9fba9708cae4dd35ad9296d ChangeLog 454 -RMD160 87d41246fb8ab3403e22c668ad91361e91515062 ChangeLog 454 -SHA256 ac7ffe8db8e45a7a3337d1155b866d54e4c23c5d9716f6d60e061e4ad427df7d ChangeLog 454 +EBUILD truecrypt-4.2.ebuild 2912 RMD160 f51fcae6297f06856a3142277f16632af14b4970 SHA1 d6ee3174d973d771864e8333bb1ac6589421473e SHA256 101b2b5bb7e33f3f48371a87608db222f757eabb298d9d8b266a882900b6e2c5 +MD5 deac8aa650563096d32b6079a792ca44 truecrypt-4.2.ebuild 2912 +RMD160 f51fcae6297f06856a3142277f16632af14b4970 truecrypt-4.2.ebuild 2912 +SHA256 101b2b5bb7e33f3f48371a87608db222f757eabb298d9d8b266a882900b6e2c5 truecrypt-4.2.ebuild 2912 +MISC ChangeLog 654 RMD160 e43cafaa6fc1d30f253b9006374f1f95f16c6915 SHA1 4106d126aa7b477eb1d0efa492b357c82f2856d3 SHA256 66bbc7eb14e65ab846dbb8bb04d1d6a7563a99fa1e8a5a659ef6b8154eeab99b +MD5 69bf1d1ca62ff10039464aa905810599 ChangeLog 654 +RMD160 e43cafaa6fc1d30f253b9006374f1f95f16c6915 ChangeLog 654 +SHA256 66bbc7eb14e65ab846dbb8bb04d1d6a7563a99fa1e8a5a659ef6b8154eeab99b ChangeLog 654 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224 @@ -24,7 +28,7 @@ SHA256 200aa4f6243ac5b5f4cff0aa69d85c25b74456555c04e5db2b2e1327d7f0e9a6 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux) -iD8DBQFEg+klmdTrptrqvGERAkyQAJ9l/v7+bj934bJx3s9gBM0+Kjf6KQCcCa7P -AWRgftnqG+8Uq/w700SugEE= -=dEeX +iD8DBQFEhWwHmdTrptrqvGERAj4eAJ4g6Oia7H7cCd/X0Lj4dNTL7wmwigCfWePC +qQvVzUCXVANkE6MttTGe7ss= +=6YfQ -----END PGP SIGNATURE----- diff --git a/app-crypt/truecrypt/files/truecrypt-4.2-nosectorformat.patch b/app-crypt/truecrypt/files/truecrypt-4.2-nosectorformat.patch new file mode 100644 index 000000000000..669758c1f05f --- /dev/null +++ b/app-crypt/truecrypt/files/truecrypt-4.2-nosectorformat.patch @@ -0,0 +1,77 @@ +--- ./Linux/Kernel/Dm-target.c.orig 2006-06-06 21:31:51.000000000 +1000 ++++ ./Linux/Kernel/Dm-target.c 2006-06-06 21:45:08.000000000 +1000 +@@ -161,7 +161,7 @@ + goto err; + } + +- if (sscanf (argv[ARG_SEC], SECTOR_FORMAT, &tc->start) != 1) ++ if (sscanf (argv[ARG_SEC], "%uL", &tc->start) != 1) + { + ti->error = "truecrypt: Invalid device sector"; + goto err; +@@ -224,14 +224,14 @@ + } + + // Read-only start sector +- if (sscanf (argv[ARG_RO_START], SECTOR_FORMAT, &tc->read_only_start) != 1) ++ if (sscanf (argv[ARG_RO_START], "%uL", &tc->read_only_start) != 1) + { + ti->error = "truecrypt: Invalid read-only start sector"; + goto err; + } + + // Read-only end sector +- if (sscanf (argv[ARG_RO_END], SECTOR_FORMAT, &tc->read_only_end) != 1) ++ if (sscanf (argv[ARG_RO_END], "%uL", &tc->read_only_end) != 1) + { + ti->error = "truecrypt: Invalid read-only end sector"; + goto err; +@@ -375,8 +375,8 @@ + int seg_no; + + trace (3, "truecrypt_endio (%p, %d, %d)\n", bio, bytes_done, error); +- trace (1, "end: sc=" SECTOR_FORMAT " fl=%ld rw=%ld sz=%d ix=%hd vc=%hd dn=%d er=%d\n", +- bio->bi_sector, bio->bi_flags, bio->bi_rw, bio->bi_size, bio->bi_idx, bio->bi_vcnt, bytes_done, error); ++ 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); + + if (error != 0) + bc->error = error; +@@ -420,8 +420,8 @@ + int seg_no; + + trace (3, "truecrypt_map (%p, %p, %p)\n", ti, bio, map_context); +- trace (1, "map: sc=" SECTOR_FORMAT " fl=%ld rw=%ld sz=%d ix=%hd vc=%hd\n", +- bio->bi_sector, bio->bi_flags, bio->bi_rw, bio->bi_size, bio->bi_idx, bio->bi_vcnt); ++ trace (1, "map: sc=%llu fl=%ld rw=%ld sz=%d ix=%hd vc=%hd\n", ++ (unsigned long long) bio->bi_sector, bio->bi_flags, bio->bi_rw, bio->bi_size, bio->bi_idx, bio->bi_vcnt); + + // Write protection + if (bio_data_dir (bio) == WRITE && READ_ONLY (tc)) +@@ -547,7 +547,7 @@ + + atomic_inc (&bc->ref_count); + +- trace (3, "generic_make_request (rw=%ld sc=" SECTOR_FORMAT ")\n", bion->bi_rw, bion->bi_sector); ++ trace (3, "generic_make_request (rw=%ld sc=%llu )\n", bion->bi_rw,(unsigned long long) bion->bi_sector); + generic_make_request (bion); + + dereference_bio_ctx (bc); +@@ -569,13 +569,13 @@ + { + char name[32]; + format_dev_t (name, tc->dev->bdev->bd_dev); +- snprintf (result, maxlen, "%d %d 0 0 %s " SECTOR_FORMAT " " SECTOR_FORMAT " " SECTOR_FORMAT " %Ld %Ld %d %s", ++ snprintf (result, maxlen, "%d %d 0 0 %s %llu %llu %llu %Ld %Ld %d %s", + tc->ci->ea, + tc->ci->mode, + name, +- tc->start, +- tc->read_only_start, +- tc->read_only_end, ++ (unsigned long long) tc->start, ++ (unsigned long long) tc->read_only_start, ++ (unsigned long long) tc->read_only_end, + tc->mtime, + tc->atime, + tc->flags, diff --git a/app-crypt/truecrypt/truecrypt-4.2.ebuild b/app-crypt/truecrypt/truecrypt-4.2.ebuild index 0bef8def14fa..27373313779a 100644 --- a/app-crypt/truecrypt/truecrypt-4.2.ebuild +++ b/app-crypt/truecrypt/truecrypt-4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.2.ebuild,v 1.1 2006/06/05 08:19:18 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-4.2.ebuild,v 1.2 2006/06/06 11:46:08 dragonheart Exp $ inherit linux-mod toolchain-funcs @@ -33,6 +33,7 @@ src_unpack() { cd "${S}" linux-mod_pkg_setup epatch "${FILESDIR}/${P}-makefile.patch" + epatch "${FILESDIR}/${P}-nosectorformat.patch" } src_compile() { -- 2.26.2