From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 23 Oct 2025 15:13:59 +0200 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 1vBv8h-00Ay2P-2w for lore@lore.pengutronix.de; Thu, 23 Oct 2025 15:13:59 +0200 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 1vBv8h-0008Rr-DF; Thu, 23 Oct 2025 15:13:59 +0200 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 1vBv8O-00080W-7G; Thu, 23 Oct 2025 15:13:40 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vBv8O-00540W-09; Thu, 23 Oct 2025 15:13:40 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1vBv8N-000000055L8-4BK5; Thu, 23 Oct 2025 15:13:39 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 23 Oct 2025 15:13:39 +0200 Message-ID: <20251023131339.1212159-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251021083936.1420203-1-s.pueschel@pengutronix.de> References: <20251021083936.1420203-1-s.pueschel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] cryptsetup: version bump 2.7.4 -> 2.8.1 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: =?UTF-8?q?Sven=20P=C3=BCschel?= 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 783891787bb8a7182f7309078d6aac3c509b74b6. Michael [sent from post-receive hook] On Thu, 23 Oct 2025 15:13:39 +0200, Sven Püschel wrote: > Cryptsetup has reorganized their licenses [1] and also added a general > readme about all licenses used in the project. > > While the licenses in the README seems to match, it only mentions the > cryptsetup OpenSSL exception for the LGPL license and not the default > GPL-2.0-or-later license. This matches the SPDX Identifier in the source > files. But in contrast both included GPL-2.0-or-later licenses > (COPYING and COPYING.GPL-2.0-or-later-WITH-cryptsetup-OpenSSL-exception) > contain the OpenSSL exception clause. Therefore both licenses were > added to the LICENSE expression. > > [1] https://git.kernel.org/pub/scm/utils/cryptsetup/cryptsetup.git/commit/?id=1a6a611dff6194071f6f374705e162500d656c53 > > Signed-off-by: Sven Püschel > Message-Id: <20251021083936.1420203-1-s.pueschel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make > index a25dfa735313..178c36b9d747 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 LGPL-2.1-or-later AND public_domain AND Apache-2.0 AND CC-BY-SA-4.0 AND GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception > 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