[ptxdist] [PATCH 1/2] dropbear: license review

[Roland Hieber <rhi@pengutronix.de>]

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 a BSD-2-Clause
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 <ada@thorsis.com>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/dropbear.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 \
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de