From 8048e5873f23e7f5d4ad4281cde917e8a9a59d68 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 14 Oct 2009 16:12:43 -0700 Subject: [PATCH] Move licensing information to a separate LICENSE file Rewrite the licensing information using the standard LICENSE file format that I now use with my other packages. Include licensing information for the Autotools files that are distributed with the package. --- LICENSE | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 8 ++-- README | 27 ----------- configure.ac | 8 ++-- 4 files changed, 142 insertions(+), 33 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2027e80 --- /dev/null +++ b/LICENSE @@ -0,0 +1,132 @@ +The krb5-strength package as a whole is: + + Copyright 2006, 2007, 2009 Board of Trustees, Leland Stanford Jr. + University. All rights reserved. + +and released under the following license: + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Stanford University not + be used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. Stanford + University makes no representations about the suitability of this + software for any purpose. It is provided "as is" without express or + implied warranty. + + THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +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 different licenses, +all of which are compatible with the above general package license. + +The version of CrackLib included here, and all modifications made to it as +part of this toolkit, is covered by the Artistic License. This applies to +all files in cracklib/*. For full license terms, see cracklib/LICENCE. + +Collected copyright notices for the entire package: + + Copyright 2006, 2007, 2009 + Board of Trustees, Leland Stanford Jr. University + Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. + Copyright 1994 X Consortium + +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 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 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/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) 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. + +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: + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, + 2003, 2004, 2005, 2006, 2007, 2008 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 krb5-strength distribution, the option described in the last +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/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. diff --git a/Makefile.am b/Makefile.am index 2293789..8cbb4db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,9 @@ -# Makefile.am -- Automake makefile for krb5-strength. +# Automake makefile for krb5-strength. # -# Copyright 2007 Board of Trustees, Leland Stanford Jr. University -# See README for licensing terms. +# Written by Russ Allbery +# Copyright 2007, 2009 Board of Trustees, Leland Stanford Jr. University +# +# See LICENSE for licensing terms. AUTOMAKE_OPTIONS = foreign subdir-objects EXTRA_DIST = autogen cracklib/HISTORY cracklib/LICENCE cracklib/README \ diff --git a/README b/README index 83ca53e..dded8be 100644 --- a/README +++ b/README @@ -136,30 +136,3 @@ CONFIGURATION flag, you will need to pass in the -clearpolicy flag as well to avoid rejecting the initial temporary password. You can then add a policy later with modprinc if desired. - -LICENSE - - The packaging, plugin glue, and build system are covered by the - following copyright and license: - - Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. - University. All rights reserved. - - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, - provided that the above copyright notice appear in all copies and that - both that copyright notice and this permission notice appear in - supporting documentation, and that the name of Stanford University not - be used in advertising or publicity pertaining to distribution of the - software without specific, written prior permission. Stanford - University makes no representations about the suitability of this - software for any purpose. It is provided "as is" without express or - implied warranty. - - THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - The version of CrackLib included here, and all modifications made to it - as part of this toolkit, is covered by the Artistic License. For full - license terms, see cracklib/LICENCE. diff --git a/configure.ac b/configure.ac index 0933528..dc5ce50 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,11 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University -dnl See README for licensing terms. +dnl Written by Russ Allbery +dnl Copyright 2006, 2007, 2009 +dnl Board of Trustees, Leland Stanford Jr. University +dnl +dnl See LICENSE for licensing terms. -AC_REVISION([$Revision$]) AC_PREREQ([2.60]) AC_INIT([krb5-strength], [0.5], [rra@stanford.edu]) AC_CONFIG_AUX_DIR([tools]) -- 2.39.2