First attempt to fix plugin excludes

[bacula/bacula] / bacula / LICENSE

diff --git a/bacula/LICENSE b/bacula/LICENSE
index 12d4c662a943d3eca6615832b8484790d2a4728c..f8ffd5b0a4bf3c9d6591e4bce07dbae7c03872f6 100644 (file)
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -1,3 +1,4 @@
+
 History:
 The original Bacula code was Copyright Kern Sibbald and John Walker.
 After November 2004, it became Copyright Kern Sibbald, and finally,
@@ -5,12 +6,12 @@ the copyright was transferred to the Free Software Foundation Europe
 on 15 November 2006.
 
 Trademark:
-The name Bacula is a registered trademark.
+The name Bacula is a registered trademark of Kern Sibbald.
 
 ===================================
 
 License:
-For the most part, Bacula is licensed under the GPL version 2 this
+For the most part, Bacula is licensed under the GPL version 2. This
 code is listed under Copyright Free Software Foundation Europe e.V.
 What follows is the addition(s) to the GPL version 2 license, that
 applies to code that is copyrighted by the Free Software Foundation
@@ -45,29 +46,29 @@ the Bacula Project at: license@bacula.org
 What follows is information from the authors of the code:
 
 License:
-To the best of our knowledge, all code used in Bacula that is 
-copyrighted by a third party has licenses that are compatible
-with the OpenSSL license, and so with the exception that we have 
+To the best of our knowledge, all code used in Bacula, which is 
+copyrighted by a third party, has licenses that are compatible
+with the OpenSSL license, and so given the exception that we have 
 made to the GPLv2 above, Bacula can be freely linked and distributed
 with the OpenSSL libraries.
 
 Intellectual Property rights:
-Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe
-the patent or other intellectual property rights of any other
-entity.  Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise.  As a condition to
-exercising the rights and licenses granted hereunder, each
-Recipient hereby assumes sole responsibility to secure any other
-intellectual property rights needed, if any.  For example, if a
-third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to
-acquire that license before distributing the Program.
+Recipient understands that although each Contributor to Bacula grants
+the licenses to its Contributions set forth herein, no assurances are
+provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity.
+Each Contributor disclaims any liability to Recipient for claims
+brought by any other entity based on infringement of intellectual
+property rights or otherwise.  As a condition to exercising the rights
+and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights
+needed, if any.  For example, if a third party patent license is
+required to allow Recipient to distribute the Program, it is
+Recipient's responsibility to acquire that license before distributing
+the Program.
 
 Copyrights:
-Each Contributor represents that to its knowledge it has
+Each Contributor to Bacula represents that to its knowledge it has
 sufficient copyright rights in its Contribution, if any, to grant
 the copyright license set forth in this Agreement.
 
@@ -75,7 +76,7 @@ Code falling under the above conditions will be marked as follows:
 
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -94,7 +95,7 @@ Code falling under the above conditions will be marked as follows:
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -122,9 +123,10 @@ copyrighted code.
 GPLv2 or later license:
  src/tools/bsmtp.c
     Copyright (C) 1997 Ralf S. Engelschall, All Rights Reserved.
-  (note, bsmtp.c does not use OpenSSL)
+  (note, bsmtp.c does not use OpenSSL, nor is it used with the code
+   of any other part of Bacula)
 
-BSD License notice for inclusion with the binary:
+3 clause BSD License notice for inclusion with the binary:              
  src/lib/fnmatch.c
    * Copyright (c) 1989, 1993, 1994
    *      The Regents of the University of California.  All rights reserved.
@@ -163,7 +165,7 @@ that contains cryptographic software written by Eric Young
 (tjh@cryptsoft.com).
 
 There are parts of Bacula that are licensed under the LGPL so
-that they may be used in proprietary code to interface with
+that those files may be used in proprietary code to interface with
 Bacula.
 
 Finally there are parts of Bacula that are in the public domain.