Merge jdk8u202-b01

Mon, 15 Oct 2018 15:04:02 +0100

author
aefimov
date
Mon, 15 Oct 2018 15:04:02 +0100
changeset 1723
761258c45a3a
parent 1717
34e99da9734d
parent 1722
3bd0d58f0fcb
child 1724
691079f04a6f

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Oct 04 10:15:06 2018 +0100
     1.2 +++ b/.hgtags	Mon Oct 15 15:04:02 2018 +0100
     1.3 @@ -824,9 +824,24 @@
     1.4  7b5ea369d72a15f8c2f2b299a0e0c94a9f6299c9 jdk8u162-b11
     1.5  b73f27fc902bdd1eb47e57ad1d72e40d37d16db2 jdk8u162-b12
     1.6  b2dfabe81b62db3668f75cdce74c749241bd35d2 jdk8u162-b31
     1.7 +f9bd31b2202d3db0b3fd6f09aa1f32005011d704 jdk8u162-b32
     1.8 +15b35c21a296d36f9145e2ccf18fecf584c9ee99 jdk8u162-b33
     1.9 +783ed73023f5168d67624eae02a0caa0441552ad jdk8u162-b34
    1.10 +7a536f0ffba631f36c43820df8eb201886c4f6b7 jdk8u162-b35
    1.11 +518c46fee6170452a8e0376e08cc9de4a1db339b jdk8u162-b36
    1.12 +57fac9abdbddf9fc875f31aefeb2623b443607cd jdk8u162-b37
    1.13 +cfde39a81b5dbeb17920efce8e96d6968685e72b jdk8u162-b38
    1.14  b43391a4015f0c890c90ab33fe03b941876d2ee6 jdk8u171-b00
    1.15  25e6ecbfeb092b43c2a04014fe8f1bf03e005c63 jdk8u171-b01
    1.16  294248d232cf45819af0d15000b0e172953f3fa9 jdk8u171-b02
    1.17 +2e4cccb6df4802405c21078b905f9c9db74fea04 jdk8u171-b03
    1.18 +068b0c57acac24edcf925e3cca73afe671ed7cac jdk8u171-b04
    1.19 +8479be9da1fa9572a36adcfce19bd36579c9c37c jdk8u171-b05
    1.20 +16be4c9dff93fdcdb2b705680b641e26320cfd5a jdk8u172-b00
    1.21 +c4309a2d981b00619635888a63a75b1f32f34555 jdk8u172-b01
    1.22 +703e4709edae7f83c3794009954f453d6f3706e8 jdk8u172-b02
    1.23 +b327c90d911f7ad1cfdf32cc18c5f32514b9ce2f jdk8u172-b03
    1.24 +e9368eb17ab6b839b20f4ff6bd657329aac788b4 jdk8u172-b04
    1.25  2e4cccb6df4802405c21078b905f9c9db74fea04 jdk8u181-b00
    1.26  2e4cccb6df4802405c21078b905f9c9db74fea04 jdk8u171-b03
    1.27  068b0c57acac24edcf925e3cca73afe671ed7cac jdk8u171-b04
    1.28 @@ -849,9 +864,45 @@
    1.29  fc695409c23dca5cb6c0ebe22ee48100fe7aa893 jdk8u172-b09
    1.30  7287e0008d111fdd1c259432f4883bb859d84221 jdk8u172-b10
    1.31  980c4675006fb42ef630d3020f502635bd8811e3 jdk8u172-b11
    1.32 +112ddcc5f7c071c89bf23d5ab2a678f29e464ca2 jdk8u172-b31
    1.33 +e716ed4b0efb1792ff1ad0ec8fdfdc30fdec40ef jdk8u172-b32
    1.34 +f8e3998fe3d6657c7634e59d49f064169fb295c9 jdk8u172-b33
    1.35 +fb84bb8b59a762e7f48789df98a816ea131c4f54 jdk8u172-b34
    1.36 +15d23e3bac63e5e5e3afe5bc4e345227e940aa5e jdk8u172-b35
    1.37 +285e9030fcc7f91a8a38aff1acc548344f75e9bc jdk8u172-b36
    1.38 +9cdcca47c0b4cf24b1dd8dd82f51a7cf2b445f2c jdk8u172-b37
    1.39  878ad885b1cf41de2bdcf143f15edc10c0238920 jdk8u181-b01
    1.40  7a978c1e3ac0f8ef05c4b1ca3526db204f978f2e jdk8u181-b02
    1.41  291ef420de8c8c5eb6c7004dd99c41d150f59696 jdk8u181-b03
    1.42 +35053a2559d252b12754fc30694d61cbd688dcdb jdk8u191-b00
    1.43 +570a943deff0a58a1c78d6ae392b8f7664189639 jdk8u172-b05
    1.44 +7a536f0ffba631f36c43820df8eb201886c4f6b7 jdk8u162-b35
    1.45 +518c46fee6170452a8e0376e08cc9de4a1db339b jdk8u162-b36
    1.46 +57fac9abdbddf9fc875f31aefeb2623b443607cd jdk8u162-b37
    1.47 +b43391a4015f0c890c90ab33fe03b941876d2ee6 jdk8u171-b00
    1.48 +25e6ecbfeb092b43c2a04014fe8f1bf03e005c63 jdk8u171-b01
    1.49 +294248d232cf45819af0d15000b0e172953f3fa9 jdk8u171-b02
    1.50 +2e4cccb6df4802405c21078b905f9c9db74fea04 jdk8u171-b03
    1.51 +068b0c57acac24edcf925e3cca73afe671ed7cac jdk8u171-b04
    1.52 +8479be9da1fa9572a36adcfce19bd36579c9c37c jdk8u171-b05
    1.53 +bd5a858e029446e777a99835482ccb389c417299 jdk8u171-b06
    1.54 +9a1b6701c75304bf9522b75ce20449aa5ee9b4b7 jdk8u171-b07
    1.55 +3a59623f4028e807b45186078aab1e85958c1172 jdk8u171-b08
    1.56 +615e81982055c9082c795f793ef6fd7fa13b2105 jdk8u171-b09
    1.57 +6b406f0e2b54cff29ec3da1c4d7b34af1590748f jdk8u171-b10
    1.58 +45e4320c2c64893fc20a8b46ff80df92021526cf jdk8u171-b11
    1.59 +16be4c9dff93fdcdb2b705680b641e26320cfd5a jdk8u172-b00
    1.60 +c4309a2d981b00619635888a63a75b1f32f34555 jdk8u172-b01
    1.61 +703e4709edae7f83c3794009954f453d6f3706e8 jdk8u172-b02
    1.62 +b327c90d911f7ad1cfdf32cc18c5f32514b9ce2f jdk8u172-b03
    1.63 +e9368eb17ab6b839b20f4ff6bd657329aac788b4 jdk8u172-b04
    1.64 +570a943deff0a58a1c78d6ae392b8f7664189639 jdk8u172-b05
    1.65 +d214e78a945098244a79a0066b827769ea189e29 jdk8u172-b06
    1.66 +db5f564ce31b9b9abe5966138c6d45adc608b80e jdk8u172-b07
    1.67 +ef209b1aa531edb8eaee608e851b8df844d476fa jdk8u172-b08
    1.68 +fc695409c23dca5cb6c0ebe22ee48100fe7aa893 jdk8u172-b09
    1.69 +7287e0008d111fdd1c259432f4883bb859d84221 jdk8u172-b10
    1.70 +980c4675006fb42ef630d3020f502635bd8811e3 jdk8u172-b11
    1.71  711ace1c558d14a086481048254bab4821489533 jdk8u181-b04
    1.72  09b083e0759c73cd8c3aae6940c9ffb890e66b80 jdk8u181-b05
    1.73  49f87757336025a7caa1b9b5100358fe67ef17ab jdk8u181-b06
    1.74 @@ -862,9 +913,34 @@
    1.75  1ce36a1fca8d437720b014c0123ce87ff89131ab jdk8u181-b11
    1.76  0e8e98ee9f488e885295d4a4fa2f38ab2e123c77 jdk8u181-b12
    1.77  2a12eb329cb9457033a16fe8ebc14a9c5b16e83d jdk8u181-b13
    1.78 +bc04ed57bd9748b241599af98c7b9fb878cbcaf9 jdk8u191-b01
    1.79 +d25514e95cfb9ad9d2afbc17c2eb6f5a4b162cd4 jdk8u191-b02
    1.80 +09ee8f82ecab760192aa7689ceb2cbce881dbf42 jdk8u191-b03
    1.81 +e545fe27629455481aa1cfc96694747c18d51f44 jdk8u191-b04
    1.82 +7aeacf26b3832f7796ea8a16bffbe2ea392e0219 jdk8u191-b05
    1.83 +56f7f52f57fe4aaabf613f6295c6f1ce4032f9c2 jdk8u191-b06
    1.84 +0fdc1c2cdad0cdd44427a647b7c4c630107db7ca jdk8u191-b07
    1.85 +a45582ee03c59bda9b305b24d104052e1ca9f5a9 jdk8u191-b08
    1.86 +2fbd39f7ce39fe7001474fda85edf490e09a66ec jdk8u191-b09
    1.87 +9f2a9efa1739dca8e522ba03ad309318b2d66daf jdk8u191-b10
    1.88 +f1c4301a31a34fbed4c9ce115313340dfdd921be jdk8u191-b25
    1.89 +0299e5e837b8aa7b5a65b306eaadc7095df38211 jdk8u191-b11
    1.90 +b32d941559901f8f7e24701fd86885dad09b8492 jdk8u191-b12
    1.91 +b0d7d6afebacc6ab0a5aa2e5079be6e749c09153 jdk8u191-b26
    1.92  8ff1173372e327cc0e82091052d048260f021515 jdk8u182-b00
    1.93  4cf1454fc10c841f6e4b4d3b5fa8cd6f6b9510cc jdk8u192-b00
    1.94  6ac8c8bf6b7860ec93ccc3080fdd6b80d2f6cccb jdk8u192-b01
    1.95  6e80b9808bec68bc5d3b53e16b4033b5fc01f237 jdk8u192-b02
    1.96  93a40adb036da5fbb6ef88af3f4a58d33b20883b jdk8u192-b03
    1.97  93a40adb036da5fbb6ef88af3f4a58d33b20883b jdk8u202-b00
    1.98 +174559c44f89897e9bb1461e443e0a4650633195 jdk8u192-b04
    1.99 +806cb57c2b08a693b3b5a546c1a7c0487b46679a jdk8u192-b05
   1.100 +641489dd36c039a48e7979ec5d19470fe3481632 jdk8u192-b06
   1.101 +c735d9e2d6046786f58d7ac3db5766865c1fe6c8 jdk8u192-b07
   1.102 +2d48e86e236a9ac01906c4790c155de38a24a673 jdk8u192-b08
   1.103 +b54d13ae94929dbd512063270f9f32c0dc8abebb jdk8u192-b09
   1.104 +c1d86695c8dcf790eb4bcb8cdb1990203eba725c jdk8u192-b10
   1.105 +fc43bdbb9cae112367b564042bc1927763f6d45d jdk8u192-b25
   1.106 +4134dd880b2d2975e42b5491a59c70e92e30d739 jdk8u192-b11
   1.107 +4b335cfde8d80a6b6d855cb34b88bd1951528d54 jdk8u192-b12
   1.108 +b08cb2197601730fd15145f8a15949239d5113e6 jdk8u192-b26
     2.1 --- a/THIRD_PARTY_README	Thu Oct 04 10:15:06 2018 +0100
     2.2 +++ b/THIRD_PARTY_README	Mon Oct 15 15:04:02 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