After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 680781 - LPGL2+/LGPL2.1+ mismatch in libsecret source
LPGL2+/LGPL2.1+ mismatch in libsecret source
Status: RESOLVED FIXED
Product: libsecret
Classification: Other
Component: General
unspecified
Other Linux
: Normal normal
: ---
Assigned To: libsecret maintainer(s)
libsecret maintainer(s)
Depends on:
Blocks:
 
 
Reported: 2012-07-29 10:42 UTC by Didier Roche
Modified: 2012-08-13 19:18 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Fix up libsecret licensing (62.20 KB, patch)
2012-08-06 09:25 UTC, Stef Walter
committed Details | Review

Description Didier Roche 2012-07-29 10:42:45 UTC
As discussed during Guadec, some files in libsecret are LGPL2+ and some are LGPL2.1+. The shipped COPYING file is the LGPL2 one.

You acked that we can change all copyright to LPGL2.1+ to ease the transition and the licencing. All seems good, however some of the files are copyright collabora (I think from the time you worked there), so maybe we should put them into the loop to ensure they agree that we change for 2.1+ only?

I open this bug for opening the discussion :)
Comment 1 Stef Walter 2012-08-06 09:07:47 UTC
Most of the files contain the LGPL 2.1+ header, so there is a mismatch with the COPYING file. Here is a list of the non-LGPL 2.1+ license headers present in files:

libsecret/tests/test-password.c (LGPL 2 or later)
libsecret/tests/test-value (LGPL 2 or later)
libsecret/tests/test-paths (LGPL 2 or later)
libsecret/tests/test-service.c (LGPL 2 or later)
libsecret/tests/mock-service.c (LGPL 2 or later)
libsecret/tests/test-item.c (LGPL 2 or later)
libsecret/tests/test-collection.c (LGPL 2 or later)
libsecret/tests/test-methods.c (LGPL 2 or later)
libsecret/tests/test-session.c (LGPL 2 or later)
libsecret/tests/test-prompt.c (LGPL 2 or later)
libsecret/tests/mock-service.h (LGPL 2 or later)

build/valgrind/valgrind.h (BSD-style license)
build/valgrind/memcheck.h (BSD-style license)

egg/tests/test-hkdf.c (LGPL 2 or later)
egg/tests/test-secmem.c (LGPL 2 or later)
egg/tests/test-hex.c (LGPL 2 or later)
egg/tests/test-dh.c (LGPL 2 or later)

libsecret/tests/test-clear-password.py (no license)
libsecret/tests/mock-service-prompt.py (no license)
libsecret/tests/test-lookup-password.py (no license)
libsecret/tests/mock-service-lock.py (no license)
libsecret/tests/mock-service-delete.py (no license)
libsecret/tests/test-store-password.py (no license)
libsecret/tests/mock/__init__.py (no license)
libsecret/tests/mock/dh.py (LGPL 2 or later)
libsecret/tests/mock/service.py (LGPL 2 or later)
libsecret/tests/mock/hkdf.py (GPL 2 or later)
libsecret/tests/mock/aes.py (Apache License 2)
libsecret/tests/mock-service-normal.py (no license)
libsecret/tests/test-unstable.py (no license)
libsecret/tests/mock-service-only-plain.py (no license)

So as I understand it we need to do the following:

 * Update COPYING to LGPL2.1+
 * Add COPYING.TESTS with the BSD-style valgrind header license, the Apache License 2.0 and the GPL 2.

Additionally (but not required) I could add an LGPL2.1+ header to the files currently without a license.
Comment 2 Didier Roche 2012-08-06 09:16:12 UTC
Indeed, I just pinged last week some people in Collabora so that we can ensure the relicensing for the code your wrote when being employed there are ok to migrate to the new GPL2.1+ license.

(on adding the headers to headless files, it's really as you prefer, no strong opinion there as not required by the license).
Comment 3 Stef Walter 2012-08-06 09:25:46 UTC
Created attachment 220425 [details] [review]
Fix up libsecret licensing

Didier, please review this and make sure it addresses the issues you
noticed with the licensing.
Comment 4 Stef Walter 2012-08-06 09:34:43 UTC
(In reply to comment #2)
> Indeed, I just pinged last week some people in Collabora so that we can ensure
> the relicensing for the code your wrote when being employed there are ok to
> migrate to the new GPL2.1+ license.

Well it turns out there's no need to relicense anything. All the LGPL2 files have the or later clause. So it's not a problem just to license libsecret under LGPL2.1+ without asking anyone.

> (on adding the headers to headless files, it's really as you prefer, no strong
> opinion there as not required by the license).

Yeah, but since we have a mix of licenses in the tests, I figured it's better to be clear.
Comment 5 Didier Roche 2012-08-06 09:59:12 UTC
Review of attachment 220425 [details] [review]:

All looks good to me. I do not see any incoherence left. Thanks Stef! :)
Comment 6 Stef Walter 2012-08-06 10:18:01 UTC
Thanks for the review.

Attachment 220425 [details] pushed as e43cba8 - Fix up libsecret licensing