dbus-glib: fix legal info

PATCH New Rahul Bedarkar 5 participants 16 messages Mar 22, 2017 – Mar 31, 2017

lore

Share & tools

lore

Rahul Bedarkar

author

2017-03-22 17:48 UTC #0 lore raw

PATCH 1/6 dbus-glib: fix legal info

dbus glib bindings are dual licensed under AFLv2.1 or GPLv2+. Separate licenses using 'or' keyword.

Signed-off-by Rahul Bedarkar <[email protected]>

---
 package/dbus-glib/dbus-glib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/dbus-glib/dbus-glib.mk +1 -1

index 4a1e4b4..5a6f5a0 100644
@@ -7,7 +7,7 @@
 DBUS_GLIB_VERSION = 0.108
 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib
 DBUS_GLIB_INSTALL_STAGING = YES
-DBUS_GLIB_LICENSE = AFLv2.1, GPLv2+
+DBUS_GLIB_LICENSE = AFLv2.1 or GPLv2+
 DBUS_GLIB_LICENSE_FILES = COPYING
 
 DBUS_GLIB_CONF_ENV = \

Signature · 1 line

2.6.2

Rahul Bedarkar

author

2017-03-22 17:48 UTC #1 lore raw

PATCH 2/6 dbus-triggerd: add license file

In absence of license file, use source file as a license file since it has license header in comments.

Signed-off-by Rahul Bedarkar <[email protected]>

---
 package/dbus-triggerd/dbus-triggerd.mk | 1 +
 1 file changed, 1 insertion(+)

package/dbus-triggerd/dbus-triggerd.mk +1 -0

index 48d5fb2..0d693b4 100644
@@ -7,6 +7,7 @@
 DBUS_TRIGGERD_VERSION = ba3dbec805cb707c94c54de21666bf18b79bcc09
 DBUS_TRIGGERD_SITE = git://rg42.org/dbustriggerd.git
 DBUS_TRIGGERD_LICENSE = GPLv2+
+DBUS_TRIGGERD_LICENSE_FILES = dbus-triggerd.c
 DBUS_TRIGGERD_DEPENDENCIES = host-pkgconf dbus
 
 define DBUS_TRIGGERD_BUILD_CMDS

Signature · 1 line

2.6.2

Peter Korsgaard

2017-03-31 07:08 UTC #2 lore raw

PATCH 2/6 dbus-triggerd: add license file

Quoted 6 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Rahul" == Rahul Bedarkar <[email protected]> writes:
In absence of license file, use source file as a license file since it has license header in comments.
Signed-off-by Rahul Bedarkar <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Rahul Bedarkar

author

2017-03-22 17:48 UTC #3 lore raw

PATCH 3/6 taglib: fix legal info

In reply to Rahul Bedarkar

taglib is dual licensed under LGPLv2.1 or MPLv1.1. Almost all source files have license text mentioning LGPLv2.1 or alternatively MPLv1.1.

Signed-off-by Rahul Bedarkar <[email protected]>

---
 package/taglib/taglib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/taglib/taglib.mk +1 -1

index f47c4ba..0f65a30 100644
@@ -7,7 +7,7 @@
 TAGLIB_VERSION = 1.11.1
 TAGLIB_SITE = http://taglib.github.io/releases
 TAGLIB_INSTALL_STAGING = YES
-TAGLIB_LICENSE = LGPLv2.1, MPL
+TAGLIB_LICENSE = LGPLv2.1 or MPLv1.1
 TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)

Signature · 1 line

2.6.2

Peter Korsgaard

2017-03-31 07:08 UTC #4 lore raw

PATCH 3/6 taglib: fix legal info

Quoted 6 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Rahul" == Rahul Bedarkar <[email protected]> writes:
taglib is dual licensed under LGPLv2.1 or MPLv1.1. Almost all source files have license text mentioning LGPLv2.1 or alternatively MPLv1.1.
Signed-off-by Rahul Bedarkar <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Rahul Bedarkar

author

2017-03-22 17:48 UTC #5 lore raw

PATCH 4/6 python-mwscrape: use documented license abbreviation

In reply to Rahul Bedarkar

For MPL version 2.0, we use MPLv2.0 as license abbreviation.

Signed-off-by Rahul Bedarkar <[email protected]>

---
 package/python-mwscrape/python-mwscrape.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/python-mwscrape/python-mwscrape.mk +1 -1

index 47b943f..5054675 100644
@@ -6,7 +6,7 @@
 
 PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6
 PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION))
-PYTHON_MWSCRAPE_LICENSE = MPL-2.0
+PYTHON_MWSCRAPE_LICENSE = MPLv2.0
 PYTHON_MWSCRAPE_LICENSE_FILES = LICENSE.txt
 PYTHON_MWSCRAPE_SETUP_TYPE = distutils

Signature · 1 line

2.6.2

Thomas Petazzoni

2017-03-22 20:39 UTC #6 lore raw

PATCH 4/6 python-mwscrape: use documented license abbreviation

Hello,

package/python-mwscrape/python-mwscrape.mk line 9

Quoted 4 lines · Rahul Bedarkar

PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6 PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION))
package/python-mwscrape/python-mwscrape.mk +1 -1
-PYTHON_MWSCRAPE_LICENSE = MPL-2.0
+PYTHON_MWSCRAPE_LICENSE = MPLv2.0

Well, our idea was to use the SPDX license codes as much as possible, and MPL-2.0 is the correct SPDX license code for this license. However, it is true we haven't used SPDX from the beginning, so we're using GPLv2 everywhere, while SPDX uses GPL-2.0.

See:

https://spdx.org/licenses/

I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all other licenses, use the SPDX code as much as possible.

Maybe we should bite the bullet, and migrate all packages to use SPDX license codes?

Arnout, Yann, Peter?

Best regards,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Yann E. MORIN

2017-03-22 22:32 UTC #7 lore raw

PATCH 4/6 python-mwscrape: use documented license abbreviation

Thomas, All,

On 2017-03-22 21:39 +0100, Thomas Petazzoni spake thusly:

Quoted 14 lines · Rahul Bedarkar

package/python-mwscrape/python-mwscrape.mk line 9
Quoted 5 lines
PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6 PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION))
package/python-mwscrape/python-mwscrape.mk +1 -1
-PYTHON_MWSCRAPE_LICENSE = MPL-2.0
+PYTHON_MWSCRAPE_LICENSE = MPLv2.0
Well, our idea was to use the SPDX license codes as much as possible, and MPL-2.0 is the correct SPDX license code for this license. However, it is true we haven't used SPDX from the beginning, so we're using GPLv2 everywhere, while SPDX uses GPL-2.0.
See:

Quoted 7 lines

https://spdx.org/licenses/
I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all other licenses, use the SPDX code as much as possible.
Maybe we should bite the bullet, and migrate all packages to use SPDX license codes?

That would have my approval, yes.

Regards,
Yann E. MORIN.

Quoted 9 lines

Arnout, Yann, Peter?
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Arnout Vandecappelle

2017-03-23 08:25 UTC #8 lore raw

PATCH 4/6 python-mwscrape: use documented license abbreviation

Quoted 19 lines · Yann E. MORIN

Thomas, All,
On 2017-03-22 21:39 +0100, Thomas Petazzoni spake thusly:
Quoted 16 lines · Rahul Bedarkar
package/python-mwscrape/python-mwscrape.mk line 9
Quoted 5 lines
PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6 PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION))
package/python-mwscrape/python-mwscrape.mk +1 -1
-PYTHON_MWSCRAPE_LICENSE = MPL-2.0
+PYTHON_MWSCRAPE_LICENSE = MPLv2.0
Well, our idea was to use the SPDX license codes as much as possible, and MPL-2.0 is the correct SPDX license code for this license. However, it is true we haven't used SPDX from the beginning, so we're using GPLv2 everywhere, while SPDX uses GPL-2.0.
See:
https://spdx.org/licenses/

Quoted 7 lines

Quoted 5 lines
I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all other licenses, use the SPDX code as much as possible.
Maybe we should bite the bullet, and migrate all packages to use SPDX license codes?
That would have my approval, yes.

Indeed, I've been thinking about doing this.

Now we just have to find a volunteer to construct the necessary sed magic :-)

BTW I would propose to do this in one mega-patch that does mechanical
substitution in all the .mk files (make sure the commit log contains the scriptlet that does it), and a second patch to fix the documentation. If it makes things easier, the mega-patch could be split up into separate patches for the different versions.

Oh, and for the documentation update: perhaps we should remove the list of
licenses from our documentation, and instead refer only to spdx.org? I just notice now: we currently don't refer to SPDX at all in the documentation! That would explain Rahul's confusion about the proper license string...

Oh, and scancpan and scanpypi have to be updated as well.

Regards,
Arnout

Quoted 14 lines

Regards,
Yann E. MORIN.
Quoted 9 lines
Arnout, Yann, Peter?
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Thomas Petazzoni

2017-03-23 09:00 UTC #9 lore raw

PATCH 4/6 python-mwscrape: use documented license abbreviation

Hello,

Quoted 9 lines · Arnout Vandecappelle

Quoted 7 lines
Quoted 5 lines
I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all other licenses, use the SPDX code as much as possible.
Maybe we should bite the bullet, and migrate all packages to use SPDX license codes?
That would have my approval, yes.
Indeed, I've been thinking about doing this.

OK, so let's just do it :)

The only thing that we might consider is the impact of this change for our users. Are people parsing the CSV output, and checking if there is no GPLv3 for example? Such checks would no longer match.

But longer term, I believe we will give our users a much more logical/stable situation if we use SPDX codes everywhere rather than the clunky mix we have today.

Quoted 7 lines

Now we just have to find a volunteer to construct the necessary sed magic :-)
BTW I would propose to do this in one mega-patch that does mechanical
substitution in all the .mk files (make sure the commit log contains the scriptlet that does it), and a second patch to fix the documentation. If it makes things easier, the mega-patch could be split up into separate patches for the different versions.

One patch for each license change would be nice IMO.

Quoted 4 lines

Oh, and for the documentation update: perhaps we should remove the list of
licenses from our documentation, and instead refer only to spdx.org? I just notice now: we currently don't refer to SPDX at all in the documentation! That would explain Rahul's confusion about the proper license string...

Agreed.

Quoted 1 line

Oh, and scancpan and scanpypi have to be updated as well.

Agreed.

Best regards,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Rahul Bedarkar

author

2017-03-23 18:01 UTC #10 lore raw

PATCH 4/6 python-mwscrape: use documented license abbreviation

Hello,

Quoted 7 lines · Thomas Petazzoni

Hello,
Quoted 3 lines · Arnout Vandecappelle
Quoted 3 lines
Quoted 3 lines
I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all other licenses, use the SPDX code as much as possible.

Quoted 8 lines

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Maybe we should bite the bullet, and migrate all packages to use SPDX license codes?
That would have my approval, yes.
Indeed, I've been thinking about doing this.
OK, so let's just do it :)

I can have a look. But I think I won't be able to post initial version until end of next week because of my travel.

Thanks,
Rahul

Peter Korsgaard

2017-03-28 06:44 UTC #11 lore raw

PATCH 4/6 python-mwscrape: use documented license abbreviation

In reply to Thomas Petazzoni

Quoted 8 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Hello,
Quoted 3 lines · Arnout Vandecappelle
Quoted 3 lines
Quoted 3 lines
I think our idea was to keep using GPLv2/LGPLv2.1/GPLv3, but for all other licenses, use the SPDX code as much as possible.

Quoted 8 lines

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Maybe we should bite the bullet, and migrate all packages to use SPDX license codes?
That would have my approval, yes.
Indeed, I've been thinking about doing this.
OK, so let's just do it :)

Agreed!

Quoted 3 lines

The only thing that we might consider is the impact of this change for our users. Are people parsing the CSV output, and checking if there is no GPLv3 for example? Such checks would no longer match.

I haven't heard about anybody doing that, but as long as we mention it in the release notes I don't think it is a big issue.

Quoted 3 lines

But longer term, I believe we will give our users a much more logical/stable situation if we use SPDX codes everywhere rather than the clunky mix we have today.

Yes, me too!

Signature · 1 line

Bye, Peter Korsgaard

Rahul Bedarkar

author

2017-03-22 17:48 UTC #12 lore raw

PATCH 5/6 python-certifi: use documented license abbreviation

In reply to Rahul Bedarkar

For MPL version 2.0, we use MPLv2.0 as license abbreviation.

Signed-off-by Rahul Bedarkar <[email protected]>

---
 package/python-certifi/python-certifi.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/python-certifi/python-certifi.mk +1 -1

index 3f83194..cf9ebc2 100644
@@ -8,7 +8,7 @@ PYTHON_CERTIFI_VERSION = 2017.1.23
 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz
 PYTHON_CERTIFI_SITE = https://pypi.python.org/packages/b6/fa/ca682d5ace0700008d246664e50db8d095d23750bb212c0086305450c276
 PYTHON_CERTIFI_SETUP_TYPE = setuptools
-PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem)
+PYTHON_CERTIFI_LICENSE = ISC (Python code), MPLv2.0 (cacert.pem)
 PYTHON_CERTIFI_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))

Signature · 1 line

2.6.2

Rahul Bedarkar

author

2017-03-22 17:48 UTC #13 lore raw

PATCH 6/6 perl-encode-detect: use documented license abbreviation

In reply to Rahul Bedarkar

For MPL version 1.1, we use MPLv1.1 as license abbreviation.

Signed-off-by Rahul Bedarkar <[email protected]>

---
 package/perl-encode-detect/perl-encode-detect.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/perl-encode-detect/perl-encode-detect.mk +1 -1

index 732fba8..692bd6b 100644
@@ -8,7 +8,7 @@ PERL_ENCODE_DETECT_VERSION = 1.01
 PERL_ENCODE_DETECT_SOURCE = Encode-Detect-$(PERL_ENCODE_DETECT_VERSION).tar.gz
 PERL_ENCODE_DETECT_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JG/JGMYERS
 PERL_ENCODE_DETECT_DEPENDENCIES = host-perl-module-build
-PERL_ENCODE_DETECT_LICENSE = MPL-1.1
+PERL_ENCODE_DETECT_LICENSE = MPLv1.1
 PERL_ENCODE_DETECT_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))

Signature · 1 line

2.6.2

Thomas Petazzoni

2017-03-26 20:51 UTC #14 lore raw

PATCH 1/6 dbus-glib: fix legal info

In reply to Rahul Bedarkar

Hello,

Quoted 7 lines · Rahul Bedarkar

dbus glib bindings are dual licensed under AFLv2.1 or GPLv2+. Separate licenses using 'or' keyword.
Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/dbus-glib/dbus-glib.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patches 1 to 3 applied. On PATCH 3, I've changed MPLv1.1 to MPL-1.1, to match the SPDX license code.

As discussed previously, I've dropped patches 4 to 6, since we really want to use the SPDX license codes.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Peter Korsgaard

2017-03-31 07:07 UTC #15 lore raw

PATCH 1/6 dbus-glib: fix legal info

In reply to Rahul Bedarkar

Quoted 6 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Rahul" == Rahul Bedarkar <[email protected]> writes:
dbus glib bindings are dual licensed under AFLv2.1 or GPLv2+. Separate licenses using 'or' keyword.
Signed-off-by Rahul Bedarkar <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard