Skip to content

Commit

Permalink
7102337: Third Party License Readme updates for 7u2
Browse files Browse the repository at this point in the history
Reviewed-by: lana, ohair
  • Loading branch information
jeff committed Oct 31, 2011
1 parent b21e275 commit ac0a952
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions THIRD_PARTY_README
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,16 @@ site-policy@w3.org.
is included with JRE 7, JDK 7, and OpenJDK 7.

You are receiving a copy of the Elliptic Curve Cryptography library in source
form with the JDK 7 source distribution and object code in the JRE 7 & JDK 7
runtime.
form with the JDK 7 and OpenJDK7 source distributions, and as object code in
the JRE 7 & JDK 7 runtimes.

In the case of the JRE 7 & JDK 7 runtimes, the terms of the Oracle license do
NOT apply to the Elliptic Curve Cryptography library; it is licensed under the
following license, separately from Oracle's JDK & JRE. If you do not wish to
install the Elliptic Curve Cryptography library, you may delete the library
named libsunec.so (on Solaris and Linux systems) or sunec.dll (on Windows
systems) from the JRE bin directory reserved for native libraries.

The terms of the Oracle license do NOT apply to the Elliptic Curve
Cryptography library program; it is licensed under the following license,
separately from the Oracle programs you receive. If you do not wish to install
this program, you may delete the library named libsunec.so (on Solaris and
Linux systems) or sunec.dll (on Windows systems) from the JRE bin directory
reserved for native libraries.

--- begin of LICENSE ---

Expand Down Expand Up @@ -1000,7 +1001,7 @@ included with JDK 7 and OpenJDK 7 source distributions.

-------------------------------------------------------------------------------

%% This notice is provided with respect to libpng 1.2.18, which is
%% This notice is provided with respect to libpng 1.5.4, which is
included with JRE 7, JDK 7, and OpenJDK 7.

--- begin of LICENSE ---
Expand All @@ -1014,8 +1015,10 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
this sentence.

libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are
Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
This code is released under the libpng license.

libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors

Expand Down Expand Up @@ -1112,7 +1115,7 @@ certification mark of the Open Source Initiative.

Glenn Randers-Pehrson
glennrp at users.sourceforge.net
May 15, 2007
July 7, 2011

--- end of LICENSE ---

Expand Down

0 comments on commit ac0a952

Please sign in to comment.