Clean up license notices and regenerate LICENSE

Use the Debian copyright-format 1.0 format for LICENSE.  Fix up the
files that had unparseable license notices or ones with typos, and
add license notices to a few files that didn't have them.

diff --git a/LICENSE b/LICENSE
index c880f45a7f27ff92a89214ced1895e91cb02f410..965c333334fd10541c08022e0ca3035975fe5eb2 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,215 +1,211 @@
-The kstart package as a whole is:
-
-  Copyright 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2004, 2005, 2006,
-      2007, 2008, 2009, 2010, 2011, 2012
-      The Board of Trustees of the Leland Stanford Junior University
-
-and released under the following license:
-
-  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.
-
-All individual files with no other license statement are released under
-this license.  Some files have additional copyright dates from earlier
-releases or may be owned by other copyright holders as noted in those
-files.  Some files are individually released under difference licenses,
-all of which are compatible with the above general package license.
-
-Collected copyright notices for the entire package:
-
-  Copyright 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2004, 2005, 2006,
-      2007, 2008, 2009, 2010, 2011, 2012
-      The Board of Trustees of the Leland Stanford Junior University
-  Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010
-      by Internet Systems Consortium, Inc. ("ISC")
-  Copyright 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-      2003 by The Internet Software Consortium and Rich Salz
-  Copyright 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011
-      Russ Allbery <eagle@eyrie.org>
-  Copyright 1995 Patrick Powell
-  Copyright 1996, 1997 Brandon Long <blong@fiction.net>
-  Copyright 1998 Thomas Roessler <roessler@guug.de>
-  Copyright 1998 Michael Elkins <me@cs.hmc.edu>
-  Copyright 1998 Andrew Tridgell <tridge@samba.org>
-  Copyright 2000, 2005 Hrvoje Niksic <hniksic@xemacs.org>
-  Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-      2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-      Free Software Foundation, Inc.
-  Copyright 1994 X Consortium
-
-The files kafs/sys-syscall.c, portable/asprintf.c, portable/daemon.c,
-portable/dummy.c, portable/krb5-extra.c, portable/krb5.h,
-portable/macros.h, portable/mkstemp.c, portable/setenv.c,
-portable/stdbool.h, portable/strlcat.c, portable/strlcpy.c,
-portable/strndup.c, portable/system.h, tests/portable/asprintf-t.c,
-tests/portable/daemon-t.c, tests/portable/mkstemp-t.c,
-tests/portable/setenv-t.c, tests/portable/strlcat-t.c,
-tests/portable/strlcpy-t.c, tests/portable/strndup-t.c,
-tests/util/concat-t.c, util/concat.c, util/concat.h, and util/macros.h 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
-(eagle@eyrie.org) so that I can continue to maintain a canonical version.
-
-The files configure.ac, m4/kafs.m4, m4/krb5.m4, m4/lib-depends.m4,
-m4/lib-pathname.m4,m4/snprintf.m4, and m4/vamacros.m4 are released under
-the following copyright and license:
-
-  Copyright 1999, 2000, 2001, 2003 Russ Allbery <eagle@eyrie.org>
-  Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011
-      The Board of Trustees of the Leland Stanford Junior University
-  Copyright 2007, 2008 Markus Moeller
-  Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-
-  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.
-
-The files util/messages.c, util/messages.h, util/xmalloc.c, and
-util/xmalloc.h are released under the following copyright and license:
-
-  Copyright 2008, 2009, 2010, 2011
-      The Board of Trustees of the Leland Stanford Junior University
-  Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-      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
-
-  This code is derived from software contributed to the Internet Software
-  Consortium by Rich Salz.
-  
-  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 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 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, 2010 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
-  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.
-
-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, 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.  All
-of these files are released under the following copyright and license:
-
-  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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
-  Free Software Foundation; either version 2, 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.
-
-  As a special exception to the GNU General Public License, if you
-  distribute this file as part of a program that contains a configuration
-  script generated by Autoconf, you may include it under the same
-  distribution terms that you use for the rest of that program.
-
-For the kstart distribution, the option described in the last paragraph
-has been accepted and these files are distributed under the same terms as
-the kstart package as a whole, as described at the top of this file.
-
-The file build-aux/install-sh is released under the following copyright
-and license:
-
-  Copyright (C) 1994 X Consortium
-
-  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 X CONSORTIUM 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.
-
-  Except as contained in this notice, the name of the X Consortium shall
-  not be used in advertising or otherwise to promote the sale, use or
-  other dealings in this Software without prior written authorization
-  from the X Consortium.
-
-  FSF changes to this file are in the public domain.
-
-The file tests/README is released under the following copyright and
-license:
-
-  Copyright 2010 Russ Allbery <eagle@eyrie.org>
-
-  Copying and distribution of this file, with or without modification, are
-  permitted in any medium without royalty provided the copyright notice
-  and this notice are preserved.  This file is offered as-is, without any
-  warranty.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Comment: This file documents the copyright statements and licenses for
+ every file in this package in a machine-readable format.  For a less
+ detailed, higher-level overview, see README.
+ .
+ For any copyright year range specified as YYYY-ZZZZ in this file, the
+ range specifies every single year in that closed interval.
+Copyright: 1995-1997, 1999-2014
+    The Board of Trustees of the Leland Stanford Junior University
+License: Expat
+
+Files: *
+Copyright: 1995-1997, 1999-2014
+    The Board of Trustees of the Leland Stanford Junior University
+  2000-2002, 2004-2015 Russ Allbery <eagle@eyrie.org>
+License: Expat
+
+Files: Makefile.in
+Copyright: 1994-2014 Free Software Foundation, Inc.
+  2000-2011 The Board of Trustees of the Leland Stanford Junior University
+  2015 Russ Allbery <eagle@eyrie.org>
+License: FSF-unlimited and Expat
+
+Files: aclocal.m4
+Copyright: 1996-2015 Free Software Foundation, Inc.
+License: FSF-unlimited
+
+Files: build-aux/ar-lib build-aux/compile build-aux/depcomp
+ build-aux/missing
+Copyright: 1996-2014 Free Software Foundation, Inc.
+License: GPL-2+ with Autoconf exception or Expat
+
+Files: build-aux/config.guess build-aux/config.sub
+Copyright: 1992-2015 Free Software Foundation, Inc.
+License: GPL-3+ with Autoconf exception or Expat
+
+Files: build-aux/install-sh
+Copyright: 1994 X Consortium
+License: X11
+ 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 X CONSORTIUM 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.
+ .
+ Except as contained in this notice, the name of the X Consortium shall
+ not be used in advertising or otherwise to promote the sale, use or other
+ dealings in this Software without prior written authorization from the X
+ Consortium.
+
+Files: configure
+Copyright: 1992-1996, 1998-2012 Free Software Foundation, Inc.
+License: FSF-configure
+ This script is free software; the Free Software Foundation gives unlimited
+ permission to copy, distribute and modify it.
+
+Files: configure.ac m4/clang.m4 m4/kafs.m4 m4/krb5-config.m4 m4/krb5.m4
+ m4/lib-depends.m4 m4/lib-pathname.m4 m4/snprintf.m4 m4/vamacros.m4
+Copyright: 2000-2014
+    The Board of Trustees of the Leland Stanford Junior University
+  2015 Russ Allbery <eagle@eyrie.org>
+License: unlimited
+ 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.
+
+Files: docs/k5start.1 docs/k5start.pod docs/krenew.1 docs/krenew.pod
+ tests/README
+Copyright: 2002, 2004-2012, 2014
+    The Board of Trustees of the Leland Stanford Junior University
+  2010, 2015 Russ Allbery <eagle@eyrie.org>
+License: all-permissive
+ Copying and distribution of this file, with or without modification, are
+ permitted in any medium without royalty provided the copyright notice and
+ this notice are preserved.  This file is offered as-is, without any
+ warranty.
+
+Files: kafs/sys-syscall.c portable/asprintf.c portable/daemon.c
+ portable/dummy.c portable/k_haspag.c portable/krb5-extra.c portable/krb5.h
+ portable/macros.h portable/mkstemp.c portable/reallocarray.c
+ portable/setenv.c portable/stdbool.h portable/system.h
+ tests/portable/asprintf-t.c tests/portable/daemon-t.c
+ tests/portable/mkstemp-t.c tests/portable/reallocarray-t.c
+ tests/portable/setenv-t.c util/macros.h
+Copyright: no copyright notice, see License
+License: rra-public-domain
+ 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.
+
+Files: portable/snprintf.c tests/portable/snprintf-t.c
+Copyright: 1995 Patrick Powell
+  2000-2006 Russ Allbery <eagle@eyrie.org>
+  2001 Hrvoje Niksic
+  2009-2010 The Board of Trustees of the Leland Stanford Junior University
+License: Powell-snprintf
+ 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
+
+Files: util/messages.c util/messages.h util/xmalloc.c util/xmalloc.h
+Copyright: 1991, 1994-2003 The Internet Software Consortium and Rich Salz
+  2004-2006 Internet Systems Consortium, Inc.
+  2008-2010, 2012-2014
+    The Board of Trustees of the Leland Stanford Junior University
+  2015 Russ Allbery <eagle@eyrie.org>
+License: ISC
+ 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.
+
+License: Expat
+ 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.
+
+License: FSF-unlimited
+ 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 even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+License: GPL-2+ with Autoconf exception
+ This file 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, see <http://www.gnu.org/licenses/>.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a configuration
+ script generated by Autoconf, you may include it under the same
+ distribution terms that you use for the rest of that program.
+Comment: The option described in the license has been accepted and these
+ files are distributed under the same terms as the package as a whole, as
+ described at the top of this file.
+
+License: GPL-3+ with Autoconf exception
+ This file 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 3 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, see <http://www.gnu.org/licenses/>.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a configuration
+ script generated by Autoconf, you may include it under the same
+ distribution terms that you use for the rest of that program.  This
+ Exception is an additional permission under section 7 of the GNU General
+ Public License, version 3 ("GPLv3").
+Comment: The option described in the license has been accepted and these
+ files are distributed under the same terms as the package as a whole, as
+ described at the top of this file.
+

diff --git a/README b/README
index 6979579e9dbc90cbedd8449c1095b56c6d08ab59..e2986919b812c326b6e194f8a0a3636bf42895e6 100644 (file)
--- a/README
+++ b/README
@@ -4,11 +4,11 @@
          Originally written by Robert Morgan and Booker C. Bense
           Currently maintained by Russ Allbery <eagle@eyrie.org>
 
-  Copyright 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012 The Board of Trustees of the Leland
-  Stanford Junior University.  This software is distributed under a
-  BSD-style license.  Please see the file LICENSE in the distribution for
-  more information.
+  Copyright 2015 Russ Allbery <eagle@eyrie.org>.  Copyright 1995, 1996,
+  1997, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+  2011, 2012, 2014 The Board of Trustees of the Leland Stanford Junior
+  University.  This software is distributed under a BSD-style license.
+  Please see the section LICENSE below for more information.
 
 BLURB
 
@@ -270,3 +270,42 @@ THANKS
   To Mike Horansky, for the idea of copying the current ticket cache when
   running krenew with a command, thereby saving the ticket cache from
   destruction when the user logs out.
+
+LICENSE
+
+  The kstart package as a whole covered by the following copyright
+  statement and license:
+
+    Copyright 2015 Russ Allbery <eagle@eyrie.org>
+    Copyright 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2004, 2005, 2006,
+        2007, 2008, 2009, 2010, 2011, 2012, 2014 The Board of Trustees of
+        the Leland Stanford Junior University
+
+    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.
+
+  All individual files without an explicit exception below are released
+  under this license.  Some files may have additional copyright holders as
+  noted in those files.  There is detailed information about the licensing
+  of each file in the LICENSE file in this distribution.
+
+  Some files in this distribution are individually released under
+  different licenses, all of which are compatible with the above general
+  package license but which may require preservation of additional
+  notices.  All required notices are preserved in the LICENSE file.

