[ptxdist] [PATCH 00/34] License updates

[ptxdist] [PATCH 00/34] License updates

[Alexander Dahl]

Hei hei,

I reviewed lots of packages for licensing issues and this patch series
is the outcome. There are basically three types of patches:

1) Add license information where it was missing
2) Add license file hashes for otherwise already correct packages
3) Fix license information where the given licenses are/became wrong
4) Combinations of the above

When mistakes were traceable to specific changesets, I added Fixes:
lines and the original author in Cc. This is not meant to offend
anyone, but to get a second opinion or review. This legal stuff is
hard, I get headaches from this. This is also why some commit messages
are longer than others.

Please review these patches carefully, I'm no lawyer. Some small
upstream projects make it easy to check each file, some would require
to inspect over 100 source files, if you want to do it right. Almost
none so far uses those still quite new SPDX license identifiers in the
file headers (sudo does in a version not yet available in ptxdist).

Some patches contain additional notes with remarks or questions.

Thanks to Roland Hieber for his SPDX matching tool [1], which made all
this a lot easier. You should however not solely depend on that tool,
but have a look into the current SPDX license list [3] and exceptions
[4].

Also helpful was the Debian project. They carry detailed copyright
information with their packages (well, most of them), e.g.:

https://metadata.ftp-master.debian.org/changelogs//main/u/util-linux/util-linux_2.33.1-0.1_copyright

And I also had a look on the license information the buildroot project
[2] has in its packages. Maybe someone wants to send them patches as
well. ;-)

Some additional notes on which packages should be reviewed and
probably updated:

* U-Boot
* util-linux-ng

Let me know, if I should reorder or change or squash something, but I
would also be happy, if just a subset would be applied.

Greets
Alex

P.S.: For people enjoying a long read about this whole license mess,
here you go: https://invisible-island.net/ncurses/ncurses-license.html

P.P.S.: If you did not already know, the FSFE started the REUSE
initiative to make all this somewhat easier, so if you're an upstream
developer, have a look: https://reuse.software/

[1] https://github.com/rohieb/spdx-license-match
[2] https://buildroot.org/
[3] https://spdx.org/licenses/
[4] https://spdx.org/licenses/exceptions-index.html

Alexander Dahl (34):
  at: Add license identifiers and hashes
  at91bootstrap: Add license information
  boost: Add license file hash
  busybox: Add license file hash
  libnl3: Fix license and add license hash
  dropbear: Add license information
  figlet: Fix license and add license file hashes
  flex: Fix license and add license file hash
  json-c: Add license file hash
  coreutils: Add license file hash
  libarchive: Add license file hash
  libfaketime: Add license file hash
  libgmp: Fix license
  libgmp: Add license file hashes
  libmnl: Fix license and add license file hashes
  libmodbus3: Fix license and add license file hashes
  libnet: Add license information
  libnftnl: Fix license and add license file hash
  libpcap: Fix license and add license file hash
  libpopt: Add license file hash
  libxml2: Fix license and add license file hash
  lighttpd: Fix licenses and add more license file hashes
  lm_sensors: Add license file hashes
  log4cplus: Fix licenses and add license file hash
  mtd-utils: Add license file hash
  ncurses: Use 'COPYING' for license file hash
  net-snmp: Fix licenses and add license file hash
  nftables: Add license file hash
  opkg: Add license file hash
  readline: Add license file hash
  rt-tests: Fix licenses and add license file hash
  sudo: Fix licenses and add license file hash
  tree: Fix licenses and add license file hashes
  u-boot-tools: Fix licenses and add license file hashes

 rules/at.make            | 5 ++++-
 rules/at91bootstrap.make | 4 ++++
 rules/boost.make         | 1 +
 rules/busybox.make       | 1 +
 rules/coreutils.make     | 1 +
 rules/dropbear.make      | 2 ++
 rules/figlet.make        | 8 +++++++-
 rules/flex.make          | 3 ++-
 rules/json-c.make        | 1 +
 rules/libarchive.make    | 1 +
 rules/libfaketime.make   | 1 +
 rules/libgmp.make        | 7 ++++++-
 rules/libmnl.make        | 3 ++-
 rules/libmodbus3.make    | 5 ++++-
 rules/libnet.make        | 2 ++
 rules/libnftnl.make      | 3 ++-
 rules/libnl3.make        | 4 +++-
 rules/libpcap.make       | 3 ++-
 rules/libpopt.make       | 1 +
 rules/libxml2.make       | 4 +++-
 rules/lighttpd.make      | 7 +++++--
 rules/lm_sensors.make    | 3 +++
 rules/log4cplus.make     | 3 ++-
 rules/mtd-utils.make     | 2 ++
 rules/ncurses.make       | 3 +--
 rules/net-snmp.make      | 3 ++-
 rules/nftables.make      | 1 +
 rules/opkg.make          | 1 +
 rules/readline.make      | 1 +
 rules/rt-tests.make      | 3 ++-
 rules/sudo.make          | 3 ++-
 rules/tree.make          | 5 ++++-
 rules/u-boot-tools.make  | 5 ++++-
 33 files changed, 80 insertions(+), 20 deletions(-)

-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 01/34] at: Add license identifiers and hashes

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/at.make | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/at.make b/rules/at.make
index 1436dcdbb..101529a4f 100644
--- a/rules/at.make
+++ b/rules/at.make
@@ -24,7 +24,10 @@ AT_TARBALL	:= at_$(AT_VERSION).orig.$(AT_SUFFIX)
 AT_URL		:= http://snapshot.debian.org/archive/debian/20091130T214753Z/pool/main/a/at/$(AT_TARBALL)
 AT_SOURCE	:= $(SRCDIR)/$(AT_TARBALL)
 AT_DIR		:= $(BUILDDIR)/$(AT)
-AT_LICENSE	:= unknown
+AT_LICENSE	:= GPL-2.0-or-later AND GPL-3.0-or-later AND ISC
+AT_LICENSE_FILES := \
+	file://COPYING;md5=4325afd396febcb659c36b49533135d4 \
+	file://Copyright;md5=dffa11c636884752fbf0b2a159b2883a
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 02/34] at91bootstrap: Add license information

[Alexander Dahl]

There's no separate license nor readme file in this project, but just
some information in the file headers. Files of the following types were
checked for individual license information: .h, .c, Makefile, .S, .bat,
and .sh. Most code by Atmel matches "BSD-Source-Code" license, one file
from U-Boot (?) is under GPL.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/at91bootstrap.make | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules/at91bootstrap.make b/rules/at91bootstrap.make
index 5dd1c2991..bb8bf8ad9 100644
--- a/rules/at91bootstrap.make
+++ b/rules/at91bootstrap.make
@@ -27,6 +27,10 @@ AT91BOOTSTRAP_URL	:= \
         http://sources.buildroot.net/$(AT91BOOTSTRAP_TARBALL)
 AT91BOOTSTRAP_SOURCE	:= $(SRCDIR)/$(AT91BOOTSTRAP_TARBALL)
 AT91BOOTSTRAP_DIR	:= $(BUILDDIR)/$(AT91BOOTSTRAP)
+AT91BOOTSTRAP_LICENSE	:= BSD-Source-Code AND GPL-2.0-or-later
+AT91BOOTSTRAP_LICENSE_FILES := \
+	file://main.c;startline=4;endline=26;md5=3492153edbe9064d12ba58818b73983d \
+	file://lib/div0.c;startline=2;endline=21;md5=e0212951661974539b2490564f7050fe
 
 # ----------------------------------------------------------------------------
 # Compile
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 03/34] boost: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/boost.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/boost.make b/rules/boost.make
index 555b1744f..9575486ab 100644
--- a/rules/boost.make
+++ b/rules/boost.make
@@ -25,6 +25,7 @@ BOOST_URL	:= $(call ptx/mirror, SF, boost/$(BOOST).$(BOOST_SUFFIX))
 BOOST_SOURCE	:= $(SRCDIR)/$(BOOST).$(BOOST_SUFFIX)
 BOOST_DIR	:= $(BUILDDIR)/$(BOOST)
 BOOST_LICENSE	:= BSL-1.0
+BOOST_LICENSE_FILES := file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 04/34] busybox: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/busybox.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/busybox.make b/rules/busybox.make
index 05bd397c6..141c0734b 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -25,6 +25,7 @@ BUSYBOX_SOURCE	:= $(SRCDIR)/$(BUSYBOX).$(BUSYBOX_SUFFIX)
 BUSYBOX_DIR	:= $(BUILDDIR)/$(BUSYBOX)
 BUSYBOX_KCONFIG	:= $(BUSYBOX_DIR)/Config.in
 BUSYBOX_LICENSE	:= GPL-2.0-only
+BUSYBOX_LICENSE_FILES := file://LICENSE;md5=de10de48642ab74318e893a61105afbb
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 05/34] libnl3: Fix license and add license hash

[Alexander Dahl]

libnl3 library is licensed under LGPL-2.1-only according to file
'COPYING' and file headers of various library source and public include
header files of the project. That did not change ever since initial
import of code into libnl vcs in 2007 and up to the current version. The
license stated when introducing the libnl3 package into ptxdist back in
2013 applies to the tools however.

This is backed by a statement of the author from 2015:

https://github.com/thom311/libnl/issues/80

Fixes: adeac13183422dc7152ad5e0484601b074436af7
Cc: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libnl3.make | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/libnl3.make b/rules/libnl3.make
index e3bda8785..285f4c89b 100644
--- a/rules/libnl3.make
+++ b/rules/libnl3.make
@@ -24,7 +24,9 @@ LIBNL3_SUFFIX	:= tar.gz
 LIBNL3_URL	:= https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBNL3).$(LIBNL3_SUFFIX)
 LIBNL3_SOURCE	:= $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX)
 LIBNL3_DIR	:= $(BUILDDIR)/$(LIBNL3)
-LIBNL3_LICENSE	:= GPL-2.0-only
+# LGPL-2.1-only for library; GPL-2.0-only for tools
+LIBNL3_LICENSE	:= LGPL-2.1-only AND GPL-2.0-only
+LIBNL3_LICENSE_FILES := file://COPYING;md5=4fbd65380cdd255951079008b364516c
 
 #
 # autoconf
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 06/34] dropbear: Add license information

[Alexander Dahl]

The parts written for dropbear itself are MIT licensed, as are those
imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause,
some parts are in the public domain. curve25519 parts from Google are
BSD 3 clause licensed. Everything is explained in the file 'LICENSE'.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/dropbear.make | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/dropbear.make b/rules/dropbear.make
index c1ad614ef..016c4d713 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -25,6 +25,8 @@ DROPBEAR_SUFFIX		:= tar.bz2
 DROPBEAR_URL		:= http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
 DROPBEAR_SOURCE		:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX)
 DROPBEAR_DIR		:= $(BUILDDIR)/$(DROPBEAR)
+DROPBEAR_LICENSE	:= MIT AND BSD-2-Clause AND BSD-3-Clause
+DROPBEAR_LICENSE_FILES	:= file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 07/34] figlet: Fix license and add license file hashes

[Alexander Dahl]

Added information based on what the Debian project found out.

https://metadata.ftp-master.debian.org/changelogs//main/f/figlet/figlet_2.2.5-2_copyright

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/figlet.make | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rules/figlet.make b/rules/figlet.make
index b22d22e17..8886beab3 100644
--- a/rules/figlet.make
+++ b/rules/figlet.make
@@ -25,7 +25,13 @@ FIGLET_SUFFIX		:= tar.gz
 FIGLET_URL		:= ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX)
 FIGLET_SOURCE		:= $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
 FIGLET_DIR		:= $(BUILDDIR)/$(FIGLET)
