From 92cebfe6c81e513d24f7192328ee6b7c9d01a929 Mon Sep 17 00:00:00 2001 From: Apollon Oikonomopoulos Date: Sat, 25 Jan 2014 23:43:47 +0200 Subject: Update libpatricia license MRT was finally put on GitHub and its license changed to a 2-clause-BSD[1]. This license change was also propagated to Perl's Net::Patricia[2], from which rPatricia borrows. We import the new license from Net::Particia and place it (together with credits.txt) under ext/rpatricia. [1] https://github.com/deepfield/MRT/blob/master/COPYRIGHT [2] https://metacpan.org/source/GRUBER/Net-Patricia-1.22/libpatricia/copyright Signed-off-by: Apollon Oikonomopoulos Signed-off-by: Eric Wong --- credits.txt | 73 ----------------------------------------------- ext/rpatricia/copyright | 25 ++++++++++++++++ ext/rpatricia/credits.txt | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 73 deletions(-) delete mode 100644 credits.txt create mode 100644 ext/rpatricia/copyright create mode 100644 ext/rpatricia/credits.txt diff --git a/credits.txt b/credits.txt deleted file mode 100644 index cef1252..0000000 --- a/credits.txt +++ /dev/null @@ -1,73 +0,0 @@ - - [newtool.gif] - -MRT Credits - - The Multi-Threaded Routing Toolkit - _________________________________________________________________ - - MRT was developed by [1]Merit Network, Inc., under National Science - Foundation grant NCR-9318902, "Experimentation with Routing Technology - to be Used for Inter-Domain Routing in the Internet." - - Current MRT Staff - - * [2]Craig Labovitz - * [3]Makaki Hirabaru - * [4]Farnam Jahanian - * Susan Hares - * Susan R. Harris - * Nathan Binkert - * Gerald Winters - - Project Alumni - - * [5]Marc Unangst - * John Scudder - - The BGP4+ extension was originally written by Francis Dupont - . - - The public domain Struct C-library of linked list, hash table and - memory allocation routines was developed by Jonathan Dekock - . - - Susan Rebecca Harris provided help with the - documentation. - David Ward provided bug fixes and helpful - suggestions. - Some sections of code and architecture ideas were taken from the GateD - routing daemon. - - The first port to Linux with IPv6 was done by Pedro Roque - . Some interface routines to the Linux kernel were - originally written by him. - - Alexey Kuznetsov made enhancements to 1.4.3a and fixed the Linux - kernel intarface. Linux's netlink interface was written, referring to - his code "iproute2". - - We would also like to thank our other colleagues in Japan, Portugal, - the Netherlands, the UK, and the US for their many contributions to - the MRT development effort. - _________________________________________________________________ - - Cisco is a registered trademark of Cisco Systems Inc. - _________________________________________________________________ - - Merit Network 4251 Plymouth Road Suite C Ann Arbor, MI 48105-2785 - 734-764-9430 - info@merit.edu - _________________________________________________________________ - - © 1999 Merit Network, Inc. - [6]www@merit.edu - -References - - 1. http://www.merit.edu/ - 2. http://www.merit.edu/~labovit - 3. http://www.merit.edu/~masaki - 4. http://www.eecs.umich.edu/~farnam - 5. http://www.contrib.andrew.cmu.edu/~mju/ - 6. mailto:www@merit.edu diff --git a/ext/rpatricia/copyright b/ext/rpatricia/copyright new file mode 100644 index 0000000..231cf67 --- /dev/null +++ b/ext/rpatricia/copyright @@ -0,0 +1,25 @@ +$Id: COPYRIGHT,v 1.1.1.1 2013/08/15 18:46:09 labovit Exp $ + +Copyright (c) 1999-2013 + +The Regents of the University of Michigan ("The Regents") and Merit +Network, Inc. + +Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/ext/rpatricia/credits.txt b/ext/rpatricia/credits.txt new file mode 100644 index 0000000..cef1252 --- /dev/null +++ b/ext/rpatricia/credits.txt @@ -0,0 +1,73 @@ + + [newtool.gif] + +MRT Credits + + The Multi-Threaded Routing Toolkit + _________________________________________________________________ + + MRT was developed by [1]Merit Network, Inc., under National Science + Foundation grant NCR-9318902, "Experimentation with Routing Technology + to be Used for Inter-Domain Routing in the Internet." + + Current MRT Staff + + * [2]Craig Labovitz + * [3]Makaki Hirabaru + * [4]Farnam Jahanian + * Susan Hares + * Susan R. Harris + * Nathan Binkert + * Gerald Winters + + Project Alumni + + * [5]Marc Unangst + * John Scudder + + The BGP4+ extension was originally written by Francis Dupont + . + + The public domain Struct C-library of linked list, hash table and + memory allocation routines was developed by Jonathan Dekock + . + + Susan Rebecca Harris provided help with the + documentation. + David Ward provided bug fixes and helpful + suggestions. + Some sections of code and architecture ideas were taken from the GateD + routing daemon. + + The first port to Linux with IPv6 was done by Pedro Roque + . Some interface routines to the Linux kernel were + originally written by him. + + Alexey Kuznetsov made enhancements to 1.4.3a and fixed the Linux + kernel intarface. Linux's netlink interface was written, referring to + his code "iproute2". + + We would also like to thank our other colleagues in Japan, Portugal, + the Netherlands, the UK, and the US for their many contributions to + the MRT development effort. + _________________________________________________________________ + + Cisco is a registered trademark of Cisco Systems Inc. + _________________________________________________________________ + + Merit Network 4251 Plymouth Road Suite C Ann Arbor, MI 48105-2785 + 734-764-9430 + info@merit.edu + _________________________________________________________________ + + © 1999 Merit Network, Inc. + [6]www@merit.edu + +References + + 1. http://www.merit.edu/ + 2. http://www.merit.edu/~labovit + 3. http://www.merit.edu/~masaki + 4. http://www.eecs.umich.edu/~farnam + 5. http://www.contrib.andrew.cmu.edu/~mju/ + 6. mailto:www@merit.edu -- cgit v1.2.3-24-ge0c7