diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index e46cfbdf29..f456451765 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,7 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 d2be4395b8f503b0ebf4b2d81db90c35a97050a358ee21fe62a0dfb66e5d5522 cryptsetup-2.7.5.tar.xz +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.8/sha256sums.asc +sha256 cc9e2d37c25a871cea37520b28d532207b0c1670fb10fc54d68071f63f5243a2 cryptsetup-2.8.0.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING -sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 docs/licenses/COPYING.Apache-2.0 +sha256 28a9529c7d0bb4dc51f4bf5c116a3d16ef247a052f7591466768ddf563fd1cf5 docs/licenses/COPYING.CC-BY-SA-4.0 +sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 docs/licenses/COPYING.GPL-2.0-or-later-WITH-cryptsetup-OpenSSL-exception +sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 docs/licenses/COPYING.LGPL-2.1-or-later-WITH-cryptsetup-OpenSSL-exception diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 52f79e177f..6d2536957d 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).5 +CRYPTSETUP_VERSION_MAJOR = 2.8 +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 = \ @@ -13,8 +13,13 @@ CRYPTSETUP_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \ $(TARGET_NLS_DEPENDENCIES) -CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) -CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL +CRYPTSETUP_LICENSE = Apache-2.0, CC-BY-SA-4.0, GPL-2.0+ (programs), LGPL-2.1+ (library) +CRYPTSETUP_LICENSE_FILES = \ + COPYING \ + docs/licenses/COPYING.Apache-2.0 \ + docs/licenses/COPYING.CC-BY-SA-4.0 \ + docs/licenses/COPYING.GPL-2.0-or-later-WITH-cryptsetup-OpenSSL-exception \ + docs/licenses/COPYING.LGPL-2.1-or-later-WITH-cryptsetup-OpenSSL-exception CRYPTSETUP_CPE_ID_VALID = YES CRYPTSETUP_INSTALL_STAGING = YES