Merge mips64el-jdk8u232-b10

Sat, 09 Nov 2019 20:29:44 +0800

author
aoqi
date
Sat, 09 Nov 2019 20:29:44 +0800
changeset 1943
3a58732739d0
parent 1928
5d16b742f3c1
parent 1942
3cdc7d41905a
child 1944
806a1d9c4f9b

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Sat Nov 09 20:15:27 2019 +0800
     1.2 +++ b/.hgtags	Sat Nov 09 20:29:44 2019 +0800
     1.3 @@ -1056,6 +1056,17 @@
     1.4  74bdd387f873523cae121fa48056fb662e289679 jdk8u222-b06
     1.5  3abf299d26c40608af206c3b43c35b7ab2aade07 jdk8u222-b07
     1.6  d8e58175603e92f46baa775c878cf346181cafed jdk8u222-b08
     1.7 +5837b825d94bd4fbc1bff28099810e8bcb1e848a jdk8u232-b00
     1.8  60d5ceb1043500475c41501de673b9582ef4d97b jdk8u222-b09
     1.9 +d44170c2cecec81b5f328d40529cb78bfd0bbb1c jdk8u222-b10
    1.10 +d44170c2cecec81b5f328d40529cb78bfd0bbb1c jdk8u222-ga
    1.11  a64d826ebca95e07f6ea5fd9bf548236e4272d1b mips64el-jdk8u222-b11
    1.12  dbcfc7479c25b451579a50901d1425b1b5e45fad mips64el-jdk8u222-b12
    1.13 +2c9e12886322c8d8a0175b021ca523ad8cf211c6 jdk8u232-b01
    1.14 +63cfd636200107b818480976973978448cf9a5ec jdk8u232-b02
    1.15 +8ce5d3e4f0b417996d0d962a3f8195501853b222 jdk8u232-b03
    1.16 +1447921be8023aec0684019e349a42e92f302fb7 jdk8u232-b04
    1.17 +836e5e2e10a55e1ed49ee002dbe9d974a4b32859 jdk8u232-b05
    1.18 +3fc52164727a38a74abceb9b9b84cd2396049c12 jdk8u232-b06
    1.19 +af5f5e2e07bc12472ffb52951120e14e19690b1a jdk8u232-b07
    1.20 +def9640e5d8213f650c128330161d9cdcd04d96b jdk8u232-b08
     2.1 --- a/THIRD_PARTY_README	Sat Nov 09 20:15:27 2019 +0800
     2.2 +++ b/THIRD_PARTY_README	Sat Nov 09 20:29:44 2019 +0800
     2.3 @@ -1470,60 +1470,90 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to libpng 1.6.35, which may be
     2.8 +%% This notice is provided with respect to libpng 1.6.37, which may be
     2.9  included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12  
    2.13 -This copy of the libpng notices is provided for your convenience.  In case of
    2.14 -any discrepancy between this copy and the notices in the file png.h that is
    2.15 -included in the libpng distribution, the latter shall prevail.
    2.16 -
    2.17 -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
    2.18 -
    2.19 -If you modify libpng you may insert additional notices immediately following
    2.20 -this sentence.
    2.21 -
    2.22 -This code is released under the libpng license.
    2.23 -
    2.24 -libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
    2.25 +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
    2.26 +=========================================
    2.27 +
    2.28 +PNG Reference Library License version 2
    2.29 +---------------------------------------
    2.30 +
    2.31 + * Copyright (c) 1995-2019 The PNG Reference Library Authors.
    2.32 + * Copyright (c) 2018-2019 Cosmin Truta.
    2.33 + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
    2.34 + * Copyright (c) 1996-1997 Andreas Dilger.
    2.35 + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
    2.36 +
    2.37 +The software is supplied "as is", without warranty of any kind,
    2.38 +express or implied, including, without limitation, the warranties
    2.39 +of merchantability, fitness for a particular purpose, title, and
    2.40 +non-infringement.  In no event shall the Copyright owners, or
    2.41 +anyone distributing the software, be liable for any damages or
    2.42 +other liability, whether in contract, tort or otherwise, arising
    2.43 +from, out of, or in connection with the software, or the use or
    2.44 +other dealings in the software, even if advised of the possibility
    2.45 +of such damage.
    2.46 +
    2.47 +Permission is hereby granted to use, copy, modify, and distribute
    2.48 +this software, or portions hereof, for any purpose, without fee,
    2.49 +subject to the following restrictions:
    2.50 +
    2.51 + 1. The origin of this software must not be misrepresented; you
    2.52 +    must not claim that you wrote the original software.  If you
    2.53 +    use this software in a product, an acknowledgment in the product
    2.54 +    documentation would be appreciated, but is not required.
    2.55 +
    2.56 + 2. Altered source versions must be plainly marked as such, and must
    2.57 +    not be misrepresented as being the original software.
    2.58 +
    2.59 + 3. This Copyright notice may not be removed or altered from any
    2.60 +    source or altered source distribution.
    2.61 +
    2.62 +
    2.63 +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
    2.64 +-----------------------------------------------------------------------
    2.65 +
    2.66 +libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
    2.67  Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
    2.68  derived from libpng-1.0.6, and are distributed according to the same
    2.69  disclaimer and license as libpng-1.0.6 with the following individuals
    2.70  added to the list of Contributing Authors:
    2.71  
    2.72 -   Simon-Pierre Cadieux
    2.73 -   Eric S. Raymond
    2.74 -   Mans Rullgard
    2.75 -   Cosmin Truta
    2.76 -   Gilles Vollant
    2.77 -   James Yu
    2.78 -   Mandar Sahastrabuddhe
    2.79 -   Google Inc.
    2.80 -   Vadim Barkov
    2.81 +    Simon-Pierre Cadieux
    2.82 +    Eric S. Raymond
    2.83 +    Mans Rullgard
    2.84 +    Cosmin Truta
    2.85 +    Gilles Vollant
    2.86 +    James Yu
    2.87 +    Mandar Sahastrabuddhe
    2.88 +    Google Inc.
    2.89 +    Vadim Barkov
    2.90  
    2.91  and with the following additions to the disclaimer:
    2.92  
    2.93 -   There is no warranty against interference with your enjoyment of the
    2.94 -   library or against infringement.  There is no warranty that our
    2.95 -   efforts or the library will fulfill any of your particular purposes
    2.96 -   or needs.  This library is provided with all faults, and the entire
    2.97 -   risk of satisfactory quality, performance, accuracy, and effort is with
    2.98 -   the user.
    2.99 +    There is no warranty against interference with your enjoyment of
   2.100 +    the library or against infringement.  There is no warranty that our
   2.101 +    efforts or the library will fulfill any of your particular purposes
   2.102 +    or needs.  This library is provided with all faults, and the entire
   2.103 +    risk of satisfactory quality, performance, accuracy, and effort is
   2.104 +    with the user.
   2.105  
   2.106  Some files in the "contrib" directory and some configure-generated
   2.107 -files that are distributed with libpng have other copyright owners and
   2.108 +files that are distributed with libpng have other copyright owners, and
   2.109  are released under other open source licenses.
   2.110  
   2.111  libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
   2.112  Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
   2.113  libpng-0.96, and are distributed according to the same disclaimer and
   2.114 -license as libpng-0.96, with the following individuals added to the list
   2.115 -of Contributing Authors:
   2.116 -
   2.117 -   Tom Lane
   2.118 -   Glenn Randers-Pehrson
   2.119 -   Willem van Schaik
   2.120 +license as libpng-0.96, with the following individuals added to the
   2.121 +list of Contributing Authors:
   2.122 +
   2.123 +    Tom Lane
   2.124 +    Glenn Randers-Pehrson
   2.125 +    Willem van Schaik
   2.126  
   2.127  libpng versions 0.89, June 1996, through 0.96, May 1997, are
   2.128  Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
   2.129 @@ -1531,14 +1561,14 @@
   2.130  libpng-0.88, with the following individuals added to the list of
   2.131  Contributing Authors:
   2.132  
   2.133 -   John Bowler
   2.134 -   Kevin Bracey
   2.135 -   Sam Bushell
   2.136 -   Magnus Holmgren
   2.137 -   Greg Roelofs
   2.138 -   Tom Tanner
   2.139 -
   2.140 -Some files in the "scripts" directory have other copyright owners
   2.141 +    John Bowler
   2.142 +    Kevin Bracey
   2.143 +    Sam Bushell
   2.144 +    Magnus Holmgren
   2.145 +    Greg Roelofs
   2.146 +    Tom Tanner
   2.147 +
   2.148 +Some files in the "scripts" directory have other copyright owners,
   2.149  but are released under this license.
   2.150  
   2.151  libpng versions 0.5, May 1995, through 0.88, January 1996, are
   2.152 @@ -1547,39 +1577,38 @@
   2.153  For the purposes of this copyright and license, "Contributing Authors"
   2.154  is defined as the following set of individuals:
   2.155  
   2.156 -   Andreas Dilger
   2.157 -   Dave Martindale
   2.158 -   Guy Eric Schalnat
   2.159 -   Paul Schmidt
   2.160 -   Tim Wegner
   2.161 -
   2.162 -The PNG Reference Library is supplied "AS IS".  The Contributing Authors
   2.163 -and Group 42, Inc. disclaim all warranties, expressed or implied,
   2.164 -including, without limitation, the warranties of merchantability and of
   2.165 -fitness for any purpose.  The Contributing Authors and Group 42, Inc.
   2.166 -assume no liability for direct, indirect, incidental, special, exemplary,
   2.167 -or consequential damages, which may result from the use of the PNG
   2.168 -Reference Library, even if advised of the possibility of such damage.
   2.169 +    Andreas Dilger
   2.170 +    Dave Martindale
   2.171 +    Guy Eric Schalnat
   2.172 +    Paul Schmidt
   2.173 +    Tim Wegner
   2.174 +
   2.175 +The PNG Reference Library is supplied "AS IS".  The Contributing
   2.176 +Authors and Group 42, Inc. disclaim all warranties, expressed or
   2.177 +implied, including, without limitation, the warranties of
   2.178 +merchantability and of fitness for any purpose.  The Contributing
   2.179 +Authors and Group 42, Inc. assume no liability for direct, indirect,
   2.180 +incidental, special, exemplary, or consequential damages, which may
   2.181 +result from the use of the PNG Reference Library, even if advised of
   2.182 +the possibility of such damage.
   2.183  
   2.184  Permission is hereby granted to use, copy, modify, and distribute this
   2.185  source code, or portions hereof, for any purpose, without fee, subject
   2.186  to the following restrictions:
   2.187  
   2.188 -  1. The origin of this source code must not be misrepresented.
   2.189 -
   2.190 -  2. Altered versions must be plainly marked as such and must not
   2.191 -     be misrepresented as being the original source.
   2.192 -
   2.193 -  3. This Copyright notice may not be removed or altered from any
   2.194 -     source or altered source distribution.
   2.195 -
   2.196 -The Contributing Authors and Group 42, Inc. specifically permit, without
   2.197 -fee, and encourage the use of this source code as a component to
   2.198 -supporting the PNG file format in commercial products.  If you use this
   2.199 -source code in a product, acknowledgment is not required but would be
   2.200 -appreciated.
   2.201 -
   2.202 -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
   2.203 + 1. The origin of this source code must not be misrepresented.
   2.204 +
   2.205 + 2. Altered versions must be plainly marked as such and must not
   2.206 +    be misrepresented as being the original source.
   2.207 +
   2.208 + 3. This Copyright notice may not be removed or altered from any
   2.209 +    source or altered source distribution.
   2.210 +
   2.211 +The Contributing Authors and Group 42, Inc. specifically permit,
   2.212 +without fee, and encourage the use of this source code as a component
   2.213 +to supporting the PNG file format in commercial products.  If you use
   2.214 +this source code in a product, acknowledgment is not required but would
   2.215 +be appreciated.
   2.216  
   2.217  TRADEMARK:
   2.218  
   2.219 @@ -2101,13 +2130,13 @@
   2.220  
   2.221  -------------------------------------------------------------------------------
   2.222  
   2.223 -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1,
   2.224 +%% This notice is provided with respect to PC/SC Lite v1.8.24,
   2.225  which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
   2.226  
   2.227  --- begin of LICENSE ---
   2.228  
   2.229 -Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com>
   2.230 -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr>
   2.231 +Copyright (c) 1999-2003 David Corcoran <corcoran@linuxnet.com>
   2.232 +Copyright (c) 2001-2011 Ludovic Rousseau <ludovic.rousseau@free.fr>
   2.233  All rights reserved.
   2.234  
   2.235  Redistribution and use in source and binary forms, with or without
   2.236 @@ -2119,15 +2148,10 @@
   2.237  2. Redistributions in binary form must reproduce the above copyright
   2.238     notice, this list of conditions and the following disclaimer in the
   2.239     documentation and/or other materials provided with the distribution.
   2.240 -3. All advertising materials mentioning features or use of this software
   2.241 -   must display the following acknowledgement:
   2.242 -     This product includes software developed by: 
   2.243 -      David Corcoran <corcoran@linuxnet.com>
   2.244 -      http://www.linuxnet.com (MUSCLE)
   2.245 -4. The name of the author may not be used to endorse or promote products
   2.246 +3. The name of the author may not be used to endorse or promote products
   2.247     derived from this software without specific prior written permission.
   2.248  
   2.249 -Changes to this license can be made only by the copyright author with 
   2.250 +Changes to this license can be made only by the copyright author with
   2.251  explicit written consent.
   2.252  
   2.253  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

mercurial