| 1 |
commit: 8d7c6fc875eec641595037a161791bafa1e00677 |
| 2 |
Author: Julien Roy <julien <AT> jroy <DOT> ca> |
| 3 |
AuthorDate: Sat Apr 9 01:30:37 2022 +0000 |
| 4 |
Commit: Julien Roy <julien <AT> jroy <DOT> ca> |
| 5 |
CommitDate: Sat Apr 9 01:32:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8d7c6fc8 |
| 7 |
|
| 8 |
dev-libs/luksmeta: Fix bug #837308 |
| 9 |
|
| 10 |
Signed-off-by: Julien Roy <julien <AT> jroy.ca> |
| 11 |
|
| 12 |
dev-libs/luksmeta/files/luksmeta-tests.patch | 133 +++++++++++++++++++++++++++ |
| 13 |
dev-libs/luksmeta/luksmeta-9.ebuild | 4 + |
| 14 |
2 files changed, 137 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-libs/luksmeta/files/luksmeta-tests.patch b/dev-libs/luksmeta/files/luksmeta-tests.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000..27baf7140 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-libs/luksmeta/files/luksmeta-tests.patch |
| 21 |
@@ -0,0 +1,133 @@ |
| 22 |
+diff --git a/test-lm-assumptions.c b/test-lm-assumptions.c |
| 23 |
+index d9ff20b..b4f293f 100644 |
| 24 |
+--- a/test-lm-assumptions.c |
| 25 |
++++ b/test-lm-assumptions.c |
| 26 |
+@@ -28,7 +28,8 @@ main(int argc, char *argv[]) |
| 27 |
+ /* Test the layout state. */ |
| 28 |
+ assert(test_layout((range_t[]) { |
| 29 |
+ { 0, 1024 }, /* LUKS header */ |
| 30 |
+- END(1024), /* Rest of the file */ |
| 31 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 32 |
++ { 0, 0 }, |
| 33 |
+ })); |
| 34 |
+ |
| 35 |
+ unlink(filename); |
| 36 |
+diff --git a/test-lm-big.c b/test-lm-big.c |
| 37 |
+index 6098e59..eb94d3b 100644 |
| 38 |
+--- a/test-lm-big.c |
| 39 |
++++ b/test-lm-big.c |
| 40 |
+@@ -111,7 +111,7 @@ main(int argc, char *argv[]) |
| 41 |
+ |
| 42 |
+ assert(test_layout((range_t[]) { |
| 43 |
+ { 0, 1024 }, /* LUKS header */ |
| 44 |
+- { 1024, offset - 1024, true }, /* Keyslot Area */ |
| 45 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 46 |
+ { offset, 4096 }, /* luksmeta header */ |
| 47 |
+ { offset + 4096, 4096 }, /* luksmeta slot 0 */ |
| 48 |
+ { offset + 8192, 4096 }, /* luksmeta slot 0 (cont) */ |
| 49 |
+@@ -127,7 +127,7 @@ main(int argc, char *argv[]) |
| 50 |
+ |
| 51 |
+ assert(test_layout((range_t[]) { |
| 52 |
+ { 0, 1024 }, /* LUKS header */ |
| 53 |
+- { 1024, offset - 1024, true }, /* Keyslot Area */ |
| 54 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 55 |
+ { offset, 4096 }, /* luksmeta header */ |
| 56 |
+ END(offset + 4096), /* Rest of the file */ |
| 57 |
+ })); |
| 58 |
+diff --git a/test-lm-init.c b/test-lm-init.c |
| 59 |
+index 2a6cb45..b16d597 100644 |
| 60 |
+--- a/test-lm-init.c |
| 61 |
++++ b/test-lm-init.c |
| 62 |
+@@ -57,7 +57,7 @@ main(int argc, char *argv[]) |
| 63 |
+ /* Test the layout state. */ |
| 64 |
+ assert(test_layout((range_t[]) { |
| 65 |
+ { 0, 1024 }, /* LUKS header */ |
| 66 |
+- { 1024, offset - 1024, true }, /* Keyslot Area */ |
| 67 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 68 |
+ { offset, 4096 }, /* luksmeta header */ |
| 69 |
+ END(offset + 4096), /* Rest of the file */ |
| 70 |
+ })); |
| 71 |
+@@ -106,7 +106,7 @@ main(int argc, char *argv[]) |
| 72 |
+ assert(luksmeta_test(cd) == -ENOENT); |
| 73 |
+ assert(test_layout((range_t[]) { |
| 74 |
+ { 0, 1024 }, /* LUKS header */ |
| 75 |
+- { 1024, offset - 1024, true }, /* Keyslot Area */ |
| 76 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 77 |
+ END(offset), /* Rest of the file */ |
| 78 |
+ })); |
| 79 |
+ |
| 80 |
+diff --git a/test-lm-one.c b/test-lm-one.c |
| 81 |
+index 8deb70a..18613e0 100644 |
| 82 |
+--- a/test-lm-one.c |
| 83 |
++++ b/test-lm-one.c |
| 84 |
+@@ -49,7 +49,7 @@ main(int argc, char *argv[]) |
| 85 |
+ /* Test the layout state. */ |
| 86 |
+ assert(test_layout((range_t[]) { |
| 87 |
+ { 0, 1024 }, /* LUKS header */ |
| 88 |
+- { 1024, offset - 1024, true }, /* Keyslot Area */ |
| 89 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 90 |
+ { offset, 4096 }, /* luksmeta header */ |
| 91 |
+ { offset + 4096, 4096 }, /* luksmeta slot 0 */ |
| 92 |
+ END(offset + 8192), /* Rest of the file */ |
| 93 |
+@@ -68,7 +68,7 @@ main(int argc, char *argv[]) |
| 94 |
+ /* Test the layout state. */ |
| 95 |
+ assert(test_layout((range_t[]) { |
| 96 |
+ { 0, 1024 }, /* LUKS header */ |
| 97 |
+- { 1024, offset - 1024, true }, /* Keyslot Area */ |
| 98 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 99 |
+ { offset, 4096 }, /* luksmeta header */ |
| 100 |
+ END(offset + 4096), /* Rest of the file */ |
| 101 |
+ })); |
| 102 |
+diff --git a/test-lm-two.c b/test-lm-two.c |
| 103 |
+index 78fea5b..9f0b1c5 100644 |
| 104 |
+--- a/test-lm-two.c |
| 105 |
++++ b/test-lm-two.c |
| 106 |
+@@ -53,7 +53,7 @@ main(int argc, char *argv[]) |
| 107 |
+ |
| 108 |
+ assert(test_layout((range_t[]) { |
| 109 |
+ { 0, 1024 }, /* LUKS header */ |
| 110 |
+- { 1024, offset - 1024, true }, /* Keyslot Area */ |
| 111 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 112 |
+ { offset, 4096 }, /* luksmeta header */ |
| 113 |
+ { offset + 4096, 4096 }, /* luksmeta slot 0 */ |
| 114 |
+ END(offset + 8192), /* Rest of the file */ |
| 115 |
+@@ -70,7 +70,7 @@ main(int argc, char *argv[]) |
| 116 |
+ |
| 117 |
+ assert(test_layout((range_t[]) { |
| 118 |
+ { 0, 1024 }, /* LUKS header */ |
| 119 |
+- { 1024, offset - 1024, true }, /* Keyslot Area */ |
| 120 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 121 |
+ { offset, 4096 }, /* luksmeta header */ |
| 122 |
+ { offset + 4096, 4096 }, /* luksmeta slot 0 */ |
| 123 |
+ { offset + 8192, 4096 }, /* luksmeta slot 1 */ |
| 124 |
+@@ -88,7 +88,7 @@ main(int argc, char *argv[]) |
| 125 |
+ assert(luksmeta_wipe(cd, 0, UUID0) == 0); |
| 126 |
+ assert(test_layout((range_t[]) { |
| 127 |
+ { 0, 1024 }, /* LUKS header */ |
| 128 |
+- { 1024, offset - 1024, true }, /* Keyslot Area */ |
| 129 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 130 |
+ { offset, 4096 }, /* luksmeta header */ |
| 131 |
+ { offset + 4096, 4096, true }, /* luksmeta slot 0 */ |
| 132 |
+ { offset + 8192, 4096 }, /* luksmeta slot 1 */ |
| 133 |
+@@ -99,7 +99,7 @@ main(int argc, char *argv[]) |
| 134 |
+ assert(luksmeta_wipe(cd, 1, UUID1) == 0); |
| 135 |
+ assert(test_layout((range_t[]) { |
| 136 |
+ { 0, 1024 }, /* LUKS header */ |
| 137 |
+- { 1024, offset - 1024, true }, /* Keyslot Area */ |
| 138 |
++ { 1024, 3072, true }, /* Keyslot Area */ |
| 139 |
+ { offset, 4096 }, /* luksmeta header */ |
| 140 |
+ END(offset + 4096), /* Rest of the file */ |
| 141 |
+ })); |
| 142 |
+diff --git a/test-luksmeta b/test-luksmeta |
| 143 |
+index fd17ead..f1e8b2e 100755 |
| 144 |
+--- a/test-luksmeta |
| 145 |
++++ b/test-luksmeta |
| 146 |
+@@ -11,7 +11,7 @@ function onexit() { |
| 147 |
+ trap 'onexit' EXIT |
| 148 |
+ |
| 149 |
+ truncate -s 4M $tmp |
| 150 |
+-echo -n foo | cryptsetup luksFormat $tmp - |
| 151 |
++echo -n foo | cryptsetup luksFormat --type luks1 $tmp - |
| 152 |
+ |
| 153 |
+ ! ./luksmeta test -d $tmp |
| 154 |
+ |
| 155 |
|
| 156 |
diff --git a/dev-libs/luksmeta/luksmeta-9.ebuild b/dev-libs/luksmeta/luksmeta-9.ebuild |
| 157 |
index f8a95fb85..4e6c9d29d 100644 |
| 158 |
--- a/dev-libs/luksmeta/luksmeta-9.ebuild |
| 159 |
+++ b/dev-libs/luksmeta/luksmeta-9.ebuild |
| 160 |
@@ -17,6 +17,10 @@ DEPEND="sys-fs/cryptsetup" |
| 161 |
RDEPEND="${DEPEND}" |
| 162 |
BDEPEND="" |
| 163 |
|
| 164 |
+PATCHES=( |
| 165 |
+ "${FILESDIR}/${PN}-tests.patch" |
| 166 |
+) |
| 167 |
+ |
| 168 |
src_prepare() { |
| 169 |
default |
| 170 |
eautoreconf |
Archives