# HG changeset patch # User aefimov # Date 1539613666 -3600 # Node ID 29d5186cdb7c5c0a47de00e6487ccaa1dffd85a6 # Parent 9ff825f28ebd3f969e3cbd1b60526149fbc11cb4# Parent 3f98d53fe94b4b066e148a7f805991c0796d0c3f Merge diff -r 9ff825f28ebd -r 29d5186cdb7c .hgtags --- a/.hgtags Thu Oct 04 10:19:35 2018 +0100 +++ b/.hgtags Mon Oct 15 15:27:46 2018 +0100 @@ -851,6 +851,30 @@ f112f1acb17609cdd4151abf21f069d2bae24e99 jdk8u162-b11 90286557058376d6c01260e3c192f76111f78b36 jdk8u162-b12 07db50c5408300e6a56dcf0a5a74aad27616f36e jdk8u162-b31 +fdc876cee8474603fb269d8e2a78d56e0809b66c jdk8u162-b32 +e3145e4e2176d1b7d4d0ddd2fb90807ec1de6983 jdk8u162-b33 +cd620bfe0fe22dbe5c2361000c1d46b971db4f55 jdk8u162-b34 +d21b97106c5dea4f4fb299f2c223bf9554fe9c8a jdk8u162-b35 +30e2a86d84bc0ca79892256d029e85d937895593 jdk8u162-b36 +1f13a5b849f8171807cea64bfd330c91639b7074 jdk8u162-b37 +f2ca22a537c9870b7107ce39b11c63402a115673 jdk8u162-b38 +c18e76a704169bfdaeb498f6cb46c99251793e19 jdk8u171-b00 +64357fde9f88e1b462aaa19afff81abdcaace7bc jdk8u171-b01 +4cd77f7e459d629a2e352fc326cb56ce8fbf55bb jdk8u171-b02 +a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u171-b03 +c25be482f93d465d7a1fadf1df1428683d1b42fb jdk8u171-b04 +206179228d91783e943a857eec52a12b9985db2a jdk8u171-b05 +53092d863cb60907700ac5fd7d12fc28ce871b2a jdk8u172-b00 +47a91ecb0b875b8c03c335e11bfe5052bad4f1cf jdk8u172-b01 +989188d1a978fea3255e733c89718b8c0b21a231 jdk8u172-b02 +c563af72dd015eb3e528dbd121d23f0743276baa jdk8u172-b03 +2fefa5723300276ed0076e09d491622030105a25 jdk8u172-b04 +a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u181-b00 +fc98059c9fdea52eb66af268332070b8c9680ec7 jdk8u191-b00 +fc985725f819fe45abf54b0139b9aa3f34125189 jdk8u172-b05 +d21b97106c5dea4f4fb299f2c223bf9554fe9c8a jdk8u162-b35 +30e2a86d84bc0ca79892256d029e85d937895593 jdk8u162-b36 +1f13a5b849f8171807cea64bfd330c91639b7074 jdk8u162-b37 c18e76a704169bfdaeb498f6cb46c99251793e19 jdk8u171-b00 64357fde9f88e1b462aaa19afff81abdcaace7bc jdk8u171-b01 4cd77f7e459d629a2e352fc326cb56ce8fbf55bb jdk8u171-b02 @@ -876,6 +900,13 @@ 3f86a51255225110eea453dd260cc4e783607a0d jdk8u172-b09 1c96dd3f4f1032dd1123c361faa73656f68c0238 jdk8u172-b10 2c9cfdb5286826d9f176d79086d58ddb0bd61333 jdk8u172-b11 +b99d109cf86fca764ff4e95cc2d876221ba96875 jdk8u172-b31 +25279b209800e60fee83800a111b37579c9ce81a jdk8u172-b32 +f7acec47bd4827c97092142beadaaeeaaf726f71 jdk8u172-b33 +08e3e8b2c3eb45e3f35677e3dba52d14e9d98d73 jdk8u172-b34 +bc82da224c12ca69bb364893c5931934e177b49e jdk8u172-b35 +85c705a1cec6627e8d443e40f44dbdce31c141ed jdk8u172-b36 +b81c5f9433cac35c74b836e52a71ff79c6f74359 jdk8u172-b37 88f53fd6adfa128816b422231f3b7cff57e36456 jdk8u181-b01 dfa9f04efeed7c5a71fb016cd340956b0fcd48b5 jdk8u181-b02 5a4d3a71aa5f14f81194745ed6de01304ce09829 jdk8u181-b03 @@ -889,9 +920,34 @@ dab3e14146dcacc98a4a4cdaa1d2ab2c2f28ef23 jdk8u181-b11 3a8cdcba4ab570ce1d2608b27574fc9d63ec5c1a jdk8u181-b12 e910eba1327dd1abab48a85a1b5890524ebf64af jdk8u181-b13 +7cfe4a92d1d51c3f6a0477e508338bcd187b520e jdk8u191-b01 +1f33e21011aaeac7e0d567be4e67f8953c42f6e0 jdk8u191-b02 +87c55122c89d88cdfd4bf22a0bc9c115429cb78b jdk8u191-b03 +249320309c12b00ce2c3c489b031d2cc1c99d265 jdk8u191-b04 +8e8cf8094aafe2ff4971a05551cce21afcd85622 jdk8u191-b05 +d234bd40acd48f0cd233613b00689179fc3859e6 jdk8u191-b06 +dc61f279ee5e32984c8942755b6de7ca2c52f9c2 jdk8u191-b07 +f1801829944a0876f079cc39bdb69cf6c7d489df jdk8u191-b08 +54538f0a8b8346785f9e62c9910c85f05c8c6297 jdk8u191-b09 +5e9e2a958660fddff8a27bc567fc0dff9d86fefe jdk8u191-b10 +394de93b280cb1d578614788dc229299bd5d12a5 jdk8u191-b25 +f3f92df0a2947114b87b4a0934f7e8db7c7d274f jdk8u191-b11 +d035a731ab597cffc8e847d46913088273f49f04 jdk8u191-b12 +17bb956bc44ee4b3f8177e9414d0e4dbb56af417 jdk8u191-b26 aee7802a04daf266caadc5742737bdd7d9a17937 jdk8u182-b00 6412528c09e2af2f551b496f455eb2141f20d525 jdk8u192-b00 db3c95ad833530ff6454cf47b9063325902bbb64 jdk8u192-b01 b9b11d994f5cab7000f53a2a9cf8a15b2b3f23b1 jdk8u192-b02 df7eda60d98d11b89fae1eb901899dd88d33ae58 jdk8u192-b03 df7eda60d98d11b89fae1eb901899dd88d33ae58 jdk8u202-b00 +7031ed34a60400768d5136df03cbf8f05e6d9a6b jdk8u192-b04 +6c91965b2ac226596877ee0259f95f858638536e jdk8u192-b05 +9593cfca3186f7481627bda08b24e3a0a3f7bed4 jdk8u192-b06 +9c9b0bca2af1c2d66e5e72104ed949286566841f jdk8u192-b07 +08be6b057771844a619389a791b12bbaa2600879 jdk8u192-b08 +d00261f4b1f5b8332fc84bfbd0dd4c15f11ce8af jdk8u192-b09 +d1e08933590e00d9c074922dc13eb3fab8ca8a9d jdk8u192-b10 +baf29dda8fdc9ffd971e659ac44dbeb37ab98476 jdk8u192-b25 +3bf2d872627dbce9fcba73f64b7a158e67e5f46f jdk8u192-b11 +3eb4c8be649b8772eb0e82ce80366e4625ea3397 jdk8u192-b12 +4bbe353fcc36f1da3ead0c874e15bb649337c183 jdk8u192-b26 diff -r 9ff825f28ebd -r 29d5186cdb7c THIRD_PARTY_README --- a/THIRD_PARTY_README Thu Oct 04 10:19:35 2018 +0100 +++ b/THIRD_PARTY_README Mon Oct 15 15:27:46 2018 +0100 @@ -1497,7 +1497,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.6.16, which may be +%% This notice is provided with respect to libpng 1.6.35, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1513,21 +1513,21 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are -Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are -distributed according to the same disclaimer and license as libpng-1.2.5 -with the following individual added to the list of Contributing Authors - - Cosmin Truta - -libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are -Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are -distributed according to the same disclaimer and license as libpng-1.0.6 -with the following individuals added to the list of Contributing Authors +libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are +Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are +derived from libpng-1.0.6, and are distributed according to the same +disclaimer and license as libpng-1.0.6 with the following individuals +added to the list of Contributing Authors: Simon-Pierre Cadieux Eric S. Raymond + Mans Rullgard + Cosmin Truta Gilles Vollant + James Yu + Mandar Sahastrabuddhe + Google Inc. + Vadim Barkov and with the following additions to the disclaimer: @@ -1538,19 +1538,25 @@ risk of satisfactory quality, performance, accuracy, and effort is with the user. +Some files in the "contrib" directory and some configure-generated +files that are distributed with libpng have other copyright owners and +are released under other open source licenses. + libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are -Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are -distributed according to the same disclaimer and license as libpng-0.96, -with the following individuals added to the list of Contributing Authors: +Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from +libpng-0.96, and are distributed according to the same disclaimer and +license as libpng-0.96, with the following individuals added to the list +of Contributing Authors: Tom Lane Glenn Randers-Pehrson Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are -Copyright (c) 1996, 1997 Andreas Dilger -Distributed according to the same disclaimer and license as libpng-0.88, -with the following individuals added to the list of Contributing Authors: +Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, +and are distributed according to the same disclaimer and license as +libpng-0.88, with the following individuals added to the list of +Contributing Authors: John Bowler Kevin Bracey @@ -1559,8 +1565,11 @@ Greg Roelofs Tom Tanner +Some files in the "scripts" directory have other copyright owners +but are released under this license. + libpng versions 0.5, May 1995, through 0.88, January 1996, are -Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. +Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: @@ -1583,13 +1592,13 @@ source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: -1. The origin of this source code must not be misrepresented. - -2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. - -3. This Copyright notice may not be removed or altered from any - source or altered source distribution. + 1. The origin of this source code must not be misrepresented. + + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. + + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. The Contributing Authors and Group 42, Inc. specifically permit, without fee, and encourage the use of this source code as a component to @@ -1597,21 +1606,34 @@ source code in a product, acknowledgment is not required but would be appreciated. - -A "png_get_copyright" function is available, for convenient use in "about" -boxes and the like: - - printf("%s",png_get_copyright(NULL)); - -Also, the PNG logo (in PNG format, of course) is supplied in the -files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). - -Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a -certification mark of the Open Source Initiative. +END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. + +TRADEMARK: + +The name "libpng" has not been registered by the Copyright owner +as a trademark in any jurisdiction. However, because libpng has +been distributed and maintained world-wide, continually since 1995, +the Copyright owner claims "common-law trademark protection" in any +jurisdiction where common-law trademark is recognized. + +OSI CERTIFICATION: + +Libpng is OSI Certified Open Source Software. OSI Certified Open Source is +a certification mark of the Open Source Initiative. OSI has not addressed +the additional disclaimers inserted at version 1.0.7. + +EXPORT CONTROL: + +The Copyright owner believes that the Export Control Classification +Number (ECCN) for libpng is EAR99, which means not subject to export +controls or International Traffic in Arms Regulations (ITAR) because +it is open source, publicly available software, that does not contain +any encryption software. See the EAR, paragraphs 734.3(b)(3) and +734.7(b). Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 22, 2014 +July 15, 2018 --- end of LICENSE ---