[ptxdist] [PATCH 02/22] cryptsetup: version bump 1.7.5 -> 2.0.0

[Clemens Gruber <clemens.gruber@pqgruber.com>]

Now includes support for dm-integrity via new integritysetup tool.
---
 rules/cryptsetup.in   | 10 +++++++++-
 rules/cryptsetup.make | 28 +++++++++++++++++++---------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/rules/cryptsetup.in b/rules/cryptsetup.in
index 2cd898058..67ce41beb 100644
--- a/rules/cryptsetup.in
+++ b/rules/cryptsetup.in
@@ -1,6 +1,7 @@
 ## SECTION=disk_and_file
 
 menuconfig CRYPTSETUP
+	select JSON_C
 	select LVM2
 	select LIBUUID
 	select LIBPOPT
@@ -11,7 +12,10 @@ menuconfig CRYPTSETUP
 	prompt "cryptsetup                    "
 	help
 	  Cryptsetup is a utility used to conveniently setup disk encryption
-	  based on DMCrypt kernel module.
+	  based on the dm-crypt kernel module.
+	  It also includes veritysetup, used to setup dm-verity block integrity
+	  checking of read-only targets, as well as integritysetup to setup
+	  dm-integrity block integrity checking of read-write targets.
 
 if CRYPTSETUP
 
@@ -42,6 +46,10 @@ config CRYPTSETUP_CRYPTSETUP
 	bool
 	prompt "install cryptsetup"
 
+config CRYPTSETUP_INTEGRITYSETUP
+	bool
+	prompt "install integritysetup"
+
 config CRYPTSETUP_VERITYSETUP
 	bool
 	prompt "install veritysetup"
diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
index 9975e72f3..bb865aa9a 100644
--- a/rules/cryptsetup.make
+++ b/rules/cryptsetup.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup
 #
 # Paths and names
 #
-CRYPTSETUP_VERSION	:= 1.7.5
-CRYPTSETUP_MD5		:= dde798a883b06a2903379dcd593480e1
+CRYPTSETUP_VERSION	:= 2.0.0
+CRYPTSETUP_MD5		:= 0f44b7535b2cdabbf0c4adf523fbceeb
 CRYPTSETUP		:= cryptsetup-$(CRYPTSETUP_VERSION)
 CRYPTSETUP_SUFFIX	:= tar.gz
-CRYPTSETUP_URL		:= https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7//$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
+CRYPTSETUP_URL		:= https://www.kernel.org/pub/linux/utils/cryptsetup/v$(basename $(CRYPTSETUP_VERSION))/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
 CRYPTSETUP_SOURCE	:= $(SRCDIR)/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
 CRYPTSETUP_DIR		:= $(BUILDDIR)/$(CRYPTSETUP)
 CRYPTSETUP_LICENSE	:= GPL-2.0+
@@ -35,20 +35,27 @@ CRYPTSETUP_LICENSE	:= GPL-2.0+
 CRYPTSETUP_CONF_TOOL	:= autoconf
 CRYPTSETUP_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--enable-keyring \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-nls \
 	--disable-rpath \
+	--disable-fips \
 	--disable-pwquality \
 	--disable-static-cryptsetup \
-	--enable-veritysetup \
-	--enable-cryptsetup-reencrypt \
+	--$(call ptx/endis, PTXCONF_CRYPTSETUP_CRYPTSETUP)-cryptsetup \
+	--$(call ptx/endis, PTXCONF_CRYPTSETUP_VERITYSETUP)-veritysetup \
+	--$(call ptx/endis, PTXCONF_CRYPTSETUP_CRYPTSETUP)-cryptsetup-reencrypt \
+	--$(call ptx/endis, PTXCONF_CRYPTSETUP_INTEGRITYSETUP)-integritysetup \
 	--disable-selinux \
 	--enable-udev \
 	--$(call ptx/endis, PTXCONF_CRYPTSETUP_CRYPT_BACKEND_KERNEL)-kernel_crypto \
 	--$(call ptx/endis, PTXCONF_CRYPTSETUP_CRYPT_BACKEND_GCRYPT)-gcrypt-pbkdf2 \
+	--enable-internal-argon2 \
+	--disable-libargon2 \
 	--enable-dev-random \
 	--disable-python \
-	--with-crypto_backend=$(PTXCONF_CRYPTSETUP_CRYPT_BACKEND)
+	--with-crypto_backend=$(PTXCONF_CRYPTSETUP_CRYPT_BACKEND) \
+	--with-luks2-lock-path=/run/cryptsetup
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -65,12 +72,15 @@ $(STATEDIR)/cryptsetup.targetinstall:
 
 	@$(call install_lib, cryptsetup, 0, 0, 0644, libcryptsetup)
 
-ifdef PTXCONF_CRYPTSETUP_VERITYSETUP
-	@$(call install_copy, cryptsetup, 0, 0, 0755, -, /usr/sbin/veritysetup)
-endif
 ifdef PTXCONF_CRYPTSETUP_CRYPTSETUP
 	@$(call install_copy, cryptsetup, 0, 0, 0755, -, /usr/sbin/cryptsetup)
 endif
+ifdef PTXCONF_CRYPTSETUP_INTEGRITYSETUP
+	@$(call install_copy, cryptsetup, 0, 0, 0755, -, /usr/sbin/integritysetup)
+endif
+ifdef PTXCONF_CRYPTSETUP_VERITYSETUP
+	@$(call install_copy, cryptsetup, 0, 0, 0755, -, /usr/sbin/veritysetup)
+endif
 
 	@$(call install_finish, cryptsetup)
 
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de