From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 17 Nov 2023 08:21:11 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1r3tA7-00EnMd-0u for lore@lore.pengutronix.de; Fri, 17 Nov 2023 08:21:11 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1r3tA7-0007CL-HP; Fri, 17 Nov 2023 08:21:11 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r3t9Y-0006Mo-Ef; Fri, 17 Nov 2023 08:20:36 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r3t9Y-009cun-1m; Fri, 17 Nov 2023 08:20:36 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1r3t9Y-00CGS9-02; Fri, 17 Nov 2023 08:20:36 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 17 Nov 2023 08:20:35 +0100 Message-Id: <20231117072035.2923174-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231108223052.69231-1-bruno.thomsen@gmail.com> References: <20231108223052.69231-1-bruno.thomsen@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] cryptsetup: update license info X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Bruno Thomsen Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 8cff1f2b9669a6be3c65ab73ff60efa505979d0d. Michael [sent from post-receive hook] On Fri, 17 Nov 2023 08:20:35 +0100, Bruno Thomsen 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 > Message-Id: <20231108223052.69231-1-bruno.thomsen@gmail.com> > Signed-off-by: Michael Olbrich > > 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