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

List overview All Threads
Download

newer

older

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

[B.A.T.M.A.N.] [PATCH] batman-adv:...

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 batctl (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): batctl: Add GPL-2.0 as Linux's LICENSES/preferred/GPL-2.0 batctl: Add License-Filename to GPL-2.0 files batctl: Import Linux's LICENSES/preferred/MIT batctl: Add SPDX license identifier above copyright header batctl: Mark remaining files as GPL-2.0 batctl: 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] batctl: Add GPL-2.0 as Linux's LICENSES/preferred/GPL-2.0

The batctl 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 --- LICENSES/preferred/GPL-2.0 | 352 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 352 insertions(+) create mode 100644 LICENSES/preferred/GPL-2.0

diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0 new file mode 100644 index 0000000..3bb0d18 --- /dev/null +++ b/LICENSES/preferred/GPL-2.0 @@ -0,0 +1,352 @@ +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 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + 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 program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License.

-- 2.11.0

Sven Eckelmann

2:05 p.m.

New subject: [B.A.T.M.A.N.] [PATCH 2/6] batctl: 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.

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

diff --git a/Makefile b/Makefile index 6bebb7d..78bd200 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

# changing the CONFIG_* line to 'y' enables the related feature # batctl advanced debugging tool bisect: diff --git a/allocate.h b/allocate.h index 99db2c1..2cd6996 100644 --- a/allocate.h +++ b/allocate.h @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

diff --git a/bat-hosts.c b/bat-hosts.c index b530243..33e1dbd 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

diff --git a/bat-hosts.h b/bat-hosts.h index 8466554..474706c 100644 --- a/bat-hosts.h +++ b/bat-hosts.h @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

diff --git a/bisect_iv.c b/bisect_iv.c index 28c7b05..c5616ad 100644 --- a/bisect_iv.c +++ b/bisect_iv.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 <stdint.h> diff --git a/bisect_iv.h b/bisect_iv.h index f1fe4d8..558508f 100644 --- a/bisect_iv.h +++ b/bisect_iv.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 _BATCTL_BISECT_IV_H diff --git a/debug.c b/debug.c index 07a91c4..1fb9cd2 100644 --- a/debug.c +++ b/debug.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

diff --git a/debug.h b/debug.h index c23af52..b185bde 100644 --- a/debug.h +++ b/debug.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 _BATCTL_DEBUG_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/functions.c b/functions.c index 868e0ae..7d857e7 100644 --- a/functions.c +++ b/functions.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

diff --git a/functions.h b/functions.h index 16b3a0e..24289b3 100644 --- a/functions.h +++ b/functions.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 _BATCTL_FUNCTIONS_H diff --git a/genl.h b/genl.h index 606a933..f8a5a25 100644 --- a/genl.h +++ b/genl.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 _BATCTL_GENL_H diff --git a/hash.c b/hash.c index f4a7af7..2df9d26 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 */

diff --git a/hash.h b/hash.h index 6b44eef..676e0ae 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/icmp_helper.c b/icmp_helper.c index 0eea5c4..3eab78b 100644 --- a/icmp_helper.c +++ b/icmp_helper.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 "icmp_helper.h" diff --git a/icmp_helper.h b/icmp_helper.h index be4cb7d..6f9c3ab 100644 --- a/icmp_helper.h +++ b/icmp_helper.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 _BATCTL_ICMP_HELPER_H diff --git a/interface.c b/interface.c index 5a57be6..5cc036b 100644 --- a/interface.c +++ b/interface.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 "interface.h" diff --git a/interface.h b/interface.h index 9977515..5c5d1a1 100644 --- a/interface.h +++ b/interface.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 _BATCTL_INTERFACE_H diff --git a/ioctl.c b/ioctl.c index 5fc56b8..92635ad 100644 --- a/ioctl.c +++ b/ioctl.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

diff --git a/ioctl.h b/ioctl.h index 9a89afb..8b270ad 100644 --- a/ioctl.h +++ b/ioctl.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 _BATCTL_IOCTL_H diff --git a/main.c b/main.c index 02d89c4..cea9257 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 */

diff --git a/main.h b/main.h index 3a5bdd6..b24b4d7 100644 --- a/main.h +++ b/main.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 _BATCTL_MAIN_H diff --git a/netlink.c b/netlink.c index 7fb1ee1..24541f8 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 8355201..704ee1b 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 _BATCTL_NETLINK_H diff --git a/packet.h b/packet.h index 8e8a5db..f1fd031 100644 --- a/packet.h +++ b/packet.h @@ -13,6 +13,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, see http://www.gnu.org/licenses/. + * + * License-Filename: LICENSES/preferred/GPL-2.0 */

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

diff --git a/ping.h b/ping.h index fbe5632..4141bef 100644 --- a/ping.h +++ b/ping.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 _BATCTL_PING_H diff --git a/sys.c b/sys.c index 65b438c..90b0d58 100644 --- a/sys.c +++ b/sys.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

diff --git a/sys.h b/sys.h index 595f45d..9fd32d2 100644 --- a/sys.h +++ b/sys.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 _BATCTL_SYS_H diff --git a/tcpdump.c b/tcpdump.c index 4ede76b..e3041f2 100644 --- a/tcpdump.c +++ b/tcpdump.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 <stdio.h> diff --git a/tcpdump.h b/tcpdump.h index 15d35b4..a625734 100644 --- a/tcpdump.h +++ b/tcpdump.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 _BATCTL_TCPDUMP_H diff --git a/tp_meter.c b/tp_meter.c index a623a68..6c97ae5 100644 --- a/tp_meter.c +++ b/tp_meter.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 "main.h" diff --git a/tp_meter.h b/tp_meter.h index bf17ad1..b4100d8 100644 --- a/tp_meter.h +++ b/tp_meter.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 _BATCTL_TP_METER_H diff --git a/traceroute.c b/traceroute.c index 79d3800..db5304f 100644 --- a/traceroute.c +++ b/traceroute.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA * + * License-Filename: LICENSES/preferred/GPL-2.0 */

diff --git a/traceroute.h b/traceroute.h index 05e5d3f..d0b31a6 100644 --- a/traceroute.h +++ b/traceroute.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 _BATCTL_TRACEROUTE_H diff --git a/translate.c b/translate.c index 31da3a3..387049a 100644 --- a/translate.c +++ b/translate.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 <stdio.h> diff --git a/translate.h b/translate.h index 7ecb7b7..fe10b8a 100644 --- a/translate.h +++ b/translate.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 _BATCTL_TRANSLATE_H

-- 2.11.0

Sven Eckelmann

2:05 p.m.

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

The MIT license is used by batctl 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:05 p.m.

New subject: [B.A.T.M.A.N.] [PATCH 4/6] batctl: 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 batctl 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 78bd200..a77517f 100755 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ #!/usr/bin/make -f +# SPDX-License-Identifier: GPL-2.0 # -*- makefile -*- # # Copyright (C) 2006-2017 B.A.T.M.A.N. contributors diff --git a/allocate.h b/allocate.h index 2cd6996..faa8abd 100644 --- a/allocate.h +++ b/allocate.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 * diff --git a/bat-hosts.c b/bat-hosts.c index 33e1dbd..9432b22 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner mareklindner@neomailbox.ch * diff --git a/bat-hosts.h b/bat-hosts.h index 474706c..5b1c137 100644 --- a/bat-hosts.h +++ b/bat-hosts.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 * 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/bisect_iv.c b/bisect_iv.c index c5616ad..cf1d0ee 100644 --- a/bisect_iv.c +++ b/bisect_iv.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 * diff --git a/bisect_iv.h b/bisect_iv.h index 558508f..aec9f15 100644 --- a/bisect_iv.h +++ b/bisect_iv.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 * diff --git a/debug.c b/debug.c index 1fb9cd2..17c040e 100644 --- a/debug.c +++ b/debug.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 * diff --git a/debug.h b/debug.h index b185bde..959193a 100644 --- a/debug.h +++ b/debug.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 * 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/functions.c b/functions.c index 7d857e7..d3dbe8a 100644 --- a/functions.c +++ b/functions.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner mareklindner@neomailbox.ch * diff --git a/functions.h b/functions.h index 24289b3..c53aa7a 100644 --- a/functions.h +++ b/functions.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner mareklindner@neomailbox.ch * diff --git a/genl.c b/genl.c index 36fc27e..0a2bd92 100644 --- a/genl.c +++ b/genl.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: ISC /* * Copyright (c) 2007, 2008 Johannes Berg * Copyright (c) 2007 Andy Lutomirski diff --git a/genl.h b/genl.h index f8a5a25..ed22104 100644 --- a/genl.h +++ b/genl.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 * diff --git a/hash.c b/hash.c index 2df9d26..2134028 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 676e0ae..b6dfd95 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/icmp_helper.c b/icmp_helper.c index 3eab78b..3dcbeed 100644 --- a/icmp_helper.c +++ b/icmp_helper.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner mareklindner@neomailbox.ch, Simon Wunderlich * diff --git a/icmp_helper.h b/icmp_helper.h index 6f9c3ab..a6cf95e 100644 --- a/icmp_helper.h +++ b/icmp_helper.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner mareklindner@neomailbox.ch * diff --git a/interface.c b/interface.c index 5cc036b..4a944de 100644 --- a/interface.c +++ b/interface.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 * diff --git a/interface.h b/interface.h index 5c5d1a1..84cd7db 100644 --- a/interface.h +++ b/interface.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 * diff --git a/ioctl.c b/ioctl.c index 92635ad..2872e0c 100644 --- a/ioctl.c +++ b/ioctl.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: * * Marek Lindner mareklindner@neomailbox.ch * diff --git a/ioctl.h b/ioctl.h index 8b270ad..b18e7af 100644 --- a/ioctl.h +++ b/ioctl.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: * * Marek Lindner mareklindner@neomailbox.ch * diff --git a/list.h b/list.h index 23df29e..a2f3f8f 100644 --- a/list.h +++ b/list.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* Minimal Linux-like double-linked list helper functions * * Copyright (c) 2012-2017, Sven Eckelmann sven@narfation.org diff --git a/main.c b/main.c index cea9257..3ea201f 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner mareklindner@neomailbox.ch * diff --git a/main.h b/main.h index b24b4d7..a417c36 100644 --- a/main.h +++ b/main.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner mareklindner@neomailbox.ch * diff --git a/netlink.c b/netlink.c index 24541f8..fce93d7 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 704ee1b..14a4e3d 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/packet.h b/packet.h index f1fd031..d58288c 100644 --- a/packet.h +++ b/packet.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich diff --git a/ping.c b/ping.c index 8e7963d..5a3a16c 100644 --- a/ping.c +++ b/ping.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner mareklindner@neomailbox.ch * diff --git a/ping.h b/ping.h index 4141bef..3e3acda 100644 --- a/ping.h +++ b/ping.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 * diff --git a/sys.c b/sys.c index 90b0d58..9442553 100644 --- a/sys.c +++ b/sys.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 * diff --git a/sys.h b/sys.h index 9fd32d2..4b8a2e0 100644 --- a/sys.h +++ b/sys.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 * diff --git a/tcpdump.c b/tcpdump.c index e3041f2..a42d227 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de * diff --git a/tcpdump.h b/tcpdump.h index a625734..b8a19bf 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner mareklindner@neomailbox.ch * diff --git a/tp_meter.c b/tp_meter.c index 6c97ae5..12d80c0 100644 --- a/tp_meter.c +++ b/tp_meter.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: * * Antonio Quartulli a@unstable.cc * diff --git a/tp_meter.h b/tp_meter.h index b4100d8..bb08d63 100644 --- a/tp_meter.h +++ b/tp_meter.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: * * Antonio Quartulli a@unstable.cc * diff --git a/traceroute.c b/traceroute.c index db5304f..9ed1c82 100644 --- a/traceroute.c +++ b/traceroute.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner mareklindner@neomailbox.ch * diff --git a/traceroute.h b/traceroute.h index d0b31a6..b30e8c0 100644 --- a/traceroute.h +++ b/traceroute.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 * diff --git a/translate.c b/translate.c index 387049a..6e69caa 100644 --- a/translate.c +++ b/translate.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner mareklindner@neomailbox.ch * diff --git a/translate.h b/translate.h index fe10b8a..2ea1dbc 100644 --- a/translate.h +++ b/translate.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 *

