8210431: Complete backport of libpng 1.6.35 TPRM jdk8u191-b10

Fri, 07 Sep 2018 10:18:54 +0100

author
dmarkov
date
Fri, 07 Sep 2018 10:18:54 +0100
changeset 2302
7d04f40e401d
parent 2300
36b52695c798
child 2303
34976d70945f
child 2308
58ce5d3a1323

8210431: Complete backport of libpng 1.6.35 TPRM
Reviewed-by: jeff, prr

THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/THIRD_PARTY_README	Wed Sep 05 00:23:19 2018 -0700
     1.2 +++ b/THIRD_PARTY_README	Fri Sep 07 10:18:54 2018 +0100
     1.3 @@ -1497,7 +1497,7 @@
     1.4  
     1.5  -------------------------------------------------------------------------------
     1.6  
     1.7 -%% This notice is provided with respect to libpng 1.6.16, which may be 
     1.8 +%% This notice is provided with respect to libpng 1.6.35, which may be
     1.9  included with JRE 8, JDK 8, and OpenJDK 8.
    1.10  
    1.11  --- begin of LICENSE ---
    1.12 @@ -1513,21 +1513,21 @@
    1.13  
    1.14  This code is released under the libpng license.
    1.15  
    1.16 -libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
    1.17 -Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
    1.18 -distributed according to the same disclaimer and license as libpng-1.2.5
    1.19 -with the following individual added to the list of Contributing Authors
    1.20 -
    1.21 -   Cosmin Truta
    1.22 -
    1.23 -libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
    1.24 -Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
    1.25 -distributed according to the same disclaimer and license as libpng-1.0.6
    1.26 -with the following individuals added to the list of Contributing Authors
    1.27 +libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
    1.28 +Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
    1.29 +derived from libpng-1.0.6, and are distributed according to the same
    1.30 +disclaimer and license as libpng-1.0.6 with the following individuals
    1.31 +added to the list of Contributing Authors:
    1.32  
    1.33     Simon-Pierre Cadieux
    1.34     Eric S. Raymond
    1.35 +   Mans Rullgard
    1.36 +   Cosmin Truta
    1.37     Gilles Vollant
    1.38 +   James Yu
    1.39 +   Mandar Sahastrabuddhe
    1.40 +   Google Inc.
    1.41 +   Vadim Barkov
    1.42  
    1.43  and with the following additions to the disclaimer:
    1.44  
    1.45 @@ -1538,19 +1538,25 @@
    1.46     risk of satisfactory quality, performance, accuracy, and effort is with
    1.47     the user.
    1.48  
    1.49 +Some files in the "contrib" directory and some configure-generated
    1.50 +files that are distributed with libpng have other copyright owners and
    1.51 +are released under other open source licenses.
    1.52 +
    1.53  libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
    1.54 -Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
    1.55 -distributed according to the same disclaimer and license as libpng-0.96,
    1.56 -with the following individuals added to the list of Contributing Authors:
    1.57 +Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
    1.58 +libpng-0.96, and are distributed according to the same disclaimer and
    1.59 +license as libpng-0.96, with the following individuals added to the list
    1.60 +of Contributing Authors:
    1.61  
    1.62     Tom Lane
    1.63     Glenn Randers-Pehrson
    1.64     Willem van Schaik
    1.65  
    1.66  libpng versions 0.89, June 1996, through 0.96, May 1997, are
    1.67 -Copyright (c) 1996, 1997 Andreas Dilger
    1.68 -Distributed according to the same disclaimer and license as libpng-0.88,
    1.69 -with the following individuals added to the list of Contributing Authors:
    1.70 +Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
    1.71 +and are distributed according to the same disclaimer and license as
    1.72 +libpng-0.88, with the following individuals added to the list of
    1.73 +Contributing Authors:
    1.74  
    1.75     John Bowler
    1.76     Kevin Bracey
    1.77 @@ -1559,8 +1565,11 @@
    1.78     Greg Roelofs
    1.79     Tom Tanner
    1.80  
    1.81 +Some files in the "scripts" directory have other copyright owners
    1.82 +but are released under this license.
    1.83 +
    1.84  libpng versions 0.5, May 1995, through 0.88, January 1996, are
    1.85 -Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
    1.86 +Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
    1.87  
    1.88  For the purposes of this copyright and license, "Contributing Authors"
    1.89  is defined as the following set of individuals:
    1.90 @@ -1583,13 +1592,13 @@
    1.91  source code, or portions hereof, for any purpose, without fee, subject
    1.92  to the following restrictions:
    1.93  
    1.94 -1. The origin of this source code must not be misrepresented.
    1.95 -
    1.96 -2. Altered versions must be plainly marked as such and must not
    1.97 -   be misrepresented as being the original source.
    1.98 -
    1.99 -3. This Copyright notice may not be removed or altered from any
   1.100 -   source or altered source distribution.
   1.101 +  1. The origin of this source code must not be misrepresented.
   1.102 +
   1.103 +  2. Altered versions must be plainly marked as such and must not
   1.104 +     be misrepresented as being the original source.
   1.105 +
   1.106 +  3. This Copyright notice may not be removed or altered from any
   1.107 +     source or altered source distribution.
   1.108  
   1.109  The Contributing Authors and Group 42, Inc. specifically permit, without
   1.110  fee, and encourage the use of this source code as a component to
   1.111 @@ -1597,21 +1606,34 @@
   1.112  source code in a product, acknowledgment is not required but would be
   1.113  appreciated.
   1.114  
   1.115 -
   1.116 -A "png_get_copyright" function is available, for convenient use in "about"
   1.117 -boxes and the like:
   1.118 -
   1.119 -   printf("%s",png_get_copyright(NULL));
   1.120 -
   1.121 -Also, the PNG logo (in PNG format, of course) is supplied in the
   1.122 -files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
   1.123 -
   1.124 -Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
   1.125 -certification mark of the Open Source Initiative.
   1.126 +END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
   1.127 +
   1.128 +TRADEMARK:
   1.129 +
   1.130 +The name "libpng" has not been registered by the Copyright owner
   1.131 +as a trademark in any jurisdiction.  However, because libpng has
   1.132 +been distributed and maintained world-wide, continually since 1995,
   1.133 +the Copyright owner claims "common-law trademark protection" in any
   1.134 +jurisdiction where common-law trademark is recognized.
   1.135 +
   1.136 +OSI CERTIFICATION:
   1.137 +
   1.138 +Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
   1.139 +a certification mark of the Open Source Initiative. OSI has not addressed
   1.140 +the additional disclaimers inserted at version 1.0.7.
   1.141 +
   1.142 +EXPORT CONTROL:
   1.143 +
   1.144 +The Copyright owner believes that the Export Control Classification
   1.145 +Number (ECCN) for libpng is EAR99, which means not subject to export
   1.146 +controls or International Traffic in Arms Regulations (ITAR) because
   1.147 +it is open source, publicly available software, that does not contain
   1.148 +any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
   1.149 +734.7(b).
   1.150  
   1.151  Glenn Randers-Pehrson
   1.152  glennrp at users.sourceforge.net
   1.153 -December 22, 2014
   1.154 +July 15, 2018
   1.155  
   1.156  --- end of LICENSE ---
   1.157  

mercurial