[B.A.T.M.A.N.] [PATCH 0/6] alfred: License cleanup

List overview All Threads
Download

newer

older

[B.A.T.M.A.N.] Set preferred mesh...

[B.A.T.M.A.N.] [PATCH 0/6] batctl:...

Sven Eckelmann

19 Nov 2017 19 Nov '17

2:05 p.m.

Hi,

the kernel community is currently trying to make the licensing status more clear in each file. This is mostly done by adding SPDX license identifiers and defining a set of rules how these license related information has to be stored.

I've used this opportunity to also go through all files of alfred (for example with FSFE's `reuse lint`) and to annotate the files according to the "Linux licensing rules" and FSFE's REUSE practices.

There are two things which could be seen as controversial:

* change of batman_adv.h to the Linux preferred license (I am waiting for Acks in the batman-adv patchset) * explicitly mark remaining files as licensed under the GPL-2.0

Kind regards, Sven

Sven Eckelmann (6): alfred: Rename LICENSE to Linux's LICENSES/preferred/GPL-2.0 alfred: Add License-Filename to GPL-2.0 files alfred: Import Linux's LICENSES/preferred/MIT alfred: Add SPDX license identifier above copyright header alfred: Mark remaining files as GPL-2.0 alfred: Change batman_adv.h license to MIT

-- 2.11.0

Show replies by date

Sven Eckelmann

19 Nov 19 Nov

2:05 p.m.

New subject: [B.A.T.M.A.N.] [PATCH 1/6] alfred: Rename LICENSE to Linux's LICENSES/preferred/GPL-2.0

The alfred project shares files with other projects hosted on open-mesh.org and kernel.org. These other projects use the filename LICENSES/preferred/GPL-2.0 for the GPL-2.0 license. It is therefore required to also use the same name for the license file when these files reference this in their license header.

The SPDX header was imported from Linux but the actual GPL-2.0 text was downloaded from https://www.gnu.org/licenses/gpl-2.0.txt

Signed-off-by: Sven Eckelmann sven@narfation.org --- LICENSE => LICENSES/preferred/GPL-2.0 | 13 +++++++++++++ 1 file changed, 13 insertions(+) rename LICENSE => LICENSES/preferred/GPL-2.0 (97%)

diff --git a/LICENSE b/LICENSES/preferred/GPL-2.0 similarity index 97% rename from LICENSE rename to LICENSES/preferred/GPL-2.0 index d159169..3bb0d18 100644 --- a/LICENSE +++ b/LICENSES/preferred/GPL-2.0 @@ -1,3 +1,16 @@ +Valid-License-Identifier: GPL-2.0 +Valid-License-Identifier: GPL-2.0+ +SPDX-URL: https://spdx.org/licenses/GPL-2.0.html +Usage-Guide: + To use this license in source code, put one of the following SPDX + tag/value pairs into a comment according to the placement + guidelines in the licensing rules documentation. + For 'GNU General Public License (GPL) version 2 only' use: + SPDX-License-Identifier: GPL-2.0 + For 'GNU General Public License (GPL) version 2 or any later version' use: + SPDX-License-Identifier: GPL-2.0+ +License-Text: + GNU GENERAL PUBLIC LICENSE Version 2, June 1991

-- 2.11.0

Sven Eckelmann

2:05 p.m.

New subject: [B.A.T.M.A.N.] [PATCH 2/6] alfred: Add License-Filename to GPL-2.0 files

The FSFE REUSE practices [1] recommend to add a "License-Filename" tag to files which don't contain the complete license text. The GPL-2.0 files usually only have a small notice at the beginning of the file. The longer license is usually stored in a separate file and therefore should be referenced accordingly.

diff --git a/Makefile b/Makefile index 4c1c6b5..1662412 100755 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA # +# License-Filename: LICENSES/preferred/GPL-2.0

