Merge jdk8u202-b01

Mon, 15 Oct 2018 14:56:27 +0100

author
aefimov
date
Mon, 15 Oct 2018 14:56:27 +0100
changeset 1832
1b45a918aae5
parent 1826
ea0313ba4705
parent 1831
a349bf5a9de7
child 1833
4195a7f3fc66

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Oct 04 10:10:57 2018 +0100
     1.2 +++ b/.hgtags	Mon Oct 15 14:56:27 2018 +0100
     1.3 @@ -865,6 +865,51 @@
     1.4  6029daad75bf459b330fc79ebf208dc35dc682d5 jdk8u162-b11
     1.5  ace99846c1fd92e8bec4cbe912ec3fc8a74fbf0c jdk8u162-b12
     1.6  acbd335f56f1a09fd8f80c2663367f90cdb00c46 jdk8u162-b31
     1.7 +4e733c1a0f810652289e1cfff790852178b07933 jdk8u162-b32
     1.8 +471aa01d563f5d1230467fdad93af97173df28e2 jdk8u162-b33
     1.9 +b934285b2aa620d01129164c3b0c1a68a67c2470 jdk8u162-b34
    1.10 +bb767c7211eace9df83649ba937d2ce507223e4d jdk8u171-b00
    1.11 +9895f9c0845cf5f8dd7be62bf2a1a73a3868f799 jdk8u171-b01
    1.12 +28be709707f8b275aeaa2ed41338678620e3ef5f jdk8u171-b02
    1.13 +d534205fffcf950a11ed37103f5a0c23fe14ee49 jdk8u171-b03
    1.14 +0baf88a7b3880bbefdbb221e67a6ce96b0552033 jdk8u171-b04
    1.15 +0c6a772d60b94de90907f2f6d4683ceac8aba54b jdk8u171-b05
    1.16 +72dbc8d63308f5b04b9fd3e06d139d673f992212 jdk8u172-b00
    1.17 +fbb7c1e76e59aabb85a70c81301f47b980f83225 jdk8u172-b01
    1.18 +56874ff37e89559692d1314d48cbab574544b677 jdk8u172-b02
    1.19 +65a52284d8a3a5b1e6de1e8c86eec6683cef346e jdk8u172-b03
    1.20 +c3942af7d2fa3c13cf43c49399d36843dd21731f jdk8u172-b04
    1.21 +d534205fffcf950a11ed37103f5a0c23fe14ee49 jdk8u181-b00
    1.22 +d534205fffcf950a11ed37103f5a0c23fe14ee49 jdk8u171-b03
    1.23 +0baf88a7b3880bbefdbb221e67a6ce96b0552033 jdk8u171-b04
    1.24 +0c6a772d60b94de90907f2f6d4683ceac8aba54b jdk8u171-b05
    1.25 +3bca003f024c7bb6774499ff2ede57d300c18c79 jdk8u171-b06
    1.26 +b90a8fc589afa4ac20a4d1e4f819058a5730af9f jdk8u171-b07
    1.27 +f7f59d87e97dd1e3a7ff4ebc5ed843b2ed5f2361 jdk8u171-b08
    1.28 +b3563151fe42c6b997279fc24f8329c4c03add96 jdk8u171-b09
    1.29 +6a9efc03746028c30c3133d57030a388e752dd99 jdk8u171-b10
    1.30 +fd5e2fc0b714d3f18c4c02e67ac093ee0cc2341a jdk8u171-b11
    1.31 +72dbc8d63308f5b04b9fd3e06d139d673f992212 jdk8u172-b00
    1.32 +fbb7c1e76e59aabb85a70c81301f47b980f83225 jdk8u172-b01
    1.33 +56874ff37e89559692d1314d48cbab574544b677 jdk8u172-b02
    1.34 +65a52284d8a3a5b1e6de1e8c86eec6683cef346e jdk8u172-b03
    1.35 +c3942af7d2fa3c13cf43c49399d36843dd21731f jdk8u172-b04
    1.36 +13c1af9669c26044981325eb1e2d239e74346b35 jdk8u172-b05
    1.37 +ad4a16f06c355b7e9f13fa2dfab7d22ac9726b3d jdk8u172-b06
    1.38 +bd2328706d14d6d17fac585645c886f94591bb28 jdk8u172-b07
    1.39 +bf262dc4ed05a905b3292bb5f2e765a9c930681c jdk8u172-b08
    1.40 +e9aaa28b626de73ffcef047992a1658f11262984 jdk8u172-b09
    1.41 +f39115b612ab6641f4d1f0bea5b70eed8bd34b19 jdk8u172-b10
    1.42 +6841ddd69c3033b2f6c2cbd3a3410b11e8935ec6 jdk8u172-b11
    1.43 +fc535a921338dcfafbe2302994332d7431df0b78 jdk8u181-b01
    1.44 +4db300c6845e901556cb1c9c5b5d37293c267a3e jdk8u181-b02
    1.45 +b01c5b98eafe388dea087807091e2c10401afd03 jdk8u181-b03
    1.46 +3b2e4c266187bbcb0d32c2339eef5d5978cba0c3 jdk8u191-b00
    1.47 +13c1af9669c26044981325eb1e2d239e74346b35 jdk8u172-b05
    1.48 +174a1670d10d725f98bcf8effb76cbd81150e20c jdk8u162-b35
    1.49 +12809d32e614e10a57e67ffe9b8a2d89f58dc4ef jdk8u162-b36
    1.50 +bd6e2c17292122235cf2c3bcc4b634b393f67d0b jdk8u162-b37
    1.51 +b550fa84ffc9452a9fdab2bb37e4d33cd9dd4095 jdk8u162-b38
    1.52  bb767c7211eace9df83649ba937d2ce507223e4d jdk8u171-b00
    1.53  9895f9c0845cf5f8dd7be62bf2a1a73a3868f799 jdk8u171-b01
    1.54  28be709707f8b275aeaa2ed41338678620e3ef5f jdk8u171-b02
    1.55 @@ -890,6 +935,13 @@
    1.56  e9aaa28b626de73ffcef047992a1658f11262984 jdk8u172-b09
    1.57  f39115b612ab6641f4d1f0bea5b70eed8bd34b19 jdk8u172-b10
    1.58  6841ddd69c3033b2f6c2cbd3a3410b11e8935ec6 jdk8u172-b11
    1.59 +4d3922c97c57924eede468fe8ec8804575350ca9 jdk8u172-b31
    1.60 +cd9edd016abefcb8e4c638d2efdc788cfadc8ad2 jdk8u172-b32
    1.61 +cdc0378172bb5b17a86823897b5a4b1225e2fe14 jdk8u172-b33
    1.62 +f0cc81483800481ec88d3fd4c45e3104978c077f jdk8u172-b34
    1.63 +c105eac8160cf2a3df960b840018452a3f47b86b jdk8u172-b35
    1.64 +bd3a6d452f004cf7ac9a88be7deb665c24ce05a4 jdk8u172-b36
    1.65 +7d1748edfb5aa89aec28eb5d2ed5abc40c6d87c3 jdk8u172-b37
    1.66  fc535a921338dcfafbe2302994332d7431df0b78 jdk8u181-b01
    1.67  4db300c6845e901556cb1c9c5b5d37293c267a3e jdk8u181-b02
    1.68  b01c5b98eafe388dea087807091e2c10401afd03 jdk8u181-b03
    1.69 @@ -903,9 +955,34 @@
    1.70  528a472b73184dd5ab6769dbd19177e2dea74e96 jdk8u181-b11
    1.71  1fac8d007debb6d610ad70930a6b1b5a2a116957 jdk8u181-b12
    1.72  a4d1d2b0da63d6d17579fa4cd9ef45850345d59c jdk8u181-b13
    1.73 +513805c9270bd834cfe659ae2b9b737579779578 jdk8u191-b01
    1.74 +ce3b35fca864a0249a5a85a25c331d1230253f3b jdk8u191-b02
    1.75 +b51969df1b6fabae859bb18555e750d8afb96246 jdk8u191-b03
    1.76 +7506d3bab4c4256127e965f6412d86f1b010b35a jdk8u191-b04
    1.77 +0cb04d207ceb65c34b9855ae7549a8de1af4910a jdk8u191-b05
    1.78 +a2069d605514f2d4f619bc8c37e8a0be901c2db3 jdk8u191-b06
    1.79 +76c097c27422be5473606da19a0586aefb4b1426 jdk8u191-b07
    1.80 +9c9ac98b01115a6cf0eda2da0178dbb464bc07d9 jdk8u191-b08
    1.81 +c83fd870e7c0643926a744ad4402b9fcb9d02ca2 jdk8u191-b09
    1.82 +e2d809469547b966baf281536fec470c3e8bec0d jdk8u191-b10
    1.83 +eb6c977b6e6c07093fc950c8028cf97257610793 jdk8u191-b25
    1.84 +328c9a87dce0b28b85433fc040f9beeedb4bfb10 jdk8u191-b11
    1.85 +298df76047a57fa8940c71f17bc641e43ee224aa jdk8u191-b12
    1.86 +314a4e05e420b7d7c4f37bd80213d7117a9d4ee0 jdk8u191-b26
    1.87  a5563d019ac440b19e791afcd298f3322b311291 jdk8u182-b00
    1.88  f845f4e7ef69e4a6848ac332b888cd586a3d03bc jdk8u192-b00
    1.89  73c9956642a295a92ba317d6b6bc858fc30004ee jdk8u192-b01
    1.90  71a1ec65fc2e7b1e5aceadb14868283d56e7cdc0 jdk8u192-b02
    1.91  6e0c9b924d6ba93c1352ba6796c97bf9d9a0fcee jdk8u192-b03
    1.92  6e0c9b924d6ba93c1352ba6796c97bf9d9a0fcee jdk8u202-b00
    1.93 +48b4c237d17c77b81f0d987df00b7d606a5b796e jdk8u192-b04
    1.94 +a08f980ab6d284c063cf220eaca89efe423864b6 jdk8u192-b05
    1.95 +3d02e4c186ee1efe87f601f9db18ee83f9eb94e2 jdk8u192-b06
    1.96 +3f4ad5eb68ceaa8249df4480a21dde9784cafaf9 jdk8u192-b07
    1.97 +c69978472754cde9f6d8bf48b90569913fbde85d jdk8u192-b08
    1.98 +2400f742e326788f5382ebb7d423d615bd4c27d8 jdk8u192-b09
    1.99 +e8ed32b4b216820e107b08a2e6d1b7d6a798ead2 jdk8u192-b10
   1.100 +4587159810c53b8a3b0323775016bc22f81ecb72 jdk8u192-b25
   1.101 +c26ddd2bd7c0a5ff8c7d358194a760b66c05392e jdk8u192-b11
   1.102 +d70620db70e3ecf0adc76a4721b201d3eb757c59 jdk8u192-b12
   1.103 +a86c7b3fc44025839a24b1ca0f2461ca2e46aee1 jdk8u192-b26
     2.1 --- a/THIRD_PARTY_README	Thu Oct 04 10:10:57 2018 +0100
     2.2 +++ b/THIRD_PARTY_README	Mon Oct 15 14:56:27 2018 +0100
     2.3 @@ -1497,7 +1497,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to libpng 1.6.16, which may be 
     2.8 +%% This notice is provided with respect to libpng 1.6.35, which may be
     2.9  included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -1513,21 +1513,21 @@
    2.13  
    2.14  This code is released under the libpng license.
    2.15  
    2.16 -libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
    2.17 -Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
    2.18 -distributed according to the same disclaimer and license as libpng-1.2.5
    2.19 -with the following individual added to the list of Contributing Authors
    2.20 -
    2.21 -   Cosmin Truta
    2.22 -
    2.23 -libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
    2.24 -Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
    2.25 -distributed according to the same disclaimer and license as libpng-1.0.6
    2.26 -with the following individuals added to the list of Contributing Authors
    2.27 +libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
    2.28 +Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
    2.29 +derived from libpng-1.0.6, and are distributed according to the same
    2.30 +disclaimer and license as libpng-1.0.6 with the following individuals
    2.31 +added to the list of Contributing Authors:
    2.32  
    2.33     Simon-Pierre Cadieux
    2.34     Eric S. Raymond
    2.35 +   Mans Rullgard
    2.36 +   Cosmin Truta
    2.37     Gilles Vollant
    2.38 +   James Yu
    2.39 +   Mandar Sahastrabuddhe
    2.40 +   Google Inc.
    2.41 +   Vadim Barkov
    2.42  
    2.43  and with the following additions to the disclaimer:
    2.44  
    2.45 @@ -1538,19 +1538,25 @@
    2.46     risk of satisfactory quality, performance, accuracy, and effort is with
    2.47     the user.
    2.48  
    2.49 +Some files in the "contrib" directory and some configure-generated
    2.50 +files that are distributed with libpng have other copyright owners and
    2.51 +are released under other open source licenses.
    2.52 +
    2.53  libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
    2.54 -Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
    2.55 -distributed according to the same disclaimer and license as libpng-0.96,
    2.56 -with the following individuals added to the list of Contributing Authors:
    2.57 +Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
    2.58 +libpng-0.96, and are distributed according to the same disclaimer and
    2.59 +license as libpng-0.96, with the following individuals added to the list
    2.60 +of Contributing Authors:
    2.61  
    2.62     Tom Lane
    2.63     Glenn Randers-Pehrson
    2.64     Willem van Schaik
    2.65  
    2.66  libpng versions 0.89, June 1996, through 0.96, May 1997, are
    2.67 -Copyright (c) 1996, 1997 Andreas Dilger
    2.68 -Distributed according to the same disclaimer and license as libpng-0.88,
    2.69 -with the following individuals added to the list of Contributing Authors:
    2.70 +Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
    2.71 +and are distributed according to the same disclaimer and license as
    2.72 +libpng-0.88, with the following individuals added to the list of
    2.73 +Contributing Authors:
    2.74  
    2.75     John Bowler
    2.76     Kevin Bracey
    2.77 @@ -1559,8 +1565,11 @@
    2.78     Greg Roelofs
    2.79     Tom Tanner
    2.80  
    2.81 +Some files in the "scripts" directory have other copyright owners
    2.82 +but are released under this license.
    2.83 +
    2.84  libpng versions 0.5, May 1995, through 0.88, January 1996, are
    2.85 -Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
    2.86 +Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
    2.87  
    2.88  For the purposes of this copyright and license, "Contributing Authors"
    2.89  is defined as the following set of individuals:
    2.90 @@ -1583,13 +1592,13 @@
    2.91  source code, or portions hereof, for any purpose, without fee, subject
    2.92  to the following restrictions:
    2.93  
    2.94 -1. The origin of this source code must not be misrepresented.
    2.95 -
    2.96 -2. Altered versions must be plainly marked as such and must not
    2.97 -   be misrepresented as being the original source.
    2.98 -
    2.99 -3. This Copyright notice may not be removed or altered from any
   2.100 -   source or altered source distribution.
   2.101 +  1. The origin of this source code must not be misrepresented.
   2.102 +
   2.103 +  2. Altered versions must be plainly marked as such and must not
   2.104 +     be misrepresented as being the original source.
   2.105 +
   2.106 +  3. This Copyright notice may not be removed or altered from any
   2.107 +     source or altered source distribution.
   2.108  
   2.109  The Contributing Authors and Group 42, Inc. specifically permit, without
   2.110  fee, and encourage the use of this source code as a component to
   2.111 @@ -1597,21 +1606,34 @@
   2.112  source code in a product, acknowledgment is not required but would be
   2.113  appreciated.
   2.114  
   2.115 -
   2.116 -A "png_get_copyright" function is available, for convenient use in "about"
   2.117 -boxes and the like:
   2.118 -
   2.119 -   printf("%s",png_get_copyright(NULL));
   2.120 -
   2.121 -Also, the PNG logo (in PNG format, of course) is supplied in the
   2.122 -files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
   2.123 -
   2.124 -Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
   2.125 -certification mark of the Open Source Initiative.
   2.126 +END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
   2.127 +
   2.128 +TRADEMARK:
   2.129 +
   2.130 +The name "libpng" has not been registered by the Copyright owner
   2.131 +as a trademark in any jurisdiction.  However, because libpng has
   2.132 +been distributed and maintained world-wide, continually since 1995,
   2.133 +the Copyright owner claims "common-law trademark protection" in any
   2.134 +jurisdiction where common-law trademark is recognized.
   2.135 +
   2.136 +OSI CERTIFICATION:
   2.137 +
   2.138 +Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
   2.139 +a certification mark of the Open Source Initiative. OSI has not addressed
   2.140 +the additional disclaimers inserted at version 1.0.7.
   2.141 +
   2.142 +EXPORT CONTROL:
   2.143 +
   2.144 +The Copyright owner believes that the Export Control Classification
   2.145 +Number (ECCN) for libpng is EAR99, which means not subject to export
   2.146 +controls or International Traffic in Arms Regulations (ITAR) because
   2.147 +it is open source, publicly available software, that does not contain
   2.148 +any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
   2.149 +734.7(b).
   2.150  
   2.151  Glenn Randers-Pehrson
   2.152  glennrp at users.sourceforge.net
   2.153 -December 22, 2014
   2.154 +July 15, 2018
   2.155  
   2.156  --- end of LICENSE ---
   2.157  

mercurial