* [ptxdist] [PATCH 1/2] dropbear: license review
@ 2021-12-05 22:11 Roland Hieber
2021-12-05 22:11 ` [ptxdist] [PATCH 2/2] fontconfig: " Roland Hieber
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Roland Hieber @ 2021-12-05 22:11 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl, Roland Hieber
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
^ permalink raw reply [flat|nested] 6+ messages in thread* [ptxdist] [PATCH 2/2] fontconfig: license review
2021-12-05 22:11 [ptxdist] [PATCH 1/2] dropbear: license review Roland Hieber
@ 2021-12-05 22:11 ` Roland Hieber
2021-12-17 13:27 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-12-10 8:48 ` [ptxdist] [PATCH 1/2] dropbear: " Alexander Dahl
2021-12-17 13:27 ` [ptxdist] [APPLIED] " Michael Olbrich
2 siblings, 1 reply; 6+ messages in thread
From: Roland Hieber @ 2021-12-05 22:11 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Since we deprecated the public_domain identifier in commit
76d1f680233955839298 (2021-08-06, Roland Hieber: "doc: working with
licensing information in packages"), classify the snippet in ftglue.c
("This code is explicitely put in the public domain") as a custom
license.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/fontconfig.make | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/rules/fontconfig.make b/rules/fontconfig.make
index 1fdda95109fc..74c5491c1cf5 100644
--- a/rules/fontconfig.make
+++ b/rules/fontconfig.make
@@ -21,8 +21,13 @@ FONTCONFIG_SUFFIX := tar.gz
FONTCONFIG_URL := http://fontconfig.org/release/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
FONTCONFIG_SOURCE := $(SRCDIR)/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
FONTCONFIG_DIR := $(BUILDDIR)/$(FONTCONFIG)
-FONTCONFIG_LICENSE := MIT AND Unicode-TOU AND public_domain
-
+FONTCONFIG_LICENSE := HPND-sell-variant AND MIT AND custom AND MIT-Modern-Variant AND Unicode-TOU
+FONTCONFIG_LICENSE_FILES := \
+ file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
+ file://src/fcfreetype.c;startline=26;endline=44;md5=44e5309810857e7964a78e3381fa2910 \
+ file://src/ftglue.c;startline=1;endline=8;789386c3d7c853bbce055520a11aaeb9 \
+ file://src/fcatomic.h;startline=4,endline=24;md5=89c79dedb0fb324bfa2fae6b7bf7f673 \
+ file://fc-case/CaseFolding.txt;startline=3;endline=6;md5=c6e05768ea162f646ae2e29667c48b2e
# ----------------------------------------------------------------------------
# Prepare
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [ptxdist] [APPLIED] fontconfig: license review
2021-12-05 22:11 ` [ptxdist] [PATCH 2/2] fontconfig: " Roland Hieber
@ 2021-12-17 13:27 ` Michael Olbrich
0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2021-12-17 13:27 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as 7818481cc57bd75f6de0bc9a9a8c02c3de4ce5b2.
Michael
[sent from post-receive hook]
On Fri, 17 Dec 2021 14:27:12 +0100, Roland Hieber <rhi@pengutronix.de> wrote:
> Since we deprecated the public_domain identifier in commit
> 76d1f680233955839298 (2021-08-06, Roland Hieber: "doc: working with
> licensing information in packages"), classify the snippet in ftglue.c
> ("This code is explicitely put in the public domain") as a custom
> license.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20211205221106.240253-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/fontconfig.make b/rules/fontconfig.make
> index 1fdda95109fc..74c5491c1cf5 100644
> --- a/rules/fontconfig.make
> +++ b/rules/fontconfig.make
> @@ -21,8 +21,13 @@ FONTCONFIG_SUFFIX := tar.gz
> FONTCONFIG_URL := http://fontconfig.org/release/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
> FONTCONFIG_SOURCE := $(SRCDIR)/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
> FONTCONFIG_DIR := $(BUILDDIR)/$(FONTCONFIG)
> -FONTCONFIG_LICENSE := MIT AND Unicode-TOU AND public_domain
> -
> +FONTCONFIG_LICENSE := HPND-sell-variant AND MIT AND custom AND MIT-Modern-Variant AND Unicode-TOU
> +FONTCONFIG_LICENSE_FILES := \
> + file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
> + file://src/fcfreetype.c;startline=26;endline=44;md5=44e5309810857e7964a78e3381fa2910 \
> + file://src/ftglue.c;startline=1;endline=8;789386c3d7c853bbce055520a11aaeb9 \
> + file://src/fcatomic.h;startline=4,endline=24;md5=89c79dedb0fb324bfa2fae6b7bf7f673 \
> + file://fc-case/CaseFolding.txt;startline=3;endline=6;md5=c6e05768ea162f646ae2e29667c48b2e
>
> # ----------------------------------------------------------------------------
> # Prepare
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH 1/2] dropbear: license review
2021-12-05 22:11 [ptxdist] [PATCH 1/2] dropbear: license review Roland Hieber
2021-12-05 22:11 ` [ptxdist] [PATCH 2/2] fontconfig: " Roland Hieber
@ 2021-12-10 8:48 ` Alexander Dahl
2021-12-11 15:58 ` Roland Hieber
2021-12-17 13:27 ` [ptxdist] [APPLIED] " Michael Olbrich
2 siblings, 1 reply; 6+ messages in thread
From: Alexander Dahl @ 2021-12-10 8:48 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
Hello Roland,
Am Sonntag, 5. Dezember 2021, 23:11:05 CET schrieb Roland Hieber:
> 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.
That header is actual MIT license. See the spdx-license-match tool or for
reference:
https://metadata.ftp-master.debian.org/changelogs//main/d/dropbear/
dropbear_2020.81-3_copyright
This does not affect the diff of your patch, but the commit message would not
be correct.
With that changed:
Acked-by: Alexander Dahl <ada@thorsis.com>
> 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>
Ack.
Greets
Alex
> ---
> 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 \
--
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [ptxdist] [PATCH 1/2] dropbear: license review
2021-12-10 8:48 ` [ptxdist] [PATCH 1/2] dropbear: " Alexander Dahl
@ 2021-12-11 15:58 ` Roland Hieber
0 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2021-12-11 15:58 UTC (permalink / raw)
To: Alexander Dahl; +Cc: ptxdist
On Fri, Dec 10, 2021 at 09:48:06AM +0100, Alexander Dahl wrote:
> Hello Roland,
>
> Am Sonntag, 5. Dezember 2021, 23:11:05 CET schrieb Roland Hieber:
> > 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.
>
> That header is actual MIT license. See the spdx-license-match tool or for
> reference:
>
> https://metadata.ftp-master.debian.org/changelogs//main/d/dropbear/
> dropbear_2020.81-3_copyright
>
> This does not affect the diff of your patch, but the commit message would not
> be correct.
Oh indded, you're right.
Michael, can you do an :s/it carries a BSD-2-Clause/it carries an MIT/
when applying the patch?
- Roland
>
> With that changed:
>
> Acked-by: Alexander Dahl <ada@thorsis.com>
>
> > 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>
>
> Ack.
>
> Greets
> Alex
>
> > ---
> > 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 \
>
>
> --
>
>
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@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 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] dropbear: license review
2021-12-05 22:11 [ptxdist] [PATCH 1/2] dropbear: license review Roland Hieber
2021-12-05 22:11 ` [ptxdist] [PATCH 2/2] fontconfig: " Roland Hieber
2021-12-10 8:48 ` [ptxdist] [PATCH 1/2] dropbear: " Alexander Dahl
@ 2021-12-17 13:27 ` Michael Olbrich
2 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2021-12-17 13:27 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as 63e2dbe3aaeb1a0cec44a227364826b20b6755c6.
Michael
[sent from post-receive hook]
On Fri, 17 Dec 2021 14:27:11 +0100, Roland Hieber <rhi@pengutronix.de> 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 <ada@thorsis.com>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20211205221106.240253-1-rhi@pengutronix.de>
> Acked-by: Alexander Dahl <ada@thorsis.com>
> [mol: fixed commit message as suggested by Alexander Dahl]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-12-17 13:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-05 22:11 [ptxdist] [PATCH 1/2] dropbear: license review Roland Hieber
2021-12-05 22:11 ` [ptxdist] [PATCH 2/2] fontconfig: " Roland Hieber
2021-12-17 13:27 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-12-10 8:48 ` [ptxdist] [PATCH 1/2] dropbear: " Alexander Dahl
2021-12-11 15:58 ` Roland Hieber
2021-12-17 13:27 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox