Update MirOS bsd4grml to 20120115

[grml-live-grml.git] / templates / boot / addons / bsd4grml / LICENCE.TXT

diff --git a/templates/boot/addons/bsd4grml/LICENCE.TXT b/templates/boot/addons/bsd4grml/LICENCE.TXT
index f751a94..b54fa7d 100644 (file)
--- a/templates/boot/addons/bsd4grml/LICENCE.TXT
+++ b/templates/boot/addons/bsd4grml/LICENCE.TXT
@@ -10,7 +10,7 @@ DESCRIPTION
 
 MIROS PROJECT
      MirOS is Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 
 MIROS PROJECT
      MirOS is Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

-     2011
+     2011, 2012

            The MirOS Project <miros-dev@mirbsd.org>
      and its contributors.
 
            The MirOS Project <miros-dev@mirbsd.org>
      and its contributors.
 


@@ -55,6 +55,37 @@ MirOS' origins
      CVS access control ought to be set). Please note that this copyright
      still applies to some work contained within the X11 and contrib modules.
 
      CVS access control ought to be set). Please note that this copyright
      still applies to some work contained within the X11 and contrib modules.
 

+MIDNIGHTBSD
+     Some code has been derived from the compilation of software known as Mid-
+     nightBSD (which is derived from the compilation of software known as
+     FreeBSD); in particular, code which would otherwise be only accessible to
+     USA citizens as Public Domain was relicenced that way. For these, the
+     following terms apply:
+
+     Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 The MidnightBSD
+     Project. All rights reserved.
+     Copyright (C) 1992-2006 The FreeBSD Project. All rights reserved.
+
+     Redistribution and use in source and binary forms, with or without modif-
+     ication, are permitted provided that the following conditions are met:
+     1.   Redistributions of source code must retain the above copyright no-
+          tice, 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.
+
+     THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS "AS IS" AND ANY EX-
+     PRESS 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 AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
+     DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAM-
+     AGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+     SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEV-
+     ER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LI-
+     ABILITY, 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.
+

 NON-BSD SOFTWARE
      MirOS aggregates third-party work, which is owned by their respective au-
      thors and covered by their respective licences (Sendmail, Apache, LGPL,
 NON-BSD SOFTWARE
      MirOS aggregates third-party work, which is owned by their respective au-
      thors and covered by their respective licences (Sendmail, Apache, LGPL,


@@ -69,8 +100,8 @@ UCB
      ing Software Release is copyrighted by The Regents of the University of
      California.
 
      ing Software Release is copyrighted by The Regents of the University of
      California.
 

-     Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 2003 The Regents of
-     the University of California.
+     Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994,
+     2003 The Regents of the University of California.

      All rights reserved.
 
      Redistribution and use in source and binary forms, with or without modif-
      All rights reserved.
 
      Redistribution and use in source and binary forms, with or without modif-


@@ -423,4 +454,4 @@ BUGS
      MirOS project at <miros-discuss@mirbsd.org> if you think you have
      discovered a bug.
 
      MirOS project at <miros-discuss@mirbsd.org> if you think you have
      discovered a bug.
 

-MirOS                          January 3, 2011                               6
+MirOS                          January 14, 2012                              6