* [ptxdist] [PATCH v2 1/3] libmodbus3: correct license
@ 2020-05-28 9:04 Bastian Krause
2020-05-28 9:04 ` [ptxdist] [PATCH v2 2/3] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Bastian Krause @ 2020-05-28 9:04 UTC (permalink / raw)
To: ptxdist; +Cc: post, rhi, Bastian Krause
libmodbus reverted its license with v3.0.0, commit 1275387 ("Revert
libmodbus licence from LGPLv3 to LGPLv2.1") to LGPL-2.1-or-later.
820e15f ("SPDX: change LGPL-2.1+ to LGPL-2.1-or-later") updates the SPDX
identifier in file headers to the recent version.
The README.md states "or later" part of the license, so add that to
LIBMODBUS3_LICENSE_FILES.
The tests are licensed under BSD-3-Clause since v3.1.2, commit bdd5379
("Switch test programs to a BSD license").
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
Changes since (implicit) v1:
- add " AND BSD-3-Clause" to license since the tests are licensed under
BSD-3-Clause
- add LIBMODBUS3_LICENSE_FILES
---
rules/libmodbus3.make | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
index f206ec4aa..06721aa05 100644
--- a/rules/libmodbus3.make
+++ b/rules/libmodbus3.make
@@ -14,15 +14,18 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
#
# Paths and names
#
-LIBMODBUS3_VERSION := 3.1.4
-LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
-LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
-LIBMODBUS3_SUFFIX := tar.gz
-LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
-LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
-LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
-LIBMODBUS3_LICENSE := LGPL-3.0-only
-
+LIBMODBUS3_VERSION := 3.1.4
+LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
+LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
+LIBMODBUS3_SUFFIX := tar.gz
+LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
+LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
+LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
+LIBMODBUS3_LICENSE := LGPL-2.1-or-later AND BSD-3-Clause
+LIBMODBUS3_LICENSE_FILES := \
+ file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
+ file://README.md;startline=17;endline=17;md5=c0937f6beb7c75412b9259e48222e077 \
+ file://tests/version.c;startline=4;endline=4;md5=b23faac1da952fa6845fd4fb63a20ffe
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
--
2.26.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] 7+ messages in thread
* [ptxdist] [PATCH v2 2/3] libmodbus3: version bump 3.1.4 -> 3.1.6
2020-05-28 9:04 [ptxdist] [PATCH v2 1/3] libmodbus3: correct license Bastian Krause
@ 2020-05-28 9:04 ` Bastian Krause
2020-05-28 9:04 ` [ptxdist] [PATCH v2 3/3] libftdi1: version bump 1.1 -> 1.4 Bastian Krause
2020-05-29 8:44 ` [ptxdist] [PATCH v2 1/3] libmodbus3: correct license Michael Olbrich
2 siblings, 0 replies; 7+ messages in thread
From: Bastian Krause @ 2020-05-28 9:04 UTC (permalink / raw)
To: ptxdist; +Cc: post, rhi, Bastian Krause
The previous URL redirected to a new location, so use that.
The line number of the license info in README.md (clarifying the "or
later" part) changed, so update it.
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
Changes since (implicit) v1:
- update line number of README.md referencing the license
---
rules/libmodbus3.make | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
index 06721aa05..4e013a9e9 100644
--- a/rules/libmodbus3.make
+++ b/rules/libmodbus3.make
@@ -14,17 +14,17 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
#
# Paths and names
#
-LIBMODBUS3_VERSION := 3.1.4
-LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
+LIBMODBUS3_VERSION := 3.1.6
+LIBMODBUS3_MD5 := 15c84c1f7fb49502b3efaaa668cfd25e
LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
LIBMODBUS3_SUFFIX := tar.gz
-LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
+LIBMODBUS3_URL := https://libmodbus.org/releases/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
LIBMODBUS3_LICENSE := LGPL-2.1-or-later AND BSD-3-Clause
LIBMODBUS3_LICENSE_FILES := \
file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
- file://README.md;startline=17;endline=17;md5=c0937f6beb7c75412b9259e48222e077 \
+ file://README.md;startline=16;endline=16;md5=c0937f6beb7c75412b9259e48222e077 \
file://tests/version.c;startline=4;endline=4;md5=b23faac1da952fa6845fd4fb63a20ffe
# ----------------------------------------------------------------------------
# Prepare
--
2.26.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] 7+ messages in thread
* [ptxdist] [PATCH v2 3/3] libftdi1: version bump 1.1 -> 1.4
2020-05-28 9:04 [ptxdist] [PATCH v2 1/3] libmodbus3: correct license Bastian Krause
2020-05-28 9:04 ` [ptxdist] [PATCH v2 2/3] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
@ 2020-05-28 9:04 ` Bastian Krause
2020-05-29 8:44 ` [ptxdist] [PATCH v2 1/3] libmodbus3: correct license Michael Olbrich
2 siblings, 0 replies; 7+ messages in thread
From: Bastian Krause @ 2020-05-28 9:04 UTC (permalink / raw)
To: ptxdist; +Cc: post, rhi, Bastian Krause
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
No changes since (implicit) v1.
---
rules/libftdi1.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/libftdi1.make b/rules/libftdi1.make
index 63b97ac43..2b580e072 100644
--- a/rules/libftdi1.make
+++ b/rules/libftdi1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBFTDI1) += libftdi1
#
# Paths and names
#
-LIBFTDI1_VERSION := 1.1
-LIBFTDI1_MD5 := b79a6356978aa8e69f8eecc3a720ff79
+LIBFTDI1_VERSION := 1.4
+LIBFTDI1_MD5 := 0c09fb2bb19a57c839fa6845c6c780a2
LIBFTDI1 := libftdi1-$(LIBFTDI1_VERSION)
LIBFTDI1_SUFFIX := tar.bz2
LIBFTDI1_URL := http://www.intra2net.com/en/developer/libftdi/download/$(LIBFTDI1).$(LIBFTDI1_SUFFIX)
--
2.26.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] 7+ messages in thread
* Re: [ptxdist] [PATCH v2 1/3] libmodbus3: correct license
2020-05-28 9:04 [ptxdist] [PATCH v2 1/3] libmodbus3: correct license Bastian Krause
2020-05-28 9:04 ` [ptxdist] [PATCH v2 2/3] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
2020-05-28 9:04 ` [ptxdist] [PATCH v2 3/3] libftdi1: version bump 1.1 -> 1.4 Bastian Krause
@ 2020-05-29 8:44 ` Michael Olbrich
2020-05-29 13:06 ` Bastian Krause
2 siblings, 1 reply; 7+ messages in thread
From: Michael Olbrich @ 2020-05-29 8:44 UTC (permalink / raw)
To: ptxdist
On Thu, May 28, 2020 at 11:04:24AM +0200, Bastian Krause wrote:
> libmodbus reverted its license with v3.0.0, commit 1275387 ("Revert
> libmodbus licence from LGPLv3 to LGPLv2.1") to LGPL-2.1-or-later.
> 820e15f ("SPDX: change LGPL-2.1+ to LGPL-2.1-or-later") updates the SPDX
> identifier in file headers to the recent version.
> The README.md states "or later" part of the license, so add that to
> LIBMODBUS3_LICENSE_FILES.
>
> The tests are licensed under BSD-3-Clause since v3.1.2, commit bdd5379
> ("Switch test programs to a BSD license").
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
> Changes since (implicit) v1:
> - add " AND BSD-3-Clause" to license since the tests are licensed under
> BSD-3-Clause
> - add LIBMODBUS3_LICENSE_FILES
> ---
> rules/libmodbus3.make | 21 ++++++++++++---------
> 1 file changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> index f206ec4aa..06721aa05 100644
> --- a/rules/libmodbus3.make
> +++ b/rules/libmodbus3.make
> @@ -14,15 +14,18 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
> #
> # Paths and names
> #
> -LIBMODBUS3_VERSION := 3.1.4
> -LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> -LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> -LIBMODBUS3_SUFFIX := tar.gz
> -LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> -LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> -LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
> -LIBMODBUS3_LICENSE := LGPL-3.0-only
> -
> +LIBMODBUS3_VERSION := 3.1.4
> +LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> +LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> +LIBMODBUS3_SUFFIX := tar.gz
> +LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> +LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> +LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
> +LIBMODBUS3_LICENSE := LGPL-2.1-or-later AND BSD-3-Clause
> +LIBMODBUS3_LICENSE_FILES := \
> + file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
> + file://README.md;startline=17;endline=17;md5=c0937f6beb7c75412b9259e48222e077 \
I don't think this line adds anything. The source files make the 'or-later'
clear and we don't have anything like this for any other package.
> + file://tests/version.c;startline=4;endline=4;md5=b23faac1da952fa6845fd4fb63a20ffe
This is not sufficient. For BSD style licenses the copyright line is
relevant and must be added.
And we need the license text which is missing :-/.
The BSD-3-Clause license states:
"Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer."
The license is in the git repo but not the release tarball :-/. I've
reported this upstream[1].
Michael
[1] https://github.com/stephane/libmodbus/issues/542
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
> --
> 2.26.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://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] 7+ messages in thread
* Re: [ptxdist] [PATCH v2 1/3] libmodbus3: correct license
2020-05-29 8:44 ` [ptxdist] [PATCH v2 1/3] libmodbus3: correct license Michael Olbrich
@ 2020-05-29 13:06 ` Bastian Krause
2020-06-02 13:28 ` Michael Olbrich
0 siblings, 1 reply; 7+ messages in thread
From: Bastian Krause @ 2020-05-29 13:06 UTC (permalink / raw)
To: ptxdist
On 5/29/20 10:44 AM, Michael Olbrich wrote:
> On Thu, May 28, 2020 at 11:04:24AM +0200, Bastian Krause wrote:
>> libmodbus reverted its license with v3.0.0, commit 1275387 ("Revert
>> libmodbus licence from LGPLv3 to LGPLv2.1") to LGPL-2.1-or-later.
>> 820e15f ("SPDX: change LGPL-2.1+ to LGPL-2.1-or-later") updates the SPDX
>> identifier in file headers to the recent version.
>> The README.md states "or later" part of the license, so add that to
>> LIBMODBUS3_LICENSE_FILES.
>>
>> The tests are licensed under BSD-3-Clause since v3.1.2, commit bdd5379
>> ("Switch test programs to a BSD license").
>>
>> Signed-off-by: Bastian Krause <bst@pengutronix.de>
>> ---
>> Changes since (implicit) v1:
>> - add " AND BSD-3-Clause" to license since the tests are licensed under
>> BSD-3-Clause
>> - add LIBMODBUS3_LICENSE_FILES
>> ---
>> rules/libmodbus3.make | 21 ++++++++++++---------
>> 1 file changed, 12 insertions(+), 9 deletions(-)
>>
>> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
>> index f206ec4aa..06721aa05 100644
>> --- a/rules/libmodbus3.make
>> +++ b/rules/libmodbus3.make
>> @@ -14,15 +14,18 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
>> #
>> # Paths and names
>> #
>> -LIBMODBUS3_VERSION := 3.1.4
>> -LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
>> -LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
>> -LIBMODBUS3_SUFFIX := tar.gz
>> -LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
>> -LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
>> -LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
>> -LIBMODBUS3_LICENSE := LGPL-3.0-only
>> -
>> +LIBMODBUS3_VERSION := 3.1.4
>> +LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
>> +LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
>> +LIBMODBUS3_SUFFIX := tar.gz
>> +LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
>> +LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
>> +LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
>> +LIBMODBUS3_LICENSE := LGPL-2.1-or-later AND BSD-3-Clause
>> +LIBMODBUS3_LICENSE_FILES := \
>> + file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
>> + file://README.md;startline=17;endline=17;md5=c0937f6beb7c75412b9259e48222e077 \
>
> I don't think this line adds anything. The source files make the 'or-later'
> clear and we don't have anything like this for any other package.
Okay, should I add a source file with startline/endline pointing to the
SPDX identifier instead?
>
>> + file://tests/version.c;startline=4;endline=4;md5=b23faac1da952fa6845fd4fb63a20ffe
>
> This is not sufficient. For BSD style licenses the copyright line is
> relevant and must be added.
> And we need the license text which is missing :-/.
>
> The BSD-3-Clause license states:
> "Redistributions of source code must retain the above copyright notice,
> this list of conditions and the following disclaimer."
>
> The license is in the git repo but not the release tarball :-/. I've
> reported this upstream[1].
Thanks!
Regards,
Bastian
>
> [1] https://github.com/stephane/libmodbus/issues/542
>
>> # ----------------------------------------------------------------------------
>> # Prepare
>> # ----------------------------------------------------------------------------
>> --
>> 2.26.2
>>
>>
>> _______________________________________________
>> ptxdist mailing list
>> ptxdist@pengutronix.de
>> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://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] 7+ messages in thread
* Re: [ptxdist] [PATCH v2 1/3] libmodbus3: correct license
2020-05-29 13:06 ` Bastian Krause
@ 2020-06-02 13:28 ` Michael Olbrich
2020-06-04 9:04 ` Roland Hieber
0 siblings, 1 reply; 7+ messages in thread
From: Michael Olbrich @ 2020-06-02 13:28 UTC (permalink / raw)
To: ptxdist
On Fri, May 29, 2020 at 03:06:51PM +0200, Bastian Krause wrote:
>
> On 5/29/20 10:44 AM, Michael Olbrich wrote:
> > On Thu, May 28, 2020 at 11:04:24AM +0200, Bastian Krause wrote:
> >> libmodbus reverted its license with v3.0.0, commit 1275387 ("Revert
> >> libmodbus licence from LGPLv3 to LGPLv2.1") to LGPL-2.1-or-later.
> >> 820e15f ("SPDX: change LGPL-2.1+ to LGPL-2.1-or-later") updates the SPDX
> >> identifier in file headers to the recent version.
> >> The README.md states "or later" part of the license, so add that to
> >> LIBMODBUS3_LICENSE_FILES.
> >>
> >> The tests are licensed under BSD-3-Clause since v3.1.2, commit bdd5379
> >> ("Switch test programs to a BSD license").
> >>
> >> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> >> ---
> >> Changes since (implicit) v1:
> >> - add " AND BSD-3-Clause" to license since the tests are licensed under
> >> BSD-3-Clause
> >> - add LIBMODBUS3_LICENSE_FILES
> >> ---
> >> rules/libmodbus3.make | 21 ++++++++++++---------
> >> 1 file changed, 12 insertions(+), 9 deletions(-)
> >>
> >> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> >> index f206ec4aa..06721aa05 100644
> >> --- a/rules/libmodbus3.make
> >> +++ b/rules/libmodbus3.make
> >> @@ -14,15 +14,18 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
> >> #
> >> # Paths and names
> >> #
> >> -LIBMODBUS3_VERSION := 3.1.4
> >> -LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> >> -LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> >> -LIBMODBUS3_SUFFIX := tar.gz
> >> -LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> >> -LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> >> -LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
> >> -LIBMODBUS3_LICENSE := LGPL-3.0-only
> >> -
> >> +LIBMODBUS3_VERSION := 3.1.4
> >> +LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> >> +LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> >> +LIBMODBUS3_SUFFIX := tar.gz
> >> +LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> >> +LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> >> +LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
> >> +LIBMODBUS3_LICENSE := LGPL-2.1-or-later AND BSD-3-Clause
> >> +LIBMODBUS3_LICENSE_FILES := \
> >> + file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
> >> + file://README.md;startline=17;endline=17;md5=c0937f6beb7c75412b9259e48222e077 \
> >
> > I don't think this line adds anything. The source files make the 'or-later'
> > clear and we don't have anything like this for any other package.
>
> Okay, should I add a source file with startline/endline pointing to the
> SPDX identifier instead?
Yes, I think that's better.
> >
> >> + file://tests/version.c;startline=4;endline=4;md5=b23faac1da952fa6845fd4fb63a20ffe
> >
> > This is not sufficient. For BSD style licenses the copyright line is
> > relevant and must be added.
> > And we need the license text which is missing :-/.
> >
> > The BSD-3-Clause license states:
> > "Redistributions of source code must retain the above copyright notice,
> > this list of conditions and the following disclaimer."
> >
> > The license is in the git repo but not the release tarball :-/. I've
> > reported this upstream[1].
Hmmm, anyways, this is about the test, and we don't install those anyways,
so I don't think we need the license here. Opinions?
Michael
> Thanks!
>
> Regards,
> Bastian
>
> >
> > [1] https://github.com/stephane/libmodbus/issues/542
> >
> >> # ----------------------------------------------------------------------------
> >> # Prepare
> >> # ----------------------------------------------------------------------------
> >> --
> >> 2.26.2
> >>
> >>
> >> _______________________________________________
> >> ptxdist mailing list
> >> ptxdist@pengutronix.de
> >> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> >>
> >
>
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://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
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://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] 7+ messages in thread
* Re: [ptxdist] [PATCH v2 1/3] libmodbus3: correct license
2020-06-02 13:28 ` Michael Olbrich
@ 2020-06-04 9:04 ` Roland Hieber
0 siblings, 0 replies; 7+ messages in thread
From: Roland Hieber @ 2020-06-04 9:04 UTC (permalink / raw)
To: ptxdist
On Tue, Jun 02, 2020 at 03:28:39PM +0200, Michael Olbrich wrote:
> On Fri, May 29, 2020 at 03:06:51PM +0200, Bastian Krause wrote:
> >
> > On 5/29/20 10:44 AM, Michael Olbrich wrote:
> > > On Thu, May 28, 2020 at 11:04:24AM +0200, Bastian Krause wrote:
> > >> libmodbus reverted its license with v3.0.0, commit 1275387 ("Revert
> > >> libmodbus licence from LGPLv3 to LGPLv2.1") to LGPL-2.1-or-later.
> > >> 820e15f ("SPDX: change LGPL-2.1+ to LGPL-2.1-or-later") updates the SPDX
> > >> identifier in file headers to the recent version.
> > >> The README.md states "or later" part of the license, so add that to
> > >> LIBMODBUS3_LICENSE_FILES.
> > >>
> > >> The tests are licensed under BSD-3-Clause since v3.1.2, commit bdd5379
> > >> ("Switch test programs to a BSD license").
> > >>
> > >> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> > >> ---
> > >> Changes since (implicit) v1:
> > >> - add " AND BSD-3-Clause" to license since the tests are licensed under
> > >> BSD-3-Clause
> > >> - add LIBMODBUS3_LICENSE_FILES
> > >> ---
> > >> rules/libmodbus3.make | 21 ++++++++++++---------
> > >> 1 file changed, 12 insertions(+), 9 deletions(-)
> > >>
> > >> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> > >> index f206ec4aa..06721aa05 100644
> > >> --- a/rules/libmodbus3.make
> > >> +++ b/rules/libmodbus3.make
> > >> @@ -14,15 +14,18 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
> > >> #
> > >> # Paths and names
> > >> #
> > >> -LIBMODBUS3_VERSION := 3.1.4
> > >> -LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> > >> -LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> > >> -LIBMODBUS3_SUFFIX := tar.gz
> > >> -LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> > >> -LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> > >> -LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
> > >> -LIBMODBUS3_LICENSE := LGPL-3.0-only
> > >> -
> > >> +LIBMODBUS3_VERSION := 3.1.4
> > >> +LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> > >> +LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> > >> +LIBMODBUS3_SUFFIX := tar.gz
> > >> +LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> > >> +LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX)
> > >> +LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3)
> > >> +LIBMODBUS3_LICENSE := LGPL-2.1-or-later AND BSD-3-Clause
> > >> +LIBMODBUS3_LICENSE_FILES := \
> > >> + file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
> > >> + file://README.md;startline=17;endline=17;md5=c0937f6beb7c75412b9259e48222e077 \
> > >
> > > I don't think this line adds anything. The source files make the 'or-later'
> > > clear and we don't have anything like this for any other package.
> >
> > Okay, should I add a source file with startline/endline pointing to the
> > SPDX identifier instead?
>
> Yes, I think that's better.
>
> > >
> > >> + file://tests/version.c;startline=4;endline=4;md5=b23faac1da952fa6845fd4fb63a20ffe
> > >
> > > This is not sufficient. For BSD style licenses the copyright line is
> > > relevant and must be added.
> > > And we need the license text which is missing :-/.
> > >
> > > The BSD-3-Clause license states:
> > > "Redistributions of source code must retain the above copyright notice,
> > > this list of conditions and the following disclaimer."
> > >
> > > The license is in the git repo but not the release tarball :-/. I've
> > > reported this upstream[1].
>
> Hmmm, anyways, this is about the test, and we don't install those anyways,
> so I don't think we need the license here. Opinions?
At least not including it would be consistent with all other packages
in which this was done, so I would opt for it here too.
- Roland
--
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] 7+ messages in thread
end of thread, other threads:[~2020-06-04 9:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-28 9:04 [ptxdist] [PATCH v2 1/3] libmodbus3: correct license Bastian Krause
2020-05-28 9:04 ` [ptxdist] [PATCH v2 2/3] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
2020-05-28 9:04 ` [ptxdist] [PATCH v2 3/3] libftdi1: version bump 1.1 -> 1.4 Bastian Krause
2020-05-29 8:44 ` [ptxdist] [PATCH v2 1/3] libmodbus3: correct license Michael Olbrich
2020-05-29 13:06 ` Bastian Krause
2020-06-02 13:28 ` Michael Olbrich
2020-06-04 9:04 ` Roland Hieber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox