[ptxdist] [PATCH v3 1/9] acl: fix license identifier

[ptxdist] [PATCH v3 1/9] acl: fix license identifier

[Christian Hermann]

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/acl.make | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/rules/acl.make b/rules/acl.make
index b950b0401..e5db4d61e 100644
--- a/rules/acl.make
+++ b/rules/acl.make
@@ -23,11 +23,12 @@ ACL_SUFFIX	:= tar.gz
 ACL_URL		:= http://download.savannah.gnu.org/releases/acl/$(ACL).src.$(ACL_SUFFIX)
 ACL_SOURCE	:= $(SRCDIR)/$(ACL).src.$(ACL_SUFFIX)
 ACL_DIR		:= $(BUILDDIR)/$(ACL)
-ACL_LICENSE	:= GPL-2.0-only AND LGPL-2.1-only
-ACL_LICENSE_FILES := \
-	file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
-	file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764
-
+ACL_LICENSE	:= LGPL-2.1-or-later
+ACL_LICENSE_FILES:= file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764
+ifdef PTXCONF_ACL_TOOLS
+ACL_LICENSE+= AND GPL-2.0.or-later
+ACL_LICENSE_FILES+= file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249
+endif
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v3 2/9] inetutils: add license identifier

[Christian Hermann]

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/inetutils.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/inetutils.make b/rules/inetutils.make
index fcbfd80ee..b90bd1e6f 100644
--- a/rules/inetutils.make
+++ b/rules/inetutils.make
@@ -23,6 +23,7 @@ INETUTILS		:= inetutils-$(INETUTILS_VERSION)
 INETUTILS_SUFFIX	:= tar.gz
 INETUTILS_URL		:= $(call ptx/mirror, GNU, inetutils/$(INETUTILS).$(INETUTILS_SUFFIX))
 INETUTILS_SOURCE	:= $(SRCDIR)/$(INETUTILS).$(INETUTILS_SUFFIX)
+INETUTILS_LICENSE	:= GPL-3.0-or-later
 INETUTILS_DIR		:= $(BUILDDIR)/$(INETUTILS)
 
 # ----------------------------------------------------------------------------
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v3 3/9] nodejs: fix license identifier

[Christian Hermann]

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/nodejs.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/nodejs.make b/rules/nodejs.make
index f469db1d6..6bf8447e8 100644
--- a/rules/nodejs.make
+++ b/rules/nodejs.make
@@ -25,7 +25,7 @@ NODEJS_SUFFIX	:= tar.gz
 NODEJS_URL	:= http://nodejs.org/dist/$(NODEJS_VERSION)/$(NODEJS).$(NODEJS_SUFFIX)
 NODEJS_SOURCE	:= $(SRCDIR)/$(NODEJS).$(NODEJS_SUFFIX)
 NODEJS_DIR	:= $(BUILDDIR)/$(NODEJS)
-NODEJS_LICENSE	:= unknown
+NODEJS_LICENSE	:= MIT
 
 NODEJS_SRCDIR		:= $(PTXDIST_WORKSPACE)/local_src
 NODEJS_MODULE_LIST	:= $(call remove_quotes, $(PTXCONF_NODEJS_MODULE_LIST))
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v3 3/9] nodejs: fix license identifier

[Michael Olbrich]

On Fri, Apr 05, 2019 at 05:12:03PM +0200, Christian Hermann wrote:
> Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> ---
>  rules/nodejs.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/nodejs.make b/rules/nodejs.make
> index f469db1d6..6bf8447e8 100644
> --- a/rules/nodejs.make
> +++ b/rules/nodejs.make
> @@ -25,7 +25,7 @@ NODEJS_SUFFIX	:= tar.gz
>  NODEJS_URL	:= http://nodejs.org/dist/$(NODEJS_VERSION)/$(NODEJS).$(NODEJS_SUFFIX)
>  NODEJS_SOURCE	:= $(SRCDIR)/$(NODEJS).$(NODEJS_SUFFIX)
>  NODEJS_DIR	:= $(BUILDDIR)/$(NODEJS)
> -NODEJS_LICENSE	:= unknown
> +NODEJS_LICENSE	:= MIT

This is incomplete. There are several builtin components with different
licenses.

Michael

>  
>  NODEJS_SRCDIR		:= $(PTXDIST_WORKSPACE)/local_src
>  NODEJS_MODULE_LIST	:= $(call remove_quotes, $(PTXCONF_NODEJS_MODULE_LIST))
> -- 
> 2.21.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
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

[ptxdist] [PATCH v3 4/9] ntp: fix license identifier

[Christian Hermann]

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/ntp.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/ntp.make b/rules/ntp.make
index 5d51ae4fc..a8d2b2f25 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -24,7 +24,7 @@ NTP_SUFFIX	:= tar.gz
 NTP_URL		:= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$(NTP).$(NTP_SUFFIX)
 NTP_SOURCE	:= $(SRCDIR)/$(NTP).$(NTP_SUFFIX)
 NTP_DIR		:= $(BUILDDIR)/$(NTP)
-NTP_LICENSE	:= ntp
+NTP_LICENSE	:= BSD-2-Clause
 NTP_LICENSE_FILES	:= file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003
 
 # ----------------------------------------------------------------------------
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v3 4/9] ntp: fix license identifier

[Michael Olbrich]

On Fri, Apr 05, 2019 at 05:12:04PM +0200, Christian Hermann wrote:
> Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> ---
>  rules/ntp.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/ntp.make b/rules/ntp.make
> index 5d51ae4fc..a8d2b2f25 100644
> --- a/rules/ntp.make
> +++ b/rules/ntp.make
> @@ -24,7 +24,7 @@ NTP_SUFFIX	:= tar.gz
>  NTP_URL		:= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$(NTP).$(NTP_SUFFIX)
>  NTP_SOURCE	:= $(SRCDIR)/$(NTP).$(NTP_SUFFIX)
>  NTP_DIR		:= $(BUILDDIR)/$(NTP)
> -NTP_LICENSE	:= ntp
> +NTP_LICENSE	:= BSD-2-Clause

Incomplete. From a quick look, I've seen at least BSD-4-Clause, GPL3+ and
there are others that I couldn't identify with just on look.

Michael

>  NTP_LICENSE_FILES	:= file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003
>  
>  # ----------------------------------------------------------------------------
> -- 
> 2.21.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
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

[ptxdist] [PATCH v3 5/9] openldap: fix license identifier

[Christian Hermann]

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/openldap.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/openldap.make b/rules/openldap.make
index 730cd1206..53802342e 100644
--- a/rules/openldap.make
+++ b/rules/openldap.make
@@ -25,7 +25,7 @@ OPENLDAP_URL		:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$(OPENLDAP
 OPENLDAP_SOURCE		:= $(SRCDIR)/$(OPENLDAP).$(OPENLDAP_SUFFIX)
 OPENLDAP_DIR		:= $(BUILDDIR)/$(OPENLDAP)
 # http://www.openldap.org/software/release/license.html
-OPENLDAP_LICENSE	:= OpenLDAP Public License
+OPENLDAP_LICENSE	:= OLDAP-2.0
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v3 5/9] openldap: fix license identifier

[Michael Olbrich]

On Fri, Apr 05, 2019 at 05:12:05PM +0200, Christian Hermann wrote:
> Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> ---
>  rules/openldap.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/openldap.make b/rules/openldap.make
> index 730cd1206..53802342e 100644
> --- a/rules/openldap.make
> +++ b/rules/openldap.make
> @@ -25,7 +25,7 @@ OPENLDAP_URL		:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$(OPENLDAP
>  OPENLDAP_SOURCE		:= $(SRCDIR)/$(OPENLDAP).$(OPENLDAP_SUFFIX)
>  OPENLDAP_DIR		:= $(BUILDDIR)/$(OPENLDAP)
>  # http://www.openldap.org/software/release/license.html
> -OPENLDAP_LICENSE	:= OpenLDAP Public License
> +OPENLDAP_LICENSE	:= OLDAP-2.0

OLDAP-2.8 I think. And given that the spdx Database contains 12 OLDAP-2.*
Licences, setting OPENLDAP_LICENSE_FILES will be a good reminder to update
this when a package update happens, so please add that as well.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.21.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
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

[ptxdist] [PATCH v3 6/9] pciutils: fix license identifier

[Christian Hermann]

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/pciutils.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/pciutils.make b/rules/pciutils.make
index 6ef7e14f7..be930fc60 100644
--- a/rules/pciutils.make
+++ b/rules/pciutils.make
@@ -24,7 +24,7 @@ PCIUTILS_SUFFIX		:= tar.xz
 PCIUTILS_URL		:= $(call ptx/mirror, KERNEL, ../software/utils/pciutils/$(PCIUTILS).$(PCIUTILS_SUFFIX))
 PCIUTILS_SOURCE		:= $(SRCDIR)/$(PCIUTILS).$(PCIUTILS_SUFFIX)
 PCIUTILS_DIR		:= $(BUILDDIR)/$(PCIUTILS)
-PCIUTILS_LICENSE	:= GPL-2.0-only
+PCIUTILS_LICENSE	:= GPL-2.0-or-later
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v3 6/9] pciutils: fix license identifier

[Michael Olbrich]

On Fri, Apr 05, 2019 at 05:12:06PM +0200, Christian Hermann wrote:
> Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> ---
>  rules/pciutils.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/pciutils.make b/rules/pciutils.make
> index 6ef7e14f7..be930fc60 100644
> --- a/rules/pciutils.make
> +++ b/rules/pciutils.make
> @@ -24,7 +24,7 @@ PCIUTILS_SUFFIX		:= tar.xz
>  PCIUTILS_URL		:= $(call ptx/mirror, KERNEL, ../software/utils/pciutils/$(PCIUTILS).$(PCIUTILS_SUFFIX))
>  PCIUTILS_SOURCE		:= $(SRCDIR)/$(PCIUTILS).$(PCIUTILS_SUFFIX)
>  PCIUTILS_DIR		:= $(BUILDDIR)/$(PCIUTILS)
> -PCIUTILS_LICENSE	:= GPL-2.0-only
> +PCIUTILS_LICENSE	:= GPL-2.0-or-later

Where do you get the 'or later' from. I can only find "Can be freely
distributed and used under the terms of the GNU GPL." in the code and a
GPL-2.0 license text.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.21.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
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

Re: [ptxdist] [PATCH v3 6/9] pciutils: fix license identifier

[Michael Olbrich]

Hi,

Please always reply to the list.

On Mon, Apr 15, 2019 at 05:34:21PM +0200, Christian Hermann wrote:
> On 4/12/19 8:50 AM, Michael Olbrich wrote:
> > On Fri, Apr 05, 2019 at 05:12:06PM +0200, Christian Hermann wrote:
> > > Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> > > ---
> > >   rules/pciutils.make | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/rules/pciutils.make b/rules/pciutils.make
> > > index 6ef7e14f7..be930fc60 100644
> > > --- a/rules/pciutils.make
> > > +++ b/rules/pciutils.make
> > > @@ -24,7 +24,7 @@ PCIUTILS_SUFFIX		:= tar.xz
> > >   PCIUTILS_URL		:= $(call ptx/mirror, KERNEL, ../software/utils/pciutils/$(PCIUTILS).$(PCIUTILS_SUFFIX))
> > >   PCIUTILS_SOURCE		:= $(SRCDIR)/$(PCIUTILS).$(PCIUTILS_SUFFIX)
> > >   PCIUTILS_DIR		:= $(BUILDDIR)/$(PCIUTILS)
> > > -PCIUTILS_LICENSE	:= GPL-2.0-only
> > > +PCIUTILS_LICENSE	:= GPL-2.0-or-later
> > 
> > Where do you get the 'or later' from. I can only find "Can be freely
> > distributed and used under the terms of the GNU GPL." in the code and a
> > GPL-2.0 license text.
> > 
> the README says this:
>   This package contains the PCI Utilities, version 3.3.0.
> 
>   Copyright (c) 1997--2014 Martin Mares <mj@ucw.cz>
> 
>   All files in this package can be freely distributed and used according
>   to the terms of the GNU General Public License, either version 2 or
>   (at your opinion) any newer version. See http://www.gnu.org/ for details
>   [...]

Right. The source files don't mention the 'or later'. So in this case, the
relevant part of the README must be added to the _LICENSE_FILES.

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

[ptxdist] [PATCH v3 7/9] perl: fix license identifier

[Christian Hermann]

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/perl.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/perl.make b/rules/perl.make
index f4c2590c1..9d41f1cb8 100644
--- a/rules/perl.make
+++ b/rules/perl.make
@@ -23,7 +23,7 @@ PERL_SUFFIX		:= tar.gz
 PERL_URL		:= http://cpan.perl.org/src/5.0/$(PERL).$(PERL_SUFFIX)
 PERL_SOURCE		:= $(SRCDIR)/$(PERL).$(PERL_SUFFIX)
 PERL_DIR		:= $(BUILDDIR)/$(PERL)
-PERL_LICENSE		:= GPL-1.0-only
+PERL_LICENSE		:= GPL-1.0-or-later OR Artistic-1.0-Perl
 PERL_LICENSE_FILES	:= file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b
 
 PERLCROSS_VERSION	:= 5.18.2-cross-0.8.5
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v3 7/9] perl: fix license identifier

[Michael Olbrich]

On Fri, Apr 05, 2019 at 05:12:07PM +0200, Christian Hermann wrote:
> Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> ---
>  rules/perl.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/perl.make b/rules/perl.make
> index f4c2590c1..9d41f1cb8 100644
> --- a/rules/perl.make
> +++ b/rules/perl.make
> @@ -23,7 +23,7 @@ PERL_SUFFIX		:= tar.gz
>  PERL_URL		:= http://cpan.perl.org/src/5.0/$(PERL).$(PERL_SUFFIX)
>  PERL_SOURCE		:= $(SRCDIR)/$(PERL).$(PERL_SUFFIX)
>  PERL_DIR		:= $(BUILDDIR)/$(PERL)
> -PERL_LICENSE		:= GPL-1.0-only
> +PERL_LICENSE		:= GPL-1.0-or-later OR Artistic-1.0-Perl
>  PERL_LICENSE_FILES	:= file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b

You should add the README (with startline=83 etc.) as the dual license is
described here.

Michael

>  
>  PERLCROSS_VERSION	:= 5.18.2-cross-0.8.5
> -- 
> 2.21.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
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

[ptxdist] [PATCH v3 8/9] tar: fix license identifier

[Christian Hermann]

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/tar.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/tar.make b/rules/tar.make
index 52436454b..4af522f51 100644
--- a/rules/tar.make
+++ b/rules/tar.make
@@ -23,7 +23,7 @@ TAR_SUFFIX	:= tar.xz
 TAR_URL		:= $(call ptx/mirror, GNU, tar/$(TAR).$(TAR_SUFFIX))
 TAR_SOURCE	:= $(SRCDIR)/$(TAR).$(TAR_SUFFIX)
 TAR_DIR		:= $(BUILDDIR)/$(TAR)
-TAR_LICENSE	:= unknown
+TAR_LICENSE	:= GPL-3.0-or-later
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v3 9/9] tmux: fix license identifier

[Christian Hermann]

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/tmux.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/tmux.make b/rules/tmux.make
index 9b596f255..7b9241fb0 100644
--- a/rules/tmux.make
+++ b/rules/tmux.make
@@ -23,7 +23,7 @@ TMUX_SUFFIX	:= tar.gz
 TMUX_URL	:= https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION)/$(TMUX).$(TMUX_SUFFIX)
 TMUX_SOURCE	:= $(SRCDIR)/$(TMUX).$(TMUX_SUFFIX)
 TMUX_DIR	:= $(BUILDDIR)/$(TMUX)
-TMUX_LICENSE	:= BSD
+TMUX_LICENSE	:= ISC
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de