New upstream release v10
Resolves: RHEL-122139 Signed-off-by: Sergio Correia <scorreia@redhat.com>
This commit is contained in:
Sergio Correia
parent
b5e37ff9c4
commit
d8fd5abbc6
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/luksmeta-9.tar.bz2
|
||||
/luksmeta-10.tar.bz2
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From 70247ce7e47963bfbd6c4cdc584f35ca38ccf66d Mon Sep 17 00:00:00 2001
|
||||
From: Sergio Correia <scorreia@redhat.com>
|
||||
Date: Mon, 11 Nov 2019 18:06:13 -0500
|
||||
Subject: [PATCH] Define log callback function to use with libcryptsetup
|
||||
|
||||
Logs from libcryptsetup now go to stderr and this prevents issues like
|
||||
the one reported in https://bugzilla.redhat.com/show_bug.cgi?id=1770395
|
||||
---
|
||||
luksmeta.c | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/luksmeta.c b/luksmeta.c
|
||||
index a79da82..1c72787 100644
|
||||
--- a/luksmeta.c
|
||||
+++ b/luksmeta.c
|
||||
@@ -45,6 +45,17 @@ struct options {
|
||||
int slot;
|
||||
};
|
||||
|
||||
+#define LUKSMETA_LIBCRYPTSETUP_LOG_LEVEL CRYPT_LOG_ERROR
|
||||
+
|
||||
+static void
|
||||
+luksmeta_libcryptsetup_log(int level, const char *msg, void *usrptr)
|
||||
+{
|
||||
+ if (level != LUKSMETA_LIBCRYPTSETUP_LOG_LEVEL) {
|
||||
+ return;
|
||||
+ }
|
||||
+ fprintf(stderr, "%s", msg);
|
||||
+}
|
||||
+
|
||||
static int
|
||||
cmd_test(const struct options *opts, struct crypt_device *cd)
|
||||
{
|
||||
@@ -485,6 +496,8 @@ main(int argc, char *argv[])
|
||||
return EX_IOERR;
|
||||
}
|
||||
|
||||
+ crypt_set_log_callback(cd, luksmeta_libcryptsetup_log, NULL);
|
||||
+
|
||||
r = crypt_load(cd, NULL, NULL);
|
||||
if (r != 0) {
|
||||
fprintf(stderr, "Unable to read LUKSv1 header (%s): %s\n",
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,148 +0,0 @@
|
||||
From 9c550e0675f9fa8fe58c996660c61eca11b424d1 Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
|
||||
Date: Mon, 10 Dec 2018 14:25:33 +0100
|
||||
Subject: [PATCH] Relax content tests in test suite
|
||||
|
||||
Starting with version 2.0.5, cryptsetup wipes the full LUKS header
|
||||
and fills unused sections with random data, this was introduced
|
||||
in commit
|
||||
|
||||
commit c2bce3e93ecee41f661b589ee28f112eb538259e
|
||||
Author: Milan Broz <gmazyland@gmail.com>
|
||||
Date: Sun Oct 14 13:11:50 2018 +0200
|
||||
|
||||
Wipe full header areas (including unused) during LUKS format.
|
||||
|
||||
While this is the right thing to do, it breaks luksmeta tests. So
|
||||
relax them.
|
||||
|
||||
Bug-Debian: https://bugs.debian.org/915256
|
||||
Resolves: https://github.com/latchset/luksmeta/issues/6
|
||||
---
|
||||
test-lm-assumptions.c | 3 ++-
|
||||
test-lm-big.c | 4 ++--
|
||||
test-lm-init.c | 4 ++--
|
||||
test-lm-one.c | 4 ++--
|
||||
test-lm-two.c | 8 ++++----
|
||||
5 files changed, 12 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/test-lm-assumptions.c b/test-lm-assumptions.c
|
||||
index d9ff20b..b4f293f 100644
|
||||
--- a/test-lm-assumptions.c
|
||||
+++ b/test-lm-assumptions.c
|
||||
@@ -28,7 +28,8 @@ main(int argc, char *argv[])
|
||||
/* Test the layout state. */
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- END(1024), /* Rest of the file */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
+ { 0, 0 },
|
||||
}));
|
||||
|
||||
unlink(filename);
|
||||
diff --git a/test-lm-big.c b/test-lm-big.c
|
||||
index 6098e59..eb94d3b 100644
|
||||
--- a/test-lm-big.c
|
||||
+++ b/test-lm-big.c
|
||||
@@ -111,7 +111,7 @@ main(int argc, char *argv[])
|
||||
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- { 1024, offset - 1024, true }, /* Keyslot Area */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
{ offset, 4096 }, /* luksmeta header */
|
||||
{ offset + 4096, 4096 }, /* luksmeta slot 0 */
|
||||
{ offset + 8192, 4096 }, /* luksmeta slot 0 (cont) */
|
||||
@@ -127,7 +127,7 @@ main(int argc, char *argv[])
|
||||
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- { 1024, offset - 1024, true }, /* Keyslot Area */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
{ offset, 4096 }, /* luksmeta header */
|
||||
END(offset + 4096), /* Rest of the file */
|
||||
}));
|
||||
diff --git a/test-lm-init.c b/test-lm-init.c
|
||||
index 2a6cb45..b16d597 100644
|
||||
--- a/test-lm-init.c
|
||||
+++ b/test-lm-init.c
|
||||
@@ -57,7 +57,7 @@ main(int argc, char *argv[])
|
||||
/* Test the layout state. */
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- { 1024, offset - 1024, true }, /* Keyslot Area */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
{ offset, 4096 }, /* luksmeta header */
|
||||
END(offset + 4096), /* Rest of the file */
|
||||
}));
|
||||
@@ -106,7 +106,7 @@ main(int argc, char *argv[])
|
||||
assert(luksmeta_test(cd) == -ENOENT);
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- { 1024, offset - 1024, true }, /* Keyslot Area */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
END(offset), /* Rest of the file */
|
||||
}));
|
||||
|
||||
diff --git a/test-lm-one.c b/test-lm-one.c
|
||||
index 8deb70a..18613e0 100644
|
||||
--- a/test-lm-one.c
|
||||
+++ b/test-lm-one.c
|
||||
@@ -49,7 +49,7 @@ main(int argc, char *argv[])
|
||||
/* Test the layout state. */
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- { 1024, offset - 1024, true }, /* Keyslot Area */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
{ offset, 4096 }, /* luksmeta header */
|
||||
{ offset + 4096, 4096 }, /* luksmeta slot 0 */
|
||||
END(offset + 8192), /* Rest of the file */
|
||||
@@ -68,7 +68,7 @@ main(int argc, char *argv[])
|
||||
/* Test the layout state. */
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- { 1024, offset - 1024, true }, /* Keyslot Area */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
{ offset, 4096 }, /* luksmeta header */
|
||||
END(offset + 4096), /* Rest of the file */
|
||||
}));
|
||||
diff --git a/test-lm-two.c b/test-lm-two.c
|
||||
index 78fea5b..9f0b1c5 100644
|
||||
--- a/test-lm-two.c
|
||||
+++ b/test-lm-two.c
|
||||
@@ -53,7 +53,7 @@ main(int argc, char *argv[])
|
||||
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- { 1024, offset - 1024, true }, /* Keyslot Area */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
{ offset, 4096 }, /* luksmeta header */
|
||||
{ offset + 4096, 4096 }, /* luksmeta slot 0 */
|
||||
END(offset + 8192), /* Rest of the file */
|
||||
@@ -70,7 +70,7 @@ main(int argc, char *argv[])
|
||||
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- { 1024, offset - 1024, true }, /* Keyslot Area */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
{ offset, 4096 }, /* luksmeta header */
|
||||
{ offset + 4096, 4096 }, /* luksmeta slot 0 */
|
||||
{ offset + 8192, 4096 }, /* luksmeta slot 1 */
|
||||
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
|
||||
assert(luksmeta_wipe(cd, 0, UUID0) == 0);
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- { 1024, offset - 1024, true }, /* Keyslot Area */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
{ offset, 4096 }, /* luksmeta header */
|
||||
{ offset + 4096, 4096, true }, /* luksmeta slot 0 */
|
||||
{ offset + 8192, 4096 }, /* luksmeta slot 1 */
|
||||
@@ -99,7 +99,7 @@ main(int argc, char *argv[])
|
||||
assert(luksmeta_wipe(cd, 1, UUID1) == 0);
|
||||
assert(test_layout((range_t[]) {
|
||||
{ 0, 1024 }, /* LUKS header */
|
||||
- { 1024, offset - 1024, true }, /* Keyslot Area */
|
||||
+ { 1024, 3072, true }, /* Keyslot Area */
|
||||
{ offset, 4096 }, /* luksmeta header */
|
||||
END(offset + 4096), /* Rest of the file */
|
||||
}));
|
||||
@ -1,26 +0,0 @@
|
||||
From 052c5d53d56f52cba95a569b3f2648b7cd647f1e Mon Sep 17 00:00:00 2001
|
||||
From: Nathaniel McCallum <npmccallum@redhat.com>
|
||||
Date: Thu, 9 Aug 2018 15:07:17 -0400
|
||||
Subject: [PATCH] Specify LUKSv1 during luksFormat
|
||||
|
||||
This fixes tests on builds of cryptsetup which default to LUKSv2.
|
||||
---
|
||||
test-luksmeta | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test-luksmeta b/test-luksmeta
|
||||
index fd17ead..f1e8b2e 100755
|
||||
--- a/test-luksmeta
|
||||
+++ b/test-luksmeta
|
||||
@@ -11,7 +11,7 @@ function onexit() {
|
||||
trap 'onexit' EXIT
|
||||
|
||||
truncate -s 4M $tmp
|
||||
-echo -n foo | cryptsetup luksFormat $tmp -
|
||||
+echo -n foo | cryptsetup luksFormat --type luks1 $tmp -
|
||||
|
||||
! ./luksmeta test -d $tmp
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,16 +1,12 @@
|
||||
Name: luksmeta
|
||||
Version: 9
|
||||
Release: 12%{?dist}
|
||||
Version: 10
|
||||
Release: 1%{?dist}
|
||||
Summary: Utility for storing small metadata in the LUKSv1 header
|
||||
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/latchset/%{name}
|
||||
Source0: https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
|
||||
|
||||
Patch01: luksmeta-9-tests.patch
|
||||
Patch02: luksmeta-9-relax-layout-assumptions.patch
|
||||
Patch03: Define-log-callback-function-to-use-with-libcryptset.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: pkgconfig
|
||||
@ -69,6 +65,10 @@ make %{?_smp_mflags} check
|
||||
%{_libdir}/pkgconfig/luksmeta.pc
|
||||
|
||||
%changelog
|
||||
* Wed Nov 26 2025 Sergio Correia <scorreia@redhat.com> - 10-1
|
||||
- New upstream release v10
|
||||
Resolves: RHEL-122139
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 9-12
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (luksmeta-9.tar.bz2) = eeecc3de9d621c380d29b2f2ca6ce715f09c20aac8ffc6a3d3cc7dc30c5dc46df686e61928d0accf7e7281ad9baa6ee59a0cf5b58635a311769d8e08c5cc94bd
|
||||
SHA512 (luksmeta-10.tar.bz2) = 03994598c7d573492eea571677d0e9b61413fc305f5a8efb04985c38e727534c6b484f847cd0dd96a53b3d2982399441bf2e269860dd0bc12bcf690d5829d93b
|
||||
|
||||
Loading…
Reference in New Issue
Block a user