diff --git a/configure.ac b/configure.ac
index 9f7131088f03a22e0005b6868dba8e67c13bd57d..8c7372d43db5bc83b3915a2d1f9c5cec38bff274 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl Autoconf configuration for kstart.
 dnl
 dnl Written by Russ Allbery <eagle@eyrie.org>
 dnl Copyright 2015 Russ Allbery <eagle@eyrie.org>
-dnl Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-dnl     2011, 2014
+dnl Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+dnl     2010, 2011, 2014
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
 dnl This file is free software; the authors give unlimited permission to copy

diff --git a/docs/k5start.pod b/docs/k5start.pod
index e6ff9bd5d7ee62c9f51d918567e5252baf5d18bd..96887886da993d01bcb9452caea04f862a8f172b 100644 (file)
--- a/docs/k5start.pod
+++ b/docs/k5start.pod
@@ -445,13 +445,6 @@ If a command is specified and B<-k> was not given, B<k5start> will create
 a temporary ticket cache file of the form C</tmp/krb5cc_%d_%s> where %d is
 the UID B<k5start> is running as and %s is a random string.
 
-=head1 SEE ALSO
-
-kinit(1), krenew(1)
-
-The kstart web page at L<http://www.eyrie.org/~eagle/software/kstart/>
-will have the current version of B<k5start> and B<krenew>.
-
 =head1 AUTHORS
 
 B<k5start> was based on the k4start code written by Robert Morgan.  It was
@@ -461,4 +454,23 @@ maintenance are done by Russ Allbery <eagle@eyrie.org>.
 Implementations of B<-b> and B<-p> and the example for a Debian init
 script are based on code contributed by Navid Golpayegani.
 
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2015 Russ Allbery <eagle@eyrie.org>
+
+Copyright 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2014
+The Board of Trustees of the Leland Stanford Junior University
+
+Copying and distribution of this file, with or without modification, are
+permitted in any medium without royalty provided the copyright notice and
+this notice are preserved.  This file is offered as-is, without any
+warranty.
+
+=head1 SEE ALSO
+
+kinit(1), krenew(1)
+
+The kstart web page at L<http://www.eyrie.org/~eagle/software/kstart/>
+will have the current version of B<k5start> and B<krenew>.
+
 =cut

diff --git a/docs/krenew.pod b/docs/krenew.pod
index d711a0a110e9124c5d6c92461babc1d040a18ccc..4dd38da48bc569487e34f948738ca4016ddf6d96 100644 (file)
--- a/docs/krenew.pod
+++ b/docs/krenew.pod
@@ -316,6 +316,24 @@ libraries.  The default path for aklog is determined at build time, and
 will normally be whichever of B<aklog> or B<afslog> is found in the user's
 path.
 
+=head1 AUTHORS
+
+B<krenew> was written by Russ Allbery <eagle@eyrie.org>.  It was based
+heavily on B<k5start> by Booker C. Bense, which in turn was based on the
+k4start code written by Robert Morgan.
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2015 Russ Allbery <eagle@eyrie.org>
+
+Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2014 The Board of Trustees
+of the Leland Stanford Junior University
+
+Copying and distribution of this file, with or without modification, are
+permitted in any medium without royalty provided the copyright notice and
+this notice are preserved.  This file is offered as-is, without any
+warranty.
+
 =head1 SEE ALSO
 
 k5start(1), kinit(1)
@@ -323,10 +341,4 @@ k5start(1), kinit(1)
 The kstart web page at L<http://www.eyrie.org/~eagle/software/kstart/>
 will have the current version of B<krenew>.
 
-=head1 AUTHORS
-
-B<krenew> was written by Russ Allbery <eagle@eyrie.org>.  It was based
-heavily on B<k5start> by Booker C. Bense, which in turn was based on the
-k4start code written by Robert Morgan.
-
 =cut

diff --git a/kstart.spec b/kstart.spec
index e21f0f9798c059ec2bd2547e3d6bac5c150eb95d..d1d38e5dd2d4eee96ee4c546294c2ae8d8086e43 100644 (file)
--- a/kstart.spec
+++ b/kstart.spec
@@ -1,3 +1,12 @@
+# RPM spec file for kstart.
+#
+# Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2015 Russ Allbery <eagle@eyrie.org>
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+#     The Board of Trustees of the Leland Stanford Junior University
+#
+# See LICENSE for licensing terms.
+
 Name: kstart
 Summary: Kerberos kinit variants supporting ticket refreshing
 Version: 4.1

diff --git a/tests/data/command b/tests/data/command
index 6da3ab36c14a7e3e8e16bd1cfa4b38e4a99e8937..d2aeca56cc0af859f7be818d381c9c4b70201c7b 100755 (executable)
--- a/tests/data/command
+++ b/tests/data/command
@@ -5,6 +5,13 @@
 # that file, it puts its PID, its current working directory, and its ticket
 # cache.  When it gets a HUP or INT signal, it writes into that file.  When it
 # gets a TERM signal, it writes into that file and exits.
+#
+# Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2015 Russ Allbery <eagle@eyrie.org>
+# Copyright 2008, 2009, 2011, 2012
+#     The Board of Trustees of the Leland Stanford Junior University
+#
+# See LICENSE for licensing terms.
 
 use Cwd;
 

diff --git a/util/command.c b/util/command.c
index 1d93171b982eeb463a25f10b26dd0952d78e2f53..ea3af3b8f1ea38563052fd2420bc5f47f126fe29 100644 (file)
--- a/util/command.c
+++ b/util/command.c
@@ -6,7 +6,7 @@
  * Written by Russ Allbery <eagle@eyrie.org>
  * Copyright 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2004, 2005, 2007,
  *     2008, 2009
- *     The Board of Trustees of the Leland Stanford Junior. University
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
  * See LICENSE for licensing terms.
  */

diff --git a/util/command.h b/util/command.h
index a65bad4a1a7fd54af1ed46ae84793df11c06fe97..580db6e9c8f9d868f32698b98539204c82c0c4ad 100644 (file)
--- a/util/command.h
+++ b/util/command.h
@@ -4,7 +4,7 @@
  * Written by Russ Allbery <eagle@eyrie.org>
  * Copyright 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2004, 2005, 2007,
  *     2008, 2009, 2010
- *     THe Board of Trustees of the Leland Stanford Junior University
+ *     The Board of Trustees of the Leland Stanford Junior University
  *
  * See LICENSE for licensing terms.
  */