# alfred build BINARY_NAME = alfred diff --git a/alfred.h b/alfred.h index f52e66b..df0bd9a 100644 --- a/alfred.h +++ b/alfred.h @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#ifndef SOURCE_VERSION diff --git a/batadv_query.c b/batadv_query.c index 78b92cd..387950a 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include "alfred.h" diff --git a/batadv_query.h b/batadv_query.h index dc2b135..5633322 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */ #ifndef _BATADV_QUERY_H #define _BATADV_QUERY_H diff --git a/batadv_querynl.c b/batadv_querynl.c index ca9ee2c..c197d24 100644 --- a/batadv_querynl.c +++ b/batadv_querynl.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include "batadv_querynl.h" diff --git a/batadv_querynl.h b/batadv_querynl.h index 4b42ed5..90f6546 100644 --- a/batadv_querynl.h +++ b/batadv_querynl.h @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#ifndef _BATADV_QUERYNL_H diff --git a/client.c b/client.c index 4102046..27dbc4a 100644 --- a/client.c +++ b/client.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include <ctype.h> diff --git a/debugfs.c b/debugfs.c index fc39322..e90c3a8 100644 --- a/debugfs.c +++ b/debugfs.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include "debugfs.h" diff --git a/debugfs.h b/debugfs.h index b4dc6bb..5404a45 100644 --- a/debugfs.h +++ b/debugfs.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#ifndef __DEBUGFS_H__ diff --git a/gpsd/Makefile b/gpsd/Makefile index da4a553..dae2b48 100755 --- a/gpsd/Makefile +++ b/gpsd/Makefile @@ -17,6 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA # +# License-Filename: LICENSES/preferred/GPL-2.0

# alfred-gpsd build BINARY_NAME = alfred-gpsd diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 01e61a0..7147136 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include "alfred-gpsd.h" diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index a4a8359..0a3a31f 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include <stdio.h> diff --git a/hash.c b/hash.c index 5a3cdef..ebdcb47 100644 --- a/hash.c +++ b/hash.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include "hash.h" diff --git a/hash.h b/hash.h index f6604d0..3111b49 100644 --- a/hash.h +++ b/hash.h @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */ #ifndef _BATMAN_HASH_H #define _BATMAN_HASH_H diff --git a/list.h b/list.h index 2ac2c87..5d4c25a 100644 --- a/list.h +++ b/list.h @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#ifndef _LINUX_LIST_H diff --git a/main.c b/main.c index cf1e460..be79fb9 100644 --- a/main.c +++ b/main.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include <arpa/inet.h> diff --git a/netlink.c b/netlink.c index 7ef4308..7678f99 100644 --- a/netlink.c +++ b/netlink.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include "netlink.h" diff --git a/netlink.h b/netlink.h index a4471a1..446948c 100644 --- a/netlink.h +++ b/netlink.h @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#ifndef _ALFRED_NETLINK_H diff --git a/netsock.c b/netsock.c index c00ea2e..ced8fbd 100644 --- a/netsock.c +++ b/netsock.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include <sys/socket.h> diff --git a/packet.h b/packet.h index 425459f..a132326 100644 --- a/packet.h +++ b/packet.h @@ -15,6 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#ifndef _ALFRED_PACKET_H diff --git a/recv.c b/recv.c index ebc3041..0f8004e 100644 --- a/recv.c +++ b/recv.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include <errno.h> diff --git a/send.c b/send.c index b566503..9c1e31b 100644 --- a/send.c +++ b/send.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include <netinet/in.h> diff --git a/server.c b/server.c index 63a3b2a..199d38c 100644 --- a/server.c +++ b/server.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include <errno.h> diff --git a/unix_sock.c b/unix_sock.c index 4a8c6e0..7f5e99c 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include <errno.h> diff --git a/util.c b/util.c index ed83895..87261a0 100644 --- a/util.c +++ b/util.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include <netinet/ether.h> diff --git a/vis/Makefile b/vis/Makefile index b69672c..63500c9 100755 --- a/vis/Makefile +++ b/vis/Makefile @@ -17,6 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA # +# License-Filename: LICENSES/preferred/GPL-2.0

# batadv-vis build BINARY_NAME = batadv-vis diff --git a/vis/vis.c b/vis/vis.c index 98ff02f..148c581 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include "vis.h" diff --git a/vis/vis.h b/vis/vis.h index 4b12248..b99e745 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

#include <sys/socket.h>

-- 2.11.0

Sven Eckelmann

2:05 p.m.

New subject: [B.A.T.M.A.N.] [PATCH 3/6] alfred: Import Linux's LICENSES/preferred/MIT

The MIT license is used by alfred for some of the code. Copy the Linux license reference file with SPDX header for completeness sake.

Signed-off-by: Sven Eckelmann sven@narfation.org --- LICENSES/preferred/MIT | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 LICENSES/preferred/MIT

diff --git a/LICENSES/preferred/MIT b/LICENSES/preferred/MIT new file mode 100644 index 0000000..f33a68c --- /dev/null +++ b/LICENSES/preferred/MIT @@ -0,0 +1,30 @@ +Valid-License-Identifier: MIT +SPDX-URL: https://spdx.org/licenses/MIT.html +Usage-Guide: + To use the MIT License put the following SPDX tag/value pair into a + comment according to the placement guidelines in the licensing rules + documentation: + SPDX-License-Identifier: MIT +License-Text: + +MIT License + +Copyright (c) <year> <copyright holders> + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE.

-- 2.11.0

Sven Eckelmann

2:06 p.m.

New subject: [B.A.T.M.A.N.] [PATCH 4/6] alfred: Add SPDX license identifier above copyright header

The "Linux kernel licensing rules" require that each file has a SPDX license identifier as first line (and sometimes as second line). Since alfred shares source files with the Linux kernel, it is appropriate to use the same identifier.

The FSFE REUSE practices [1] would also require the same tags but have no restrictions on the placement in the source file. Using the "Linux kernel licensing rules" is therefore also fulfilling the FSFE REUSE practices requirements at the same time.

[1] https://reuse.software/practices/

