Hi!
On Fri, 2015-08-21 at 20:41:26 +0100, Ian Jackson wrote:
> Guillem Jover writes ("Re: License audit on dpkg source tree"):
> > On Thu, 2009-11-12 at 18:11:16 +0100, Guillem Jover wrote:
> > > The remaining issues, which might need asking people around are:
> >
> > > * lib/dpkg/utils.c: GPL-2 only
> > >
> > > This file started as GPL-2 only with commit a4f9322a6417e1683183ea
> > > by Wichert Akkerman, which only included cisdigit() and cisalpha().
> > >
> > > Ian Jackson added a new cisspace() function in commit c91dc9f, and
> > > refactored the fgets_checked() and fgets_must() functions from
> > > src/filesdb.c (GPL-2+) in commit b95907e. I'm pretty certian he
> > > just didn't notice that license header, but to be sure he'd need to
> > > be asked for confirmation,
> >
> > Ian was that the case?
>
> Anything in the dpkg source tree with my copyright should be GPLv2+.
>
> Anything there which seems to be marked GPLv2-only represents some
> kind of administrative mistake, and the copyright notice can be
> changed to GPLv2+.
Thanks! I'm going to push the attached patch. Hope the S-o-b is fine.
Regards,
Guillem
From 26f4bc4b12b68e145d4df084c40b7612d70a5b8f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Tue, 15 Sep 2015 15:28:39 +0200
Subject: [PATCH] libdpkg: Fix inadvertent license change back from GPL2 to
GPL2+
In commit b95907e6e0f3f25136fb2ebcc8d3489efb208dea, several functions
were refactored out from src/filesdb.c (with a GPL2+ license), into
lib/utils.c (with a GPL2 license), inadvertently making them change
license.
Ian clarified that this was a mistake in:
<https://lists.debian.org/debian-dpkg/2015/08/msg00029.html>
Signed-off-by: Ian Jackson <ijack...@chiark.greenend.org.uk>
Signed-off-by: Guillem Jover <guil...@debian.org>
---
debian/changelog | 1 +
debian/copyright | 8 +-------
lib/dpkg/utils.c | 7 +++++--
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index de17395..c992de7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ dpkg (1.18.3) UNRELEASED; urgency=low
* Split overlong perl regexes into multiline extended regexes.
* Switch dselect multicd method license from GPL2 to GPL2+, with consent
from all its authors.
+ * Fix inadvertent license change for lib/dpkg/utils.c from GPL2 to GPL2+.
* Perl modules:
- Only warn on invalid week days instead of aborting in
Dpkg::Changelog::Entry::Debian. Regression introduced in dpkg 1.18.2.
diff --git a/debian/copyright b/debian/copyright
index cd7af7d..84c4d5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Copyright:
Copyright © 1994 Ian Murdock <imurd...@debian.org>
Copyright © 1994 Matt Welsh <m...@sunsite.unc.edu>
Copyright © 1994 Carl Streeter <stree...@cae.wisc.edu>
- Copyright © 1994-1999 Ian Jackson <i...@chiark.greenend.org.uk>
+ Copyright © 1994-1999, 2008 Ian Jackson <i...@chiark.greenend.org.uk>
Copyright © 1995 Bruce Perens <br...@pixar.com>
Copyright © 1995-1996 Erick Branderhorst <branderho...@heel.fgg.eur.nl>
Copyright © 1996 Michael Shields <shie...@crosslink.net>
@@ -53,12 +53,6 @@ Copyright:
License: GPL-2+
Files:
- lib/dpkg/utils.c
-Copyright:
- Copyright © 2008 Ian Jackson <i...@davenant.greenend.org.uk>
-License: GPL-2
-
-Files:
dselect/methods/Dselect/Ftp.pm
dselect/methods/ftp/*
Copyright:
diff --git a/lib/dpkg/utils.c b/lib/dpkg/utils.c
index d0221ca..20d7bb4 100644
--- a/lib/dpkg/utils.c
+++ b/lib/dpkg/utils.c
@@ -2,9 +2,12 @@
* libdpkg - Debian packaging suite library routines
* utils.c - helper functions for dpkg
*
+ * Copyright © 1995, 2008 Ian Jackson <i...@chiark.greenend.org.uk>
+ *
* This is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public
- * License version 2 as published by the Free Software Foundation.
+ * it under the terms of 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.
*
* This is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
--
2.6.0.rc0.131.gf624c3d
