mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 0/4] gnupg, screen, squashfs-tools, zip: add license tags
@ 2016-10-03 19:01 Andreas Pretzsch
  2016-10-03 19:01 ` [ptxdist] [PATCH 1/4] gnupg: add license information (GPL-3.0+) Andreas Pretzsch
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Andreas Pretzsch @ 2016-10-03 19:01 UTC (permalink / raw)
  To: ptxdist

Add missing license tags for packages gnupg, screen, squashfs-tools, zip.

gnupg and screen are straightforward.

For squashfs-tools, there is already an old patch on the list
    From: 	Oliver Graute <oliver.graute@gmail.com>
    Subject: 	[ptxdist] [PATCH] squashfs-tools: fix license information tag
    Date: 	Fri, 18 Sep 2015 13:01:52 +0200
which never got picked up. Nearly same content ("GPLv2", but code is GPLv2+),
but old (non-SPDX) names. So suggest you take mine.

About zip, it is essentially the same license as for the unzip package,
just a newer revision. So I followed the statement in the unzip package
and called it "Info-ZIP, BSD-like", too. If SPDX provides a better way,
please feel free to fix both ;-)

Last, feel free to squash and/or fixup at your own discretion.

Andreas Pretzsch (4):
  gnupg: add license information (GPL-3.0+)
  screen: add license information (GPL-2.0+)
  squashfs-tools: add license information (GPL-2.0+)
  zip: add license information and license file for report generation

 rules/gnupg.make          | 1 +
 rules/screen.make         | 1 +
 rules/squashfs-tools.make | 2 +-
 rules/zip.make            | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)

-- 
2.9.3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH 1/4] gnupg: add license information (GPL-3.0+)
  2016-10-03 19:01 [ptxdist] [PATCH 0/4] gnupg, screen, squashfs-tools, zip: add license tags Andreas Pretzsch
@ 2016-10-03 19:01 ` Andreas Pretzsch
  2016-10-03 19:01 ` [ptxdist] [PATCH 2/4] screen: add license information (GPL-2.0+) Andreas Pretzsch
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 8+ messages in thread
From: Andreas Pretzsch @ 2016-10-03 19:01 UTC (permalink / raw)
  To: ptxdist

Nearly all of the code is licensed under GPL version 3 or later.
There are a few pieces which are either GPLv2+, LGPLv2.1+, LGPLv3+:
  common/localename.c : LGPL-2.1+
  gl/allocsa.c : GPL-2+
  jnlib : LGPL-2.1+ ; LGPL-3+
All of these are only used internally (linked into gpg).
So all in all, gnupg is GPL version 3 or later.

Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
---
 rules/gnupg.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/gnupg.make b/rules/gnupg.make
index 7f0270e..15e78eb 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -23,6 +23,7 @@ GNUPG_SUFFIX	:= tar.bz2
 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+
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.9.3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH 2/4] screen: add license information (GPL-2.0+)
  2016-10-03 19:01 [ptxdist] [PATCH 0/4] gnupg, screen, squashfs-tools, zip: add license tags Andreas Pretzsch
  2016-10-03 19:01 ` [ptxdist] [PATCH 1/4] gnupg: add license information (GPL-3.0+) Andreas Pretzsch
@ 2016-10-03 19:01 ` Andreas Pretzsch
  2016-10-03 19:01 ` [ptxdist] [PATCH 3/4] squashfs-tools: " Andreas Pretzsch
  2016-10-03 19:01 ` [ptxdist] [PATCH 4/4] zip: add license information and license file for report generation Andreas Pretzsch
  3 siblings, 0 replies; 8+ messages in thread
From: Andreas Pretzsch @ 2016-10-03 19:01 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
---
 rules/screen.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/screen.make b/rules/screen.make
index 954463a..f9d7869 100644
--- a/rules/screen.make
+++ b/rules/screen.make
@@ -23,6 +23,7 @@ SCREEN_SUFFIX	:= tar.gz
 SCREEN_URL	:= $(call ptx/mirror, GNU, screen/$(SCREEN).$(SCREEN_SUFFIX))
 SCREEN_SOURCE	:= $(SRCDIR)/$(SCREEN).$(SCREEN_SUFFIX)
 SCREEN_DIR	:= $(BUILDDIR)/$(SCREEN)
+SCREEN_LICENSE	:= GPL-2.0+
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.9.3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH 3/4] squashfs-tools: add license information (GPL-2.0+)
  2016-10-03 19:01 [ptxdist] [PATCH 0/4] gnupg, screen, squashfs-tools, zip: add license tags Andreas Pretzsch
  2016-10-03 19:01 ` [ptxdist] [PATCH 1/4] gnupg: add license information (GPL-3.0+) Andreas Pretzsch
  2016-10-03 19:01 ` [ptxdist] [PATCH 2/4] screen: add license information (GPL-2.0+) Andreas Pretzsch
@ 2016-10-03 19:01 ` Andreas Pretzsch
  2016-10-03 19:01 ` [ptxdist] [PATCH 4/4] zip: add license information and license file for report generation Andreas Pretzsch
  3 siblings, 0 replies; 8+ messages in thread
From: Andreas Pretzsch @ 2016-10-03 19:01 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
---
 rules/squashfs-tools.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/squashfs-tools.make b/rules/squashfs-tools.make
index 71497fb..c242f71 100644
--- a/rules/squashfs-tools.make
+++ b/rules/squashfs-tools.make
@@ -28,7 +28,7 @@ SQUASHFS_TOOLS_URL	:= $(call ptx/mirror, SF, squashfs/$(SQUASHFS_TOOLS).$(SQUASH
 SQUASHFS_TOOLS_SOURCE	:= $(SRCDIR)/$(SQUASHFS_TOOLS).$(SQUASHFS_TOOLS_SUFFIX)
 SQUASHFS_TOOLS_DIR	:= $(BUILDDIR)/$(SQUASHFS_TOOLS)
 SQUASHFS_TOOLS_SUBDIR	:= squashfs-tools
-SQUASHFS_TOOLS_LICENSE	:= unknown
+SQUASHFS_TOOLS_LICENSE	:= GPL-2.0+
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.9.3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH 4/4] zip: add license information and license file for report generation
  2016-10-03 19:01 [ptxdist] [PATCH 0/4] gnupg, screen, squashfs-tools, zip: add license tags Andreas Pretzsch
                   ` (2 preceding siblings ...)
  2016-10-03 19:01 ` [ptxdist] [PATCH 3/4] squashfs-tools: " Andreas Pretzsch
@ 2016-10-03 19:01 ` Andreas Pretzsch
  2016-10-04 13:30   ` Michael Olbrich
  2016-10-04 16:40   ` [ptxdist] [PATCH v2] " Andreas Pretzsch
  3 siblings, 2 replies; 8+ messages in thread
From: Andreas Pretzsch @ 2016-10-03 19:01 UTC (permalink / raw)
  To: ptxdist

License information is pretty much the same as with unzip, just a newer
revision of the (BSD-like) Info-ZIP license (here: version 2007-Mar-4).

Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
---
 rules/zip.make | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/zip.make b/rules/zip.make
index 09ba4a0..ec59e72 100644
--- a/rules/zip.make
+++ b/rules/zip.make
@@ -26,6 +26,8 @@ ZIP		:= zip$(ZIP_AVERSION)
 ZIP_URL		:= $(call ptx/mirror, SF, infozip/$(ZIP_ARCHIVE))
 ZIP_SOURCE	:= $(SRCDIR)/$(ZIP_ARCHIVE)
 ZIP_DIR		:= $(BUILDDIR)/$(ZIP)
+ZIP_LICENSE	:= Info-ZIP, BSD-like
+ZIP_LICENSE_FILES	:= file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d
 
 # ----------------------------------------------------------------------------
 # Compile
-- 
2.9.3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* Re: [ptxdist] [PATCH 4/4] zip: add license information and license file for report generation
  2016-10-03 19:01 ` [ptxdist] [PATCH 4/4] zip: add license information and license file for report generation Andreas Pretzsch
@ 2016-10-04 13:30   ` Michael Olbrich
  2016-10-04 15:50     ` Andreas Pretzsch
  2016-10-04 16:40   ` [ptxdist] [PATCH v2] " Andreas Pretzsch
  1 sibling, 1 reply; 8+ messages in thread
From: Michael Olbrich @ 2016-10-04 13:30 UTC (permalink / raw)
  To: ptxdist

On Mon, Oct 03, 2016 at 09:01:24PM +0200, Andreas Pretzsch wrote:
> License information is pretty much the same as with unzip, just a newer
> revision of the (BSD-like) Info-ZIP license (here: version 2007-Mar-4).
> 
> Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
> ---
>  rules/zip.make | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/rules/zip.make b/rules/zip.make
> index 09ba4a0..ec59e72 100644
> --- a/rules/zip.make
> +++ b/rules/zip.make
> @@ -26,6 +26,8 @@ ZIP		:= zip$(ZIP_AVERSION)
>  ZIP_URL		:= $(call ptx/mirror, SF, infozip/$(ZIP_ARCHIVE))
>  ZIP_SOURCE	:= $(SRCDIR)/$(ZIP_ARCHIVE)
>  ZIP_DIR		:= $(BUILDDIR)/$(ZIP)
> +ZIP_LICENSE	:= Info-ZIP, BSD-like

Nothing with ',' here please. I think only 'Info-ZIP' is correct here, the
'BSD-like' is just a different description for the same license, right? And
'Info-ZIP' ist the correct SPDX identifiere.

Michael

> +ZIP_LICENSE_FILES	:= file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d
>  
>  # ----------------------------------------------------------------------------
>  # Compile
> -- 
> 2.9.3
> 
> 
> _______________________________________________
> 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] 8+ messages in thread

* Re: [ptxdist] [PATCH 4/4] zip: add license information and license file for report generation
  2016-10-04 13:30   ` Michael Olbrich
@ 2016-10-04 15:50     ` Andreas Pretzsch
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Pretzsch @ 2016-10-04 15:50 UTC (permalink / raw)
  To: ptxdist

On Di, 2016-10-04 at 15:30 +0200, Michael Olbrich wrote:
> On Mon, Oct 03, 2016 at 09:01:24PM +0200, Andreas Pretzsch wrote:
> > License information is pretty much the same as with unzip, just a newer
> > revision of the (BSD-like) Info-ZIP license (here: version 2007-Mar-4).
> > 
> > Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
> > ---
> >  rules/zip.make | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/rules/zip.make b/rules/zip.make
> > index 09ba4a0..ec59e72 100644
> > --- a/rules/zip.make
> > +++ b/rules/zip.make
> > @@ -26,6 +26,8 @@ ZIP		:= zip$(ZIP_AVERSION)
> >  ZIP_URL		:= $(call ptx/mirror, SF, infozip/$(ZIP_ARCHIVE))
> >  ZIP_SOURCE	:= $(SRCDIR)/$(ZIP_ARCHIVE)
> >  ZIP_DIR		:= $(BUILDDIR)/$(ZIP)
> > +ZIP_LICENSE	:= Info-ZIP, BSD-like
> 
> Nothing with ',' here please. I think only 'Info-ZIP' is correct here, the
> 'BSD-like' is just a different description for the same license, right? And
> 'Info-ZIP' ist the correct SPDX identifiere.

All correct. Just followed the way it is stated in unzip.
But true, descriptive texts ("BSD-like") do not belong here, but should
come out of the real license, resp. from a link/addition to it, on
another place. Not from above tag.

I'll make a V2 of the patch, this time both for unzip and zip packages.
You prefer this patch combined or separate ?


-- 

carpe noctem engineering
Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch
Dipl.-Ing. (FH) Andreas Pretzsch        Tel. +49-(0)7307-936088-1
Lange Strasse 28a                       Fax: +49-(0)7307-936088-9
89250 Senden, Germany                   email: apr@cn-eng.de


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH v2] zip: add license information and license file for report generation
  2016-10-03 19:01 ` [ptxdist] [PATCH 4/4] zip: add license information and license file for report generation Andreas Pretzsch
  2016-10-04 13:30   ` Michael Olbrich
@ 2016-10-04 16:40   ` Andreas Pretzsch
  1 sibling, 0 replies; 8+ messages in thread
From: Andreas Pretzsch @ 2016-10-04 16:40 UTC (permalink / raw)
  To: ptxdist

License information is pretty much the same as with unzip, just a newer
revision of the (BSD-like) Info-ZIP license (here: version 2007-Mar-4).
Add license tag and reference to license text.

Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
---
v1 -> v2: remove descriptive "BSD-like" in license tag

 rules/zip.make | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/zip.make b/rules/zip.make
index 09ba4a0..239b11f 100644
--- a/rules/zip.make
+++ b/rules/zip.make
@@ -26,6 +26,8 @@ ZIP		:= zip$(ZIP_AVERSION)
 ZIP_URL		:= $(call ptx/mirror, SF, infozip/$(ZIP_ARCHIVE))
 ZIP_SOURCE	:= $(SRCDIR)/$(ZIP_ARCHIVE)
 ZIP_DIR		:= $(BUILDDIR)/$(ZIP)
+ZIP_LICENSE	:= Info-ZIP
+ZIP_LICENSE_FILES	:= file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d
 
 # ----------------------------------------------------------------------------
 # Compile
-- 
2.9.3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

end of thread, other threads:[~2016-10-04 16:40 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-03 19:01 [ptxdist] [PATCH 0/4] gnupg, screen, squashfs-tools, zip: add license tags Andreas Pretzsch
2016-10-03 19:01 ` [ptxdist] [PATCH 1/4] gnupg: add license information (GPL-3.0+) Andreas Pretzsch
2016-10-03 19:01 ` [ptxdist] [PATCH 2/4] screen: add license information (GPL-2.0+) Andreas Pretzsch
2016-10-03 19:01 ` [ptxdist] [PATCH 3/4] squashfs-tools: " Andreas Pretzsch
2016-10-03 19:01 ` [ptxdist] [PATCH 4/4] zip: add license information and license file for report generation Andreas Pretzsch
2016-10-04 13:30   ` Michael Olbrich
2016-10-04 15:50     ` Andreas Pretzsch
2016-10-04 16:40   ` [ptxdist] [PATCH v2] " Andreas Pretzsch

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