[ptxdist] [PATCH] cryptsetup: version bump 2.7.4 -> 2.8.1

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

* [ptxdist] [PATCH] cryptsetup: version bump 2.7.4 -> 2.8.1
@ 2025-10-15  9:28 Sven Püschel
  2025-10-17  8:24 ` Michael Olbrich
  0 siblings, 1 reply; 3+ messages in thread
From: Sven Püschel @ 2025-10-15  9:28 UTC (permalink / raw)
  To: ptxdist; +Cc: Sven Püschel

Cryptsetup has reorganized their licenses [1] and also added a general
readme about all licenses used in the project.

[1] https://git.kernel.org/pub/scm/utils/cryptsetup/cryptsetup.git/commit/?id=1a6a611dff6194071f6f374705e162500d656c53

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/cryptsetup.make | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
index a25dfa735..b05a55bc5 100644
--- a/rules/cryptsetup.make
+++ b/rules/cryptsetup.make
@@ -14,17 +14,21 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup
 #
 # Paths and names
 #
-CRYPTSETUP_VERSION		:= 2.7.4
-CRYPTSETUP_MD5			:= 26ffe48f65d144af91b2a9639425d08c
+CRYPTSETUP_VERSION		:= 2.8.1
+CRYPTSETUP_MD5			:= 92b51ffa30e98447dccece6e4a055e3b
 CRYPTSETUP			:= cryptsetup-$(CRYPTSETUP_VERSION)
 CRYPTSETUP_SUFFIX		:= tar.xz
 CRYPTSETUP_URL			:= $(call ptx/mirror, KERNEL, 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		:= GPL-2.0-or-later AND public_domain AND Apache-2.0 AND CC-BY-SA-4.0 AND LGPL-2.0-or-later
 CRYPTSETUP_LICENSE_FILES	:= \
 	file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326 \
-	file://COPYING.LGPL;md5=1960515788100ce5f9c98ea78a65dc52
+	file://README.licensing;md5=45c1ba157f18d08991819f41f56d72e9 \
+	file://docs/licenses/COPYING.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+	file://docs/licenses/COPYING.CC-BY-SA-4.0;md5=b296faaab9c17d5874fd17967df54736 \
+	file://docs/licenses/COPYING.GPL-2.0-or-later-WITH-cryptsetup-OpenSSL-exception;md5=32107dd283b1dfeb66c9b3e6be312326 \
+	file://docs/licenses/COPYING.LGPL-2.1-or-later-WITH-cryptsetup-OpenSSL-exception;md5=1960515788100ce5f9c98ea78a65dc52
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.47.3




^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [ptxdist] [PATCH] cryptsetup: version bump 2.7.4 -> 2.8.1
  2025-10-15  9:28 [ptxdist] [PATCH] cryptsetup: version bump 2.7.4 -> 2.8.1 Sven Püschel
@ 2025-10-17  8:24 ` Michael Olbrich
  2025-10-17 12:38   ` Roland Hieber
  0 siblings, 1 reply; 3+ messages in thread
From: Michael Olbrich @ 2025-10-17  8:24 UTC (permalink / raw)
  To: Sven Püschel; +Cc: ptxdist

On Wed, Oct 15, 2025 at 11:28:46AM +0200, Sven Püschel wrote:
> Cryptsetup has reorganized their licenses [1] and also added a general
> readme about all licenses used in the project.
> 
> [1] https://git.kernel.org/pub/scm/utils/cryptsetup/cryptsetup.git/commit/?id=1a6a611dff6194071f6f374705e162500d656c53
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> ---
>  rules/cryptsetup.make | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
> index a25dfa735..b05a55bc5 100644
> --- a/rules/cryptsetup.make
> +++ b/rules/cryptsetup.make
> @@ -14,17 +14,21 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup
>  #
>  # Paths and names
>  #
> -CRYPTSETUP_VERSION		:= 2.7.4
> -CRYPTSETUP_MD5			:= 26ffe48f65d144af91b2a9639425d08c
> +CRYPTSETUP_VERSION		:= 2.8.1
> +CRYPTSETUP_MD5			:= 92b51ffa30e98447dccece6e4a055e3b
>  CRYPTSETUP			:= cryptsetup-$(CRYPTSETUP_VERSION)
>  CRYPTSETUP_SUFFIX		:= tar.xz
>  CRYPTSETUP_URL			:= $(call ptx/mirror, KERNEL, 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		:= GPL-2.0-or-later AND public_domain AND Apache-2.0 AND CC-BY-SA-4.0 AND LGPL-2.0-or-later

You're using LGPL-2.0-or-later here but the file is called
COPYING.LGPL-2.1-or-later. LGPL-2.0 is rare. Are you sure that this is
correct?

Michael

>  CRYPTSETUP_LICENSE_FILES	:= \
>  	file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326 \
> -	file://COPYING.LGPL;md5=1960515788100ce5f9c98ea78a65dc52
> +	file://README.licensing;md5=45c1ba157f18d08991819f41f56d72e9 \
> +	file://docs/licenses/COPYING.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \
> +	file://docs/licenses/COPYING.CC-BY-SA-4.0;md5=b296faaab9c17d5874fd17967df54736 \
> +	file://docs/licenses/COPYING.GPL-2.0-or-later-WITH-cryptsetup-OpenSSL-exception;md5=32107dd283b1dfeb66c9b3e6be312326 \
> +	file://docs/licenses/COPYING.LGPL-2.1-or-later-WITH-cryptsetup-OpenSSL-exception;md5=1960515788100ce5f9c98ea78a65dc52
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.47.3
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [ptxdist] [PATCH] cryptsetup: version bump 2.7.4 -> 2.8.1
  2025-10-17  8:24 ` Michael Olbrich
