From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 17 Dec 2021 14:28:02 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1myDHG-009UUS-QU for lore@lore.pengutronix.de; Fri, 17 Dec 2021 14:28:02 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1myDHF-00084T-HO; Fri, 17 Dec 2021 14:28:01 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1myDGT-0007Lj-3Y; Fri, 17 Dec 2021 14:27:13 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1myDGT-0052Jt-3Q; Fri, 17 Dec 2021 14:27:12 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1myDGR-00E2fP-H3; Fri, 17 Dec 2021 14:27:11 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 17 Dec 2021 14:27:11 +0100 Message-Id: <20211217132711.3346800-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211205221106.240253-1-rhi@pengutronix.de> References: <20211205221106.240253-1-rhi@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] dropbear: license review 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: Roland Hieber Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 63e2dbe3aaeb1a0cec44a227364826b20b6755c6. Michael [sent from post-receive hook] On Fri, 17 Dec 2021 14:27:11 +0100, Roland Hieber wrote: > Commit 80326bc43e7 (2020-11-16, Alexander Dahl: "dropbear: version bump > 2019.78 -> 2020.79") mentioned: > > The curve25519 implementation was replaced with the one by TweetNaCl, > which induced a change in 'LICENSE' summary. The old implementation was > licensed BSD-3-Clause and the new is public domain. > > This was wrong; even though curve25519.c is based on the public domain > TweetNaCl library, as mentioned in LICENSE, it carries an MIT > license header like most other files. Therefore remove the first > public_domain sub-expression. > > The second public_domain sub-expression referred to the libtomcrypt > license, which is licensed as, alternatively, WTFPL, or "LibTomCrypt is > public domain. As should all quality software be.". Classify it as a > custom license, as we deprecated the public_domain license identifier in > commit 76d1f680233955839298 (2021-08-06, Roland Hieber: "doc: working > with licensing information in packages"). > > Fixes: 80326bc43e71d1b012b3 ("dropbear: version bump 2019.78 -> 2020.79") > Cc: Alexander Dahl > Signed-off-by: Roland Hieber > Message-Id: <20211205221106.240253-1-rhi@pengutronix.de> > Acked-by: Alexander Dahl > [mol: fixed commit message as suggested by Alexander Dahl] > Signed-off-by: Michael Olbrich > > diff --git a/rules/dropbear.make b/rules/dropbear.make > index 102825ed6ab4..678bd7d85778 100644 > --- a/rules/dropbear.make > +++ b/rules/dropbear.make > @@ -24,7 +24,7 @@ DROPBEAR_URL := http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR > DROPBEAR_SOURCE := $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX) > DROPBEAR_DIR := $(BUILDDIR)/$(DROPBEAR) > DROPBEAR_LICENSE := \ > - MIT AND BSD-2-Clause AND public_domain AND SSH-short AND (public_domain OR WTFPL) AND Unlicense > + MIT AND BSD-2-Clause AND SSH-short AND (custom OR WTFPL) AND Unlicense > DROPBEAR_LICENSE_FILES := \ > file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f \ > file://libtomcrypt/LICENSE;md5=71baacc459522324ef3e2b9e052e8180 \ _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de