Merge branch 'debian' into squeeze

[kerberos/krb5-strength.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index c5b972389ce8796ba15a2d2b29f25a6b01d4e5bb..b5a06ea672525b1e37d3d1c9486bfc9ff4d9719a 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -5,27 +5,27 @@ Comment: This file documents the copyright statements and licenses for
  .
  For any copyright year range specified as YYYY-ZZZZ in this file, the
  range specifies every single year in that closed interval.
-Copyright: 2006-2007, 2009-2013
+Copyright: 2006-2007, 2009-2014
     The Board of Trustees of the Leland Stanford Junior University
 License: Expat
 
 Files: *
-Copyright: 2000-2002, 2004-2012 Russ Allbery <rra@stanford.edu>
-  2001-2002, 2004-2013
+Copyright: 2000-2002, 2004-2014 Russ Allbery <eagle@eyrie.org>
+  2001-2002, 2004-2014
     The Board of Trustees of the Leland Stanford Junior University
   2010 the Massachusetts Institute of Technology
 License: Expat
 
 Files: Makefile.in
 Copyright: 1994-2013 Free Software Foundation, Inc.
-  2007, 2009-2010, 2012-2013
+  2007, 2009-2010, 2012-2014
     The Board of Trustees of the Leland Stanford Junior University
 License: FSF-unlimited and Expat
 
-Files: aclocal.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
- m4/lt~obsolete.m4
+Files: aclocal.m4
 Copyright: 1996-2013 Free Software Foundation, Inc.
-License: FSF-unlimited
+  2004 Scott James Remnant <scott@netsplit.com>
+License: FSF-unlimited, and GPL-2+ with Autoconf exception or Expat
 
 Files: build-aux/ar-lib build-aux/compile build-aux/depcomp
  build-aux/missing
@@ -82,9 +82,9 @@ License: Artistic
  See cracklib/LICENCE for the full licensing terms.
 
 Files: m4/cracklib.m4 m4/krb5-config.m4 m4/krb5.m4 m4/lib-depends.m4
- m4/lib-helper.m4 m4/lib-pathname.m4 m4/snprintf.m4 m4/tinycdb.m4
- m4/vamacros.m4
-Copyright: 2005-2013
+ m4/lib-helper.m4 m4/lib-pathname.m4 m4/snprintf.m4 m4/sqlite.m4
+ m4/tinycdb.m4 m4/vamacros.m4
+Copyright: 2005-2014
     The Board of Trustees of the Leland Stanford Junior University
 License: unlimited
  This file is free software; the authors give unlimited permission to copy
@@ -95,9 +95,15 @@ Files: m4/libtool.m4
 Copyright: 1996-2001, 2003-2011 Free Software Foundation, Inc.
 License: FSF-unlimited, and GPL-2+ with Libtool exception or Expat
 
+Files: m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4
+Copyright: 2004-2005, 2007-2009 Free Software Foundation, Inc.
+License: FSF-unlimited
+
 Files: portable/asprintf.c portable/dummy.c portable/kadmin.h
- portable/krb5-extra.c portable/krb5.h portable/macros.h portable/stdbool.h
- portable/system.h tests/portable/asprintf-t.c util/macros.h
+ portable/krb5-extra.c portable/krb5.h portable/macros.h portable/mkstemp.c
+ portable/stdbool.h portable/strndup.c portable/system.h
+ tests/portable/asprintf-t.c tests/portable/mkstemp-t.c
+ tests/portable/strndup-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
@@ -110,7 +116,7 @@ License: rra-public-domain
 
 Files: portable/snprintf.c tests/portable/snprintf-t.c
 Copyright: 1995 Patrick Powell
-  2000-2006 Russ Allbery <rra@stanford.edu>
+  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
@@ -119,8 +125,9 @@ License: Powell-snprintf
  on all source code distributions
 
 Files: tests/HOWTO tools/heimdal-strength.1 tools/heimdal-strength.pod
-Copyright: 2010 Russ Allbery <rra@stanford.edu>
-  2010, 2013 The Board of Trustees of the Leland Stanford Junior University
+Copyright: 2010 Russ Allbery <eagle@eyrie.org>
+  2010, 2013-2014
+    The Board of Trustees of the Leland Stanford Junior University
 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
@@ -130,7 +137,7 @@ License: all-permissive
 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-2013
+  2008-2010, 2012-2014
     The Board of Trustees of the Leland Stanford Junior University
 License: ISC
  Permission to use, copy, modify, and distribute this software for any