* [ptxdist] [PATCH 2/3] libmodbus3: version bump 3.1.4 -> 3.1.6
2020-05-27 21:04 [ptxdist] [PATCH 1/3] libmodbus3: correct license Bastian Krause
@ 2020-05-27 21:04 ` Bastian Krause
2020-05-27 21:04 ` [ptxdist] [PATCH 3/3] libftdi1: version bump 1.1 -> 1.4 Bastian Krause
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Bastian Krause @ 2020-05-27 21:04 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
The previous URL redirected to a new location, so use that.
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
rules/libmodbus3.make | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
index 412401cbe..0923d4bbf 100644
--- a/rules/libmodbus3.make
+++ b/rules/libmodbus3.make
@@ -14,11 +14,11 @@ 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
--
2.26.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread* [ptxdist] [PATCH 3/3] libftdi1: version bump 1.1 -> 1.4
2020-05-27 21:04 [ptxdist] [PATCH 1/3] libmodbus3: correct license Bastian Krause
2020-05-27 21:04 ` [ptxdist] [PATCH 2/3] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
@ 2020-05-27 21:04 ` Bastian Krause
2020-05-27 21:33 ` [ptxdist] [PATCH 1/3] libmodbus3: correct license Roland Hieber
2020-05-28 6:46 ` Alexander Dahl
3 siblings, 0 replies; 6+ messages in thread
From: Bastian Krause @ 2020-05-27 21:04 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH 1/3] libmodbus3: correct license
2020-05-27 21:04 [ptxdist] [PATCH 1/3] libmodbus3: correct license Bastian Krause
2020-05-27 21:04 ` [ptxdist] [PATCH 2/3] libmodbus3: version bump 3.1.4 -> 3.1.6 Bastian Krause
2020-05-27 21:04 ` [ptxdist] [PATCH 3/3] libftdi1: version bump 1.1 -> 1.4 Bastian Krause
@ 2020-05-27 21:33 ` Roland Hieber
2020-05-28 6:46 ` Alexander Dahl
3 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2020-05-27 21:33 UTC (permalink / raw)
To: Bastian Krause; +Cc: ptxdist
On Wed, May 27, 2020 at 11:04:23PM +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.
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
> rules/libmodbus3.make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> index f206ec4aa..412401cbe 100644
> --- a/rules/libmodbus3.make
> +++ b/rules/libmodbus3.make
> @@ -21,7 +21,7 @@ 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_LICENSE := LGPL-2.1-or-later
Could you please also add the respective files stating that license to
the LIBMODBUS3_LICENSE_FILES variable? See [1] for syntax, especially
the md5sum parameter, so we notice when that changes again :) I guess it
should be COPYRIGHT.LESSER and the respective lines from README.md.
[1]: https://www.ptxdist.org/doc/ref_manual.html#package-definition
- 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [ptxdist] [PATCH 1/3] libmodbus3: correct license
2020-05-27 21:04 [ptxdist] [PATCH 1/3] libmodbus3: correct license Bastian Krause
` (2 preceding siblings ...)
2020-05-27 21:33 ` [ptxdist] [PATCH 1/3] libmodbus3: correct license Roland Hieber
@ 2020-05-28 6:46 ` Alexander Dahl
2020-05-28 8:45 ` Bastian Krause
3 siblings, 1 reply; 6+ messages in thread
From: Alexander Dahl @ 2020-05-28 6:46 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
[-- Attachment #1.1: Type: text/plain, Size: 2080 bytes --]
Hello Bastian,
I sent a patch for the libmodbus3 license issue last year, Message-Id
was <20190510092434.15019-17-ada@thorsis.com> and Michael gave some
feedback, see:
https://www.mail-archive.com/ptxdist@pengutronix.de/msg14488.html
On Wed, May 27, 2020 at 11:04:23PM +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.
My initial analysis was this, copied from my old patch:
When introduced to ptxdist back in 2011 with version 3.0.1 libmodbus
was already licensed LGPL-2.1-or-later for the library part and
GPL-3.0-or-later for the tests. This did not change upstream since
then.
Fixes: a8f85be09c663bfad8a34a162b1a63fb3d499985
This is of course better:
Fixes: a8f85be09c66 ("libmodbus3: add new package")
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
> rules/libmodbus3.make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> index f206ec4aa..412401cbe 100644
> --- a/rules/libmodbus3.make
> +++ b/rules/libmodbus3.make
> @@ -21,7 +21,7 @@ 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_LICENSE := LGPL-2.1-or-later
This is probably not sufficient, see my original patch, and feedback
by Michael on that and by Roland in the other mail.
HTH & Greets
Alex
--
/"\ ASCII RIBBON | »With the first link, the chain is forged. The first
\ / CAMPAIGN | speech censured, the first thought forbidden, the
X AGAINST | first freedom denied, chains us all irrevocably.«
/ \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie)
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 181 bytes --]
_______________________________________________
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/3] libmodbus3: correct license
2020-05-28 6:46 ` Alexander Dahl
@ 2020-05-28 8:45 ` Bastian Krause
0 siblings, 0 replies; 6+ messages in thread
From: Bastian Krause @ 2020-05-28 8:45 UTC (permalink / raw)
To: ptxdist
Hi Alex,
On 5/28/20 8:46 AM, Alexander Dahl wrote:
> I sent a patch for the libmodbus3 license issue last year, Message-Id
> was <20190510092434.15019-17-ada@thorsis.com> and Michael gave some
> feedback, see:
>
> https://www.mail-archive.com/ptxdist@pengutronix.de/msg14488.html
>
> On Wed, May 27, 2020 at 11:04:23PM +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.
>
> My initial analysis was this, copied from my old patch:
>
> When introduced to ptxdist back in 2011 with version 3.0.1 libmodbus
> was already licensed LGPL-2.1-or-later for the library part and
> GPL-3.0-or-later for the tests. This did not change upstream since
> then.
Thanks for the feedback. Will send a v2.
>
> Fixes: a8f85be09c663bfad8a34a162b1a63fb3d499985
>
> This is of course better:
>
> Fixes: a8f85be09c66 ("libmodbus3: add new package")
Okay, this also fixes a76b31d5b ("libmodbus3: version bump 3.0.6 ->
3.1.4") since the test license changed with v3.1.2 from GPL-3.0-or-later
to BSD-3-Clause.
>
>>
>> Signed-off-by: Bastian Krause <bst@pengutronix.de>
>> ---
>> rules/libmodbus3.make | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
>> index f206ec4aa..412401cbe 100644
>> --- a/rules/libmodbus3.make
>> +++ b/rules/libmodbus3.make
>> @@ -21,7 +21,7 @@ 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_LICENSE := LGPL-2.1-or-later
>
> This is probably not sufficient, see my original patch, and feedback
> by Michael on that and by Roland in the other mail.
This will be LGPL-2.1-or-later AND BSD-3-Clause. I'll also add
LIBMODBUS3_LICENSE_FILES.
This license stuff never gets boring :)
Regards,
Bastian
--
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] 6+ messages in thread