From f9ffc142ecba391d23d26d8bc1aa925d5499f594 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 11 May 2012 14:37:02 -0700 Subject: [PATCH] Update LICENSE statements Use the correct form of the Stanford University copyright. --- LICENSE | 160 ++++++++++++++++++------------------ README | 8 +- external/heimdal-strength.c | 3 +- m4/cracklib.m4 | 3 +- plugin/api.h | 3 +- plugin/heimdal.c | 3 +- plugin/mit.c | 3 +- tests/heimdal/plugin.c | 3 +- tests/mit/plugin-t | 3 +- tests/mit/plugin.c | 3 +- 10 files changed, 98 insertions(+), 94 deletions(-) diff --git a/LICENSE b/LICENSE index bbc9976..32b1f6e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ The krb5-strength package as a whole is: - Copyright 2006, 2007, 2009, 2010 Board of Trustees, Leland Stanford Jr. - University. All rights reserved. + Copyright 2006, 2007, 2009, 2010, 2012 The Board of Trustees of the + Leland Stanford Junior University. All rights reserved. and released under the following license: @@ -32,10 +32,10 @@ all files in cracklib/*. For full license terms, see cracklib/LICENCE. Collected copyright notices for the entire package: - Copyright 2000, 2001, 2004, 2006, 2007, 2008, 2009 + Copyright 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010 Russ Allbery - Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Board of Trustees, Leland Stanford Jr. University + Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, + 2012 The Board of Trustees of the Leland Stanford Junior University Copyright 1993 Alec Muffett Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 by Internet Systems Consortium, Inc. ("ISC") @@ -48,83 +48,53 @@ Collected copyright notices for the entire package: Copyright 1998 Andrew Tridgell Copyright 2000, 2005 Hrvoje Niksic Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Copyright 1994 X Consortium The files portable/asprintf.c, portable/dummy.c, portable/macros.h, -portable/stdbool.h, portable/strlcat.c, portable/strlcpy.c, and -portable/system.h have been placed in the public domain by their author. -You may do anything you like with that code, although I would strongly -prefer that any improvements or modifications be sent to me +portable/stdbool.h, portable/strlcat.c, portable/strlcpy.c, +portable/system.h, tests/portable/asprintf-t.c, +tests/portable/strlcat-t.c, and tests/portable/strlcpy-t.c are covered by +the following statement: + + The authors hereby relinquish any claim to any copyright that they may + have in this work, whether granted under contract or by operation of + law or international treaty, and hereby commit to the public, at + large, that they shall not, at any time in the future, seek to enforce + any copyright in this work against any person or entity, or prevent + any person or entity from copying, publishing, distributing or + creating derivative works of this work. + +In other words, you can do anything you wish with this code, although I +would strongly prefer that any improvements or modifications be sent to me (rra@stanford.edu) so that I can continue to maintain a canonical version. -The files tests/portable/snprintf.c, tests/portable/strlcat.c, -tests/portable/strlcpy.c, tests/tap/basic.c, and tests/tap/basic.h are +The files m4/lib-depends.m4, m4/lib-pathname.m4, and m4/snprintf.m4 are released under the following copyright and license: - Copyright 2009 Russ Allbery - Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Board of Trustees, Leland Stanford Jr. University - Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 - by Internet Systems Consortium, Inc. ("ISC") - Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003 by The Internet Software Consortium and Rich Salz + Copyright 2005, 2006, 2007, 2008, 2009, 2010 + The Board of Trustees of the Leland Stanford Junior University - This code is derived from software contributed to the Internet Software - Consortium by Rich Salz. + This file is free software; the authors give unlimited permission to + copy and/or distribute it, with or without modifications, as long as + this notice is preserved. - Permission to use, copy, modify, and 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. - - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC 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 file portable/snprintf.c is released under the following license: +The files portable/snprintf.c and tests/portable/snprintf-t.c are released +under the following license: This code is based on code written by Patrick Powell (papowell@astart.com) It may be used for any purpose as long as this notice remains intact on all source code distributions -The file tests/runtests.c is released under the following copyright and -license: - - Copyright 2000, 2001, 2004, 2006, 2007, 2008, 2009 - Russ Allbery - - 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. - The files Makefile.in and aclocal.m4 are generated by GNU Automake and released under the following copyright and license: Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - This file is free software; the Free Software Foundation - gives unlimited permission to copy and/or distribute it, - with or without modifications, as long as this notice is preserved. + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software + Foundation, Inc. This file is free software; the Free Software + Foundation gives unlimited permission to copy and/or distribute it, with + or without modifications, as long as this notice is preserved. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, to the extent permitted by law; without @@ -135,30 +105,19 @@ The file configure is generated by GNU Autoconf and is released under the following copyright and license: Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, - Inc. This configure script is free software; the Free Software - Foundation gives unlimited permission to copy, distribute and modify it. - -The files m4/libtool.m4, m4/ltoptions.m4, m4/ltsugar.m4, m4/ltversion.m4, -and m4/lt~obsolete.m4 are from GNU Libtool and are released under the -following copyright and license: - - Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, - 2007, 2008 Free Software Foundation, Inc. - - This file is free software; the Free Software Foundation gives unlimited - permission to copy and/or distribute it, with or without modifications, - as long as this notice is preserved. + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software + Foundation, Inc. This configure script is free software; the Free + Software Foundation gives unlimited permission to copy, distribute and + modify it. The files build-aux/compile, build-aux/depcomp, and build-aux/missing are taken from GNU Automake. The files build-aux/config.guess and -build-aux/config.sub are taken from the Debian autotools-dev package. The -file build-aux/ltmain.sh is taken from GNU Libtool. All of these files -are released under the following copyright and license: +build-aux/config.sub are taken from the Debian autotools-dev package. All +of these files are released under the following copyright and license: Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software - Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. 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 @@ -180,6 +139,43 @@ paragraph has been accepted and these files are distributed under the same terms as the krb5-strength package as a whole, as described at the top of this file. +The file build-aux/ltmain.sh is taken from GNU Libtool and is released +under the following copyright and license: + + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, + 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + + GNU Libtool 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. + + As a special exception to the GNU General Public License, if you + distribute this file as part of a program or library that is built using + GNU Libtool, you may include this file under the same distribution terms + that you use for the rest of that program. + + GNU Libtool 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. + +For the krb5-strength distribution, the option described in the +second-to-last paragraph has been accepted, and this file is distributed +under the same terms as the remctl package as a whole, as described at the +top of this file. + +The files m4/libtool.m4, m4/ltoptions.m4, m4/ltsugar.m4, m4/ltversion.m4, +and m4/lt~obsolete.m4 are from GNU Libtool and are released under the +following copyright and license: + + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, + 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + + This file is free software; the Free Software Foundation gives unlimited + permission to copy and/or distribute it, with or without modifications, + as long as this notice is preserved. + The file build-aux/install-sh is released under the following copyright and license: diff --git a/README b/README index 824d73b..703ce22 100644 --- a/README +++ b/README @@ -3,10 +3,10 @@ Maintained by Russ Allbery - Copyright 2006, 2007, 2009, 2010 Board of Trustees, Leland Stanford - Jr. University. Portions copyright 1993 Alec Muffett. Developed by - Derrick Brashear and Ken Hornstein of Sine Nomine Associates, on behalf - of Stanford University. + Copyright 2006, 2007, 2009, 2010, 2012 The Board of Trustees of the + Leland Stanford Junior University. Portions copyright 1993 Alec + Muffett. Developed by Derrick Brashear and Ken Hornstein of Sine Nomine + Associates, on behalf of Stanford University. This software is distributed under a BSD-style license and under the Artistic License. Please see the section LICENSE for more information. diff --git a/external/heimdal-strength.c b/external/heimdal-strength.c index 83be9b0..613a9b4 100644 --- a/external/heimdal-strength.c +++ b/external/heimdal-strength.c @@ -7,7 +7,8 @@ * dictionary. * * Written by Russ Allbery - * Copyright 2009 Board of Trustees, Leland Stanford Jr. University + * Copyright 2009 + * The Board of Trustees of the Leland Stanford Junior University * * See LICENSE for licensing terms. */ diff --git a/m4/cracklib.m4 b/m4/cracklib.m4 index 840d3a8..4c40121 100644 --- a/m4/cracklib.m4 +++ b/m4/cracklib.m4 @@ -18,7 +18,8 @@ dnl dnl Depends on RRA_SET_LDFLAGS. dnl dnl Written by Russ Allbery -dnl Copyright 2010 Board of Trustees, Leland Stanford Jr. University +dnl Copyright 2010 +dnl The Board of Trustees of the Leland Stanford Junior University dnl dnl See LICENSE for licensing terms. diff --git a/plugin/api.h b/plugin/api.h index 2dd5911..a687384 100644 --- a/plugin/api.h +++ b/plugin/api.h @@ -4,7 +4,8 @@ * Developed by Derrick Brashear and Ken Hornstein of Sine Nomine Associates, * on behalf of Stanford University. * Extensive modifications by Russ Allbery - * Copyright 2006, 2007, 2009 Board of Trustees, Leland Stanford Jr. Unversity + * Copyright 2006, 2007, 2009, 2012 + * The Board of Trustees of the Leland Stanford Junior Unversity * * See LICENSE for licensing terms. */ diff --git a/plugin/heimdal.c b/plugin/heimdal.c index 403084c..fab2b9f 100644 --- a/plugin/heimdal.c +++ b/plugin/heimdal.c @@ -12,7 +12,8 @@ * instead. * * Written by Russ Allbery - * Copyright 2009 Board of Trustees, Leland Stanford Jr. Unversity + * Copyright 2009 + * The Board of Trustees of the Leland Stanford Junior Unversity * * See LICENSE for licensing terms. */ diff --git a/plugin/mit.c b/plugin/mit.c index bc67177..5dec76f 100644 --- a/plugin/mit.c +++ b/plugin/mit.c @@ -7,7 +7,8 @@ * information from kadmind to the plugin. * * Written by Russ Allbery - * Copyright 2010 Board of Trustees, Leland Stanford Jr. Unversity + * Copyright 2010 + * The Board of Trustees of the Leland Stanford Junior Unversity * * See LICENSE for licensing terms. */ diff --git a/tests/heimdal/plugin.c b/tests/heimdal/plugin.c index 88fdfd5..4bf9268 100644 --- a/tests/heimdal/plugin.c +++ b/tests/heimdal/plugin.c @@ -2,7 +2,8 @@ * Test for the Heimdal shared module API. * * Written by Russ Allbery - * Copyright 2009 Board of Trustees, Leland Stanford Jr. University + * Copyright 2009 + * The Board of Trustees of the Leland Stanford Junior University * * See LICENSE for licensing terms. */ diff --git a/tests/mit/plugin-t b/tests/mit/plugin-t index b1223a3..201b5c7 100755 --- a/tests/mit/plugin-t +++ b/tests/mit/plugin-t @@ -3,7 +3,8 @@ # Test suite wrapper for the MIT Kerberos shared module API. # # Written by Russ Allbery -# Copyright 2009, 2010 Board of Trustees, Leland Stanford Jr. University +# Copyright 2009, 2010 +# The Board of Trustees of the Leland Stanford Junior University # # See LICENSE for licensing terms. diff --git a/tests/mit/plugin.c b/tests/mit/plugin.c index 587b03f..ea7585e 100644 --- a/tests/mit/plugin.c +++ b/tests/mit/plugin.c @@ -2,7 +2,8 @@ * Test for the MIT Kerberos shared module API. * * Written by Russ Allbery - * Copyright 2010 Board of Trustees, Leland Stanford Jr. University + * Copyright 2010 + * The Board of Trustees of the Leland Stanford Junior University * * See LICENSE for licensing terms. */ -- 2.39.2