Release 3.1

diff --git a/LICENSE b/LICENSE
index b5a06ea672525b1e37d3d1c9486bfc9ff4d9719a..d724bd464fa245f94421f7d5ace3256e65c369c0 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -10,30 +10,33 @@ Copyright: 2006-2007, 2009-2014
 License: Expat
 
 Files: *
-Copyright: 2000-2002, 2004-2014 Russ Allbery <eagle@eyrie.org>
+Copyright: 1993 Alec Muffett
+  2000-2002, 2004-2016 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.
+Copyright: 1994-2014 Free Software Foundation, Inc.
   2007, 2009-2010, 2012-2014
     The Board of Trustees of the Leland Stanford Junior University
+  2016 Russ Allbery <eagle@eyrie.org>
 License: FSF-unlimited and Expat
 
 Files: aclocal.m4
-Copyright: 1996-2013 Free Software Foundation, Inc.
+Copyright: 1996-2016 Free Software Foundation, Inc.
   2004 Scott James Remnant <scott@netsplit.com>
+  2012-2015 Dan Nicholson <dbn.lists@gmail.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
-Copyright: 1996-2013 Free Software Foundation, Inc.
+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-2013 Free Software Foundation, Inc.
+Copyright: 1992-2016 Free Software Foundation, Inc.
 License: GPL-3+ with Autoconf exception or Expat
 
 Files: build-aux/install-sh
@@ -64,11 +67,11 @@ License: X11
  Consortium.
 
 Files: build-aux/ltmain.sh
-Copyright: 1996-2001, 2003-2011 Free Software Foundation, Inc.
-License: GPL-2+ with Libtool exception or Expat
+Copyright: 1996-2015 Free Software Foundation, Inc.
+License: GPL-2+ with Libtool exception or Expat, and GPL-3+ with Libtool exception or Expat, and GPL-3+
 
 Files: configure
-Copyright: 1992-2012 Free Software Foundation, Inc.
+Copyright: 1992-1996, 1998-2012, 2014 Free Software Foundation, Inc.
 License: FSF-configure, and GPL-2+ with Libtool exception or Expat
 
 Files: cracklib/*
@@ -81,30 +84,62 @@ 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/sqlite.m4
- m4/tinycdb.m4 m4/vamacros.m4
+Files: docs/krb5-strength.5.in docs/krb5-strength.pod tests/README
+ tools/heimdal-strength.1 tools/heimdal-strength.pod
+Copyright: 2006-2007, 2009-2010, 2012-2014
+    The Board of Trustees of the Leland Stanford Junior University
+  2010, 2016 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: m4/cc-flags.m4 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, 2009, 2016 Internet Systems Consortium, Inc.
+  2008-2010, 2012-2014
+    The Board of Trustees of the Leland Stanford Junior University
+  2015-2016 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.
+
+Files: m4/clang.m4 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/sqlite.m4 m4/tinycdb.m4 m4/vamacros.m4
 Copyright: 2005-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: m4/libtool.m4
-Copyright: 1996-2001, 2003-2011 Free Software Foundation, Inc.
+Copyright: 1996-2001, 2003-2015 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.
+Copyright: 2004-2005, 2007-2009, 2011-2015 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/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
+ portable/reallocarray.c portable/stdbool.h portable/strndup.c
+ portable/system.h tests/portable/asprintf-t.c tests/portable/mkstemp-t.c
+ tests/portable/reallocarray-t.c tests/portable/strndup-t.c util/macros.h
+Copyright: no copyright notice, see License below
 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
@@ -124,34 +159,6 @@ License: Powell-snprintf
  It may be used for any purpose as long as this notice remains intact
  on all source code distributions
 
-Files: tests/HOWTO tools/heimdal-strength.1 tools/heimdal-strength.pod
-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
- this notice are preserved.  This file is offered as-is, without any
- warranty.
-
-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
-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
@@ -228,6 +235,17 @@ 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+
+ 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 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.
+
 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
@@ -252,3 +270,22 @@ 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 Libtool exception
+ 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 3 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.
+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/NEWS b/NEWS
index 5b61a6f884afc27511eb22155624e909d25e68f4..27ec12c20fa5fb8e24da8303bc322e55591cbb54 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
                     User-Visible krb5-strength Changes
 
-krb5-strength 3.1 (unreleased)
+krb5-strength 3.1 (2016-12-25)
 
     A new configuration option, cracklib_maxlen, can be set to skip
     CrackLib checks of passwords longer than that length.  The CrackLib

diff --git a/README.md b/README.md
index 3a304d27f0745903ed99cb0c91ade48cd82551ed..67f2e686338239ef203cb32ebc27ffca38bae29b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -238,8 +238,8 @@ path:
 `--with-krb5-include` or `--with-krb5-lib` are given.
 
 Pass `--enable-silent-rules` to configure for a quieter build (similar to
-the Linux kernel).  Use make warnings instead of make to build with full
-GCC compiler warnings (requires a relatively current version of GCC).
+the Linux kernel).  Use `make warnings` instead of `make` to build with
+full GCC compiler warnings (requires a relatively current version of GCC).
 
 You can pass the `--enable-reduced-depends` flag to configure to try to
 minimize the shared library dependencies encoded in the binaries.  This
@@ -284,8 +284,8 @@ pointers to any additional resources.
 For bug tracking, use the [issue tracker on
 GitHub](https://github.com/rra/krb5-strength/issues).  However, please be
 aware that I tend to be extremely busy and work projects often take
-priority.  I'll save your mail and get to it as soon as I can, but it may
-take me a couple of months.
+priority.  I'll save your report and get to it as soon as I can, but it
+may take me a couple of months.
 
 ## Source Repository
 

diff --git a/configure.ac b/configure.ac
index 9e2aa18e30fbf448637ac9d22446c7090edd8447..e2e64916052002d9d25ccacb23982da0c5773ca6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl See LICENSE for licensing terms.
 
 dnl Basic Autoconf configuration.
 AC_PREREQ([2.64])
-AC_INIT([krb5-strength], [3.0], [eagle@eyrie.org])
+AC_INIT([krb5-strength], [3.1], [eagle@eyrie.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_LIBOBJ_DIR([portable])
 AC_CONFIG_MACRO_DIR([m4])