From b537fe14339592023221a7c200257eb3a923c0be Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Dec 2021 14:45:32 -0700 Subject: [PATCH] package/cryptsetup: bump to version 2.4.2 Enable optional ssh-token support when available. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../0001-Remove-json_object-typedef.patch | 48 ------------------- package/cryptsetup/cryptsetup.hash | 4 +- package/cryptsetup/cryptsetup.mk | 12 ++++- 3 files changed, 12 insertions(+), 52 deletions(-) delete mode 100644 package/cryptsetup/0001-Remove-json_object-typedef.patch diff --git a/package/cryptsetup/0001-Remove-json_object-typedef.patch b/package/cryptsetup/0001-Remove-json_object-typedef.patch deleted file mode 100644 index bbfd1aa075..0000000000 --- a/package/cryptsetup/0001-Remove-json_object-typedef.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 567e7f8664c621f8aeaa95d9f4ab4b590574f572 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 15 Aug 2018 14:13:46 +0300 -Subject: [PATCH] Remove json_object typedef - -The json-c header already defines the same typedef. While C11 allows -typedef redefinition to the same type, older versions of gcc disallow -that. - -In file included from lib/luks2/luks2_internal.h:32, - from lib/luks2/luks2_disk_metadata.c:24: -lib/luks2/luks2.h:86: error: redefinition of typedef 'json_object' - -Signed-off-by: Baruch Siach -[Upstream status: -https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/91] ---- - lib/luks2/luks2.h | 1 - - lib/setup.c | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/luks2/luks2.h b/lib/luks2/luks2.h -index ee57b41ba974..25e36190da45 100644 ---- a/lib/luks2/luks2.h -+++ b/lib/luks2/luks2.h -@@ -83,7 +83,6 @@ struct luks2_hdr_disk { - /* - * LUKS2 header in-memory. - */ --typedef struct json_object json_object; - struct luks2_hdr { - size_t hdr_size; - uint64_t seqid; -diff --git a/lib/setup.c b/lib/setup.c -index fddbe7ef7897..856f6e80f465 100644 ---- a/lib/setup.c -+++ b/lib/setup.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include "libcryptsetup.h" - #include "luks.h" --- -2.18.0 - diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 0aa3f79df7..b3bb859bdc 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/sha256sums.asc -sha256 b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f cryptsetup-2.3.6.tar.xz +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/sha256sums.asc +sha256 170cc2326a9daeeeb578579176bd10d4a60ee5c4fc5bc69018ce67dafc540b9c cryptsetup-2.4.2.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 3cf6c8a301..980a36faa8 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.3 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).6 +CRYPTSETUP_VERSION_MAJOR = 2.4 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ @@ -33,6 +33,13 @@ else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif +ifeq ($(BR2_PACKAGE_LIBSSH),y) +CRYPTSETUP_DEPENDENCIES += libssh +CRYPTSETUP_CONF_OPTS += --enable-ssh-token +else +CRYPTSETUP_CONF_OPTS += --disable-ssh-token +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) CRYPTSETUP_CONF_OPTS += --with-tmpfilesdir=/usr/lib/tmpfiles.d else @@ -49,6 +56,7 @@ HOST_CRYPTSETUP_DEPENDENCIES = \ HOST_CRYPTSETUP_CONF_OPTS = --with-crypto_backend=openssl \ --disable-kernel_crypto \ + --disable-ssh-token \ --enable-blkid \ --with-tmpfilesdir=no