Revise licenses for OpenSSL exception requested by Debian folks...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@2375 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/LICENSE.html b/LICENSE.html
index 246c67092cc6cbe6176a5a64432ae4f03c61fe15..a9d9ff79309d2b490438b2e6eded9170ef594cb1 100644 (file)
--- a/LICENSE.html
+++ b/LICENSE.html
@@ -30,9 +30,8 @@ of the exceptions and licenses follow this introduction.
 binary distributions.
 
 <P>The GNU GPL applies to the remainder of the CUPS
-distribution, including the "pstoraster" filter which is based
-upon GNU Ghostscript 5.50 and the "pdftops" filter which is
-based upon Xpdf 0.93a.
+distribution, including the "pdftops" filter which is based upon
+Xpdf 0.93a.
 
 <P>For those not familiar with the GNU GPL, the license basically
 allows you to:
@@ -102,6 +101,19 @@ the following text at the top of each source file:
 <BLOCKQUOTE>This file is subject to the Apple OS-Developed
 Software exception.</BLOCKQUOTE>
 
+<H3>OpenSSL Toolkit License Exception</H3>
+
+<P>In addition, as the copyright holder of CUPS, Easy Software Products
+grants the following special exception:
+
+<BLOCKQUOTE>Easy Software Products explicitly allows the compilation and
+distribution of the CUPS software with the OpenSSL Toolkit. The
+requirement for disclosure of the use of OpenSSL in CUPS-derived
+software is not deemed by Easy Software Products to constitute a
+violation of the distribution terms of the GNU GPL, since the GNU GPL
+specifically requires acknowledgement of the original copyright holder
+in derived works.</BLOCKQUOTE>
+
 <H3>Trademarks</H3>
 
 <P>Easy Software Products has trademarked the Common UNIX Printing
@@ -120,24 +132,9 @@ release source code for their drivers, additions, and modifications to
 CUPS under the GNU GPL and LGPL. For information please contact us at
 the address shown above.
 
-<P>The Common UNIX Printing System provides a "pstoraster" filter that
-utilizes the GNU GhostScript 5.50 core to convert PostScript files into
-a stream of raster images. For binary distribution licensing of this
-software, please contact:
-
-<BLOCKQUOTE>
-Miles Jones<BR>
-Director of Marketing<BR>
-Artifex Software Inc.<BR>
-454 Las Gallinas Ave., Suite 108<BR>
-San Rafael, CA 94903 USA<BR>
-Voice: +1.415.492.9861<BR>
-Fax: +1.415.492.9862<BR>
-EMail: <A HREF="mailto:info@arsoft.com">info@arsoft.com</A>
-</BLOCKQUOTE>
-
-<P>The "pdftops" filter is based on the Xpdf 0.93a software. For binary
-distribution licensing of this software, please contact:
+<P>The Common UNIX Printing System provides a "pdftops" filter
+is based on the Xpdf 0.93a software. For binary distribution
+licensing of this software, please contact:
 
 <BLOCKQUOTE>
 Derek B. Noonburg<BR>

diff --git a/LICENSE.txt b/LICENSE.txt
index fcf5ce03b003a5a3092c7d52388fb832d0ba8092..a819cbf84a1692f395c6ddbd16bbbda5400b86bb 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -11,7 +11,7 @@
 
 INTRODUCTION
 
-The Common UNIX Printing System^TM , ("CUPS^TM "), is provided under
+The Common UNIX Printing System^TM, ("CUPS^TM"), is provided under
 the GNU General Public License ("GPL") and GNU Library General Public
 License ("LGPL"), Version 2, with exceptions for Apple operating
 systems. A copy of the exceptions and licenses follow this
@@ -87,6 +87,20 @@ following text at the top of each source file:
     This file is subject to the Apple OS-Developed Software exception.
 
 
+OPENSSL TOOLKIT LICENSE EXCEPTION
+
+In addition, as the copyright holder of CUPS, Easy Software Products
+grants the following special exception:
+
+    Easy Software Products explicitly allows the compilation and
+    distribution of the CUPS software with the OpenSSL Toolkit. The
+    requirement for disclosure of the use of OpenSSL in CUPS-derived
+    software is not deemed by Easy Software Products to constitute a
+    violation of the distribution terms of the GNU GPL, since the GNU GPL
+    specifically requires acknowledgement of the original copyright holder
+    in derived works.
+
+
 TRADEMARKS
 
 Easy Software Products has trademarked the Common UNIX Printing System,
@@ -104,22 +118,9 @@ binary distribution license for vendors that are unable to release source
 code for their drivers, additions, and modifications to CUPS under the GNU
 GPL and LGPL. For information please contact us at the address shown above.
 
-The Common UNIX Printing System provides a "pstoraster" filter that utilizes
-the GNU GhostScript 5.50 core to convert PostScript files into a stream of
-raster images. For binary distribution licensing of this software, please
-contact:
-
-     Miles Jones
-     Director of Marketing
-     Artifex Software Inc.
-     454 Las Gallinas Ave., Suite 108
-     San Rafael, CA 94903 USA
-     Voice: +1.415.492.9861
-     Fax: +1.415.492.9862
-     EMail: info@arsoft.com
-
-The "pdftops" filter is based on the Xpdf 0.93a software. For binary
-distribution licensing of this software, please contact:
+The Common UNIX Printing System provides a  "pdftops" filter is based on
+the Xpdf 0.93a software. For binary distribution licensing of this
+software, please contact:
 
      Derek B. Noonburg
      Email: derekn@foolabs.com