X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FLICENSE;h=7b65ee5474086b1dd71397fabbdfcc5479917619;hb=1dc71b592aabf1dc0b4ecaf17c65fcf21d45f544;hp=029ef03d390b4f493dec6021780fdbab2fa8f1a5;hpb=cb55ec8aa42630175e8839dd40161bd2efc2a44a;p=bacula%2Fbacula

diff --git a/bacula/LICENSE b/bacula/LICENSE
index 029ef03d39..7b65ee5474 100644
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -16,19 +16,6 @@ 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
-license shall terminate automatically and you may no longer
-exercise any of the rights granted to you by this license as of
-the date you commence an action, including a cross-claim or
-counterclaim, against any licensor of GPL software alleging that
-the software infringes an intellectual property right or a
-patent.  Special dispensation from or delay to the execution of
-this clause may be possible by applying directly to the license
-owner of this software.  Such a dispensation or delay is valid
-only in writing and signed by the one or more of the license
-holders.
-
 IP rights:
 Recipient understands that although each Contributor grants the
 licenses to its Contributions set forth herein, no assurances are
@@ -51,31 +38,48 @@ 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.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
+
+
+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. We are permitted
+however to distribute Bacula in binary form with the necessary Microsoft
+libraries linked in.
+
+You may obtain the parts that we cannot distribute as follows.  The
+Microsoft compiler 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 the URLs from which we obtained the library source, and
+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 manuals distributed with the
-Bacula documentation and can also be found online on the GNU web site as well
-as at www.bacula.org.
+Bacula documentation and can also be found online on the GNU web site
+as well as at www.bacula.org. You may also obtain a copy of the
+GPL (or LGPL) by writing to: Free Software Foundation, Inc., 
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 Certain parts of the Bacula software are licensed by their
-copyright holder(s) undert the GPL with no modifications.  These
+copyright holder(s) under 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