[ptxdist] [PATCH] cryptsetup: update license info

[ptxdist] [PATCH] cryptsetup: update license info

[Bruno Thomsen]

Add hash of license files and include "AND LGPL-2.0-or-later".

License was clarified back in v1.5.1 release note:

 * Cryptsetup and libcryptsetup is now released under GPLv2+
   (GPL version 2 or any later).
   Some internal code handling files (loopaes, verity, tcrypt
   and crypto backend wrapper) are LGPLv2+.

   Previously code was GPL version 2 only.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/cryptsetup.make | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
index aacf7e138259..6e14cab8a67d 100644
--- a/rules/cryptsetup.make
+++ b/rules/cryptsetup.make
@@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup
 #
 # Paths and names
 #
-CRYPTSETUP_VERSION	:= 2.6.0
-CRYPTSETUP_MD5		:= 8b67da403a2515dc75d40c42e8196e4e
-CRYPTSETUP		:= cryptsetup-$(CRYPTSETUP_VERSION)
-CRYPTSETUP_SUFFIX	:= tar.xz
-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-or-later
+CRYPTSETUP_VERSION		:= 2.6.0
+CRYPTSETUP_MD5			:= 8b67da403a2515dc75d40c42e8196e4e
+CRYPTSETUP			:= cryptsetup-$(CRYPTSETUP_VERSION)
+CRYPTSETUP_SUFFIX		:= tar.xz
+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-or-later AND LGPL-2.0-or-later
+CRYPTSETUP_LICENSE_FILES	:= \
+	file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326 \
+	file://COPYING.LGPL;md5=1960515788100ce5f9c98ea78a65dc52
 
 # ----------------------------------------------------------------------------
 # Prepare

base-commit: cae7daaa8850c4d952427fac5bcf4d8ffc553226
-- 
2.41.0

Re: [ptxdist] [APPLIED] cryptsetup: update license info

[Michael Olbrich]

Thanks, applied as 8cff1f2b9669a6be3c65ab73ff60efa505979d0d.

Michael

[sent from post-receive hook]

On Fri, 17 Nov 2023 08:20:35 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Add hash of license files and include "AND LGPL-2.0-or-later".
> 
> License was clarified back in v1.5.1 release note:
> 
>  * Cryptsetup and libcryptsetup is now released under GPLv2+
>    (GPL version 2 or any later).
>    Some internal code handling files (loopaes, verity, tcrypt
>    and crypto backend wrapper) are LGPLv2+.
> 
>    Previously code was GPL version 2 only.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20231108223052.69231-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
> index aacf7e138259..6e14cab8a67d 100644
> --- a/rules/cryptsetup.make
> +++ b/rules/cryptsetup.make
> @@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup
>  #
>  # Paths and names
>  #
> -CRYPTSETUP_VERSION	:= 2.6.0
> -CRYPTSETUP_MD5		:= 8b67da403a2515dc75d40c42e8196e4e
> -CRYPTSETUP		:= cryptsetup-$(CRYPTSETUP_VERSION)
> -CRYPTSETUP_SUFFIX	:= tar.xz
> -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-or-later
> +CRYPTSETUP_VERSION		:= 2.6.0
> +CRYPTSETUP_MD5			:= 8b67da403a2515dc75d40c42e8196e4e
> +CRYPTSETUP			:= cryptsetup-$(CRYPTSETUP_VERSION)
> +CRYPTSETUP_SUFFIX		:= tar.xz
> +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-or-later AND LGPL-2.0-or-later
> +CRYPTSETUP_LICENSE_FILES	:= \
> +	file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326 \
> +	file://COPYING.LGPL;md5=1960515788100ce5f9c98ea78a65dc52
>  
>  # ----------------------------------------------------------------------------
>  # Prepare