Fix patchlevel.h for krb5-1.10 branch

[krb5.git] / NOTICE

diff --git a/NOTICE b/NOTICE
index d455eaf65b35533042937a2cf27053401e61f015..40b851c8520dcfc1c603a175f3285cd380db036c 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Copyright (C) 1985-2010 by the Massachusetts Institute of Technology.
+Copyright (C) 1985-2011 by the Massachusetts Institute of Technology.
 
 All rights reserved.
 
@@ -1092,3 +1092,47 @@ license:
      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.
+
+                          -------------------
+
+The bundled libev source code is subject to the following license:
+
+     All files in libev are Copyright (C)2007,2008,2009 Marc Alexander
+     Lehmann.
+
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions
+     are met:
+
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+
+        * 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.
+
+     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
+     COPYRIGHT OWNER 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.
+
+     Alternatively, the contents of this package may be used under the
+     terms of the GNU General Public License ("GPL") version 2 or any
+     later version, in which case the provisions of the GPL are
+     applicable instead of the above. If you wish to allow the use of
+     your version of this package only under the terms of the GPL and
+     not to allow others to use your version of this file under the BSD
+     license, indicate your decision by deleting the provisions above
+     and replace them with the notice and other provisions required by
+     the GPL in this and the other files of this package. If you do not
+     delete the provisions above, a recipient may use your version of
+     this file under either the BSD or the GPL.