* [ptxdist] [PATCH 1/3] wget: add license identifier
@ 2019-10-09 14:34 Hubert Feurstein
2019-10-09 14:34 ` [ptxdist] [PATCH 2/3] openvpn: " Hubert Feurstein
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Hubert Feurstein @ 2019-10-09 14:34 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
rules/wget.make | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rules/wget.make b/rules/wget.make
index 1ec6d8c42..cf1a2340f 100644
--- a/rules/wget.make
+++ b/rules/wget.make
@@ -21,6 +21,10 @@ WGET_SUFFIX := tar.gz
WGET_URL := $(call ptx/mirror, GNU, wget/$(WGET).$(WGET_SUFFIX))
WGET_SOURCE := $(SRCDIR)/$(WGET).$(WGET_SUFFIX)
WGET_DIR := $(BUILDDIR)/$(WGET)
+WGET_LICENSE := GPL-3.0-or-later
+WGET_LICENSE_FILES := \
+ file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \
+ file://src/main.c;startline=1;endline=28;md5=7b27873e910933ba54fa16589c4b8eed
# ----------------------------------------------------------------------------
# Prepare
--
2.23.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread* [ptxdist] [PATCH 2/3] openvpn: add license identifier
2019-10-09 14:34 [ptxdist] [PATCH 1/3] wget: add license identifier Hubert Feurstein
@ 2019-10-09 14:34 ` Hubert Feurstein
2019-10-15 10:30 ` Roland Hieber
2019-10-09 14:34 ` [ptxdist] [PATCH 3/3] cpufrequtils: " Hubert Feurstein
2019-10-15 10:14 ` [ptxdist] [PATCH 1/3] wget: " Roland Hieber
2 siblings, 1 reply; 8+ messages in thread
From: Hubert Feurstein @ 2019-10-09 14:34 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
rules/openvpn.make | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rules/openvpn.make b/rules/openvpn.make
index ad496d1a7..4035f453f 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -21,6 +21,10 @@ OPENVPN_SUFFIX := tar.xz
OPENVPN_URL := http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX)
OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN)
+OPENVPN_LICENSE := GPL-2.0-only
+OPENVPN_LICENSE_FILES := \
+ file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba \
+ file://src/openvpn/openvpn.c;startline=1;endline=22;md5=1bb6a64be5c851a32fa98b8f9d6e33f9
# ----------------------------------------------------------------------------
# Prepare
--
2.23.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/3] openvpn: add license identifier
2019-10-09 14:34 ` [ptxdist] [PATCH 2/3] openvpn: " Hubert Feurstein
@ 2019-10-15 10:30 ` Roland Hieber
2019-10-15 10:40 ` Michael Olbrich
0 siblings, 1 reply; 8+ messages in thread
From: Roland Hieber @ 2019-10-15 10:30 UTC (permalink / raw)
To: Hubert Feurstein; +Cc: ptxdist
On Wed, Oct 09, 2019 at 04:34:28PM +0200, Hubert Feurstein wrote:
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
> rules/openvpn.make | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/rules/openvpn.make b/rules/openvpn.make
> index ad496d1a7..4035f453f 100644
> --- a/rules/openvpn.make
> +++ b/rules/openvpn.make
> @@ -21,6 +21,10 @@ OPENVPN_SUFFIX := tar.xz
> OPENVPN_URL := http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX)
> OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
> OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN)
> +OPENVPN_LICENSE := GPL-2.0-only
OPENVPN_LICENSE := GPL-2.0-only WITH openvpn-openssl-exception AND BSD-2-Clause AND BSD-3-Clause
The exception is mentioned in COPYING, and SPDX already knows this one :)
A few files like src/openvpn/base64.c carry BSD-3-Clause headers, and
the lz4 implementation in src/compat/ is BSD-2-Clause.
> +OPENVPN_LICENSE_FILES := \
> + file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba \
> + file://src/openvpn/openvpn.c;startline=1;endline=22;md5=1bb6a64be5c851a32fa98b8f9d6e33f9
file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f
file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5f66cf078523624965e41518eed881e2
- Roland
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/3] openvpn: add license identifier
2019-10-15 10:30 ` Roland Hieber
@ 2019-10-15 10:40 ` Michael Olbrich
0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2019-10-15 10:40 UTC (permalink / raw)
To: ptxdist
On Tue, Oct 15, 2019 at 12:30:06PM +0200, Roland Hieber wrote:
> On Wed, Oct 09, 2019 at 04:34:28PM +0200, Hubert Feurstein wrote:
> > Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> > ---
> > rules/openvpn.make | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/rules/openvpn.make b/rules/openvpn.make
> > index ad496d1a7..4035f453f 100644
> > --- a/rules/openvpn.make
> > +++ b/rules/openvpn.make
> > @@ -21,6 +21,10 @@ OPENVPN_SUFFIX := tar.xz
> > OPENVPN_URL := http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX)
> > OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
> > OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN)
> > +OPENVPN_LICENSE := GPL-2.0-only
>
> OPENVPN_LICENSE := GPL-2.0-only WITH openvpn-openssl-exception AND BSD-2-Clause AND BSD-3-Clause
>
> The exception is mentioned in COPYING, and SPDX already knows this one :)
> A few files like src/openvpn/base64.c carry BSD-3-Clause headers, and
> the lz4 implementation in src/compat/ is BSD-2-Clause.
>
> > +OPENVPN_LICENSE_FILES := \
> > + file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba \
> > + file://src/openvpn/openvpn.c;startline=1;endline=22;md5=1bb6a64be5c851a32fa98b8f9d6e33f9
>
> file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f
> file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5f66cf078523624965e41518eed881e2
And COPYRIGHT.GPL, that contains the actual GPL license text.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 3/3] cpufrequtils: add license identifier
2019-10-09 14:34 [ptxdist] [PATCH 1/3] wget: add license identifier Hubert Feurstein
2019-10-09 14:34 ` [ptxdist] [PATCH 2/3] openvpn: " Hubert Feurstein
@ 2019-10-09 14:34 ` Hubert Feurstein
2019-10-15 10:32 ` Roland Hieber
2019-10-15 10:14 ` [ptxdist] [PATCH 1/3] wget: " Roland Hieber
2 siblings, 1 reply; 8+ messages in thread
From: Hubert Feurstein @ 2019-10-09 14:34 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
rules/cpufrequtils.make | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rules/cpufrequtils.make b/rules/cpufrequtils.make
index 1173c488c..d119cce53 100644
--- a/rules/cpufrequtils.make
+++ b/rules/cpufrequtils.make
@@ -21,6 +21,10 @@ CPUFREQUTILS_SUFFIX := tar.xz
CPUFREQUTILS_URL := $(call ptx/mirror, KERNEL, utils/kernel/cpufreq/$(CPUFREQUTILS).$(CPUFREQUTILS_SUFFIX))
CPUFREQUTILS_SOURCE := $(SRCDIR)/$(CPUFREQUTILS).$(CPUFREQUTILS_SUFFIX)
CPUFREQUTILS_DIR := $(BUILDDIR)/$(CPUFREQUTILS)
+CPUFREQUTILS_LICENSE := GPL-2.0-only
+CPUFREQUTILS_LICENSE_FILES := \
+ file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+ file://utils/info.c;startline=1;endline=5;md5=a3504f2818a74b2fffdc8e61bf3ef0f8
# ----------------------------------------------------------------------------
# Prepare
--
2.23.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 3/3] cpufrequtils: add license identifier
2019-10-09 14:34 ` [ptxdist] [PATCH 3/3] cpufrequtils: " Hubert Feurstein
@ 2019-10-15 10:32 ` Roland Hieber
0 siblings, 0 replies; 8+ messages in thread
From: Roland Hieber @ 2019-10-15 10:32 UTC (permalink / raw)
To: Hubert Feurstein; +Cc: ptxdist
On Wed, Oct 09, 2019 at 04:34:29PM +0200, Hubert Feurstein wrote:
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
> rules/cpufrequtils.make | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/rules/cpufrequtils.make b/rules/cpufrequtils.make
> index 1173c488c..d119cce53 100644
> --- a/rules/cpufrequtils.make
> +++ b/rules/cpufrequtils.make
> @@ -21,6 +21,10 @@ CPUFREQUTILS_SUFFIX := tar.xz
> CPUFREQUTILS_URL := $(call ptx/mirror, KERNEL, utils/kernel/cpufreq/$(CPUFREQUTILS).$(CPUFREQUTILS_SUFFIX))
> CPUFREQUTILS_SOURCE := $(SRCDIR)/$(CPUFREQUTILS).$(CPUFREQUTILS_SUFFIX)
> CPUFREQUTILS_DIR := $(BUILDDIR)/$(CPUFREQUTILS)
> +CPUFREQUTILS_LICENSE := GPL-2.0-only
> +CPUFREQUTILS_LICENSE_FILES := \
> + file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> + file://utils/info.c;startline=1;endline=5;md5=a3504f2818a74b2fffdc8e61bf3ef0f8
Reviewed-by: Roland Hieber <rhi@pengutronix.de>
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/3] wget: add license identifier
2019-10-09 14:34 [ptxdist] [PATCH 1/3] wget: add license identifier Hubert Feurstein
2019-10-09 14:34 ` [ptxdist] [PATCH 2/3] openvpn: " Hubert Feurstein
2019-10-09 14:34 ` [ptxdist] [PATCH 3/3] cpufrequtils: " Hubert Feurstein
@ 2019-10-15 10:14 ` Roland Hieber
2019-10-25 7:37 ` Michael Olbrich
2 siblings, 1 reply; 8+ messages in thread
From: Roland Hieber @ 2019-10-15 10:14 UTC (permalink / raw)
To: Hubert Feurstein; +Cc: ptxdist
On Wed, Oct 09, 2019 at 04:34:27PM +0200, Hubert Feurstein wrote:
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
> rules/wget.make | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/rules/wget.make b/rules/wget.make
> index 1ec6d8c42..cf1a2340f 100644
> --- a/rules/wget.make
> +++ b/rules/wget.make
> @@ -21,6 +21,10 @@ WGET_SUFFIX := tar.gz
> WGET_URL := $(call ptx/mirror, GNU, wget/$(WGET).$(WGET_SUFFIX))
> WGET_SOURCE := $(SRCDIR)/$(WGET).$(WGET_SUFFIX)
> WGET_DIR := $(BUILDDIR)/$(WGET)
> +WGET_LICENSE := GPL-3.0-or-later
> +WGET_LICENSE_FILES := \
> + file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \
> + file://src/main.c;startline=1;endline=28;md5=7b27873e910933ba54fa16589c4b8eed
src/*.c also mentions a linking exceptions for OpenSSL, but we currently
cannot express that in SPDX syntax... So I guess it's as correct as we
can currently be. For further reference, I have opened the discussion at
<https://github.com/spdx/license-list-XML/issues/939>.
Reviewed-by: Roland Hieber <rhi@pengutronix.de>
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/3] wget: add license identifier
2019-10-15 10:14 ` [ptxdist] [PATCH 1/3] wget: " Roland Hieber
@ 2019-10-25 7:37 ` Michael Olbrich
0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2019-10-25 7:37 UTC (permalink / raw)
To: ptxdist
On Tue, Oct 15, 2019 at 12:14:35PM +0200, Roland Hieber wrote:
> On Wed, Oct 09, 2019 at 04:34:27PM +0200, Hubert Feurstein wrote:
> > Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> > ---
> > rules/wget.make | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/rules/wget.make b/rules/wget.make
> > index 1ec6d8c42..cf1a2340f 100644
> > --- a/rules/wget.make
> > +++ b/rules/wget.make
> > @@ -21,6 +21,10 @@ WGET_SUFFIX := tar.gz
> > WGET_URL := $(call ptx/mirror, GNU, wget/$(WGET).$(WGET_SUFFIX))
> > WGET_SOURCE := $(SRCDIR)/$(WGET).$(WGET_SUFFIX)
> > WGET_DIR := $(BUILDDIR)/$(WGET)
> > +WGET_LICENSE := GPL-3.0-or-later
> > +WGET_LICENSE_FILES := \
> > + file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \
> > + file://src/main.c;startline=1;endline=28;md5=7b27873e910933ba54fa16589c4b8eed
>
> src/*.c also mentions a linking exceptions for OpenSSL, but we currently
> cannot express that in SPDX syntax... So I guess it's as correct as we
> can currently be. For further reference, I have opened the discussion at
> <https://github.com/spdx/license-list-XML/issues/939>.
>
> Reviewed-by: Roland Hieber <rhi@pengutronix.de>
Right. The text from main.c does include the exception, so I think this
will do for now.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-10-25 7:37 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-09 14:34 [ptxdist] [PATCH 1/3] wget: add license identifier Hubert Feurstein
2019-10-09 14:34 ` [ptxdist] [PATCH 2/3] openvpn: " Hubert Feurstein
2019-10-15 10:30 ` Roland Hieber
2019-10-15 10:40 ` Michael Olbrich
2019-10-09 14:34 ` [ptxdist] [PATCH 3/3] cpufrequtils: " Hubert Feurstein
2019-10-15 10:32 ` Roland Hieber
2019-10-15 10:14 ` [ptxdist] [PATCH 1/3] wget: " Roland Hieber
2019-10-25 7:37 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox