From e70ce4042c6c5fac43946b762ccfccedfe898058 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 1 Jan 2020 07:38:04 +0100 Subject: [PATCH 1/6] license: relicense "shared/nm-glib-aux/nm-glib.h" under LGPL-2.1+ $ git shortlog -n -s a3e75f329446a93a61ca4c458a7657bd919f4fe6 -- shared/nm-glib-aux/nm-glib.h shared/nm-utils/nm-glib.h shared/nm-glib.h include/nm-glib.h include/nm-glib-compat.h 35 Thomas Haller 12 Dan Winship 5 Dan Williams 3 Lubomir Rintel 2 Beniamino Galvani 1 Jan Kantert 1 Thomas Bechtold The last two contributions by Thomas and Jan are no longer present in any form, because they were for an older version of glib which is no longer supported. All other contributors agree to the licences change according to "RELICENSE.md" file. --- shared/nm-glib-aux/nm-glib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/nm-glib-aux/nm-glib.h b/shared/nm-glib-aux/nm-glib.h index e9d89ae0e3..4ecba9ffca 100644 --- a/shared/nm-glib-aux/nm-glib.h +++ b/shared/nm-glib-aux/nm-glib.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (C) 2008 - 2018 Red Hat, Inc. */ From fee50e17b2c327463581b0af294a3b4610718150 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 1 Jan 2020 08:00:02 +0100 Subject: [PATCH 2/6] license: relicense "shared/nm-glib-aux/nm-jansson.h" under LGPL-2.1+ $ git shortlog -n -s a3e75f329446a93a61ca4c458a7657bd919f4fe6 -- shared/nm-glib-aux/nm-jansson.h shared/nm-utils/nm-jansson.h 7 Thomas Haller 1 Lubomir Rintel 1 Beniamino Galvani 1 Francesco Giudici All contributors agreed to the relicensing according to "RELICENSE.md". --- shared/nm-glib-aux/nm-jansson.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/nm-glib-aux/nm-jansson.h b/shared/nm-glib-aux/nm-jansson.h index 0a75cff5b6..7c034222c4 100644 --- a/shared/nm-glib-aux/nm-jansson.h +++ b/shared/nm-glib-aux/nm-jansson.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (C) 2018 Red Hat, Inc. */ From 3eef0cf387a0b7ab0a77b806c8a0fafcc99cd96a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 1 Jan 2020 08:14:46 +0100 Subject: [PATCH 3/6] license: relicense "shared/nm-libnm-core-intern-aux/nm-auth-subject.[hc]" under LGPL-2.1+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $ git shortlog -n -s a3e75f329446a93a61ca4c458a7657bd919f4fe6 -- shared/nm-libnm-core-intern/nm-auth-subject.'[hc]' src/nm-auth-subject.'[hc]' 28 Thomas Haller 7 Dan Winship 1 Beniamino Galvani 1 Dan Williams 1 Jiří Klimeš All contributors agreed to the relicensing according to "RELICENSE.md". --- shared/nm-libnm-core-intern/nm-auth-subject.c | 2 +- shared/nm-libnm-core-intern/nm-auth-subject.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/nm-libnm-core-intern/nm-auth-subject.c b/shared/nm-libnm-core-intern/nm-auth-subject.c index 7d864e31a3..15c2d65296 100644 --- a/shared/nm-libnm-core-intern/nm-auth-subject.c +++ b/shared/nm-libnm-core-intern/nm-auth-subject.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (C) 2013 - 2014 Red Hat, Inc. */ diff --git a/shared/nm-libnm-core-intern/nm-auth-subject.h b/shared/nm-libnm-core-intern/nm-auth-subject.h index e885c4ea96..fc37b8e2bb 100644 --- a/shared/nm-libnm-core-intern/nm-auth-subject.h +++ b/shared/nm-libnm-core-intern/nm-auth-subject.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (C) 2013 Red Hat, Inc. */ From 46da89cb54cdcddc457c56f5140964270fd53e9e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 1 Jan 2020 09:00:51 +0100 Subject: [PATCH 4/6] license: relicense "shared/nm-utils/nm-vpn-editor-plugin-call.h" under LGPL-2.1+ $ git shortlog -n -s a3e75f329446a93a61ca4c458a7657bd919f4fe6 -- shared/nm-utils/nm-vpn-editor-plugin-call.h shared/nm-vpn-editor-plugin-call.h 5 Thomas Haller All contributors agreed to the relicensing according to "RELICENSE.md". --- shared/nm-utils/nm-vpn-editor-plugin-call.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/nm-utils/nm-vpn-editor-plugin-call.h b/shared/nm-utils/nm-vpn-editor-plugin-call.h index ab47308399..b2c39e2981 100644 --- a/shared/nm-utils/nm-vpn-editor-plugin-call.h +++ b/shared/nm-utils/nm-vpn-editor-plugin-call.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (C) 2016 Red Hat, Inc. */ From 2dde55203b1854593d121fd5d07b5d2bf6e02de9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 1 Jan 2020 09:07:35 +0100 Subject: [PATCH 5/6] license: relicense "shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h" under LGPL-2.1+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $ git shortlog -n -s a3e75f329446a93a61ca4c458a7657bd919f4fe6 -- shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h src/systemd/sd-adapt-core/nm-sd-adapt-core.c src/systemd/sd-adapt/nm-sd-adapt.'[hc]' src/systemd/nm-sd-adapt.'[hc]' src/dhcp-manager/systemd-dhcp/nm-sd-adapt.'[hc]' 46 Thomas Haller 7 Beniamino Galvani 3 Lubomir Rintel 2 Dan Williams 2 Dan Winship 1 Glenn Washburn 1 Jiří Klimeš Note that the contribution to the file by Glenn was removed in commit e27b15c00d23 ('all: remove CLOCK_BOOTTIME defintions'), so it is no longer relevant. All other contributors agreed to the relicensing according to "RELICENSE.md". --- shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h index d4df97d6e5..231e06bdad 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (C) 2014 - 2018 Red Hat, Inc. */ From 6963ecf0d1b14e0057b2be3b823bddaa69b055ec Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 1 Jan 2020 15:49:34 +0100 Subject: [PATCH 6/6] license: relicense "libnm-core/nm-errors.h" under LGPL-2.1+ $ git shortlog -n -s a3e75f329446a93a61ca4c458a7657bd919f4fe6 -- libnm-core/nm-errors.h 11 Dan Winship 5 Thomas Haller 2 Beniamino Galvani Note that the header also contains code that was copied from other files. However, that code originates from libnm itself (and thus was already LGPL licensed). All contributors agreed to the relicensing according to "RELICENSE.md". --- libnm-core/nm-errors.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnm-core/nm-errors.h b/libnm-core/nm-errors.h index 0b54133dc4..031cc670b5 100644 --- a/libnm-core/nm-errors.h +++ b/libnm-core/nm-errors.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (C) 2004 - 2014 Red Hat, Inc. */