changeset 6484:59b7fec40e0d HEAD

There's no Cyrus code anymore. Show BSD license in COPYING.
author Timo Sirainen <tss@iki.fi>
date Sun, 23 Sep 2007 00:23:31 +0300
parents 6d15946eccb5
children 2eff72b212fe
files AUTHORS COPYING
diffstat 2 files changed, 31 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Sun Sep 23 00:18:47 2007 +0300
+++ b/AUTHORS	Sun Sep 23 00:23:31 2007 +0300
@@ -10,10 +10,6 @@
 
 Jelmer Vernooij <jelmer@samba.org> (src/auth/mech-gssapi.c)
 
-This product includes software developed by Computing Services
-at Carnegie Mellon University (http://www.cmu.edu/computing/).
-(src/lib/base64.c, src/lib/utc-mktime.c)
-
 Vaclav Haisman <v.haisman@sh.cvut.cz> (src/lib/ioloop-kqueue.c,
   src/lib/ioloop-notify-kqueue.c)
 
--- a/COPYING	Sun Sep 23 00:18:47 2007 +0300
+++ b/COPYING	Sun Sep 23 00:23:31 2007 +0300
@@ -12,4 +12,34 @@
 src/lib/
   - md5.c : Public Domain
   - sha1.c, sha2.c : BSD
-  - base64.c, utc-mktime.c : BSD-like (read it)
+
+sha1.c / sha2.c BSD license:
+
+ Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ Copyright (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
+
+ All rights reserved.
+
+ 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.
+ 3. Neither the name of the project 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 PROJECT 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 PROJECT 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.