diff --git a/Makefile b/Makefile index 1662412..c2bacc0 100755 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ #!/usr/bin/make -f +# SPDX-License-Identifier: GPL-2.0 # -*- makefile -*- # # Copyright (C) 2012-2017 B.A.T.M.A.N. contributors diff --git a/alfred.h b/alfred.h index df0bd9a..d12b47a 100644 --- a/alfred.h +++ b/alfred.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.c b/batadv_query.c index 387950a..ac29da1 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.h b/batadv_query.h index 5633322..4bf30c2 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/batadv_querynl.c b/batadv_querynl.c index c197d24..b58dac4 100644 --- a/batadv_querynl.c +++ b/batadv_querynl.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner mareklindner@neomailbox.ch, Andrew Lunn andrew@lunn.ch * diff --git a/batadv_querynl.h b/batadv_querynl.h index 90f6546..8d76ea9 100644 --- a/batadv_querynl.h +++ b/batadv_querynl.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner mareklindner@neomailbox.ch, Andrew Lunn andrew@lunn.ch * diff --git a/batman_adv.h b/batman_adv.h index efd641c..fb45338 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: ISC */ /* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: * * Matthias Schiffer diff --git a/bitops.h b/bitops.h index 37ce7e8..459fafc 100644 --- a/bitops.h +++ b/bitops.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* Minimal Linux-like bit manipulation helper functions * (reduced version for alfred) * diff --git a/client.c b/client.c index 27dbc4a..7c89f95 100644 --- a/client.c +++ b/client.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/debugfs.c b/debugfs.c index e90c3a8..1cea8ac 100644 --- a/debugfs.c +++ b/debugfs.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009 Clark Williams williams@redhat.com +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009 Clark Williams williams@redhat.com * Copyright (C) 2009 Xiao Guangrong xiaoguangrong@cn.fujitsu.com * * This program is free software; you can redistribute it and/or diff --git a/debugfs.h b/debugfs.h index 5404a45..6e49efa 100644 --- a/debugfs.h +++ b/debugfs.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009 Clark Williams williams@redhat.com +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2009 Clark Williams williams@redhat.com * Copyright (C) 2009 Xiao Guangrong xiaoguangrong@cn.fujitsu.com * * This program is free software; you can redistribute it and/or diff --git a/gpsd/Makefile b/gpsd/Makefile index dae2b48..e3c824b 100755 --- a/gpsd/Makefile +++ b/gpsd/Makefile @@ -1,4 +1,5 @@ #!/usr/bin/make -f +# SPDX-License-Identifier: GPL-2.0 # -*- makefile -*- # # Copyright (C) 2013-2017 B.A.T.M.A.N. contributors diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 7147136..b2eee9b 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 0a3a31f..ce765c2 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/hash.c b/hash.c index ebdcb47..3ba5a5a 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index 3111b49..4ec5c57 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/list.h b/list.h index 5d4c25a..f6c0cae 100644 --- a/list.h +++ b/list.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 1991-2013 linux kernel contributors +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 1991-2013 linux kernel contributors * * Linus Torvalds, ... * diff --git a/main.c b/main.c index be79fb9..59a24c9 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/netlink.c b/netlink.c index 7678f99..e050de3 100644 --- a/netlink.c +++ b/netlink.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner mareklindner@neomailbox.ch, Andrew Lunn andrew@lunn.ch * diff --git a/netlink.h b/netlink.h index 446948c..81a8f8d 100644 --- a/netlink.h +++ b/netlink.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner mareklindner@neomailbox.ch, Andrew Lunn andrew@lunn.ch * diff --git a/netsock.c b/netsock.c index ced8fbd..5de1bbb 100644 --- a/netsock.c +++ b/netsock.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/packet.h b/packet.h index a132326..a60c8ac 100644 --- a/packet.h +++ b/packet.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Sven Eckelmann * diff --git a/recv.c b/recv.c index 0f8004e..b93af7c 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/send.c b/send.c index 9c1e31b..f1be0ea 100644 --- a/send.c +++ b/send.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/server.c b/server.c index 199d38c..95e5f24 100644 --- a/server.c +++ b/server.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/unix_sock.c b/unix_sock.c index 7f5e99c..fd9465d 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/util.c b/util.c index 87261a0..bf82d1e 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/Makefile b/vis/Makefile index 63500c9..18b8070 100755 --- a/vis/Makefile +++ b/vis/Makefile @@ -1,4 +1,5 @@ #!/usr/bin/make -f +# SPDX-License-Identifier: GPL-2.0 # -*- makefile -*- # # Copyright (C) 2013-2017 B.A.T.M.A.N. contributors diff --git a/vis/vis.c b/vis/vis.c index 148c581..5371f05 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/vis.h b/vis/vis.h index b99e745..03028f0 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich *

-- 2.11.0

Sven Eckelmann

2:06 p.m.

New subject: [B.A.T.M.A.N.] [PATCH 5/6] alfred: Mark remaining files as GPL-2.0

Some files were not explicitly marked with any license. It is therefore assumed that these are licensed under the GPL-2.0. Make this unambiguous by adding this information direct to the file using the SPDX license identifier. The FSFE REUSE *.license annotation file is used for files which don't allow comments.

Signed-off-by: Sven Eckelmann sven@narfation.org --- Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Jonathan Haws jhaws@sdl.usu.edu Cc: Andrew Lunn andrew@lunn.ch Cc: Anatoliy Lapitskiy anatoliy.lapitskiy@gmail.com

Feel free to request a different license for these files. --- .gitattributes | 3 +++ CHANGELOG.license | 2 ++ README.license | 2 ++ gpsd/man/alfred-gpsd.8 | 2 ++ man/alfred.8 | 2 ++ vis/man/batadv-vis.8 | 2 ++ 6 files changed, 13 insertions(+) create mode 100644 CHANGELOG.license create mode 100644 README.license

diff --git a/.gitattributes b/.gitattributes index eeef3e0..3a9a74f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +# License-Filename: LICENSES/preferred/GPL-2.0 + /.gitignore export-ignore /.gitattributes export-ignore diff --git a/CHANGELOG.license b/CHANGELOG.license new file mode 100644 index 0000000..a55d70e --- /dev/null +++ b/CHANGELOG.license @@ -0,0 +1,2 @@ +SPDX-License-Identifier: GPL-2.0 +License-Filename: LICENSES/preferred/GPL-2.0 diff --git a/README.license b/README.license new file mode 100644 index 0000000..a55d70e --- /dev/null +++ b/README.license @@ -0,0 +1,2 @@ +SPDX-License-Identifier: GPL-2.0 +License-Filename: LICENSES/preferred/GPL-2.0 diff --git a/gpsd/man/alfred-gpsd.8 b/gpsd/man/alfred-gpsd.8 index 3799293..87879ee 100644 --- a/gpsd/man/alfred-gpsd.8 +++ b/gpsd/man/alfred-gpsd.8 @@ -1,3 +1,5 @@ +." SPDX-License-Identifier: GPL-2.0 +." License-Filename: LICENSES/preferred/GPL-2.0 ." Hey, EMACS: -*- nroff -*- ." First parameter, NAME, should be all caps ." Second parameter, SECTION, should be 1-8, maybe w/ subsection diff --git a/man/alfred.8 b/man/alfred.8 index a2c3d4c..7e31e12 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -1,3 +1,5 @@ +." SPDX-License-Identifier: GPL-2.0 +." License-Filename: LICENSES/preferred/GPL-2.0 ." Hey, EMACS: -*- nroff -*- ." First parameter, NAME, should be all caps ." Second parameter, SECTION, should be 1-8, maybe w/ subsection diff --git a/vis/man/batadv-vis.8 b/vis/man/batadv-vis.8 index 20dead7..94be0e9 100644 --- a/vis/man/batadv-vis.8 +++ b/vis/man/batadv-vis.8 @@ -1,3 +1,5 @@ +." SPDX-License-Identifier: GPL-2.0 +." License-Filename: LICENSES/preferred/GPL-2.0 ." Hey, EMACS: -*- nroff -*- ." First parameter, NAME, should be all caps ." Second parameter, SECTION, should be 1-8, maybe w/ subsection

-- 2.11.0

Sven Eckelmann

2:06 p.m.

New subject: [B.A.T.M.A.N.] [PATCH 6/6] alfred: Change batman_adv.h license to MIT

The ISC license is considered as not recommended in "Linux kernel licensing rules". It should only be used for existing code or for importing code from a different project with that license.

But the kernel still has the similar sounding MIT/Expat license under the preferred licenses. Switching to this license for this relatively new file should therefore allow batman-adv to better follow the new licensing rules.

Signed-off-by: Sven Eckelmann sven@narfation.org --- Only apply this change after the change was applied in batman-adv.

Please check

* https://www.gnu.org/licenses/license-list.html * https://en.wikipedia.org/w/index.php?title=ISC_license&oldid=791486092 * https://en.wikipedia.org/w/index.php?title=MIT_License&oldid=809249689

For more information about these licenses. --- batman_adv.h | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/batman_adv.h b/batman_adv.h index fb45338..ae00c99 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -1,19 +1,25 @@ -/* SPDX-License-Identifier: ISC */ +/* SPDX-License-Identifier: MIT */ /* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: * * Matthias Schiffer * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */

#ifndef _UAPI_LINUX_BATMAN_ADV_H_

-- 2.11.0

Sven Eckelmann

6 Dec 6 Dec

10:58 a.m.

New subject: [B.A.T.M.A.N.] [PATCH 6/6] alfred: Change batman_adv.h license to MIT

On Sonntag, 19. November 2017 15:06:02 CET Sven Eckelmann wrote:

...

The ISC license is considered as not recommended in "Linux kernel licensing rules". It should only be used for existing code or for importing code from a different project with that license.

But the kernel still has the similar sounding MIT/Expat license under the preferred licenses. Switching to this license for this relatively new file should therefore allow batman-adv to better follow the new licensing rules.

Signed-off-by: Sven Eckelmann sven@narfation.org

Only apply this change after the change was applied in batman-adv.

The batman-adv change was applied and it received following Acked-by's [1]

Acked-by: Antonio Quartulli a@unstable.cc Acked-by: Matthias Schiffer mschiffer@universe-factory.net Acked-by: Simon Wunderlich sw@simonwunderlich.de Acked-by: Andrew Lunn andrew@lunn.ch

Kind regards, Sven

[1] https://patchwork.open-mesh.org/patch/17116/

Sven Eckelmann

1 Dec 1 Dec

1:41 p.m.

New subject: [B.A.T.M.A.N.] [PATCH v2 5/6] alfred: Mark remaining files as GPL-2.0

Signed-off-by: Sven Eckelmann sven@narfation.org --- v2: - removed CHANGELOG.license and README.license --- .gitattributes | 3 +++ gpsd/man/alfred-gpsd.8 | 2 ++ man/alfred.8 | 2 ++ vis/man/batadv-vis.8 | 2 ++ 4 files changed, 9 insertions(+)

diff --git a/.gitattributes b/.gitattributes index eeef3e0..3a9a74f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +# License-Filename: LICENSES/preferred/GPL-2.0 + /.gitignore export-ignore /.gitattributes export-ignore diff --git a/gpsd/man/alfred-gpsd.8 b/gpsd/man/alfred-gpsd.8 index 3799293..87879ee 100644 --- a/gpsd/man/alfred-gpsd.8 +++ b/gpsd/man/alfred-gpsd.8 @@ -1,3 +1,5 @@ +." SPDX-License-Identifier: GPL-2.0 +." License-Filename: LICENSES/preferred/GPL-2.0 ." Hey, EMACS: -*- nroff -*- ." First parameter, NAME, should be all caps ." Second parameter, SECTION, should be 1-8, maybe w/ subsection diff --git a/man/alfred.8 b/man/alfred.8 index a2c3d4c..7e31e12 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -1,3 +1,5 @@ +." SPDX-License-Identifier: GPL-2.0 +." License-Filename: LICENSES/preferred/GPL-2.0 ." Hey, EMACS: -*- nroff -*- ." First parameter, NAME, should be all caps ." Second parameter, SECTION, should be 1-8, maybe w/ subsection diff --git a/vis/man/batadv-vis.8 b/vis/man/batadv-vis.8 index 20dead7..94be0e9 100644 --- a/vis/man/batadv-vis.8 +++ b/vis/man/batadv-vis.8 @@ -1,3 +1,5 @@ +." SPDX-License-Identifier: GPL-2.0 +." License-Filename: LICENSES/preferred/GPL-2.0 ." Hey, EMACS: -*- nroff -*- ." First parameter, NAME, should be all caps ." Second parameter, SECTION, should be 1-8, maybe w/ subsection

-- 2.11.0

Simon Wunderlich

8 Dec 8 Dec

1:22 p.m.

On Sunday, November 19, 2017 3:05:56 PM CET Sven Eckelmann wrote:

...

Hi,

the kernel community is currently trying to make the licensing status more clear in each file. This is mostly done by adding SPDX license identifiers and defining a set of rules how these license related information has to be stored.

I've used this opportunity to also go through all files of alfred (for example with FSFE's `reuse lint`) and to annotate the files according to the "Linux licensing rules" and FSFE's REUSE practices.

There are two things which could be seen as controversial:

change of batman_adv.h to the Linux preferred license (I am waiting for Acks in the batman-adv patchset)

explicitly mark remaining files as licensed under the GPL-2.0

I've picked this series.

Thank you!! Simon

2540

Age (days ago)

2559

Last active (days ago)

b.a.t.m.a.n@lists.open-mesh.org

9 comments

2 participants

tags (0)

participants (2)

Simon Wunderlich
Sven Eckelmann