-FIGLET_LICENSE		:= figlet
+FIGLET_LICENSE		:= BSD-3-Clause AND MIT-CMU AND ISC AND Unicode-DFS-2016 AND WTFPL
+FIGLET_LICENSE_FILES	:= \
+	file://LICENSE;md5=1688bcd97b27704f1afcac7336409857 \
+	file://inflate.c;startline=7;endline=27;md5=74ed6158b8244dbc4d91afaf8a39bec2 \
+	file://utf8.c;startline=2;endline=16;md5=eb9cc57cf60ac24044670bf8dc475579 \
+	file://fonts/8859-2.flc;startline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34 \
+	file://tests/emboss.tlf;startline=3;endline=10;md5=8e317e9236ffade21fedc39e3496eac2
 
 # ----------------------------------------------------------------------------
 # Compile
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 08/34] flex: Fix license and add license file hash

[Alexander Dahl]

The license text neither matches BSD-2-Clause nor BSD-3-Clause exactly.
However it actually contains the third clause, but without leading
numbering.

Fixes: 1c799fcdc126d9e81da7944809e9da2a6d96466d
Cc: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/flex.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/flex.make b/rules/flex.make
index 803e25897..bcf628d44 100644
--- a/rules/flex.make
+++ b/rules/flex.make
@@ -23,7 +23,8 @@ FLEX_SUFFIX	:= tar.xz
 FLEX_URL	:= $(call ptx/mirror, SF, flex/$(FLEX).$(FLEX_SUFFIX))
 FLEX_SOURCE	:= $(SRCDIR)/$(FLEX).$(FLEX_SUFFIX)
 FLEX_DIR	:= $(BUILDDIR)/$(FLEX)
-FLEX_LICENSE	:= BSD-2-Clause
+FLEX_LICENSE	:= BSD-3-Clause
+FLEX_LICENSE_FILES := file://COPYING;md5=e4742cf92e89040b39486a6219b68067
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 09/34] json-c: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/json-c.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/json-c.make b/rules/json-c.make
index 166392e1f..f5d9fe254 100644
--- a/rules/json-c.make
+++ b/rules/json-c.make
@@ -24,6 +24,7 @@ JSON_C_URL		:= https://github.com/json-c/json-c/archive/$(JSON_C).$(JSON_C_SUFFI
 JSON_C_SOURCE		:= $(SRCDIR)/$(JSON_C).$(JSON_C_SUFFIX)
 JSON_C_DIR		:= $(BUILDDIR)/$(JSON_C)
 JSON_C_LICENSE		:= MIT
+JSON_C_LICENSE_FILES	:= file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 10/34] coreutils: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/coreutils.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/coreutils.make b/rules/coreutils.make
index e36767a81..fc39de8e7 100644
--- a/rules/coreutils.make
+++ b/rules/coreutils.make
@@ -24,6 +24,7 @@ COREUTILS_URL		:= $(call ptx/mirror, GNU, coreutils/$(COREUTILS).$(COREUTILS_SUF
 COREUTILS_SOURCE	:= $(SRCDIR)/$(COREUTILS).$(COREUTILS_SUFFIX)
 COREUTILS_DIR		:= $(BUILDDIR)/$(COREUTILS)
 COREUTILS_LICENSE	:= GPL-3.0-only
+COREUTILS_LICENSE_FILES	:= file://COPYING;md5=d32239bcb673463ab874e80d47fae504
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 11/34] libarchive: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libarchive.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/libarchive.make b/rules/libarchive.make
index f4252df35..e5a9a3f5b 100644
--- a/rules/libarchive.make
+++ b/rules/libarchive.make
@@ -24,6 +24,7 @@ LIBARCHIVE_URL		:= http://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIV
 LIBARCHIVE_SOURCE	:= $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
 LIBARCHIVE_DIR		:= $(BUILDDIR)/$(LIBARCHIVE)
 LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause
+LIBARCHIVE_LICENSE_FILES := file://COPYING;md5=ed99aca006bc346974bb745a35336425
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 12/34] libfaketime: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libfaketime.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/libfaketime.make b/rules/libfaketime.make
index fe5d21b46..4ed9c3db2 100644
--- a/rules/libfaketime.make
+++ b/rules/libfaketime.make
@@ -18,6 +18,7 @@ LIBFAKETIME_URL		:= https://github.com/wolfcw/libfaketime/archive/v$(LIBFAKETIME
 LIBFAKETIME_SOURCE	:= $(SRCDIR)/$(LIBFAKETIME).$(LIBFAKETIME_SUFFIX)
 LIBFAKETIME_DIR		:= $(BUILDDIR)/$(LIBFAKETIME)
 LIBFAKETIME_LICENSE	:= GPL-2.0-only
+LIBFAKETIME_LICENSE_FILES := file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 13/34] libgmp: Fix license

[Alexander Dahl]

The README of libgmp 6.1.2 and 6.0.0 states this:

> The GNU MP Library is free software; you can redistribute it and/or modify
> it under the terms of either:
>
>   * the GNU Lesser General Public License as published by the Free
>     Software Foundation; either version 3 of the License, or (at your
>     option) any later version.
>
> or
>
>   * the GNU General Public License as published by the Free Software
>     Foundation; either version 2 of the License, or (at your option) any
>     later version.
>
> or both in parallel, as here.

The library switched licensing with release of version 6.

Fixes: 9d22b77f54f0001640e4d632d0c463c029a3e8d0
Cc: Alexander Aring <alex.aring@gmail.com>
Fixes: 00c6e91b6b8a54cdfc7af0d75e4eb7637981e63d
Cc: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libgmp.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/libgmp.make b/rules/libgmp.make
index 1c9568f37..80a0baab7 100644
--- a/rules/libgmp.make
+++ b/rules/libgmp.make
@@ -24,7 +24,7 @@ LIBGMP_SUFFIX	:= tar.bz2
 LIBGMP_URL	:= $(call ptx/mirror, GNU, gmp/$(LIBGMP).$(LIBGMP_SUFFIX))
 LIBGMP_SOURCE	:= $(SRCDIR)/$(LIBGMP).$(LIBGMP_SUFFIX)
 LIBGMP_DIR	:= $(BUILDDIR)/$(LIBGMP)
-LIBGMP_LICENSE	:= GPL-3.0-only AND LGPL-3.0-only
+LIBGMP_LICENSE	:= GPL-2.0-or-later OR LGPL-3.0-or-later
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 14/34] libgmp: Add license file hashes

[Alexander Dahl]

The README contains the dual licensing statement. The other three files
are the license texts for GPL-2.0, GPL-3.0, and LGPL-3.0. The file
'COPYING' in version 6.1.2 of libgmp also contains a GPLv3 license text,
but is removed upstream in later versions.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libgmp.make | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rules/libgmp.make b/rules/libgmp.make
index 80a0baab7..1948f8cb2 100644
--- a/rules/libgmp.make
+++ b/rules/libgmp.make
@@ -25,6 +25,11 @@ LIBGMP_URL	:= $(call ptx/mirror, GNU, gmp/$(LIBGMP).$(LIBGMP_SUFFIX))
 LIBGMP_SOURCE	:= $(SRCDIR)/$(LIBGMP).$(LIBGMP_SUFFIX)
 LIBGMP_DIR	:= $(BUILDDIR)/$(LIBGMP)
 LIBGMP_LICENSE	:= GPL-2.0-or-later OR LGPL-3.0-or-later
+LIBGMP_LICENSE_FILES := \
+	file://README;startline=1;endline=27;md5=20e1eb0dbe1e7dba4f5934a132360fe9 \
+	file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
+	file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 15/34] libmnl: Fix license and add license file hashes

[Alexander Dahl]

libmnl switched from GPLv2+ to LGPLv2.1+ before the 1.0.0 release. The
package was initially added to ptxdist with version 1.0.3 in 2016 with
the wrong license information. The project clearly states it is
LGPL-2.1-or-later in both COPYING file and file headers.

Fixes: e2c4c9dceec7dfcef3bfcbd2f2a2d09eb88b8726
Cc: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libmnl.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/libmnl.make b/rules/libmnl.make
index cacef7d07..844cc9279 100644
--- a/rules/libmnl.make
+++ b/rules/libmnl.make
@@ -23,7 +23,8 @@ LIBMNL_SUFFIX	:= tar.bz2
 LIBMNL_URL		:= http://ftp.netfilter.org/pub/libmnl/$(LIBMNL).$(LIBMNL_SUFFIX)
 LIBMNL_SOURCE	:= $(SRCDIR)/$(LIBMNL).$(LIBMNL_SUFFIX)
 LIBMNL_DIR		:= $(BUILDDIR)/$(LIBMNL)
-LIBMNL_LICENSE	:= GPL-2.0-only
+LIBMNL_LICENSE	:= LGPL-2.1-or-later
+LIBMNL_LICENSE_FILES := file://COPYING;md5=4fbd65380cdd255951079008b364516c
 
 #
 # autoconf
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 16/34] libmodbus3: Fix license and add license file hashes

[Alexander Dahl]

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
Cc: Josef Holzmayr <holzmayr@rsi-elektrotechnik.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libmodbus3.make | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
index 9f9acdc6d..5f3189cd0 100644
--- a/rules/libmodbus3.make
+++ b/rules/libmodbus3.make
@@ -23,7 +23,10 @@ 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 AND GPL-3.0-or-later
+LIBMODBUS3_LICENSE_FILES := \
+	file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
+	file://COPYING;md5=d32239bcb673463ab874e80d47fae504
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 17/34] libnet: Add license information

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libnet.make | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/libnet.make b/rules/libnet.make
index 635c3d8c4..3c94b5fd6 100644
--- a/rules/libnet.make
+++ b/rules/libnet.make
@@ -24,6 +24,8 @@ LIBNET_SUFFIX	:= tar.gz
 LIBNET_URL	:= $(call ptx/mirror, SF, libnet-dev/$(LIBNET).$(LIBNET_SUFFIX))
 LIBNET_SOURCE	:= $(SRCDIR)/$(LIBNET).$(LIBNET_SUFFIX)
 LIBNET_DIR	:= $(BUILDDIR)/$(LIBNET)
+LIBNET_LICENSE	:= BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND MIT-CMU
+LIBNET_LICENSE_FILES := file://doc/COPYING;md5=fb43d5727b2d3d1238545f75ce456ec3
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 18/34] libnftnl: Fix license and add license file hash

[Alexander Dahl]

When added to ptxdist in 2016 the package version was 1.0.5, which
already contained at least one file under GPL-2.0-only, which is still
the case with the current version 1.1.2.

Fixes: db4d91b62aa8f8653fa2e6b87fc72f07cd838cfd
Cc: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libnftnl.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/libnftnl.make b/rules/libnftnl.make
index b5fd6331d..a53652d0a 100644
--- a/rules/libnftnl.make
+++ b/rules/libnftnl.make
@@ -23,7 +23,8 @@ LIBNFTNL_SUFFIX		:= tar.bz2
 LIBNFTNL_URL		:= http://ftp.netfilter.org/pub/libnftnl/$(LIBNFTNL).$(LIBNFTNL_SUFFIX)
 LIBNFTNL_SOURCE		:= $(SRCDIR)/$(LIBNFTNL).$(LIBNFTNL_SUFFIX)
 LIBNFTNL_DIR		:= $(BUILDDIR)/$(LIBNFTNL)
-LIBNFTNL_LICENSE	:= GPL-2.0-only
+LIBNFTNL_LICENSE	:= GPL-2.0-only AND GPL-2.0-or-later
+LIBNFTNL_LICENSE_FILES	:= file://COPYING;md5=79808397c3355f163c012616125c9e26
 
 #
 # autoconf
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 19/34] libpcap: Fix license and add license file hash

[Alexander Dahl]

While the license in file 'LICENSE' indeed seems to be BSD-3-Clause, the
actual source files have more, different licensing applied in their
headers, all different variants of BSD licenses.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---

Notes:
    ./ieee80211.h is even BSD-3-Clause OR GPL-2.0-only … o.O
    
    How should this be handled?

 rules/libpcap.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/libpcap.make b/rules/libpcap.make
index 3f2c85205..7871f8684 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -23,7 +23,8 @@ LIBPCAP_SUFFIX	:= tar.gz
 LIBPCAP_URL	:= http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX)
 LIBPCAP_SOURCE	:= $(SRCDIR)/$(LIBPCAP).$(LIBPCAP_SUFFIX)
 LIBPCAP_DIR	:= $(BUILDDIR)/$(LIBPCAP)
