[ptxdist] [PATCH v2] gnupg: add license files and update spdx identifiers

[ptxdist] [PATCH v2] gnupg: add license files and update spdx identifiers

[Bruno Thomsen]

Add license files with md5 hash.

Add more complete SPDX identifiers based on package COPYING* files.

COPYING.CC0 is not included as it's only used for tests.

COPYING.other contain the following licenses that are not test files:
- MIT
- Spencer-86
- BSD-2-Clause-Views
- Unicode-DFS-2016

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
v2:
Include licenses from COPYING.other file.
*GPL*-{only,or-later}
I have not resend the other 5 patches in the series to avoid spamming.

 rules/gnupg.make | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rules/gnupg.make b/rules/gnupg.make
index 25d267769443..d6c53c7cafcd 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -24,7 +24,13 @@ GNUPG_URL	:= \
 	ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
 GNUPG_SOURCE	:= $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX)
 GNUPG_DIR	:= $(BUILDDIR)/$(GNUPG)
-GNUPG_LICENSE	:= GPL-3.0-or-later
+GNUPG_LICENSE	:= GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND MIT AND Spencer-86 AND BSD-2-Clause-Views AND Unicode-DFS-2016
+GNUPG_LICENSE_FILES := \
+	file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \
+	file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://COPYING.LGPL21;md5=3c9636424f4ef15d6cb24f934190cfb0 \
+	file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257 \
+	file://COPYING.other;md5=a231ccb4bb5b0651e08464e4e6f846d3
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.37.1

Re: [ptxdist] [APPLIED] gnupg: add license files and update spdx identifiers

[Michael Olbrich]

Thanks, applied as b1215f5ce75abdb01bca332b46e740bb453f5d01.

Michael

[sent from post-receive hook]

On Fri, 05 Aug 2022 09:50:58 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Add license files with md5 hash.
> 
> Add more complete SPDX identifiers based on package COPYING* files.
> 
> COPYING.CC0 is not included as it's only used for tests.
> 
> COPYING.other contain the following licenses that are not test files:
> - MIT
> - Spencer-86
> - BSD-2-Clause-Views
> - Unicode-DFS-2016
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20220729123113.3838-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gnupg.make b/rules/gnupg.make
> index acb4d2082050..65a4264e1cad 100644
> --- a/rules/gnupg.make
> +++ b/rules/gnupg.make
> @@ -24,7 +24,13 @@ GNUPG_URL	:= \
>  	ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
>  GNUPG_SOURCE	:= $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX)
>  GNUPG_DIR	:= $(BUILDDIR)/$(GNUPG)
> -GNUPG_LICENSE	:= GPL-3.0-or-later
> +GNUPG_LICENSE	:= GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND MIT AND Spencer-86 AND BSD-2-Clause-Views AND Unicode-DFS-2016
> +GNUPG_LICENSE_FILES := \
> +	file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \
> +	file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +	file://COPYING.LGPL21;md5=3c9636424f4ef15d6cb24f934190cfb0 \
> +	file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257 \
> +	file://COPYING.other;md5=a231ccb4bb5b0651e08464e4e6f846d3
>  
>  # ----------------------------------------------------------------------------
>  # Prepare