8217676: Upgrade libpng to 1.6.37 jdk8u232-b06

Thu, 12 Sep 2019 15:22:44 -0400

author
zgu
date
Thu, 12 Sep 2019 15:22:44 -0400
changeset 3840
dd568d0e5e10
parent 3839
2338eb5fa755
child 3841
3b3a43588afb

8217676: Upgrade libpng to 1.6.37
Reviewed-by: prr, jdv, kcr

THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/THIRD_PARTY_README	Wed Sep 04 19:40:34 2019 +0100
     1.2 +++ b/THIRD_PARTY_README	Thu Sep 12 15:22:44 2019 -0400
     1.3 @@ -1470,60 +1470,90 @@
     1.4  
     1.5  -------------------------------------------------------------------------------
     1.6  
     1.7 -%% This notice is provided with respect to libpng 1.6.35, which may be
     1.8 +%% This notice is provided with respect to libpng 1.6.37, which may be
     1.9  included with JRE 8, JDK 8, and OpenJDK 8.
    1.10  
    1.11  --- begin of LICENSE ---
    1.12  
    1.13 -This copy of the libpng notices is provided for your convenience.  In case of
    1.14 -any discrepancy between this copy and the notices in the file png.h that is
    1.15 -included in the libpng distribution, the latter shall prevail.
    1.16 -
    1.17 -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
    1.18 -
    1.19 -If you modify libpng you may insert additional notices immediately following
    1.20 -this sentence.
    1.21 -
    1.22 -This code is released under the libpng license.
    1.23 -
    1.24 -libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
    1.25 +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
    1.26 +=========================================
    1.27 +
    1.28 +PNG Reference Library License version 2
    1.29 +---------------------------------------
    1.30 +
    1.31 + * Copyright (c) 1995-2019 The PNG Reference Library Authors.
    1.32 + * Copyright (c) 2018-2019 Cosmin Truta.
    1.33 + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
    1.34 + * Copyright (c) 1996-1997 Andreas Dilger.
    1.35 + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
    1.36 +
    1.37 +The software is supplied "as is", without warranty of any kind,
    1.38 +express or implied, including, without limitation, the warranties
    1.39 +of merchantability, fitness for a particular purpose, title, and
    1.40 +non-infringement.  In no event shall the Copyright owners, or
    1.41 +anyone distributing the software, be liable for any damages or
    1.42 +other liability, whether in contract, tort or otherwise, arising
    1.43 +from, out of, or in connection with the software, or the use or
    1.44 +other dealings in the software, even if advised of the possibility
    1.45 +of such damage.
    1.46 +
    1.47 +Permission is hereby granted to use, copy, modify, and distribute
    1.48 +this software, or portions hereof, for any purpose, without fee,
    1.49 +subject to the following restrictions:
    1.50 +
    1.51 + 1. The origin of this software must not be misrepresented; you
    1.52 +    must not claim that you wrote the original software.  If you
    1.53 +    use this software in a product, an acknowledgment in the product
    1.54 +    documentation would be appreciated, but is not required.
    1.55 +
    1.56 + 2. Altered source versions must be plainly marked as such, and must
    1.57 +    not be misrepresented as being the original software.
    1.58 +
    1.59 + 3. This Copyright notice may not be removed or altered from any
    1.60 +    source or altered source distribution.
    1.61 +
    1.62 +
    1.63 +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
    1.64 +-----------------------------------------------------------------------
    1.65 +
    1.66 +libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
    1.67  Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
    1.68  derived from libpng-1.0.6, and are distributed according to the same
    1.69  disclaimer and license as libpng-1.0.6 with the following individuals
    1.70  added to the list of Contributing Authors:
    1.71  
    1.72 -   Simon-Pierre Cadieux
    1.73 -   Eric S. Raymond
    1.74 -   Mans Rullgard
    1.75 -   Cosmin Truta
    1.76 -   Gilles Vollant
    1.77 -   James Yu
    1.78 -   Mandar Sahastrabuddhe
    1.79 -   Google Inc.
    1.80 -   Vadim Barkov
    1.81 +    Simon-Pierre Cadieux
    1.82 +    Eric S. Raymond
    1.83 +    Mans Rullgard
    1.84 +    Cosmin Truta
    1.85 +    Gilles Vollant
    1.86 +    James Yu
    1.87 +    Mandar Sahastrabuddhe
    1.88 +    Google Inc.
    1.89 +    Vadim Barkov
    1.90  
    1.91  and with the following additions to the disclaimer:
    1.92  
    1.93 -   There is no warranty against interference with your enjoyment of the
    1.94 -   library or against infringement.  There is no warranty that our
    1.95 -   efforts or the library will fulfill any of your particular purposes
    1.96 -   or needs.  This library is provided with all faults, and the entire
    1.97 -   risk of satisfactory quality, performance, accuracy, and effort is with
    1.98 -   the user.
    1.99 +    There is no warranty against interference with your enjoyment of
   1.100 +    the library or against infringement.  There is no warranty that our
   1.101 +    efforts or the library will fulfill any of your particular purposes
   1.102 +    or needs.  This library is provided with all faults, and the entire
   1.103 +    risk of satisfactory quality, performance, accuracy, and effort is
   1.104 +    with the user.
   1.105  
   1.106  Some files in the "contrib" directory and some configure-generated
   1.107 -files that are distributed with libpng have other copyright owners and
   1.108 +files that are distributed with libpng have other copyright owners, and
   1.109  are released under other open source licenses.
   1.110  
   1.111  libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
   1.112  Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
   1.113  libpng-0.96, and are distributed according to the same disclaimer and
   1.114 -license as libpng-0.96, with the following individuals added to the list
   1.115 -of Contributing Authors:
   1.116 -
   1.117 -   Tom Lane
   1.118 -   Glenn Randers-Pehrson
   1.119 -   Willem van Schaik
   1.120 +license as libpng-0.96, with the following individuals added to the
   1.121 +list of Contributing Authors:
   1.122 +
   1.123 +    Tom Lane
   1.124 +    Glenn Randers-Pehrson
   1.125 +    Willem van Schaik
   1.126  
   1.127  libpng versions 0.89, June 1996, through 0.96, May 1997, are
   1.128  Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
   1.129 @@ -1531,14 +1561,14 @@
   1.130  libpng-0.88, with the following individuals added to the list of
   1.131  Contributing Authors:
   1.132  
   1.133 -   John Bowler
   1.134 -   Kevin Bracey
   1.135 -   Sam Bushell
   1.136 -   Magnus Holmgren
   1.137 -   Greg Roelofs
   1.138 -   Tom Tanner
   1.139 -
   1.140 -Some files in the "scripts" directory have other copyright owners
   1.141 +    John Bowler
   1.142 +    Kevin Bracey
   1.143 +    Sam Bushell
   1.144 +    Magnus Holmgren
   1.145 +    Greg Roelofs
   1.146 +    Tom Tanner
   1.147 +
   1.148 +Some files in the "scripts" directory have other copyright owners,
   1.149  but are released under this license.
   1.150  
   1.151  libpng versions 0.5, May 1995, through 0.88, January 1996, are
   1.152 @@ -1547,39 +1577,38 @@
   1.153  For the purposes of this copyright and license, "Contributing Authors"
   1.154  is defined as the following set of individuals:
   1.155  
   1.156 -   Andreas Dilger
   1.157 -   Dave Martindale
   1.158 -   Guy Eric Schalnat
   1.159 -   Paul Schmidt
   1.160 -   Tim Wegner
   1.161 -
   1.162 -The PNG Reference Library is supplied "AS IS".  The Contributing Authors
   1.163 -and Group 42, Inc. disclaim all warranties, expressed or implied,
   1.164 -including, without limitation, the warranties of merchantability and of
   1.165 -fitness for any purpose.  The Contributing Authors and Group 42, Inc.
   1.166 -assume no liability for direct, indirect, incidental, special, exemplary,
   1.167 -or consequential damages, which may result from the use of the PNG
   1.168 -Reference Library, even if advised of the possibility of such damage.
   1.169 +    Andreas Dilger
   1.170 +    Dave Martindale
   1.171 +    Guy Eric Schalnat
   1.172 +    Paul Schmidt
   1.173 +    Tim Wegner
   1.174 +
   1.175 +The PNG Reference Library is supplied "AS IS".  The Contributing
   1.176 +Authors and Group 42, Inc. disclaim all warranties, expressed or
   1.177 +implied, including, without limitation, the warranties of
   1.178 +merchantability and of fitness for any purpose.  The Contributing
   1.179 +Authors and Group 42, Inc. assume no liability for direct, indirect,
   1.180 +incidental, special, exemplary, or consequential damages, which may
   1.181 +result from the use of the PNG Reference Library, even if advised of
   1.182 +the possibility of such damage.
   1.183  
   1.184  Permission is hereby granted to use, copy, modify, and distribute this
   1.185  source code, or portions hereof, for any purpose, without fee, subject
   1.186  to the following restrictions:
   1.187  
   1.188 -  1. The origin of this source code must not be misrepresented.
   1.189 -
   1.190 -  2. Altered versions must be plainly marked as such and must not
   1.191 -     be misrepresented as being the original source.
   1.192 -
   1.193 -  3. This Copyright notice may not be removed or altered from any
   1.194 -     source or altered source distribution.
   1.195 -
   1.196 -The Contributing Authors and Group 42, Inc. specifically permit, without
   1.197 -fee, and encourage the use of this source code as a component to
   1.198 -supporting the PNG file format in commercial products.  If you use this
   1.199 -source code in a product, acknowledgment is not required but would be
   1.200 -appreciated.
   1.201 -
   1.202 -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
   1.203 + 1. The origin of this source code must not be misrepresented.
   1.204 +
   1.205 + 2. Altered versions must be plainly marked as such and must not
   1.206 +    be misrepresented as being the original source.
   1.207 +
   1.208 + 3. This Copyright notice may not be removed or altered from any
   1.209 +    source or altered source distribution.
   1.210 +
   1.211 +The Contributing Authors and Group 42, Inc. specifically permit,
   1.212 +without fee, and encourage the use of this source code as a component
   1.213 +to supporting the PNG file format in commercial products.  If you use
   1.214 +this source code in a product, acknowledgment is not required but would
   1.215 +be appreciated.
   1.216  
   1.217  TRADEMARK:
   1.218  

mercurial