-LIBPCAP_LICENSE	:= BSD-3-Clause
+LIBPCAP_LICENSE	:= BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-UC
+LIBPCAP_LICENSE_FILES := file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 20/34] libpopt: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libpopt.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/libpopt.make b/rules/libpopt.make
index 3bc769080..06e6d896f 100644
--- a/rules/libpopt.make
+++ b/rules/libpopt.make
@@ -25,6 +25,7 @@ LIBPOPT_URL	:= http://rpm5.org/files/popt/$(LIBPOPT).$(LIBPOPT_SUFFIX)
 LIBPOPT_SOURCE	:= $(SRCDIR)/$(LIBPOPT).$(LIBPOPT_SUFFIX)
 LIBPOPT_DIR	:= $(BUILDDIR)/$(LIBPOPT)
 LIBPOPT_LICENSE	:= MIT
+LIBPOPT_LICENSE_FILES := file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 21/34] libxml2: Fix license and add license file hash

[Alexander Dahl]

The 'Copyright' file says:

> Except where otherwise noted in the source code (e.g. the files hash.c,
> list.c and the trio files, which are covered by a similar licence but
> with different Copyright notices) all the files are:

According to comparison with the license text at SPDX and what Debian
found out, those files are put under ISC license.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libxml2.make | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/libxml2.make b/rules/libxml2.make
index 234e85f3e..c47356532 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -24,7 +24,9 @@ LIBXML2		:= libxml2-$(LIBXML2_VERSION)
 LIBXML2_SUFFIX	:= tar.gz
 LIBXML2_SOURCE	:= $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
 LIBXML2_DIR	:= $(BUILDDIR)/$(LIBXML2)
-LIBXML2_LICENSE	:= MIT
+LIBXML2_LICENSE	:= MIT AND ISC
+# The file 'COPYING' is just a symlink on the file 'Copyright'
+LIBXML2_LICENSE_FILES := file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1
 
 LIBXML2_URL := \
 	ftp://xmlsoft.org/libxml2/$(LIBXML2).$(LIBXML2_SUFFIX) \
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 22/34] lighttpd: Fix licenses and add more license file hashes

[Alexander Dahl]

Most of lighttpd is BSD-3-Clause, except three files, which are OML or
RSA-MD licensed. Found by reading Debian package copyright information
and by inspecting file headers.

Fixes: d9ee5ecd1fe89b4a1cc3a32b09388ab678d129af
Cc: Andreas Pretzsch <apr@cn-eng.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/lighttpd.make | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 69fa69a22..1398431ea 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -24,8 +24,11 @@ LIGHTTPD_SUFFIX		:= tar.xz
 LIGHTTPD_URL		:= http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
 LIGHTTPD_SOURCE		:= $(SRCDIR)/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
 LIGHTTPD_DIR		:= $(BUILDDIR)/$(LIGHTTPD)
-LIGHTTPD_LICENSE	:= BSD-3-Clause
-LIGHTTPD_LICENSE_FILES := file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579
+LIGHTTPD_LICENSE	:= BSD-3-Clause AND OML AND RSA-MD
+LIGHTTPD_LICENSE_FILES	:= \
+	file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579 \
+	file://src/fastcgi.h;startline=7;endline=15;md5=fe9ffe753772839aace9c90e814bc356 \
+	file://src/md5.c;startline=6;endline=26;md5=b5be3b6afd4afa7bb89b16361244f9b6
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 23/34] lm_sensors: Add license file hashes

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/lm_sensors.make | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rules/lm_sensors.make b/rules/lm_sensors.make
index a80ffdc13..5f6de9785 100644
--- a/rules/lm_sensors.make
+++ b/rules/lm_sensors.make
@@ -27,6 +27,9 @@ LM_SENSORS_URL		:= \
 LM_SENSORS_SOURCE	:= $(SRCDIR)/$(LM_SENSORS).$(LM_SENSORS_SUFFIX)
 LM_SENSORS_DIR		:= $(BUILDDIR)/$(LM_SENSORS)
 LM_SENSORS_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
+LM_SENSORS_LICENSE_FILES := \
+	file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+	file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 24/34] log4cplus: Fix licenses and add license file hash

[Alexander Dahl]

When introduced as package to ptxdist, log4cplus 1.1.0 README already
stated:

> This library is licensed under the Apache Public License 2.0 and two
> clause BSD license.  Please read the included LICENSE file for
> details.

Actually some files are under Apache-2.0 and other files are under
BSD-2-Clause, so both apply.

Fixes: 0ac556f6b55da4c9d41c5e191432ba51276a40eb
Cc: Bernhard Sessler <bernhard.sessler@corscience.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/log4cplus.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/log4cplus.make b/rules/log4cplus.make
index 18fc53fb0..75959a32d 100644
--- a/rules/log4cplus.make
+++ b/rules/log4cplus.make
@@ -24,7 +24,8 @@ LOG4CPLUS_SUFFIX	:= tar.xz
 LOG4CPLUS_URL		:= $(call ptx/mirror, SF, log4cplus/$(LOG4CPLUS).$(LOG4CPLUS_SUFFIX))
 LOG4CPLUS_SOURCE	:= $(SRCDIR)/$(LOG4CPLUS).$(LOG4CPLUS_SUFFIX)
 LOG4CPLUS_DIR		:= $(BUILDDIR)/$(LOG4CPLUS)
-LOG4CPLUS_LICENSE	:= Apache-2.0
+LOG4CPLUS_LICENSE	:= Apache-2.0 AND BSD-2-Clause
+LOG4CPLUS_LICENSE_FILES	:= file://LICENSE;md5=65053a46f707ee2b93f09ad22f692170
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 25/34] mtd-utils: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/mtd-utils.make | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index a433c6fa2..36f5fb7b1 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -25,6 +25,8 @@ MTD_UTILS_URL		:= ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS
 MTD_UTILS_SOURCE	:= $(SRCDIR)/$(MTD_UTILS).$(MTD_UTILS_SUFFIX)
 MTD_UTILS_DIR		:= $(BUILDDIR)/$(MTD_UTILS)
 MTD_UTILS_LICENSE	:= GPL-2.0-or-later
+MTD_UTILS_LICENSE_FILES	:= file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3
+
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 26/34] ncurses: Use 'COPYING' for license file hash

[Alexander Dahl]

That file came with ncurses 6.0, when the initial license file hash was
defined in ptxdist for ncurses 5.9, that file was not yet present.

For details on ncurses licensing see:

https://invisible-island.net/ncurses/ncurses-license.html

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/ncurses.make | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rules/ncurses.make b/rules/ncurses.make
index 1df747983..c2a111cc2 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -24,8 +24,7 @@ NCURSES_URL	:= $(call ptx/mirror, GNU, ncurses/$(NCURSES).$(NCURSES_SUFFIX))
 NCURSES_SOURCE	:= $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX)
 NCURSES_DIR	:= $(BUILDDIR)/$(NCURSES)
 NCURSES_LICENSE	:= MIT
-NCURSES_LICENSE_FILES	:= \
-	file://include/curses.h.in;startline=2;endline=26;md5=12de1a79061c9246decc146201452dc5
+NCURSES_LICENSE_FILES := file://COPYING;md5=8a241caac0fd66225f7ac2d1b2ef76ac
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 27/34] net-snmp: Fix licenses and add license file hash

[Alexander Dahl]

Fixes: 4cb0b96e0df94644e42a735039967c6a5fa22a27
Cc: Oliver Graute <oliver.graute@gmail.com>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/net-snmp.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index eb24ccbc2..98acf38cd 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -25,7 +25,8 @@ NET_SNMP_SUFFIX		:= tar.gz
 NET_SNMP_URL		:= $(call ptx/mirror, SF, net-snmp/$(NET_SNMP).$(NET_SNMP_SUFFIX))
 NET_SNMP_SOURCE		:= $(SRCDIR)/$(NET_SNMP).$(NET_SNMP_SUFFIX)
 NET_SNMP_DIR		:= $(BUILDDIR)/$(NET_SNMP)
-NET_LICENSE		:= BSD like
+NET_SNMP_LICENSE	:= MIT-CMU AND BSD-3-Clause
+NET_SNMP_LICENSE_FILES	:= file://COPYING;md5=5dedd290b5ffbe69d9625ddeb350a044
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 28/34] nftables: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/nftables.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/nftables.make b/rules/nftables.make
index 15368f965..8509059b4 100644
--- a/rules/nftables.make
+++ b/rules/nftables.make
@@ -24,6 +24,7 @@ NFTABLES_URL		:= http://ftp.netfilter.org/pub/nftables/$(NFTABLES).$(NFTABLES_SU
 NFTABLES_SOURCE		:= $(SRCDIR)/$(NFTABLES).$(NFTABLES_SUFFIX)
 NFTABLES_DIR		:= $(BUILDDIR)/$(NFTABLES)
 NFTABLES_LICENSE	:= GPL-2.0-only
+NFTABLES_LICENSE_FILES	:= file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 29/34] opkg: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/opkg.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/opkg.make b/rules/opkg.make
index d9004d8b7..d2dda73cf 100644
--- a/rules/opkg.make
+++ b/rules/opkg.make
@@ -25,6 +25,7 @@ OPKG_URL	:= http://downloads.yoctoproject.org/releases/opkg/$(OPKG).$(OPKG_SUFFI
 OPKG_SOURCE	:= $(SRCDIR)/$(OPKG).$(OPKG_SUFFIX)
 OPKG_DIR	:= $(BUILDDIR)/$(OPKG)
 OPKG_LICENSE	:= GPL-2.0-or-later
+OPKG_LICENSE_FILES := file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 30/34] readline: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/readline.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/readline.make b/rules/readline.make
index be3928c78..382d22685 100644
--- a/rules/readline.make
+++ b/rules/readline.make
@@ -25,6 +25,7 @@ READLINE_URL		:= $(call ptx/mirror, GNU, readline/$(READLINE).$(READLINE_SUFFIX)
 READLINE_SOURCE		:= $(SRCDIR)/$(READLINE).$(READLINE_SUFFIX)
 READLINE_DIR		:= $(BUILDDIR)/$(READLINE)
 READLINE_LICENSE	:= GPL-3.0-or-later
+READLINE_LICENSE_FILES	:= file://COPYING;md5=d32239bcb673463ab874e80d47fae504
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 31/34] rt-tests: Fix licenses and add license file hash

[Alexander Dahl]

The file 'src/pi_tests/tst-mutexpi10.c' is LGPL-2.1-or-later.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/rt-tests.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/rt-tests.make b/rules/rt-tests.make
index f3c38fe3f..10c4769f7 100644
--- a/rules/rt-tests.make
+++ b/rules/rt-tests.make
@@ -21,7 +21,6 @@ PACKAGES-$(PTXCONF_RT_TESTS) += rt-tests
 #
 RT_TESTS_VERSION	:= 1.0
 RT_TESTS_MD5		:= 3818d2d0a3069291864bf85fde40883b
-RT_TESTS_LICENSE	:= GPL-2.0-only AND GPL-2.0-or-later
 RT_TESTS		:= rt-tests-$(RT_TESTS_VERSION)
 RT_TESTS_SUFFIX		:= tar.xz
 RT_TESTS_URL		:= \
@@ -29,6 +28,8 @@ RT_TESTS_URL		:= \
 	$(call ptx/mirror, KERNEL, utils/rt-tests/older/$(RT_TESTS).$(RT_TESTS_SUFFIX))
 RT_TESTS_SOURCE		:= $(SRCDIR)/$(RT_TESTS).$(RT_TESTS_SUFFIX)
 RT_TESTS_DIR		:= $(BUILDDIR)/$(RT_TESTS)
+RT_TESTS_LICENSE	:= GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
+RT_TESTS_LICENSE_FILES	:= file://COPYING;md5=751419260aa954499f7abaabaa882bbe
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 32/34] sudo: Fix licenses and add license file hash

[Alexander Dahl]

Upstream distributes a fairly complete LICENSE document listing all
applying licenses.

Fixes: 8a4ca3129944e590408f375aa4855a7e7509d137
Cc: Andreas Pretzsch <apr@cn-eng.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/sudo.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/sudo.make b/rules/sudo.make
index 54d84ea54..232942482 100644
--- a/rules/sudo.make
+++ b/rules/sudo.make
@@ -26,7 +26,8 @@ SUDO_URL	:= \
 	http://www.sudo.ws/sudo/dist/OLD/$(SUDO).$(SUDO_SUFFIX)
 SUDO_SOURCE	:= $(SRCDIR)/$(SUDO).$(SUDO_SUFFIX)
 SUDO_DIR	:= $(BUILDDIR)/$(SUDO)
-SUDO_LICENSE	:= BSD AND ISC
+SUDO_LICENSE	:= ISC AND BSD-3-Clause AND BSD-2-Clause-NetBSD AND Zlib
+SUDO_LICENSE_FILES := file://doc/LICENSE;md5=7765a3d787cb4fed3ccc3c9cee030af9
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 33/34] tree: Fix licenses and add license file hashes

[Alexander Dahl]

Fixes: 91c5a41750b821cf2a5af537b1a0d93e0cf4ba59
Cc: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/tree.make | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/tree.make b/rules/tree.make
index d86293851..9e25602a2 100644
--- a/rules/tree.make
+++ b/rules/tree.make
@@ -23,7 +23,10 @@ TREE_SUFFIX	:= tgz
 TREE_URL	:= http://mama.indstate.edu/users/ice/tree/src/$(TREE).$(TREE_SUFFIX)
 TREE_SOURCE	:= $(SRCDIR)/$(TREE).$(TREE_SUFFIX)
 TREE_DIR	:= $(BUILDDIR)/$(TREE)
-TREE_LICENSE	:= GPL
+TREE_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
+TREE_LICENSE_FILES := \
+	file://LICENSE;md5=393a5ca445f6965873eca0259a17f833 \
+	file://strverscmp.c;startline=1;endline=19;md5=f50ab9ef044f00fb22691ec5051c922d
 
 # ----------------------------------------------------------------------------
 # Compile
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 34/34] u-boot-tools: Fix licenses and add license file hashes

[Alexander Dahl]

This package uses only a small part of U-Boot intended to run on Linux,
for which only two licenses apply.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/u-boot-tools.make | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
index b1b5515ca..a05b41d5f 100644
--- a/rules/u-boot-tools.make
+++ b/rules/u-boot-tools.make
@@ -23,7 +23,10 @@ U_BOOT_TOOLS_SUFFIX	:= tar.bz2
 U_BOOT_TOOLS_URL	:= ftp://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
 U_BOOT_TOOLS_SOURCE	:= $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
 U_BOOT_TOOLS_DIR	:= $(BUILDDIR)/u-boot-tools-$(U_BOOT_TOOLS_VERSION)
-U_BOOT_TOOLS_LICENSE	:= GPL-2.0-only
+U_BOOT_TOOLS_LICENSE	:= GPL-2.0-or-later AND Zlib
+U_BOOT_TOOLS_LICENSE_FILES := \
+	file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://include/u-boot/zlib.h;startline=15;endline=43;md5=7c27ae0384929249664da410d539a1dc
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 07/34] figlet: Fix license and add license file hashes

[Roland Hieber]

[-- Attachment #1: Type: text/plain, Size: 1861 bytes --]

On Fri, May 10, 2019 at 11:24:07AM +0200, Alexander Dahl wrote:
> Added information based on what the Debian project found out.
> 
> https://metadata.ftp-master.debian.org/changelogs//main/f/figlet/figlet_2.2.5-2_copyright
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/figlet.make | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/figlet.make b/rules/figlet.make
> index b22d22e17..8886beab3 100644
> --- a/rules/figlet.make
> +++ b/rules/figlet.make
> @@ -25,7 +25,13 @@ FIGLET_SUFFIX		:= tar.gz
>  FIGLET_URL		:= ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX)
>  FIGLET_SOURCE		:= $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
>  FIGLET_DIR		:= $(BUILDDIR)/$(FIGLET)
> -FIGLET_LICENSE		:= figlet
> +FIGLET_LICENSE		:= BSD-3-Clause AND MIT-CMU AND ISC AND Unicode-DFS-2016 AND WTFPL
> +FIGLET_LICENSE_FILES	:= \
> +	file://LICENSE;md5=1688bcd97b27704f1afcac7336409857 \
> +	file://inflate.c;startline=7;endline=27;md5=74ed6158b8244dbc4d91afaf8a39bec2 \
> +	file://utf8.c;startline=2;endline=16;md5=eb9cc57cf60ac24044670bf8dc475579 \
> +	file://fonts/8859-2.flc;startline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34 \
> +	file://tests/emboss.tlf;startline=3;endline=10;md5=8e317e9236ffade21fedc39e3496eac2

I was trying to reproduce these, but I got a better match for HPND
instead of MIT-CMU for inflate.c. And I cannot reprocude the match from
fonts/8859-2.flc, which apparently should be Unicode-DFS-2016? It seems
to me this is a bug in the Debian package you referenced above.

See attachments.

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

[-- Attachment #2: 8859-2.flc-unicode-dfs-2016.wdiff --]
[-- Type: text/plain, Size: 4142 bytes --]

.../figlet-2.2.5 $ sed -n '9,23p' fonts/8859-2.flc | cut -b3- | spdx-license-match -g Unicode-DFS-2016
Match: 6% Unicode-DFS-2016
Note: match for Unicode-DFS-2016 is pretty bad. Maybe try a better --guess.
Diff:
  --- Unicode-DFS-2016.txt
  +++ input
  
  @@ -1,54 +1,13 @@
  [-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
  
  Unicode Data Files include all data files under the directories  
  http://www.unicode.org/Public/, http://www.unicode.org/reports/,  
  http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,  
  and http://www.unicode.org/utility/trac/browser/.
  
  Unicode Data Files do not include PDF online code charts under the directory  
  http://www.unicode.org/Public/.
  
  Software includes any source code published in the Unicode Standard or under  
  the directories http://www.unicode.org/Public/,  
  http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/,  
  http://source.icu-project.org/repos/icu/, and  
  http://www.unicode.org/utility/trac/browser/.
  
  NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING,  
  INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA  
  FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO  
  BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT  
  AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR  
  SOFTWARE.
  
  COPYRIGHT AND PERMISSION NOTICE-] Copyright [-© 1991-2016-] {+(c) 1991-1999+} 
  Unicode, Inc.  All [-rights-] {+Rights+} reserved. [-Distributed under  the 
  Terms of Use in http://www.unicode.org/copyright.html.
  
  Permission-]
  
  {+This file+} is [-hereby granted, free of charge,-] {+provided as-is by 
  Unicode, Inc. (The Unicode Consortium). No  claims are made as+} to {+fitness 
  for+} any [-person obtaining a copy-] {+particular purpose.  No warranties+} of 
  [-the Unicode data files and-]  any [-associated documentation (the "Data 
  Files")-] {+kind are expressed+} or [-Unicode software and-] {+implied.  The 
  recipient agrees to determine  applicability of information provided.  If this 
  file has been provided on  optical media by Unicode, Inc., the sole remedy 
  for+} any [-associated documentation (the "Software")-] {+claim will be  
  exchange of defective media within 90 days of receipt.
  
  Unicode, Inc. hereby grants the right+} to [-deal  in-] {+freely use+} the 
  [-Data Files or Software without restriction, including without  limitation-] 
  {+information supplied  in this file in+} the [-rights to use, copy, modify, 
  merge, publish, distribute,  and/or sell copies-] {+creation+} of {+products 
  supporting+} the [-Data Files or Software,-] {+Unicode Standard,+} and  to 
  [-permit persons to  whom the Data Files or Software are furnished to do so, 
  provided that either 
  
       (a) this copyright and permission notice appear with all-] {+make+} copies 
  of [-the  Data Files or Software, or       (b)-] this [-copyright and 
  permission notice  appear-] {+file+} in [-associated Documentation.
  
  THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY  
  KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  
  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF  THIRD 
  PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS  INCLUDED IN 
  THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR  CONSEQUENTIAL 
  DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,  DATA OR 
  PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER  TORTIOUS 
  ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE  OF THE 
  DATA FILES OR SOFTWARE.
  
  Except-] {+any form for internal or external distribution  as long+} as 
  [-contained in-] this [-notice, the name of a copyright holder shall not  be 
  used in advertising or otherwise to promote the sale, use or other  dealings in 
  these Data Files or Software without prior written authorization  of the 
  copyright holder.-] {+notice remains attached.+}


[-- Attachment #3: inflate-hpnd.wdiff --]
[-- Type: text/plain, Size: 1756 bytes --]

.../figlet-2.2.5 $ sed -n '8,26p' inflate.c | cut -b 3- | spdx-license-match -g HPND
Match: 83% HPND
Diff:
  --- HPND.txt
  +++ input
  
  @@ -1,21 +1,19 @@
  [-Historical Permission Notice and Disclaimer
  
  <copyright notice>-]  {+Copyright (C) 1995, Edward B. Hamrick+}
  
   Permission to use, copy, [-modify-] {+modify,+} and distribute this software 
  and  its  documentation for any purpose and without fee is hereby granted, 
  provided  that the above copyright notice appear in all [-copies[,] [and]-] 
  {+copies and+}  that both  [-[that] [the]-] {+that+}  copyright notice and this 
  permission notice appear in  supporting  [-documentation[,-]  
  {+documentation,+} and that the name [-[of] <copyright holder> [or <related  
  entities>]-] {+of the copyright holders+}  not be used in  advertising or 
  publicity pertaining to distribution of  the software without  specific, 
  written prior [-permission]. [<copyright  holder>-] {+permission. The copyright 
   holders+} makes no  representations about the suitability of this software  
  for any purpose. It  is provided "as is" without express or implied [-warranty.]
  
  [<copyright holder> DISCLAIMS-] {+warranty.
  
   THE COPYRIGHT HOLDERS DISCLAIM+} ALL WARRANTIES WITH REGARD TO THIS  SOFTWARE, 
   INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND [-FITNESS[,][.]-] 
  {+FITNESS,+}  IN NO EVENT  SHALL [-<copyright holder>-] {+THE COPYRIGHT 
  HOLDERS+} BE LIABLE FOR ANY SPECIAL, INDIRECT  OR  CONSEQUENTIAL DAMAGES OR ANY 
  DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,  DATA OR PROFITS, WHETHER IN AN 
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER  TORTIOUS ACTION, ARISING OUT OF OR IN 
  CONNECTION WITH THE USE OR PERFORMANCE  OF THIS [-SOFTWARE.]-] {+SOFTWARE.+}

[-- Attachment #4: Type: text/plain, Size: 91 bytes --]

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 06/34] dropbear: Add license information

[Roland Hieber]

For patches 1 to incl. 6:

Reviewed-by: Roland Hieber <rhi@pengutronix.de>

On Fri, May 10, 2019 at 11:24:06AM +0200, Alexander Dahl wrote:
> The parts written for dropbear itself are MIT licensed, as are those
> imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause,
> some parts are in the public domain. curve25519 parts from Google are
> BSD 3 clause licensed. Everything is explained in the file 'LICENSE'.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/dropbear.make | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/rules/dropbear.make b/rules/dropbear.make
> index c1ad614ef..016c4d713 100644
> --- a/rules/dropbear.make
> +++ b/rules/dropbear.make
> @@ -25,6 +25,8 @@ DROPBEAR_SUFFIX		:= tar.bz2
>  DROPBEAR_URL		:= http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
>  DROPBEAR_SOURCE		:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX)
>  DROPBEAR_DIR		:= $(BUILDDIR)/$(DROPBEAR)
> +DROPBEAR_LICENSE	:= MIT AND BSD-2-Clause AND BSD-3-Clause
> +DROPBEAR_LICENSE_FILES	:= file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@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

Re: [ptxdist] [PATCH 07/34] figlet: Fix license and add license file hashes

[Alexander Dahl]

Hello Roland,

thanks for your review. Comments below.

Am Montag, 13. Mai 2019, 11:41:12 CEST schrieb Roland Hieber:
> On Fri, May 10, 2019 at 11:24:07AM +0200, Alexander Dahl wrote:
> > Added information based on what the Debian project found out.
> > 
> > https://metadata.ftp-master.debian.org/changelogs//main/f/figlet/figlet_2.
> > 2.5-2_copyright
> > 
> > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > ---
> > 
> >  rules/figlet.make | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/rules/figlet.make b/rules/figlet.make
> > index b22d22e17..8886beab3 100644
> > --- a/rules/figlet.make
> > +++ b/rules/figlet.make
> > @@ -25,7 +25,13 @@ FIGLET_SUFFIX		:= tar.gz
> > 
> >  FIGLET_URL		:=
> >  ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX)
> >  FIGLET_SOURCE		:= $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
> >  FIGLET_DIR		:= $(BUILDDIR)/$(FIGLET)
> > 
> > -FIGLET_LICENSE		:= figlet
> > +FIGLET_LICENSE		:= BSD-3-Clause AND MIT-CMU AND ISC AND Unicode-
DFS-2016
> > AND WTFPL +FIGLET_LICENSE_FILES	:= \
> > +	file://LICENSE;md5=1688bcd97b27704f1afcac7336409857 \
> > +	file://
inflate.c;startline=7;endline=27;md5=74ed6158b8244dbc4d91afaf8a39
> > bec2 \
> > +	file://utf8.c;startline=2;endline=16;md5=eb9cc57cf60ac24044670bf8dc4755
> > 79 \
> > +	file://fonts/8859-2.flc;startline=9;endline=23;md5=1cecb984063248f29ffe
> > 5c46f5c04f34 \
> > +	file://tests/emboss.tlf;startline=3;endline=10;md5=8e317e9236ffade21fed
> > c39e3496eac2
> I was trying to reproduce these, but I got a better match for HPND
> instead of MIT-CMU for inflate.c. 

See lines 29 to 33 in inflate.c, it is explicitly licensed under MIT. However 
the license text for MIT itself does not match very well, but for MIT-CMU 
quite well.

It's a little tricky to interpret the output of your tool. One has to look 
very closely at the brackets! Sometimes comparing manually with the annotated 
license text at spdx.org got me a better result. I often had the case your 
tool had a higher matching value for BSD-2-Clause, when the license was 
actually BSD-3-Clause, for example.

> And I cannot reprocude the match from
> fonts/8859-2.flc, which apparently should be Unicode-DFS-2016? It seems
> to me this is a bug in the Debian package you referenced above.

I was not sure about this, I actually tried to compare with upstream unicode 
files, but the licensing was rather unclear to me. From the three Unicode 
licenses listed by SPDX that one seemed to match best. If someone has a better 
idea on that, let me know.

Greets
Alex


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 07/34] figlet: Fix license and add license file hashes

