Make the COPYRIGHT file match reality again.

1 files changed, 26 insertions, 17 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 2aa5013..4da30a5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
 The btpd software is distributed under the following terms:
 
-Copyright (c) 2005-2007
+Copyright (c) 2005-2009
         Richard Nyberg <rnyberg@murmeldjur.se>. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -24,23 +24,32 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-Additionally, some software included in btpd is covered by one or more of
-the following copyrights and extra conditions:
+Additionally, the part of the btpd code contained in misc/queue.h is
+covered by the following license:
 
-Copyright (c) 2000-2004, 2006 Niels Provos <provos@citi.umich.edu>
-Copyright (c) 2003 Michael A. Davis <mike@datanerds.net>
-Copyright (c) 2006 Sun Microsystems. All rights reserved.
-Copyright (c) 2006 Mathew Mills <mathewmills@mac.com>
-Copyright (c) 2005 Nick Mathewson <nickm@freehaven.net>
-Copyright (c) 2000 Dug Song <dugsong@monkey.org>
-All rights reserved.
+Copyright (c) 1991, 1993
+The Regents of the University of California.  All rights reserved.
 
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-Copyright (c) 1982, 1986, 1991, 1993
-        The Regents of the University of California. All rights reserved.
-
-3. Neither the name of the University nor the names of its contributors
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+4. Neither the name of the University nor the names of its contributors
    may be used to endorse or promote products derived from this software
    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.