From owner-p4-projects@FreeBSD.ORG Mon Aug 25 21:35:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9AD51065692; Mon, 25 Aug 2008 21:35:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83E6E1065744 for ; Mon, 25 Aug 2008 21:35:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 635918FC1E for ; Mon, 25 Aug 2008 21:35:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7PLZU2X011956 for ; Mon, 25 Aug 2008 21:35:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7PLZTxw011948 for perforce@freebsd.org; Mon, 25 Aug 2008 21:35:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Aug 2008 21:35:29 GMT Message-Id: <200808252135.m7PLZTxw011948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 148457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2008 21:35:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=148457 Change 148457 by rwatson@rwatson_fledge on 2008/08/25 21:34:53 Update legal page to make it a bit more clear, and include the BSD license inline. Affected files ... .. //depot/projects/trustedbsd/www/legal.page#5 edit Differences ... ==== //depot/projects/trustedbsd/www/legal.page#5 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/legal.page#4 $ + $P4: //depot/projects/trustedbsd/www/legal.page#5 $ @@ -45,23 +45,56 @@ Legal Information -

TrustedBSD extensions are intended for use with the FreeBSD - operating system, a liberally licensed free operating system based - on the Berkeley UNIX variant, BSD. The extensions are released under - a two-clause BSD license, copyright held - by the authors of the component in question. This license permits - both commercial and non-commercial use of the code, providing that - the copyright is observed and documented, and that the authors may - not be held liable for damages associated with use of the code.

+

The TrustedBSD extensions are intended for use with the open source + FreeBSD operating systems, as well as related open and closed source + operating systems such as Mac OS X, NetBSD, OpenBSD, and Linux. + Almost all TrustedBSD code is under a two-clause Berkeley or + substantially similar open source license:

+ +
    +Copyright (c) [year] [name]
    +All rights reserved.
    +
    +This software was developed by the TrustedBSD Project.
    +
    +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.
    +
    +THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
    +
+ +

This license is intended to encourage commercial, research, and + personal use of this software without limitation, providing that + the copyright notice is observed and documented, and that authors + and contributors are not held liable for any damages that may result + from use of the code. With the exception of a small amount of GPL + code associated with SEBSD, all TrustedBSD + code may be incorporated into close source products without fee. + Please make sure to observe all licenses included with distributed + source code.

-

Generally speaking, this places few (if any) restrictions on any - real-world use, and legally consumers of the code are under no - obligation to provide compensation to the authors. However, machinery - is in place to accept donations to the TrustedBSD project to allow - further development, if anyone is interested. If you are interested - in this opportunity, please email trustedbsd-finances@TrustedBSD.org - for more information.

+

Organizations and individuals who extend TrustedBSD are encouraged + to contribute bug reports, bug fixes, functional enhancements, and + documentation to the project under similar licenses. While not + obligatory, financial contributions via the FreeBSD Foundation are + most welcome, and support developer travel, test hardware, etc.

The copyright on the BSD Daemon is held by Kirk McKusick; the copyright for the TrustedBSD Daemon, Trusty, is held by Leigh