From 95d63b113219d1f6bed9fb8f0fff86c9b24db422 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sat, 16 Mar 2024 18:38:22 -0400 Subject: [PATCH] Move acknowledgments of included third-party software to README.md This allows licensee and similar tools (and thus GitHub) to properly recognize the GPL in COPYING.md Change-Id: Ifa9d46b87837b347a8fa00c54785543f30e39e4f --- COPYING.md | 72 ++++++++++++++++----------------------------------- README-dev.md | 2 +- README.md | 8 ++++++ 3 files changed, 31 insertions(+), 51 deletions(-) diff --git a/COPYING.md b/COPYING.md index d01ca336..496acdb2 100644 --- a/COPYING.md +++ b/COPYING.md @@ -1,32 +1,4 @@ -NFD is licensed under the terms of the GNU General Public License, -version 3 or later. - -NFD relies on third-party software, licensed under the following licenses: - -- ndn-cxx is licensed under the terms of the - [GNU Lesser General Public License version 3](https://github.com/named-data/ndn-cxx/blob/master/COPYING.md) - -- The Boost libraries are licensed under the - [Boost Software License 1.0](https://www.boost.org/users/license.html) - -- CityHash is licensed under the - [MIT license](https://github.com/google/cityhash/blob/master/COPYING) - -- Libpcap is licensed under the - [3-clause BSD license](https://github.com/the-tcpdump-group/libpcap/blob/master/LICENSE) - -- The WebSocket++ library is licensed under the terms of the - [BSD license](https://github.com/zaphoyd/websocketpp/blob/0.8.1/COPYING) - -- The waf build system is licensed under the terms of the - [BSD license](https://github.com/named-data/NFD/blob/master/waf) - -The GPL license is provided below in this file. For more information about -these licenses, see - --------------------------------------------------------------------------------- - -### GNU GENERAL PUBLIC LICENSE +# GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 @@ -36,7 +8,7 @@ Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -### Preamble +## Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. @@ -101,9 +73,9 @@ assures that patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. -### TERMS AND CONDITIONS +## TERMS AND CONDITIONS -#### 0. Definitions. +### 0. Definitions. "This License" refers to version 3 of the GNU General Public License. @@ -143,7 +115,7 @@ work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. -#### 1. Source Code. +### 1. Source Code. The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of @@ -184,7 +156,7 @@ regenerate automatically from other parts of the Corresponding Source. The Corresponding Source for a work in source code form is that same work. -#### 2. Basic Permissions. +### 2. Basic Permissions. All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated @@ -209,7 +181,7 @@ Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. -#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. +### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article @@ -225,7 +197,7 @@ operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. -#### 4. Conveying Verbatim Copies. +### 4. Conveying Verbatim Copies. You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and @@ -238,7 +210,7 @@ recipients a copy of this License along with the Program. You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. -#### 5. Conveying Modified Source Versions. +### 5. Conveying Modified Source Versions. You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the @@ -273,7 +245,7 @@ beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. -#### 6. Conveying Non-Source Forms. +### 6. Conveying Non-Source Forms. You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable @@ -369,7 +341,7 @@ documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. -#### 7. Additional Terms. +### 7. Additional Terms. "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. @@ -428,7 +400,7 @@ Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. -#### 8. Termination. +### 8. Termination. You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or @@ -456,7 +428,7 @@ this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. -#### 9. Acceptance Not Required for Having Copies. +### 9. Acceptance Not Required for Having Copies. You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work @@ -467,7 +439,7 @@ modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. -#### 10. Automatic Licensing of Downstream Recipients. +### 10. Automatic Licensing of Downstream Recipients. Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and @@ -492,7 +464,7 @@ rights granted under this License, and you may not initiate litigation any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. -#### 11. Patents. +### 11. Patents. A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The @@ -561,7 +533,7 @@ Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. -#### 12. No Surrender of Others' Freedom. +### 12. No Surrender of Others' Freedom. If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not @@ -574,7 +546,7 @@ from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. -#### 13. Use with the GNU Affero General Public License. +### 13. Use with the GNU Affero General Public License. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed @@ -585,7 +557,7 @@ but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. -#### 14. Revised Versions of this License. +### 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions @@ -611,7 +583,7 @@ permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. -#### 15. Disclaimer of Warranty. +### 15. Disclaimer of Warranty. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT @@ -623,7 +595,7 @@ PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -#### 16. Limitation of Liability. +### 16. Limitation of Liability. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR @@ -635,7 +607,7 @@ 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. -#### 17. Interpretation of Sections 15 and 16. +### 17. Interpretation of Sections 15 and 16. If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, @@ -646,7 +618,7 @@ copy of the Program in return for a fee. END OF TERMS AND CONDITIONS -### How to Apply These Terms to Your New Programs +## 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 diff --git a/README-dev.md b/README-dev.md index 66109bc8..56b2e40c 100644 --- a/README-dev.md +++ b/README-dev.md @@ -45,7 +45,7 @@ have a configuration file. See `ndn-log(7)` manual page for syntax and examples ## Unit tests -To run unit tests, NFD needs to be configured and build with unit test support: +To run the unit tests, NFD needs to be configured and built with unit test support: ```shell ./waf configure --with-tests # --debug is also strongly recommended while developing diff --git a/README.md b/README.md index bcdcbe59..28707da0 100644 --- a/README.md +++ b/README.md @@ -59,3 +59,11 @@ and [`README-dev.md`](README-dev.md) to get started. NFD is free software distributed under the GNU General Public License version 3. See [`COPYING.md`](COPYING.md) for details. + +NFD contains third-party software, licensed under the following licenses: + +* *CityHash* is licensed under the + [MIT license](https://github.com/google/cityhash/blob/master/COPYING) +* The *WebSocket++* library is licensed under the + [3-clause BSD license](https://github.com/zaphoyd/websocketpp/blob/0.8.1/COPYING) +* The *waf* build system is licensed under the [3-clause BSD license](waf)