-- 2.11.0

Sven Eckelmann

2:05 p.m.

New subject: [B.A.T.M.A.N.] [PATCH 5/6] batctl: 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: Martin Hundebøll martin@hundeboll.net Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Linus Lüssing linus.luessing@c0d3.blue Cc: Andrew Lunn andrew@lunn.ch Cc: Antonio Quartulli a@unstable.cc

Feel free to request a different license for these files. --- .gitattributes | 3 +++ CHANGELOG.license | 2 ++ README.license | 2 ++ bat-hosts.sample | 3 +++ man/batctl.8 | 2 ++ 5 files changed, 12 insertions(+) create mode 100644 CHANGELOG.license create mode 100644 README.license

diff --git a/.gitattributes b/.gitattributes index 1d2a7e9..402ecae 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +# License-Filename: LICENSES/preferred/GPL-2.0 + /.gitignore export-ignore /.gitattributes export-ignore *.c diff=cpp 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/bat-hosts.sample b/bat-hosts.sample index 6042b35..ba0d776 100644 --- a/bat-hosts.sample +++ b/bat-hosts.sample @@ -1 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +# License-Filename: LICENSES/preferred/GPL-2.0 + 0:d2:58:ca:91:e8 example diff --git a/man/batctl.8 b/man/batctl.8 index 9ee0e31..7cf66ca 100644 --- a/man/batctl.8 +++ b/man/batctl.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:05 p.m.

New subject: [B.A.T.M.A.N.] [PATCH 6/6] batctl: 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

1 Dec 1 Dec

1:40 p.m.

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

Signed-off-by: Sven Eckelmann sven@narfation.org --- v2: - Removed CHANGELOG.license README.license --- .gitattributes | 3 +++ bat-hosts.sample | 3 +++ man/batctl.8 | 2 ++ 3 files changed, 8 insertions(+)

-- 2.11.0

Sven Eckelmann

6 Dec 6 Dec

10:52 a.m.

On Sonntag, 19. November 2017 15:05:47 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 batctl (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

Applied in 007ece3..11b729f

Kind regards, Sven

2573

Age (days ago)

2590

Last active (days ago)

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

8 comments

1 participants

tags (0)

participants (1)

Sven Eckelmann