X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2FLICENSE;h=56a74ef734afe7c39d188660b36b9a67c62dfa0d;hb=0e17f32019eb391f04b1dd7cbad8206863caf053;hp=14fedbc9e82251951e6daa679680336d5a0586b2;hpb=13b70b45ab81f042379739d6390f8150f0fea470;p=bacula%2Fbacula

diff --git a/bacula/LICENSE b/bacula/LICENSE
index 14fedbc9e8..56a74ef734 100644
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -4,15 +4,17 @@ The name Bacula is a registered trademark.
 ===================================
 
 License:
-For the most part, Bacula is licensed under the GPL version 2 or greater         
-and any code that is Copyright Kern Sibbald and John Walker with the GPL
-indication is so licensed, but with the following four additions:
+For the most part, Bacula is licensed under the GPL version 2         
+and any code that is Copyright Kern Sibbald and John Walker or
+Copyright Kern Sibbald (after November 2004) with the GPL
+indication is so licensed, but with the following five additions:
 
 Linking: 
-Bacula may be linked with any libraries permitted under
-the GPL, or with any non-GPLed libraries, including OpenSSL, that
-are required for its proper functioning, providing the source
-code of those non-GPLed libraries is non-proprietary and freely available.
+Bacula may be linked with any libraries permitted under the GPL,
+or with any non-GPLed libraries, including OpenSSL, that are
+required for its proper functioning, providing the source code of
+those non-GPLed libraries is non-proprietary and freely
+available to the public.
 
 Termination for IP or Patent Action: 
 In addition to the termination clause specified in the GPL, this
@@ -49,12 +51,12 @@ the copyright license set forth in this Agreement.
 
 Code falling under the above conditions will be marked as follows:
 
-   Copyright (C) 2000-2005 Kern Sibbald
+   Copyright (C) 2000-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
    published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -66,15 +68,33 @@ Code falling under the above conditions will be marked as follows:
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
    MA 02111-1307, USA.
 
+Windows:
+Certain source code used to build the Windows version of the Bacula
+File daemon is copyrighted and or trademarked by Microsoft and may
+contain Microsoft intellectual property (examples: Microsoft VC++, the
+source to the VSS libraries, the Microsoft C runtime libraries).  As
+such we cannot and do not distribute that software. The compiler is
+available for purchase, and Microsoft provides a free version of the
+compiler. The source code and libraries are available for download from
+Microsoft public Web servers.  We have documented in the src/win32
+directory how we build the Windows File daemon and many users have
+succeeded in doing so themselves.  Our intention is to respect as
+closely as possible Open Source practices while maintaining full
+respect for proprietary and copyrighted code.
+
 =====================================
 
-The entire GPL is reproduced in the html manual distributed with this 
-source and can also be found online on the GNU web site as well
+The entire GPL is reproduced in the manuals distributed with the
+Bacula documentation and can also be found online on the GNU web site as well
 as at www.bacula.org.
 
-In addition to the GPL, there are parts of Bacula that are licensed
-under the LGPL so that they may be used in proprietary code to interface
-with Bacula. 
+Certain parts of the Bacula software are licensed by their
+copyright holder(s) undert the GPL with no modifications.  These
+software files are clearly marked as such.
+
+There are parts of Bacula that are licensed under the LGPL so
+that they may be used in proprietary code to interface with
+Bacula.
 
 Finally there are parts of Bacula that are in the public domain.