Merge changes from CUPS 1.4svn-r7370.

[thirdparty/cups.git] / LICENSE.txt

diff --git a/LICENSE.txt b/LICENSE.txt
index b15a77b7786fba41c3077655f5f7fd9fa2f9c108..bff03673da5ad85a5a52394145c2d8c21e20afc9 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,12 +1,10 @@
                 Common UNIX Printing System License Agreement
 
-                Copyright 1997-2006 by Easy Software Products
-                        44141 AIRPORT VIEW DR STE 204
-                     HOLLYWOOD, MARYLAND 20636 USA
+                        Copyright 2007 by Apple Inc.
+                            1 Infinite Loop
+                         Cupertino, CA 95014 USA
 
-                           Voice: +1.301.373.9600
-                          Email: cups-info@cups.org
-                          WWW: http://www.cups.org
+                         WWW: http://www.cups.org/
 
 
 INTRODUCTION
@@ -49,8 +47,8 @@ application, driver, or filter.
 
 LICENSE EXCEPTIONS
 
-In addition, as the copyright holder of CUPS, Easy Software
-Products grants the following special exceptions:
+In addition, as the copyright holder of CUPS, Apple Inc. grants
+the following special exceptions:
 
      1. Apple Operating System Development License Exception;
 
@@ -93,49 +91,58 @@ Products grants the following special exceptions:
 
      2. OpenSSL Toolkit License Exception;
 
-       a. Easy Software Products explicitly allows the
-          compilation and distribution of the CUPS software
-          with the OpenSSL Toolkit.
+       a. Apple Inc. explicitly allows the compilation and
+          distribution of the CUPS software with the OpenSSL
+          Toolkit.
 
 No developer is required to provide these exceptions in a
 derived work.
 
 
-TRADEMARKS
+KERBEROS SUPPORT CODE
+
+The Kerberos support code ("KSC") is copyright 2006 by Jelmer
+Vernooij and is provided 'as-is', without any express or implied
+warranty.  In no event will the author or Apple Inc. be held
+liable for any damages arising from the use of the KSC.
 
-Easy Software Products has trademarked the Common UNIX Printing
-System, CUPS, and CUPS logo. You may use these names and logos
-in any direct port or binary distribution of CUPS. Please
-contact Easy Software Products for written permission to use
-them in derivative products. Our intention is to protect the
-value of these trademarks and ensure that any derivative product
-meets the same high-quality standards as the original.
+Sources files containing KSC have the following text at the top
+of each source file:
 
+     This file contains Kerberos support code, copyright 2006 by
+     Jelmer Vernooij.
 
-BINARY DISTRIBUTION RIGHTS
+The KSC copyright and license apply only to Kerberos-related
+feature code in CUPS.  Such code is typically conditionally
+compiled based on the present of the HAVE_GSSAPI preprocessor
+definition.
 
-Easy Software Products also sells rights to the CUPS source code
-under a binary distribution license for vendors that are unable
-to release source code for their additions and modifications to
-CUPS under the GNU GPL and LGPL. For information please contact
-us at the address shown above.
+Permission is granted to anyone to use the KSC for any purpose,
+including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
 
-The Common UNIX Printing System provides a "pdftops" filter that
-is based on the Xpdf software. For binary distribution licensing
-of this software, please contact:
+     1. The origin of the KSC must not be misrepresented; you
+       must not claim that you wrote the original software. If
+       you use the KSC in a product, an acknowledgment in the
+       product documentation would be appreciated but is not
+       required.
 
-     Derek B. Noonburg
-     Email: derekn@glyphandcog.com
-     WWW: http://www.glyphandcog.com/
+     2. Altered source versions must be plainly marked as such,
+       and must not be misrepresented as being the original
+       software.
 
+     3. This notice may not be removed or altered from any source
+       distribution. 
 
-SUPPORT
 
-Easy Software Products sells software support for CUPS as well
-as a commercial printing product based on CUPS called ESP Print
-Pro. You can find out more at our web site:
+TRADEMARKS
 
-     http://www.easysw.com/
+Apple Inc. has trademarked the Common UNIX Printing System, CUPS,
+and CUPS logo. You may use these names and logos in any direct port
+or binary distribution of CUPS. Please contact Apple Inc. for written
+permission to use them in derivative products. Our intention is to
+protect the value of these trademarks and ensure that any derivative
+product meets the same high-quality standards as the original.
 \f
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991