@ 2025-10-17 12:38   ` Roland Hieber
  0 siblings, 0 replies; 3+ messages in thread
From: Roland Hieber @ 2025-10-17 12:38 UTC (permalink / raw)
  To: ptxdist; +Cc: Sven Püschel

On Fri, Oct 17, 2025 at 10:24:09AM +0200, Michael Olbrich wrote:
> On Wed, Oct 15, 2025 at 11:28:46AM +0200, Sven Püschel wrote:
> > Cryptsetup has reorganized their licenses [1] and also added a general
> > readme about all licenses used in the project.
> > 
> > [1] https://git.kernel.org/pub/scm/utils/cryptsetup/cryptsetup.git/commit/?id=1a6a611dff6194071f6f374705e162500d656c53
> > 
> > Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> > ---
> >  rules/cryptsetup.make | 12 ++++++++----
> >  1 file changed, 8 insertions(+), 4 deletions(-)
> > 
> > diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
> > index a25dfa735..b05a55bc5 100644
> > --- a/rules/cryptsetup.make
> > +++ b/rules/cryptsetup.make
> > @@ -14,17 +14,21 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup
> >  #
> >  # Paths and names
> >  #
> > -CRYPTSETUP_VERSION		:= 2.7.4
> > -CRYPTSETUP_MD5			:= 26ffe48f65d144af91b2a9639425d08c
> > +CRYPTSETUP_VERSION		:= 2.8.1
> > +CRYPTSETUP_MD5			:= 92b51ffa30e98447dccece6e4a055e3b
> >  CRYPTSETUP			:= cryptsetup-$(CRYPTSETUP_VERSION)
> >  CRYPTSETUP_SUFFIX		:= tar.xz
> >  CRYPTSETUP_URL			:= $(call ptx/mirror, KERNEL, 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		:= GPL-2.0-or-later AND public_domain AND Apache-2.0 AND CC-BY-SA-4.0 AND LGPL-2.0-or-later
> 
> You're using LGPL-2.0-or-later here but the file is called
> COPYING.LGPL-2.1-or-later. LGPL-2.0 is rare. Are you sure that this is
> correct?

No, this was probably a typo. README.licensing mentions:

   * LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception
   * LGPL-2.1-or-later  - GNU Lesser General Public License 2.1 or any later ersion,
                          (with cryptsetup-OpenSSL-exception where applicable)

Please also keep the WITH cryptsetup-OpenSSL-exception in the license statement
for both GPL and LGPL licenses.

 - Roland

> Michael
> 
> >  CRYPTSETUP_LICENSE_FILES	:= \
> >  	file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326 \
> > -	file://COPYING.LGPL;md5=1960515788100ce5f9c98ea78a65dc52
> > +	file://README.licensing;md5=45c1ba157f18d08991819f41f56d72e9 \
> > +	file://docs/licenses/COPYING.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \
> > +	file://docs/licenses/COPYING.CC-BY-SA-4.0;md5=b296faaab9c17d5874fd17967df54736 \
> > +	file://docs/licenses/COPYING.GPL-2.0-or-later-WITH-cryptsetup-OpenSSL-exception;md5=32107dd283b1dfeb66c9b3e6be312326 \
> > +	file://docs/licenses/COPYING.LGPL-2.1-or-later-WITH-cryptsetup-OpenSSL-exception;md5=1960515788100ce5f9c98ea78a65dc52
> >  
> >  # ----------------------------------------------------------------------------
> >  # Prepare
> > -- 
> > 2.47.3
> > 
> > 
> > 
> 
> -- 
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> 

-- 
Roland Hieber, Pengutronix e.K.          | rhi@pengutronix.de          |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-10-17 12:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-10-15  9:28 [ptxdist] [PATCH] cryptsetup: version bump 2.7.4 -> 2.8.1 Sven Püschel
2025-10-17  8:24 ` Michael Olbrich
2025-10-17 12:38   ` Roland Hieber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox