package/cryptsetup: bump to version 2.3.3

- Update indentation in hash file (two spaces)
- Send patch upstream

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

diff --git a/package/cryptsetup/0001-Remove-json_object-typedef.patch b/package/cryptsetup/0001-Remove-json_object-typedef.patch
index fa865314a7da99b1f6a7e06c1f78a5d3f219f64e..bbfd1aa07591539b08033eff2c25966c6d00bd67 100644 (file)
--- a/package/cryptsetup/0001-Remove-json_object-typedef.patch
+++ b/package/cryptsetup/0001-Remove-json_object-typedef.patch
@@ -12,6 +12,8 @@ In file included from lib/luks2/luks2_internal.h:32,
 lib/luks2/luks2.h:86: error: redefinition of typedef 'json_object'
 
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+[Upstream status:
+https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/91]
 ---
  lib/luks2/luks2.h | 1 -
  lib/setup.c       | 1 +

diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash
index 175ecf33cfd6baddd4d76a08ef88ec0b6cc4a13c..c47d701baae13ccba8cae5a439cf9b2664c6bd4c 100644 (file)
--- a/package/cryptsetup/cryptsetup.hash
+++ b/package/cryptsetup/cryptsetup.hash
@@ -1,4 +1,4 @@
-# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.2/sha256sums.asc
-sha256 2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46  cryptsetup-2.2.2.tar.xz
-sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33  COPYING
-sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5  COPYING.LGPL
+# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/sha256sums.asc
+sha256  3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df  cryptsetup-2.3.3.tar.xz
+sha256  45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33  COPYING
+sha256  8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5  COPYING.LGPL

diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 197f5f25b2d90a3c1f2933d1f3c73718672f1acf..587ef0a810c08a034ecca55f9e88c565a172b413 100644 (file)
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRYPTSETUP_VERSION_MAJOR = 2.2
-CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2
+CRYPTSETUP_VERSION_MAJOR = 2.3
+CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3
 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 libargon2 \