[Roland Hieber]

On Mon, May 13, 2019 at 12:20:25PM +0200, Alexander Dahl wrote:
> Hello Roland,
> 
> thanks for your review. Comments below.
> 
> Am Montag, 13. Mai 2019, 11:41:12 CEST schrieb Roland Hieber:
> > On Fri, May 10, 2019 at 11:24:07AM +0200, Alexander Dahl wrote:
> > > Added information based on what the Debian project found out.
> > > 
> > > https://metadata.ftp-master.debian.org/changelogs//main/f/figlet/figlet_2.
> > > 2.5-2_copyright
> > > 
> > > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > > ---
> > > 
> > >  rules/figlet.make | 8 +++++++-
> > >  1 file changed, 7 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/rules/figlet.make b/rules/figlet.make
> > > index b22d22e17..8886beab3 100644
> > > --- a/rules/figlet.make
> > > +++ b/rules/figlet.make
> > > @@ -25,7 +25,13 @@ FIGLET_SUFFIX		:= tar.gz
> > > 
> > >  FIGLET_URL		:=
> > >  ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX)
> > >  FIGLET_SOURCE		:= $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
> > >  FIGLET_DIR		:= $(BUILDDIR)/$(FIGLET)
> > > 
> > > -FIGLET_LICENSE		:= figlet
> > > +FIGLET_LICENSE		:= BSD-3-Clause AND MIT-CMU AND ISC AND Unicode-
> DFS-2016
> > > AND WTFPL +FIGLET_LICENSE_FILES	:= \
> > > +	file://LICENSE;md5=1688bcd97b27704f1afcac7336409857 \
> > > +	file://
> inflate.c;startline=7;endline=27;md5=74ed6158b8244dbc4d91afaf8a39
> > > bec2 \
> > > +	file://utf8.c;startline=2;endline=16;md5=eb9cc57cf60ac24044670bf8dc4755
> > > 79 \
> > > +	file://fonts/8859-2.flc;startline=9;endline=23;md5=1cecb984063248f29ffe
> > > 5c46f5c04f34 \
> > > +	file://tests/emboss.tlf;startline=3;endline=10;md5=8e317e9236ffade21fed
> > > c39e3496eac2
> > I was trying to reproduce these, but I got a better match for HPND
> > instead of MIT-CMU for inflate.c. 
> 
> See lines 29 to 33 in inflate.c, it is explicitly licensed under MIT. However 
> the license text for MIT itself does not match very well, but for MIT-CMU 
> quite well.
> 
> It's a little tricky to interpret the output of your tool. One has to look 
> very closely at the brackets! Sometimes comparing manually with the annotated 
> license text at spdx.org got me a better result. I often had the case your 
> tool had a higher matching value for BSD-2-Clause, when the license was 
> actually BSD-3-Clause, for example.
> 
> > And I cannot reprocude the match from
> > fonts/8859-2.flc, which apparently should be Unicode-DFS-2016? It seems
> > to me this is a bug in the Debian package you referenced above.
> 
> I was not sure about this, I actually tried to compare with upstream unicode 
> files, but the licensing was rather unclear to me. From the three Unicode 
> licenses listed by SPDX that one seemed to match best. If someone has a better 
> idea on that, let me know.

I guess if this is in doubt, we should leave it as "... AND unknown".

 - 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

Re: [ptxdist] [PATCH 08/34] flex: Fix license and add license file hash

[Roland Hieber]

On Fri, May 10, 2019 at 11:24:08AM +0200, Alexander Dahl wrote:
> The license text neither matches BSD-2-Clause nor BSD-3-Clause exactly.
> However it actually contains the third clause, but without leading
> numbering.
> 
> Fixes: 1c799fcdc126d9e81da7944809e9da2a6d96466d
> Cc: Juergen Borleis <jbe@pengutronix.de>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/flex.make | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/flex.make b/rules/flex.make
> index 803e25897..bcf628d44 100644
> --- a/rules/flex.make
> +++ b/rules/flex.make
> @@ -23,7 +23,8 @@ FLEX_SUFFIX	:= tar.xz
>  FLEX_URL	:= $(call ptx/mirror, SF, flex/$(FLEX).$(FLEX_SUFFIX))
>  FLEX_SOURCE	:= $(SRCDIR)/$(FLEX).$(FLEX_SUFFIX)
>  FLEX_DIR	:= $(BUILDDIR)/$(FLEX)
> -FLEX_LICENSE	:= BSD-2-Clause
> +FLEX_LICENSE	:= BSD-3-Clause
> +FLEX_LICENSE_FILES := file://COPYING;md5=e4742cf92e89040b39486a6219b68067

COPYING contains a BSD-3-Clause-y license (the differences to the
BSD-3-Clause template are negligible), but there are other files in the
tree:

parse.c - GPL-3.0-or-later WITH bison-exception
flex.skl - according to COPYING, this seems to be Public Domain

 - 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

Re: [ptxdist] [PATCH 05/34] libnl3: Fix license and add license hash

[Roland Hieber]

On Fri, May 10, 2019 at 11:24:05AM +0200, Alexander Dahl wrote:
> libnl3 library is licensed under LGPL-2.1-only according to file
> 'COPYING' and file headers of various library source and public include
> header files of the project. That did not change ever since initial
> import of code into libnl vcs in 2007 and up to the current version. The
> license stated when introducing the libnl3 package into ptxdist back in
> 2013 applies to the tools however.
> 
> This is backed by a statement of the author from 2015:
> 
> https://github.com/thom311/libnl/issues/80
> 
> Fixes: adeac13183422dc7152ad5e0484601b074436af7
> Cc: Alexander Aring <alex.aring@gmail.com>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/libnl3.make | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/libnl3.make b/rules/libnl3.make
> index e3bda8785..285f4c89b 100644
> --- a/rules/libnl3.make
> +++ b/rules/libnl3.make
> @@ -24,7 +24,9 @@ LIBNL3_SUFFIX	:= tar.gz
>  LIBNL3_URL	:= https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBNL3).$(LIBNL3_SUFFIX)
>  LIBNL3_SOURCE	:= $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX)
>  LIBNL3_DIR	:= $(BUILDDIR)/$(LIBNL3)
> -LIBNL3_LICENSE	:= GPL-2.0-only
> +# LGPL-2.1-only for library; GPL-2.0-only for tools
> +LIBNL3_LICENSE	:= LGPL-2.1-only AND GPL-2.0-only
> +LIBNL3_LICENSE_FILES := file://COPYING;md5=4fbd65380cdd255951079008b364516c

I was a bit hasty with my Reviewed-by line, and found some more:

include/netlink/xfrm/*: BSD-3-Clause
include/netlink/hash.h: Public Domain / CC-0
m4/*: FSFULLR (today I learned a new SPDX license identifier ...^^)
lib/xfrm/*: BSD-3-Clause
lib/hash.h: Public Domain / CC-0

 - 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

Re: [ptxdist] [PATCH 08/34] flex: Fix license and add license file hash

[Michael Olbrich]

On Tue, May 28, 2019 at 11:07:25PM +0200, Roland Hieber wrote:
> On Fri, May 10, 2019 at 11:24:08AM +0200, Alexander Dahl wrote:
> > The license text neither matches BSD-2-Clause nor BSD-3-Clause exactly.
> > However it actually contains the third clause, but without leading
> > numbering.
> > 
> > Fixes: 1c799fcdc126d9e81da7944809e9da2a6d96466d
> > Cc: Juergen Borleis <jbe@pengutronix.de>
> > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > ---
> >  rules/flex.make | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/rules/flex.make b/rules/flex.make
> > index 803e25897..bcf628d44 100644
> > --- a/rules/flex.make
> > +++ b/rules/flex.make
> > @@ -23,7 +23,8 @@ FLEX_SUFFIX	:= tar.xz
> >  FLEX_URL	:= $(call ptx/mirror, SF, flex/$(FLEX).$(FLEX_SUFFIX))
> >  FLEX_SOURCE	:= $(SRCDIR)/$(FLEX).$(FLEX_SUFFIX)
> >  FLEX_DIR	:= $(BUILDDIR)/$(FLEX)
> > -FLEX_LICENSE	:= BSD-2-Clause
> > +FLEX_LICENSE	:= BSD-3-Clause
> > +FLEX_LICENSE_FILES := file://COPYING;md5=e4742cf92e89040b39486a6219b68067
> 
> COPYING contains a BSD-3-Clause-y license (the differences to the
> BSD-3-Clause template are negligible), but there are other files in the
> tree:
> 
> parse.c - GPL-3.0-or-later WITH bison-exception

That's the code generated by bison, right? I don't think we've added the
license anywhere.

> flex.skl - according to COPYING, this seems to be Public Domain

That's the template for the generated code. I think we can leave this out.

So this is ok, as is.

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

Re: [ptxdist] [PATCH 05/34] libnl3: Fix license and add license hash

[Michael Olbrich]

On Tue, May 28, 2019 at 11:43:46PM +0200, Roland Hieber wrote:
> On Fri, May 10, 2019 at 11:24:05AM +0200, Alexander Dahl wrote:
> > libnl3 library is licensed under LGPL-2.1-only according to file
> > 'COPYING' and file headers of various library source and public include
> > header files of the project. That did not change ever since initial
> > import of code into libnl vcs in 2007 and up to the current version. The
> > license stated when introducing the libnl3 package into ptxdist back in
> > 2013 applies to the tools however.
> > 
> > This is backed by a statement of the author from 2015:
> > 
> > https://github.com/thom311/libnl/issues/80
> > 
> > Fixes: adeac13183422dc7152ad5e0484601b074436af7
> > Cc: Alexander Aring <alex.aring@gmail.com>
> > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > ---
> >  rules/libnl3.make | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/rules/libnl3.make b/rules/libnl3.make
> > index e3bda8785..285f4c89b 100644
> > --- a/rules/libnl3.make
> > +++ b/rules/libnl3.make
> > @@ -24,7 +24,9 @@ LIBNL3_SUFFIX	:= tar.gz
> >  LIBNL3_URL	:= https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBNL3).$(LIBNL3_SUFFIX)
> >  LIBNL3_SOURCE	:= $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX)
> >  LIBNL3_DIR	:= $(BUILDDIR)/$(LIBNL3)
> > -LIBNL3_LICENSE	:= GPL-2.0-only
> > +# LGPL-2.1-only for library; GPL-2.0-only for tools
> > +LIBNL3_LICENSE	:= LGPL-2.1-only AND GPL-2.0-only
> > +LIBNL3_LICENSE_FILES := file://COPYING;md5=4fbd65380cdd255951079008b364516c
> 
> I was a bit hasty with my Reviewed-by line, and found some more:
> 
> include/netlink/xfrm/*: BSD-3-Clause

This one should be added with a file entry with starline/endline

> include/netlink/hash.h: Public Domain / CC-0
> m4/*: FSFULLR (today I learned a new SPDX license identifier ...^^)

I think we can skip those.

> lib/xfrm/*: BSD-3-Clause

Source to the headers above.

> lib/hash.h: Public Domain / CC-0

And skip this as well.

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

Re: [ptxdist] [PATCH 07/34] figlet: Fix license and add license file hashes

[Michael Olbrich]

On Wed, May 22, 2019 at 01:56:18PM +0200, Roland Hieber wrote:
> On Mon, May 13, 2019 at 12:20:25PM +0200, Alexander Dahl wrote:
> > thanks for your review. Comments below.
> > Am Montag, 13. Mai 2019, 11:41:12 CEST schrieb Roland Hieber:
> > > On Fri, May 10, 2019 at 11:24:07AM +0200, Alexander Dahl wrote:
> > > > Added information based on what the Debian project found out.
> > > > 
> > > > https://metadata.ftp-master.debian.org/changelogs//main/f/figlet/figlet_2.
> > > > 2.5-2_copyright
> > > > 
> > > > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > > > ---
> > > > 
> > > >  rules/figlet.make | 8 +++++++-
> > > >  1 file changed, 7 insertions(+), 1 deletion(-)
> > > > 
> > > > diff --git a/rules/figlet.make b/rules/figlet.make
> > > > index b22d22e17..8886beab3 100644
> > > > --- a/rules/figlet.make
> > > > +++ b/rules/figlet.make
> > > > @@ -25,7 +25,13 @@ FIGLET_SUFFIX		:= tar.gz
> > > > 
> > > >  FIGLET_URL		:=
> > > >  ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX)
> > > >  FIGLET_SOURCE		:= $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
> > > >  FIGLET_DIR		:= $(BUILDDIR)/$(FIGLET)
> > > > 
> > > > -FIGLET_LICENSE		:= figlet
> > > > +FIGLET_LICENSE		:= BSD-3-Clause AND MIT-CMU AND ISC AND Unicode-
> > DFS-2016
> > > > AND WTFPL +FIGLET_LICENSE_FILES	:= \
> > > > +	file://LICENSE;md5=1688bcd97b27704f1afcac7336409857 \
> > > > +	file://
> > inflate.c;startline=7;endline=27;md5=74ed6158b8244dbc4d91afaf8a39
> > > > bec2 \
> > > > +	file://utf8.c;startline=2;endline=16;md5=eb9cc57cf60ac24044670bf8dc4755
> > > > 79 \
> > > > +	file://fonts/8859-2.flc;startline=9;endline=23;md5=1cecb984063248f29ffe
> > > > 5c46f5c04f34 \
> > > > +	file://tests/emboss.tlf;startline=3;endline=10;md5=8e317e9236ffade21fed
> > > > c39e3496eac2
> > > I was trying to reproduce these, but I got a better match for HPND
> > > instead of MIT-CMU for inflate.c. 
> > 
> > See lines 29 to 33 in inflate.c, it is explicitly licensed under MIT. However 
> > the license text for MIT itself does not match very well, but for MIT-CMU 
> > quite well.

I think the _old_ license is HPND and then it was relicensed to MIT but no
new license text was added.

Maybe '(HPND OR MIT)' and include the lines up to 33.

> > It's a little tricky to interpret the output of your tool. One has to look 
> > very closely at the brackets! Sometimes comparing manually with the annotated 
> > license text at spdx.org got me a better result. I often had the case your 
> > tool had a higher matching value for BSD-2-Clause, when the license was 
> > actually BSD-3-Clause, for example.
> > 
> > > And I cannot reprocude the match from
> > > fonts/8859-2.flc, which apparently should be Unicode-DFS-2016? It seems
> > > to me this is a bug in the Debian package you referenced above.
> > 
> > I was not sure about this, I actually tried to compare with upstream unicode 
> > files, but the licensing was rather unclear to me. From the three Unicode 
> > licenses listed by SPDX that one seemed to match best. If someone has a better 
> > idea on that, let me know.
> 
> I guess if this is in doubt, we should leave it as "... AND unknown".

I think unknown is good. This just means you need to read the text to
decide what need to be done.

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

Re: [ptxdist] [PATCH 06/34] dropbear: Add license information

[Michael Olbrich]

On Fri, May 10, 2019 at 11:24:06AM +0200, Alexander Dahl wrote:
> The parts written for dropbear itself are MIT licensed, as are those
> imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause,
> some parts are in the public domain. curve25519 parts from Google are
> BSD 3 clause licensed. Everything is explained in the file 'LICENSE'.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/dropbear.make | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/rules/dropbear.make b/rules/dropbear.make
> index c1ad614ef..016c4d713 100644
> --- a/rules/dropbear.make
> +++ b/rules/dropbear.make
> @@ -25,6 +25,8 @@ DROPBEAR_SUFFIX		:= tar.bz2
>  DROPBEAR_URL		:= http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
>  DROPBEAR_SOURCE		:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX)
>  DROPBEAR_DIR		:= $(BUILDDIR)/$(DROPBEAR)
> +DROPBEAR_LICENSE	:= MIT AND BSD-2-Clause AND BSD-3-Clause
> +DROPBEAR_LICENSE_FILES	:= file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01

The license text for BSD-2-Clause is missing.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.11.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 10/34] coreutils: Add license file hash

[Michael Olbrich]

On Fri, May 10, 2019 at 11:24:10AM +0200, Alexander Dahl wrote:
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/coreutils.make | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/rules/coreutils.make b/rules/coreutils.make
> index e36767a81..fc39de8e7 100644
> --- a/rules/coreutils.make
> +++ b/rules/coreutils.make
> @@ -24,6 +24,7 @@ COREUTILS_URL		:= $(call ptx/mirror, GNU, coreutils/$(COREUTILS).$(COREUTILS_SUF
>  COREUTILS_SOURCE	:= $(SRCDIR)/$(COREUTILS).$(COREUTILS_SUFFIX)
>  COREUTILS_DIR		:= $(BUILDDIR)/$(COREUTILS)
>  COREUTILS_LICENSE	:= GPL-3.0-only

It's actually 'GPL-3.0-or-later'. I'll add a extra commit to fix that.

Michael

> +COREUTILS_LICENSE_FILES	:= file://COPYING;md5=d32239bcb673463ab874e80d47fae504
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.11.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 11/34] libarchive: Add license file hash

[Michael Olbrich]

On Fri, May 10, 2019 at 11:24:11AM +0200, Alexander Dahl wrote:
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/libarchive.make | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/rules/libarchive.make b/rules/libarchive.make
> index f4252df35..e5a9a3f5b 100644
> --- a/rules/libarchive.make
> +++ b/rules/libarchive.make
> @@ -24,6 +24,7 @@ LIBARCHIVE_URL		:= http://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIV
>  LIBARCHIVE_SOURCE	:= $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
>  LIBARCHIVE_DIR		:= $(BUILDDIR)/$(LIBARCHIVE)
>  LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause
> +LIBARCHIVE_LICENSE_FILES := file://COPYING;md5=ed99aca006bc346974bb745a35336425

Please add the BSD-3-Clause text (maybe from
archive_write_add_filter_compress.c)

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.11.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 06/34] dropbear: Add license information

[Alexander Dahl]

Hello Michael,

Am Mittwoch, 29. Mai 2019, 09:49:23 CEST schrieb Michael Olbrich:
> On Fri, May 10, 2019 at 11:24:06AM +0200, Alexander Dahl wrote:
> > The parts written for dropbear itself are MIT licensed, as are those
> > imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause,
> > some parts are in the public domain. curve25519 parts from Google are
> > BSD 3 clause licensed. Everything is explained in the file 'LICENSE'.
> > 
> > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > ---
> > 
> >  rules/dropbear.make | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/rules/dropbear.make b/rules/dropbear.make
> > index c1ad614ef..016c4d713 100644
> > --- a/rules/dropbear.make
> > +++ b/rules/dropbear.make
> > @@ -25,6 +25,8 @@ DROPBEAR_SUFFIX		:= tar.bz2
> > 
> >  DROPBEAR_URL		:=
> >  http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> >  DROPBEAR_SOURCE		:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> >  DROPBEAR_DIR		:= $(BUILDDIR)/$(DROPBEAR)
> > 
> > +DROPBEAR_LICENSE	:= MIT AND BSD-2-Clause AND BSD-3-Clause
> > +DROPBEAR_LICENSE_FILES	:=
> > file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01
> The license text for BSD-2-Clause is missing.

It is not in the file LICENSE, but as stated in that file applies to 
loginrec.c, loginrec.h, atomicio.h, and atomicio.c. Each of those files 
contains the license text. Just pick one and add it to DROPBEAR_LICENSE_FILES?

Greets
Alex


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 16/34] libmodbus3: Fix license and add license file hashes

[Michael Olbrich]

On Fri, May 10, 2019 at 11:24:16AM +0200, Alexander Dahl wrote:
> 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.

Do we have different versions, because the test in version 3.1.4 are
BSD-3-Clause ....

> Fixes: a8f85be09c663bfad8a34a162b1a63fb3d499985
> Cc: Josef Holzmayr <holzmayr@rsi-elektrotechnik.de>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/libmodbus3.make | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> index 9f9acdc6d..5f3189cd0 100644
> --- a/rules/libmodbus3.make
> +++ b/rules/libmodbus3.make
> @@ -23,7 +23,10 @@ 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 AND GPL-3.0-or-later
> +LIBMODBUS3_LICENSE_FILES := \
> +	file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
> +	file://COPYING;md5=d32239bcb673463ab874e80d47fae504

... and this file does not exist.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.11.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 17/34] libnet: Add license information

[Michael Olbrich]

On Fri, May 10, 2019 at 11:24:17AM +0200, Alexander Dahl wrote:
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/libnet.make | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/rules/libnet.make b/rules/libnet.make
> index 635c3d8c4..3c94b5fd6 100644
> --- a/rules/libnet.make
> +++ b/rules/libnet.make
> @@ -24,6 +24,8 @@ LIBNET_SUFFIX	:= tar.gz
>  LIBNET_URL	:= $(call ptx/mirror, SF, libnet-dev/$(LIBNET).$(LIBNET_SUFFIX))
>  LIBNET_SOURCE	:= $(SRCDIR)/$(LIBNET).$(LIBNET_SUFFIX)
>  LIBNET_DIR	:= $(BUILDDIR)/$(LIBNET)
> +LIBNET_LICENSE	:= BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND MIT-CMU
> +LIBNET_LICENSE_FILES := file://doc/COPYING;md5=fb43d5727b2d3d1238545f75ce456ec3

Please add texts for all licenses. I had a very quick look and could not
find the files with BSD-3-Clause or MIT-CMU license.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.11.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 16/34] libmodbus3: Fix license and add license file hashes

[Alexander Dahl]

Hello Michael,

Am Mittwoch, 29. Mai 2019, 10:04:20 CEST schrieb Michael Olbrich:
> On Fri, May 10, 2019 at 11:24:16AM +0200, Alexander Dahl wrote:
> > 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.
> 
> Do we have different versions, because the test in version 3.1.4 are
> BSD-3-Clause ....

Maybe. We still have 3.0.x in some BSPs, possible I mixed things up here. 

I'll recheck.

> > Fixes: a8f85be09c663bfad8a34a162b1a63fb3d499985
> > Cc: Josef Holzmayr <holzmayr@rsi-elektrotechnik.de>
> > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > ---
> > 
> >  rules/libmodbus3.make | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> > index 9f9acdc6d..5f3189cd0 100644
> > --- a/rules/libmodbus3.make
> > +++ b/rules/libmodbus3.make
> > @@ -23,7 +23,10 @@ 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 AND GPL-3.0-or-later
> > +LIBMODBUS3_LICENSE_FILES := \
> > +	file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
> > +	file://COPYING;md5=d32239bcb673463ab874e80d47fae504
> 
> ... and this file does not exist.

o.O

Okay I will recheck this library.

Alex


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 19/34] libpcap: Fix license and add license file hash

[Michael Olbrich]

On Fri, May 10, 2019 at 11:24:19AM +0200, Alexander Dahl wrote:
> While the license in file 'LICENSE' indeed seems to be BSD-3-Clause, the
> actual source files have more, different licensing applied in their
> headers, all different variants of BSD licenses.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
> 
> Notes:
>     ./ieee80211.h is even BSD-3-Clause OR GPL-2.0-only … o.O
>     
>     How should this be handled?

I think just BSD-3-Clause is fine. It's more restrictive for this file but
we need that license anyways, to it really doesn't matter.

> 
>  rules/libpcap.make | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/libpcap.make b/rules/libpcap.make
> index 3f2c85205..7871f8684 100644
> --- a/rules/libpcap.make
> +++ b/rules/libpcap.make
> @@ -23,7 +23,8 @@ LIBPCAP_SUFFIX	:= tar.gz
>  LIBPCAP_URL	:= http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX)
>  LIBPCAP_SOURCE	:= $(SRCDIR)/$(LIBPCAP).$(LIBPCAP_SUFFIX)
>  LIBPCAP_DIR	:= $(BUILDDIR)/$(LIBPCAP)
> -LIBPCAP_LICENSE	:= BSD-3-Clause
> +LIBPCAP_LICENSE	:= BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-UC
> +LIBPCAP_LICENSE_FILES := file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453

Please add texts for all licenses. If _LICENSE_FILES are specified I want
it to be complete.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.11.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 21/34] libxml2: Fix license and add license file hash

[Michael Olbrich]

On Fri, May 10, 2019 at 11:24:21AM +0200, Alexander Dahl wrote:
> The 'Copyright' file says:
> 
> > Except where otherwise noted in the source code (e.g. the files hash.c,
> > list.c and the trio files, which are covered by a similar licence but
> > with different Copyright notices) all the files are:
> 
> According to comparison with the license text at SPDX and what Debian
> found out, those files are put under ISC license.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/libxml2.make | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/libxml2.make b/rules/libxml2.make
> index 234e85f3e..c47356532 100644
> --- a/rules/libxml2.make
> +++ b/rules/libxml2.make
> @@ -24,7 +24,9 @@ LIBXML2		:= libxml2-$(LIBXML2_VERSION)
>  LIBXML2_SUFFIX	:= tar.gz
>  LIBXML2_SOURCE	:= $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
>  LIBXML2_DIR	:= $(BUILDDIR)/$(LIBXML2)
> -LIBXML2_LICENSE	:= MIT
> +LIBXML2_LICENSE	:= MIT AND ISC
> +# The file 'COPYING' is just a symlink on the file 'Copyright'
> +LIBXML2_LICENSE_FILES := file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1

Add the text for ISC.

Michael

>  
>  LIBXML2_URL := \
>  	ftp://xmlsoft.org/libxml2/$(LIBXML2).$(LIBXML2_SUFFIX) \
> -- 
> 2.11.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 24/34] log4cplus: Fix licenses and add license file hash

[Michael Olbrich]

On Fri, May 10, 2019 at 11:24:24AM +0200, Alexander Dahl wrote:
> When introduced as package to ptxdist, log4cplus 1.1.0 README already
> stated:
> 
> > This library is licensed under the Apache Public License 2.0 and two
> > clause BSD license.  Please read the included LICENSE file for
> > details.
> 
> Actually some files are under Apache-2.0 and other files are under
> BSD-2-Clause, so both apply.
> 
> Fixes: 0ac556f6b55da4c9d41c5e191432ba51276a40eb
> Cc: Bernhard Sessler <bernhard.sessler@corscience.de>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/log4cplus.make | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/log4cplus.make b/rules/log4cplus.make
> index 18fc53fb0..75959a32d 100644
> --- a/rules/log4cplus.make
> +++ b/rules/log4cplus.make
> @@ -24,7 +24,8 @@ LOG4CPLUS_SUFFIX	:= tar.xz
>  LOG4CPLUS_URL		:= $(call ptx/mirror, SF, log4cplus/$(LOG4CPLUS).$(LOG4CPLUS_SUFFIX))
>  LOG4CPLUS_SOURCE	:= $(SRCDIR)/$(LOG4CPLUS).$(LOG4CPLUS_SUFFIX)
>  LOG4CPLUS_DIR		:= $(BUILDDIR)/$(LOG4CPLUS)
> -LOG4CPLUS_LICENSE	:= Apache-2.0
> +LOG4CPLUS_LICENSE	:= Apache-2.0 AND BSD-2-Clause
> +LOG4CPLUS_LICENSE_FILES	:= file://LICENSE;md5=65053a46f707ee2b93f09ad22f692170

Add text for BSD-2-Clause,

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.11.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 06/34] dropbear: Add license information

[Michael Olbrich]

On Wed, May 29, 2019 at 10:00:00AM +0200, Alexander Dahl wrote:
> Am Mittwoch, 29. Mai 2019, 09:49:23 CEST schrieb Michael Olbrich:
> > On Fri, May 10, 2019 at 11:24:06AM +0200, Alexander Dahl wrote:
> > > The parts written for dropbear itself are MIT licensed, as are those
> > > imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause,
> > > some parts are in the public domain. curve25519 parts from Google are
> > > BSD 3 clause licensed. Everything is explained in the file 'LICENSE'.
> > > 
> > > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > > ---
> > > 
> > >  rules/dropbear.make | 2 ++
> > >  1 file changed, 2 insertions(+)
> > > 
> > > diff --git a/rules/dropbear.make b/rules/dropbear.make
> > > index c1ad614ef..016c4d713 100644
> > > --- a/rules/dropbear.make
> > > +++ b/rules/dropbear.make
> > > @@ -25,6 +25,8 @@ DROPBEAR_SUFFIX		:= tar.bz2
> > > 
> > >  DROPBEAR_URL		:=
> > >  http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> > >  DROPBEAR_SOURCE		:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> > >  DROPBEAR_DIR		:= $(BUILDDIR)/$(DROPBEAR)
> > > 
> > > +DROPBEAR_LICENSE	:= MIT AND BSD-2-Clause AND BSD-3-Clause
> > > +DROPBEAR_LICENSE_FILES	:=
> > > file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01
> > The license text for BSD-2-Clause is missing.
> 
> It is not in the file LICENSE, but as stated in that file applies to 
> loginrec.c, loginrec.h, atomicio.h, and atomicio.c. Each of those files 
> contains the license text. Just pick one and add it to DROPBEAR_LICENSE_FILES?

Yes please.

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

Re: [ptxdist] [PATCH 06/34] dropbear: Add license information

[Roland Hieber]

On Wed, May 29, 2019 at 10:00:00AM +0200, Alexander Dahl wrote:
> Hello Michael,
> 
> Am Mittwoch, 29. Mai 2019, 09:49:23 CEST schrieb Michael Olbrich:
> > On Fri, May 10, 2019 at 11:24:06AM +0200, Alexander Dahl wrote:
> > > The parts written for dropbear itself are MIT licensed, as are those
> > > imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause,
> > > some parts are in the public domain. curve25519 parts from Google are
> > > BSD 3 clause licensed. Everything is explained in the file 'LICENSE'.
> > > 
> > > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > > ---
> > > 
> > >  rules/dropbear.make | 2 ++
> > >  1 file changed, 2 insertions(+)
> > > 
> > > diff --git a/rules/dropbear.make b/rules/dropbear.make
> > > index c1ad614ef..016c4d713 100644
> > > --- a/rules/dropbear.make
> > > +++ b/rules/dropbear.make
> > > @@ -25,6 +25,8 @@ DROPBEAR_SUFFIX		:= tar.bz2
> > > 
> > >  DROPBEAR_URL		:=
> > >  http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> > >  DROPBEAR_SOURCE		:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> > >  DROPBEAR_DIR		:= $(BUILDDIR)/$(DROPBEAR)
> > > 
> > > +DROPBEAR_LICENSE	:= MIT AND BSD-2-Clause AND BSD-3-Clause
> > > +DROPBEAR_LICENSE_FILES	:=
> > > file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01
> > The license text for BSD-2-Clause is missing.
> 
> It is not in the file LICENSE, but as stated in that file applies to 
> loginrec.c, loginrec.h, atomicio.h, and atomicio.c. Each of those files 
> contains the license text. Just pick one and add it to DROPBEAR_LICENSE_FILES?

Oh, and sshpty.[ch] includes a license which I couldn't find in the SPDX
repo:

     * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
     *                    All rights reserved
     *
     * As far as I am concerned, the code I have written for this software
     * can be used freely for any purpose.  Any derived versions of this
     * software must be clearly marked as such, and if the derived work is
     * incompatible with the protocol description in the RFC file, it must be
     * called by a name other than "ssh" or "Secure Shell".

So I would add an "AND unknown" here too, until my license request [0] is
approved :)

[0]: http://13.57.134.254/app/license_requests/39/

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

Re: [ptxdist] [PATCH 08/34] flex: Fix license and add license file hash

[Roland Hieber]

On Wed, May 29, 2019 at 09:03:54AM +0200, Michael Olbrich wrote:
> On Tue, May 28, 2019 at 11:07:25PM +0200, Roland Hieber wrote:
> > parse.c - GPL-3.0-or-later WITH bison-exception
> 
> That's the code generated by bison, right? I don't think we've added the
> license anywhere.

Ah, yes, I overlooked parse.y, which has the same license as the others.

 - 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

Re: [ptxdist] [PATCH 00/34] License updates

[Michael Olbrich]

Hi,

Thanks for this series. I've looked at all of the patches now and I've done
some checking that this makes sense. I've had comments for some of them.
I'm currently running build tests for the rest (this is mostly to check
that the md5sums are ok).

These should hit master soon. I hope I got all of them, but you should
probably rebase your brach once I've pushed the initial batch.

Michael

On Fri, May 10, 2019 at 11:24:00AM +0200, Alexander Dahl wrote:
> I reviewed lots of packages for licensing issues and this patch series
> is the outcome. There are basically three types of patches:
> 
> 1) Add license information where it was missing
> 2) Add license file hashes for otherwise already correct packages
> 3) Fix license information where the given licenses are/became wrong
> 4) Combinations of the above
> 
> When mistakes were traceable to specific changesets, I added Fixes:
> lines and the original author in Cc. This is not meant to offend
> anyone, but to get a second opinion or review. This legal stuff is
> hard, I get headaches from this. This is also why some commit messages
> are longer than others.
> 
> Please review these patches carefully, I'm no lawyer. Some small
> upstream projects make it easy to check each file, some would require
> to inspect over 100 source files, if you want to do it right. Almost
> none so far uses those still quite new SPDX license identifiers in the
> file headers (sudo does in a version not yet available in ptxdist).
> 
> Some patches contain additional notes with remarks or questions.
> 
> Thanks to Roland Hieber for his SPDX matching tool [1], which made all
> this a lot easier. You should however not solely depend on that tool,
> but have a look into the current SPDX license list [3] and exceptions
> [4].
> 
> Also helpful was the Debian project. They carry detailed copyright
> information with their packages (well, most of them), e.g.:
> 
> https://metadata.ftp-master.debian.org/changelogs//main/u/util-linux/util-linux_2.33.1-0.1_copyright
> 
> And I also had a look on the license information the buildroot project
> [2] has in its packages. Maybe someone wants to send them patches as
> well. ;-)
> 
> Some additional notes on which packages should be reviewed and
> probably updated:
> 
> * U-Boot
> * util-linux-ng
> 
> Let me know, if I should reorder or change or squash something, but I
> would also be happy, if just a subset would be applied.
> 
> Greets
> Alex
> 
> P.S.: For people enjoying a long read about this whole license mess,
> here you go: https://invisible-island.net/ncurses/ncurses-license.html
> 
> P.P.S.: If you did not already know, the FSFE started the REUSE
> initiative to make all this somewhat easier, so if you're an upstream
> developer, have a look: https://reuse.software/
> 
> [1] https://github.com/rohieb/spdx-license-match
> [2] https://buildroot.org/
> [3] https://spdx.org/licenses/
> [4] https://spdx.org/licenses/exceptions-index.html

-- 
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 06/34] dropbear: Add license information

[Michael Olbrich]

On Wed, May 29, 2019 at 11:31:55AM +0200, Roland Hieber wrote:
> On Wed, May 29, 2019 at 10:00:00AM +0200, Alexander Dahl wrote:
> > Hello Michael,
> > 
> > Am Mittwoch, 29. Mai 2019, 09:49:23 CEST schrieb Michael Olbrich:
> > > On Fri, May 10, 2019 at 11:24:06AM +0200, Alexander Dahl wrote:
> > > > The parts written for dropbear itself are MIT licensed, as are those
> > > > imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause,
> > > > some parts are in the public domain. curve25519 parts from Google are
> > > > BSD 3 clause licensed. Everything is explained in the file 'LICENSE'.
> > > > 
> > > > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > > > ---
> > > > 
> > > >  rules/dropbear.make | 2 ++
> > > >  1 file changed, 2 insertions(+)
> > > > 
> > > > diff --git a/rules/dropbear.make b/rules/dropbear.make
> > > > index c1ad614ef..016c4d713 100644
> > > > --- a/rules/dropbear.make
> > > > +++ b/rules/dropbear.make
> > > > @@ -25,6 +25,8 @@ DROPBEAR_SUFFIX		:= tar.bz2
> > > > 
> > > >  DROPBEAR_URL		:=
> > > >  http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> > > >  DROPBEAR_SOURCE		:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> > > >  DROPBEAR_DIR		:= $(BUILDDIR)/$(DROPBEAR)
> > > > 
> > > > +DROPBEAR_LICENSE	:= MIT AND BSD-2-Clause AND BSD-3-Clause
> > > > +DROPBEAR_LICENSE_FILES	:=
> > > > file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01
> > > The license text for BSD-2-Clause is missing.
> > 
> > It is not in the file LICENSE, but as stated in that file applies to 
> > loginrec.c, loginrec.h, atomicio.h, and atomicio.c. Each of those files 
> > contains the license text. Just pick one and add it to DROPBEAR_LICENSE_FILES?
> 
> Oh, and sshpty.[ch] includes a license which I couldn't find in the SPDX
> repo:
> 
>      * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
>      *                    All rights reserved
>      *
>      * As far as I am concerned, the code I have written for this software
>      * can be used freely for any purpose.  Any derived versions of this
>      * software must be clearly marked as such, and if the derived work is
>      * incompatible with the protocol description in the RFC file, it must be
>      * called by a name other than "ssh" or "Secure Shell".
> 
> So I would add an "AND unknown" here too, until my license request [0] is
> approved :)

Ok. Don't forget the ext in the _LICENSE_FILES.

Michael

> 
> [0]: http://13.57.134.254/app/license_requests/39/
> 
> -- 
> 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

-- 
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 05/34] libnl3: Fix license and add license hash

[Alexander Dahl]

Hei hei,

before I dive in deeper, I have a general questionm which does not only apply 
to libnl3, see below.

Am Mittwoch, 29. Mai 2019, 09:12:32 CEST schrieb Michael Olbrich:
> On Tue, May 28, 2019 at 11:43:46PM +0200, Roland Hieber wrote:
> > I was a bit hasty with my Reviewed-by line, and found some more:
> > 
> > include/netlink/xfrm/*: BSD-3-Clause
> 
> This one should be added with a file entry with starline/endline
> 
> > include/netlink/hash.h: Public Domain / CC-0
> > m4/*: FSFULLR (today I learned a new SPDX license identifier ...^^)
> 
> I think we can skip those.
> 
> > lib/xfrm/*: BSD-3-Clause
> 
> Source to the headers above.
> 
> > lib/hash.h: Public Domain / CC-0
> 
> And skip this as well.

What about 'include/linux-private'? These seem to be headers all copied from 
'include/uapi' from the Linux kernel. So I think this is not directly part of 
libnl3, but comes with the lib just for convenience and easier build. 
Otherwise one would have to build against real kernel headers, right? Should 
those files also be part of the license list and files then?

Greets
Alex


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 06/34] dropbear: Add license information

[Alexander Dahl]

Hello Roland,

Am Mittwoch, 29. Mai 2019, 11:31:55 CET schrieb Roland Hieber:
> On Wed, May 29, 2019 at 10:00:00AM +0200, Alexander Dahl wrote:
> > Am Mittwoch, 29. Mai 2019, 09:49:23 CEST schrieb Michael Olbrich:
> > > On Fri, May 10, 2019 at 11:24:06AM +0200, Alexander Dahl wrote:
> > > > The parts written for dropbear itself are MIT licensed, as are those
> > > > imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause,
> > > > some parts are in the public domain. curve25519 parts from Google are
> > > > BSD 3 clause licensed. Everything is explained in the file 'LICENSE'.
> > > > 
> > > > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > > > ---
> > > > 
> > > >  rules/dropbear.make | 2 ++
> > > >  1 file changed, 2 insertions(+)
> > > > 
> > > > diff --git a/rules/dropbear.make b/rules/dropbear.make
> > > > index c1ad614ef..016c4d713 100644
> > > > --- a/rules/dropbear.make
> > > > +++ b/rules/dropbear.make
> > > > @@ -25,6 +25,8 @@ DROPBEAR_SUFFIX		:= tar.bz2
> > > > 
> > > >  DROPBEAR_URL		:=
> > > >  http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFI
> > > >  X)
> > > >  DROPBEAR_SOURCE		:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> > > >  DROPBEAR_DIR		:= $(BUILDDIR)/$(DROPBEAR)
> > > > 
> > > > +DROPBEAR_LICENSE	:= MIT AND BSD-2-Clause AND BSD-3-Clause
> > > > +DROPBEAR_LICENSE_FILES	:=
> > > > file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01
> > > 
> > > The license text for BSD-2-Clause is missing.
> > 
> > It is not in the file LICENSE, but as stated in that file applies to
> > loginrec.c, loginrec.h, atomicio.h, and atomicio.c. Each of those files
> > contains the license text. Just pick one and add it to
> > DROPBEAR_LICENSE_FILES?
> Oh, and sshpty.[ch] includes a license which I couldn't find in the SPDX
> repo:
> 
>      * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
>      *                    All rights reserved
>      *
>      * As far as I am concerned, the code I have written for this software
>      * can be used freely for any purpose.  Any derived versions of this
>      * software must be clearly marked as such, and if the derived work is
>      * incompatible with the protocol description in the RFC file, it must
> be * called by a name other than "ssh" or "Secure Shell".
> 
> So I would add an "AND unknown" here too, until my license request [0] is
> approved :)
> 
> [0]: http://13.57.134.254/app/license_requests/39/

What's the state on this one? Any updates? Or should I just add your "ADD 
unknown"?

Greets
Alex


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 06/34] dropbear: Add license information

[Roland Hieber]

On Tue, Mar 10, 2020 at 03:23:30PM +0100, Alexander Dahl wrote:
> Hello Roland,
> 
> Am Mittwoch, 29. Mai 2019, 11:31:55 CET schrieb Roland Hieber:
> > On Wed, May 29, 2019 at 10:00:00AM +0200, Alexander Dahl wrote:
> > > Am Mittwoch, 29. Mai 2019, 09:49:23 CEST schrieb Michael Olbrich:
> > > > On Fri, May 10, 2019 at 11:24:06AM +0200, Alexander Dahl wrote:
> > > > > The parts written for dropbear itself are MIT licensed, as are those
> > > > > imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause,
> > > > > some parts are in the public domain. curve25519 parts from Google are
> > > > > BSD 3 clause licensed. Everything is explained in the file 'LICENSE'.
> > > > > 
> > > > > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > > > > ---
> > > > > 
> > > > >  rules/dropbear.make | 2 ++
> > > > >  1 file changed, 2 insertions(+)
> > > > > 
> > > > > diff --git a/rules/dropbear.make b/rules/dropbear.make
> > > > > index c1ad614ef..016c4d713 100644
> > > > > --- a/rules/dropbear.make
> > > > > +++ b/rules/dropbear.make
> > > > > @@ -25,6 +25,8 @@ DROPBEAR_SUFFIX		:= tar.bz2
> > > > > 
> > > > >  DROPBEAR_URL		:=
> > > > >  http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFI
> > > > >  X)
> > > > >  DROPBEAR_SOURCE		:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> > > > >  DROPBEAR_DIR		:= $(BUILDDIR)/$(DROPBEAR)
> > > > > 
> > > > > +DROPBEAR_LICENSE	:= MIT AND BSD-2-Clause AND BSD-3-Clause
> > > > > +DROPBEAR_LICENSE_FILES	:=
> > > > > file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01
> > > > 
> > > > The license text for BSD-2-Clause is missing.
> > > 
> > > It is not in the file LICENSE, but as stated in that file applies to
> > > loginrec.c, loginrec.h, atomicio.h, and atomicio.c. Each of those files
> > > contains the license text. Just pick one and add it to
> > > DROPBEAR_LICENSE_FILES?
> > Oh, and sshpty.[ch] includes a license which I couldn't find in the SPDX
> > repo:
> > 
> >      * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
> >      *                    All rights reserved
> >      *
> >      * As far as I am concerned, the code I have written for this software
> >      * can be used freely for any purpose.  Any derived versions of this
> >      * software must be clearly marked as such, and if the derived work is
> >      * incompatible with the protocol description in the RFC file, it must
> > be * called by a name other than "ssh" or "Secure Shell".
> > 
> > So I would add an "AND unknown" here too, until my license request [0] is
> > approved :)
> > 
> > [0]: http://13.57.134.254/app/license_requests/39/
> 
> What's the state on this one? Any updates? Or should I just add your "ADD 
> unknown"?

Ah right – the GitHub issue [2] didn't trigger a reminder to answer to
this mail :) It got approved as "SSH-short", so no need for "unknown".

[2]: https://github.com/spdx/license-list-XML/pull/936

 - 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