mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v2 01/13] polkit: add license identifier
@ 2019-07-22 17:44 Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 02/13] portmap: add license identifiers Christian Hermann
                   ` (11 more replies)
  0 siblings, 12 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

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

diff --git a/rules/polkit.make b/rules/polkit.make
index 76ab15bc0..ba5d9a299 100644
--- a/rules/polkit.make
+++ b/rules/polkit.make
@@ -21,6 +21,10 @@ POLKIT_SUFFIX	:= tar.gz
 POLKIT_URL	:= https://www.freedesktop.org/software/polkit/releases/$(POLKIT).$(POLKIT_SUFFIX)
 POLKIT_SOURCE	:= $(SRCDIR)/$(POLKIT).$(POLKIT_SUFFIX)
 POLKIT_DIR	:= $(BUILDDIR)/$(POLKIT)
+POLKIT_LICENSE := GPL-2.0-or-later
+POLKIT_LICENSE_FILES := \
+	file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
+	file://src/polkitd/main.c;startline=1;endline=20;md5=4a13d29c09d1ef6fa53a5c79ac2c6a28
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 02/13] portmap: add license identifiers
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 03/13] procps: fix " Christian Hermann
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

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

diff --git a/rules/portmap.make b/rules/portmap.make
index bece1ea81..c09854a3b 100644
--- a/rules/portmap.make
+++ b/rules/portmap.make
@@ -23,6 +23,10 @@ PORTMAP_SUFFIX	:= tgz
 PORTMAP_URL	:= http://fossies.org/linux/misc/old/portmap-$(PORTMAP_VERSION).$(PORTMAP_SUFFIX)
 PORTMAP_SOURCE	:= $(SRCDIR)/portmap-$(PORTMAP_VERSION).$(PORTMAP_SUFFIX)
 PORTMAP_DIR	:= $(BUILDDIR)/$(PORTMAP)
+PORTMAP_LICENSE := BSD-4-Clause-UC AND unknown
+PORTMAP_LICENSE_FILES := \
+	file://portmap.c;startline=1;endline=32;md5=eab9bc1a44f8936c130f91f7a079ff54 \
+	file://portmap.c;startline=45;endline=77;md5=031846750f4058d98079ec93d1a46d8b
 
 # ----------------------------------------------------------------------------
 # Compile
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 03/13] procps: fix license identifiers
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 02/13] portmap: add license identifiers Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 04/13] bash: fix license identifier Christian Hermann
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

All *.c files contain the "or (at your option) any later
version" clause of the GPL-2.0 or the LGPL-2.1 dedication
in their header.

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

diff --git a/rules/procps.make b/rules/procps.make
index 8d19e7b4a..9a042900d 100644
--- a/rules/procps.make
+++ b/rules/procps.make
@@ -24,7 +24,7 @@ PROCPS_SUFFIX	:= tar.xz
 PROCPS_URL	:= $(call ptx/mirror, SF, procps-ng/Production/$(PROCPS).$(PROCPS_SUFFIX))
 PROCPS_SOURCE	:= $(SRCDIR)/$(PROCPS).$(PROCPS_SUFFIX)
 PROCPS_DIR	:= $(BUILDDIR)/$(PROCPS)
-PROCPS_LICENSE	:= GPL-2.0-only AND LGPL-2.0-only
+PROCPS_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
 PROCPS_LICENSE_FILES := \
 	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 	file://COPYING.LIB;md5=4cf66a4984120007c9881cc871cf49db
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 04/13] bash: fix license identifier
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 02/13] portmap: add license identifiers Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 03/13] procps: fix " Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 05/13] bc: add " Christian Hermann
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

All *.c files contain the "or (at your option) any later
version" clause of the GPL-3.0 dedication in their header.

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

diff --git a/rules/bash.make b/rules/bash.make
index d128a5ab7..bed121586 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -21,7 +21,10 @@ BASH_URL	:= $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX))
 BASH_SOURCE	:= $(SRCDIR)/$(BASH).$(BASH_SUFFIX)
 BASH_DIR	:= $(BUILDDIR)/$(BASH)
 BASH_MAKE_PAR	:= NO
-BASH_LICENSE	:= GPL-3.0-only
+BASH_LICENSE	:= GPL-3.0-or-later
+BASH_LICENSE_FILES	:= \
+	file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+	file://general.c;startline=1;endline=19;md5=c018785d21f8c206ca7a13fa7d027568
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 05/13] bc: add license identifier
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
                   ` (2 preceding siblings ...)
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 04/13] bash: fix license identifier Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 06/13] cifs-utils: fix " Christian Hermann
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

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

diff --git a/rules/bc.make b/rules/bc.make
index 7db14ac67..af8a0b1a4 100644
--- a/rules/bc.make
+++ b/rules/bc.make
@@ -22,6 +22,10 @@ BC_SUFFIX	:= tar.gz
 BC_URL		:= $(call ptx/mirror, GNU, bc/$(BC).$(BC_SUFFIX))
 BC_SOURCE	:= $(SRCDIR)/$(BC).$(BC_SUFFIX)
 BC_DIR		:= $(BUILDDIR)/$(BC)
+BC_LICENSE	:= GPL-2.0-or-later
+BC_LICENSE_FILES	:= \
+	file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+	file://bc/bc.c;startline=47;endline=73;md5=944528275142ba90c112735cf0cbc7d1
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 06/13] cifs-utils: fix license identifier
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
                   ` (3 preceding siblings ...)
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 05/13] bc: add " Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 07/13] ddrescue: " Christian Hermann
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/cifs-utils.make | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/cifs-utils.make b/rules/cifs-utils.make
index 8f54aee1e..02cf948cb 100644
--- a/rules/cifs-utils.make
+++ b/rules/cifs-utils.make
@@ -21,7 +21,10 @@ CIFS_UTILS_SUFFIX	:= tar.bz2
 CIFS_UTILS_URL		:= https://ftp.samba.org/pub/linux-cifs/cifs-utils/$(CIFS_UTILS).$(CIFS_UTILS_SUFFIX)
 CIFS_UTILS_SOURCE	:= $(SRCDIR)/$(CIFS_UTILS).$(CIFS_UTILS_SUFFIX)
 CIFS_UTILS_DIR		:= $(BUILDDIR)/$(CIFS_UTILS)
-CIFS_UTILS_LICENSE	:= GPL-3.0-only
+CIFS_UTILS_LICENSE	:= GPL-3.0-or-later
+CIFS_UTILS_LICENSE_FILES := \
+	file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+	file://mount.cifs.c;startline=1;endline=19;md5=2f09dc7eb71007249fb0c485abdae60f
 
 #
 # autoconf
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 07/13] ddrescue: fix license identifier
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
                   ` (4 preceding siblings ...)
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 06/13] cifs-utils: fix " Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 08/13] diffutils: " Christian Hermann
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

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

diff --git a/rules/ddrescue.make b/rules/ddrescue.make
index 91e3a4843..5c051a780 100644
--- a/rules/ddrescue.make
+++ b/rules/ddrescue.make
@@ -21,7 +21,12 @@ DDRESCUE_SUFFIX		:= tar.lz
 DDRESCUE_URL		:= $(call ptx/mirror, GNU, ddrescue/$(DDRESCUE).$(DDRESCUE_SUFFIX))
 DDRESCUE_SOURCE		:= $(SRCDIR)/$(DDRESCUE).$(DDRESCUE_SUFFIX)
 DDRESCUE_DIR		:= $(BUILDDIR)/$(DDRESCUE)
-DDRESCUE_LICENSE	:= unknown
+DDRESCUE_LICENSE	:= GPL-2.0-or-later AND BSD-2-Clause
+DDRESCUE_LICENSE_FILES	:= \
+	file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
+	file://main.cc;startline=1;endline=16;md5=a01d61d3293ce28b883d8ba0c497e968 \
+	file://arg_parser.cc;startline=1;endline=18;md5=41d1341d0d733a5d24b26dc3cbc1ac42
+
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 08/13] diffutils: fix license identifier
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
                   ` (5 preceding siblings ...)
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 07/13] ddrescue: " Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 09/13] fuse: fix license identifier (split) Christian Hermann
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

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

diff --git a/rules/diffutils.make b/rules/diffutils.make
index 1cd13c77e..55ee903ea 100644
--- a/rules/diffutils.make
+++ b/rules/diffutils.make
@@ -21,6 +21,10 @@ DIFFUTILS_SUFFIX	:= tar.gz
 DIFFUTILS_URL		:= $(call ptx/mirror, GNU, diffutils/$(DIFFUTILS).$(DIFFUTILS_SUFFIX))
 DIFFUTILS_SOURCE	:= $(SRCDIR)/$(DIFFUTILS).$(DIFFUTILS_SUFFIX)
 DIFFUTILS_DIR		:= $(BUILDDIR)/$(DIFFUTILS)
+DIFFUTILS_LICENSE	:= GPL-2.0-or-later
+DIFFUTILS_LICENSE_FILES	:= \
+	file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+	file://src/diff.c;startline=1;endline=21;md5=6300de6fcda19d4ac43bedc776f5b3b7
 
 
 # ----------------------------------------------------------------------------
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 09/13] fuse: fix license identifier (split)
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
                   ` (6 preceding siblings ...)
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 08/13] diffutils: " Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-08-08  7:39   ` Michael Olbrich
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 10/13] dosfstools: fix license identifier Christian Hermann
                   ` (3 subsequent siblings)
  11 siblings, 1 reply; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
---
 rules/fuse.make | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/rules/fuse.make b/rules/fuse.make
index b3c55bfe5..88c6eae1e 100644
--- a/rules/fuse.make
+++ b/rules/fuse.make
@@ -21,7 +21,15 @@ FUSE_SUFFIX	:= tar.gz
 FUSE_URL	:= https://github.com/libfuse/libfuse/releases/download/$(FUSE)/$(FUSE).$(FUSE_SUFFIX)
 FUSE_SOURCE	:= $(SRCDIR)/$(FUSE).$(FUSE_SUFFIX)
 FUSE_DIR	:= $(BUILDDIR)/$(FUSE)
-FUSE_LICENSE	:= GPL-2.0-only AND LGPL-2.1-only
+ifdef PTXCONF_FUSE_UTIL
+FUSE_LICENSE := GPL-2.0-only
+endif
+ifdef PTXCONF_FUSE_LIB
+ifdef FUSE_LICENSE
+FUSE_LICENSE += AND
+endif
+FUSE_LICENSE += LGPL-2.1-only
+endif
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 10/13] dosfstools: fix license identifier
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
                   ` (7 preceding siblings ...)
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 09/13] fuse: fix license identifier (split) Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 11/13] file: " Christian Hermann
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

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

diff --git a/rules/dosfstools.make b/rules/dosfstools.make
index eb11644f3..c728cc1d5 100644
--- a/rules/dosfstools.make
+++ b/rules/dosfstools.make
@@ -23,7 +23,10 @@ DOSFSTOOLS_SRC		:= $(DOSFSTOOLS).$(DOSFSTOOLS_SUFFIX)
 DOSFSTOOLS_URL		:= https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION)/$(DOSFSTOOLS_SRC)
 DOSFSTOOLS_SOURCE	:= $(SRCDIR)/$(DOSFSTOOLS_SRC)
 DOSFSTOOLS_DIR		:= $(BUILDDIR)/$(DOSFSTOOLS)
-DOSFSTOOLS_LICENSE	:= GPL-3.0-only
+DOSFSTOOLS_LICENSE	:= GPL-3.0-or-later
+DOSFSTOOLS_LICENSE_FILES	:= \
+	file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+	file://src/fsck.fat.c;startline=1;endline=22;md5=3f94b53f3d7556100055c58a48937788
 
 # ----------------------------------------------------------------------------
 # Prepare (nothing to be done here)
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 11/13] file: fix license identifier
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
                   ` (8 preceding siblings ...)
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 10/13] dosfstools: fix license identifier Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-08-08  7:47   ` Michael Olbrich
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 12/13] dnsmasq: add " Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 13/13] findutils: " Christian Hermann
  11 siblings, 1 reply; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

besides an additional
    "immediately at the beginning of the file"
it conforms to the BSD-2-Clause text.

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

diff --git a/rules/file.make b/rules/file.make
index b721cf7e6..0844e5c7c 100644
--- a/rules/file.make
+++ b/rules/file.make
@@ -21,7 +21,8 @@ FILE_SUFFIX	:= tar.gz
 FILE_URL	:= ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
 FILE_SOURCE	:= $(SRCDIR)/$(FILE).$(FILE_SUFFIX)
 FILE_DIR	:= $(BUILDDIR)/$(FILE)
-FILE_LICENSE	:= BSD AND 2-term BSD
+FILE_LICENSE	:= BSD-2-Clause
+FILE_LICENSE_FILES	:= file://COPYING;md5=8bafafc441e2e0b9660848c98760b5f3
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 12/13] dnsmasq: add license identifier
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
                   ` (9 preceding siblings ...)
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 11/13] file: " Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 13/13] findutils: " Christian Hermann
  11 siblings, 0 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

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

diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index 7da9768ed..bce8dd651 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -22,6 +22,11 @@ DNSMASQ_SUFFIX		:= tar.xz
 DNSMASQ_URL		:= http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX)
 DNSMASQ_SOURCE		:= $(SRCDIR)/$(DNSMASQ).$(DNSMASQ_SUFFIX)
 DNSMASQ_DIR		:= $(BUILDDIR)/$(DNSMASQ)
+DNSMASQ_LICENSE	:= GPL-2.0-only OR GPL-3.0-only
+DNSMASQ_LICENSE_FILES	:= \
+	file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
+	file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504 \
+	file://src/dnsmasq.c;startline=1;endline=15;md5=9142b2fc6c71d7fad3af5ba18b26f0f1
 
 
 # ----------------------------------------------------------------------------
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [ptxdist] [PATCH v2 13/13] findutils: add license identifier
  2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
                   ` (10 preceding siblings ...)
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 12/13] dnsmasq: add " Christian Hermann
@ 2019-07-22 17:44 ` Christian Hermann
  11 siblings, 0 replies; 16+ messages in thread
From: Christian Hermann @ 2019-07-22 17:44 UTC (permalink / raw)
  To: ptxdist

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

diff --git a/rules/findutils.make b/rules/findutils.make
index d3fcae684..2fd513a36 100644
--- a/rules/findutils.make
+++ b/rules/findutils.make
@@ -22,6 +22,10 @@ FINDUTILS_SUFFIX	:= tar.gz
 FINDUTILS_URL		:= $(call ptx/mirror, GNU, findutils/$(FINDUTILS).$(FINDUTILS_SUFFIX))
 FINDUTILS_SOURCE	:= $(SRCDIR)/$(FINDUTILS).$(FINDUTILS_SUFFIX)
 FINDUTILS_DIR		:= $(BUILDDIR)/$(FINDUTILS)
+FINDUTILS_LICENSE   := GPL-3.0-or-later
+FINDUTILS_LICENSE_FILES   := \
+	file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
+	file://find/finddata.c;startline=1;endline=17;md5=8762699fb923e458287765af95c28d5a
 
 
 # ----------------------------------------------------------------------------
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [ptxdist] [PATCH v2 09/13] fuse: fix license identifier (split)
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 09/13] fuse: fix license identifier (split) Christian Hermann
@ 2019-08-08  7:39   ` Michael Olbrich
  0 siblings, 0 replies; 16+ messages in thread
From: Michael Olbrich @ 2019-08-08  7:39 UTC (permalink / raw)
  To: ptxdist

On Mon, Jul 22, 2019 at 07:44:23PM +0200, Christian Hermann wrote:
> Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> ---
>  rules/fuse.make | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/fuse.make b/rules/fuse.make
> index b3c55bfe5..88c6eae1e 100644
> --- a/rules/fuse.make
> +++ b/rules/fuse.make
> @@ -21,7 +21,15 @@ FUSE_SUFFIX	:= tar.gz
>  FUSE_URL	:= https://github.com/libfuse/libfuse/releases/download/$(FUSE)/$(FUSE).$(FUSE_SUFFIX)
>  FUSE_SOURCE	:= $(SRCDIR)/$(FUSE).$(FUSE_SUFFIX)
>  FUSE_DIR	:= $(BUILDDIR)/$(FUSE)
> -FUSE_LICENSE	:= GPL-2.0-only AND LGPL-2.1-only
> +ifdef PTXCONF_FUSE_UTIL
> +FUSE_LICENSE := GPL-2.0-only
> +endif
> +ifdef PTXCONF_FUSE_LIB
> +ifdef FUSE_LICENSE
> +FUSE_LICENSE += AND
> +endif
> +FUSE_LICENSE += LGPL-2.1-only
> +endif

fusermount uses mount_util.c from lib/ so LGPL-2.1-only applies for the
utils as well.
So it's always LGPL-2.1-only and GPL-2.0-only if utils are enabled.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.22.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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [ptxdist] [PATCH v2 11/13] file: fix license identifier
  2019-07-22 17:44 ` [ptxdist] [PATCH v2 11/13] file: " Christian Hermann
@ 2019-08-08  7:47   ` Michael Olbrich
  2019-08-08  8:29     ` Roland Hieber
  0 siblings, 1 reply; 16+ messages in thread
From: Michael Olbrich @ 2019-08-08  7:47 UTC (permalink / raw)
  To: ptxdist

On Mon, Jul 22, 2019 at 07:44:25PM +0200, Christian Hermann wrote:
> besides an additional
>     "immediately at the beginning of the file"
> it conforms to the BSD-2-Clause text.
> 
> Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> ---
>  rules/file.make | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/file.make b/rules/file.make
> index b721cf7e6..0844e5c7c 100644
> --- a/rules/file.make
> +++ b/rules/file.make
> @@ -21,7 +21,8 @@ FILE_SUFFIX	:= tar.gz
>  FILE_URL	:= ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
>  FILE_SOURCE	:= $(SRCDIR)/$(FILE).$(FILE_SUFFIX)
>  FILE_DIR	:= $(BUILDDIR)/$(FILE)
> -FILE_LICENSE	:= BSD AND 2-term BSD
> +FILE_LICENSE	:= BSD-2-Clause

src/strcasestr.c is BSD-3-Clause

src/strlcat.c and src/strlcpy.c look like ISC (I think?)

Michael

> +FILE_LICENSE_FILES	:= file://COPYING;md5=8bafafc441e2e0b9660848c98760b5f3
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.22.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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [ptxdist] [PATCH v2 11/13] file: fix license identifier
  2019-08-08  7:47   ` Michael Olbrich
@ 2019-08-08  8:29     ` Roland Hieber
  0 siblings, 0 replies; 16+ messages in thread
From: Roland Hieber @ 2019-08-08  8:29 UTC (permalink / raw)
  To: ptxdist

On Thu, Aug 08, 2019 at 09:47:58AM +0200, Michael Olbrich wrote:
> On Mon, Jul 22, 2019 at 07:44:25PM +0200, Christian Hermann wrote:
> > besides an additional
> >     "immediately at the beginning of the file"
> > it conforms to the BSD-2-Clause text.
> > 
> > Signed-off-by: Christian Hermann <christian.hermann@hytera.de>
> > ---
> >  rules/file.make | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/rules/file.make b/rules/file.make
> > index b721cf7e6..0844e5c7c 100644
> > --- a/rules/file.make
> > +++ b/rules/file.make
> > @@ -21,7 +21,8 @@ FILE_SUFFIX	:= tar.gz
> >  FILE_URL	:= ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
> >  FILE_SOURCE	:= $(SRCDIR)/$(FILE).$(FILE_SUFFIX)
> >  FILE_DIR	:= $(BUILDDIR)/$(FILE)
> > -FILE_LICENSE	:= BSD AND 2-term BSD
> > +FILE_LICENSE	:= BSD-2-Clause
> 
> src/strcasestr.c is BSD-3-Clause
> 
> src/strlcat.c and src/strlcpy.c look like ISC (I think?)

Yes, it's ISC.

 - 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

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2019-08-08  8:29 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-22 17:44 [ptxdist] [PATCH v2 01/13] polkit: add license identifier Christian Hermann
2019-07-22 17:44 ` [ptxdist] [PATCH v2 02/13] portmap: add license identifiers Christian Hermann
2019-07-22 17:44 ` [ptxdist] [PATCH v2 03/13] procps: fix " Christian Hermann
2019-07-22 17:44 ` [ptxdist] [PATCH v2 04/13] bash: fix license identifier Christian Hermann
2019-07-22 17:44 ` [ptxdist] [PATCH v2 05/13] bc: add " Christian Hermann
2019-07-22 17:44 ` [ptxdist] [PATCH v2 06/13] cifs-utils: fix " Christian Hermann
2019-07-22 17:44 ` [ptxdist] [PATCH v2 07/13] ddrescue: " Christian Hermann
2019-07-22 17:44 ` [ptxdist] [PATCH v2 08/13] diffutils: " Christian Hermann
2019-07-22 17:44 ` [ptxdist] [PATCH v2 09/13] fuse: fix license identifier (split) Christian Hermann
2019-08-08  7:39   ` Michael Olbrich
2019-07-22 17:44 ` [ptxdist] [PATCH v2 10/13] dosfstools: fix license identifier Christian Hermann
2019-07-22 17:44 ` [ptxdist] [PATCH v2 11/13] file: " Christian Hermann
2019-08-08  7:47   ` Michael Olbrich
2019-08-08  8:29     ` Roland Hieber
2019-07-22 17:44 ` [ptxdist] [PATCH v2 12/13] dnsmasq: add " Christian Hermann
2019-07-22 17:44 ` [ptxdist] [PATCH v2 13/13] findutils: " Christian Hermann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox