From a6da9d41e9bd1d2725d6f2ad889cf9810e0a6df5 Mon Sep 17 00:00:00 2001 From: Matthew Cole Date: Sat, 3 Sep 2022 02:06:08 +0000 Subject: [PATCH 1/2] Update cryptsetup and lvm2 sources --- package/cryptsetup/cryptsetup.hash | 8 ++++---- package/cryptsetup/cryptsetup.mk | 7 +++++-- package/lvm2/lvm2.mk | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 748ea0eafb..638e70c4cd 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.0/sha256sums.asc -sha256 7c51fae0f0e7ea9af0f515b2ac77009fb2969a6619ebab47d097dca38b083d30 cryptsetup-2.0.6.tar.xz -sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING -sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/sha256sums.asc +sha256 f8dacf7e29773b667b1d20ca5c3def2c3bde2dd0a673f6ab7bbaa66d76413263 cryptsetup-2.5.0.tar.gz +sha256 9184a6ebbd9ce7eb211152e7f741a6c82f2d1cc0e24a84ec9c52939eee0f0542 cryptsetup-2.5.0.tar.xz +sha256 a185daab56f6a2ee532f742209e81a65000f567afb82d2706af0169621258eb7 v2.5.0-ReleaseNotes diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 7788bfb60b..a79dc59781 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.0 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).6 +CRYPTSETUP_VERSION_MAJOR = 2.5 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c \ @@ -29,6 +29,9 @@ else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif +# Removes libssh dependency that is failing to compile (at least for me) +CRYPTSETUP_CONF_OPTS += --disable-ssh-token + HOST_CRYPTSETUP_DEPENDENCIES = \ host-pkgconf \ host-lvm2 \ diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 7fdb9a7e30..82a6cf49b4 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -6,7 +6,7 @@ LVM2_VERSION = 2.02.183 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz -LVM2_SITE = ftp://sources.redhat.com/pub/lvm2 +LVM2_SITE = ftp://sourceware.org/pub/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB -- 2.35.1 From 860d2088193ff637affcf5955feffdf1610afaa6 Mon Sep 17 00:00:00 2001 From: Matthew Cole Date: Sat, 3 Sep 2022 02:54:17 +0000 Subject: [PATCH 2/2] Remove unneeded cryptsetup patch --- .../0001-Remove-json_object-typedef.patch | 46 ------------------- 1 file changed, 46 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 fa865314a7..0000000000 --- a/package/cryptsetup/0001-Remove-json_object-typedef.patch +++ /dev/null @@ -1,46 +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 ---- - 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 - -- 2.35.1