Mon, 15 Oct 2018 15:27:46 +0100
Merge
.hgtags | file | annotate | diff | comparison | revisions | |
THIRD_PARTY_README | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Thu Oct 04 10:19:35 2018 +0100 1.2 +++ b/.hgtags Mon Oct 15 15:27:46 2018 +0100 1.3 @@ -851,6 +851,30 @@ 1.4 f112f1acb17609cdd4151abf21f069d2bae24e99 jdk8u162-b11 1.5 90286557058376d6c01260e3c192f76111f78b36 jdk8u162-b12 1.6 07db50c5408300e6a56dcf0a5a74aad27616f36e jdk8u162-b31 1.7 +fdc876cee8474603fb269d8e2a78d56e0809b66c jdk8u162-b32 1.8 +e3145e4e2176d1b7d4d0ddd2fb90807ec1de6983 jdk8u162-b33 1.9 +cd620bfe0fe22dbe5c2361000c1d46b971db4f55 jdk8u162-b34 1.10 +d21b97106c5dea4f4fb299f2c223bf9554fe9c8a jdk8u162-b35 1.11 +30e2a86d84bc0ca79892256d029e85d937895593 jdk8u162-b36 1.12 +1f13a5b849f8171807cea64bfd330c91639b7074 jdk8u162-b37 1.13 +f2ca22a537c9870b7107ce39b11c63402a115673 jdk8u162-b38 1.14 +c18e76a704169bfdaeb498f6cb46c99251793e19 jdk8u171-b00 1.15 +64357fde9f88e1b462aaa19afff81abdcaace7bc jdk8u171-b01 1.16 +4cd77f7e459d629a2e352fc326cb56ce8fbf55bb jdk8u171-b02 1.17 +a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u171-b03 1.18 +c25be482f93d465d7a1fadf1df1428683d1b42fb jdk8u171-b04 1.19 +206179228d91783e943a857eec52a12b9985db2a jdk8u171-b05 1.20 +53092d863cb60907700ac5fd7d12fc28ce871b2a jdk8u172-b00 1.21 +47a91ecb0b875b8c03c335e11bfe5052bad4f1cf jdk8u172-b01 1.22 +989188d1a978fea3255e733c89718b8c0b21a231 jdk8u172-b02 1.23 +c563af72dd015eb3e528dbd121d23f0743276baa jdk8u172-b03 1.24 +2fefa5723300276ed0076e09d491622030105a25 jdk8u172-b04 1.25 +a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u181-b00 1.26 +fc98059c9fdea52eb66af268332070b8c9680ec7 jdk8u191-b00 1.27 +fc985725f819fe45abf54b0139b9aa3f34125189 jdk8u172-b05 1.28 +d21b97106c5dea4f4fb299f2c223bf9554fe9c8a jdk8u162-b35 1.29 +30e2a86d84bc0ca79892256d029e85d937895593 jdk8u162-b36 1.30 +1f13a5b849f8171807cea64bfd330c91639b7074 jdk8u162-b37 1.31 c18e76a704169bfdaeb498f6cb46c99251793e19 jdk8u171-b00 1.32 64357fde9f88e1b462aaa19afff81abdcaace7bc jdk8u171-b01 1.33 4cd77f7e459d629a2e352fc326cb56ce8fbf55bb jdk8u171-b02 1.34 @@ -876,6 +900,13 @@ 1.35 3f86a51255225110eea453dd260cc4e783607a0d jdk8u172-b09 1.36 1c96dd3f4f1032dd1123c361faa73656f68c0238 jdk8u172-b10 1.37 2c9cfdb5286826d9f176d79086d58ddb0bd61333 jdk8u172-b11 1.38 +b99d109cf86fca764ff4e95cc2d876221ba96875 jdk8u172-b31 1.39 +25279b209800e60fee83800a111b37579c9ce81a jdk8u172-b32 1.40 +f7acec47bd4827c97092142beadaaeeaaf726f71 jdk8u172-b33 1.41 +08e3e8b2c3eb45e3f35677e3dba52d14e9d98d73 jdk8u172-b34 1.42 +bc82da224c12ca69bb364893c5931934e177b49e jdk8u172-b35 1.43 +85c705a1cec6627e8d443e40f44dbdce31c141ed jdk8u172-b36 1.44 +b81c5f9433cac35c74b836e52a71ff79c6f74359 jdk8u172-b37 1.45 88f53fd6adfa128816b422231f3b7cff57e36456 jdk8u181-b01 1.46 dfa9f04efeed7c5a71fb016cd340956b0fcd48b5 jdk8u181-b02 1.47 5a4d3a71aa5f14f81194745ed6de01304ce09829 jdk8u181-b03 1.48 @@ -889,9 +920,34 @@ 1.49 dab3e14146dcacc98a4a4cdaa1d2ab2c2f28ef23 jdk8u181-b11 1.50 3a8cdcba4ab570ce1d2608b27574fc9d63ec5c1a jdk8u181-b12 1.51 e910eba1327dd1abab48a85a1b5890524ebf64af jdk8u181-b13 1.52 +7cfe4a92d1d51c3f6a0477e508338bcd187b520e jdk8u191-b01 1.53 +1f33e21011aaeac7e0d567be4e67f8953c42f6e0 jdk8u191-b02 1.54 +87c55122c89d88cdfd4bf22a0bc9c115429cb78b jdk8u191-b03 1.55 +249320309c12b00ce2c3c489b031d2cc1c99d265 jdk8u191-b04 1.56 +8e8cf8094aafe2ff4971a05551cce21afcd85622 jdk8u191-b05 1.57 +d234bd40acd48f0cd233613b00689179fc3859e6 jdk8u191-b06 1.58 +dc61f279ee5e32984c8942755b6de7ca2c52f9c2 jdk8u191-b07 1.59 +f1801829944a0876f079cc39bdb69cf6c7d489df jdk8u191-b08 1.60 +54538f0a8b8346785f9e62c9910c85f05c8c6297 jdk8u191-b09 1.61 +5e9e2a958660fddff8a27bc567fc0dff9d86fefe jdk8u191-b10 1.62 +394de93b280cb1d578614788dc229299bd5d12a5 jdk8u191-b25 1.63 +f3f92df0a2947114b87b4a0934f7e8db7c7d274f jdk8u191-b11 1.64 +d035a731ab597cffc8e847d46913088273f49f04 jdk8u191-b12 1.65 +17bb956bc44ee4b3f8177e9414d0e4dbb56af417 jdk8u191-b26 1.66 aee7802a04daf266caadc5742737bdd7d9a17937 jdk8u182-b00 1.67 6412528c09e2af2f551b496f455eb2141f20d525 jdk8u192-b00 1.68 db3c95ad833530ff6454cf47b9063325902bbb64 jdk8u192-b01 1.69 b9b11d994f5cab7000f53a2a9cf8a15b2b3f23b1 jdk8u192-b02 1.70 df7eda60d98d11b89fae1eb901899dd88d33ae58 jdk8u192-b03 1.71 df7eda60d98d11b89fae1eb901899dd88d33ae58 jdk8u202-b00 1.72 +7031ed34a60400768d5136df03cbf8f05e6d9a6b jdk8u192-b04 1.73 +6c91965b2ac226596877ee0259f95f858638536e jdk8u192-b05 1.74 +9593cfca3186f7481627bda08b24e3a0a3f7bed4 jdk8u192-b06 1.75 +9c9b0bca2af1c2d66e5e72104ed949286566841f jdk8u192-b07 1.76 +08be6b057771844a619389a791b12bbaa2600879 jdk8u192-b08 1.77 +d00261f4b1f5b8332fc84bfbd0dd4c15f11ce8af jdk8u192-b09 1.78 +d1e08933590e00d9c074922dc13eb3fab8ca8a9d jdk8u192-b10 1.79 +baf29dda8fdc9ffd971e659ac44dbeb37ab98476 jdk8u192-b25 1.80 +3bf2d872627dbce9fcba73f64b7a158e67e5f46f jdk8u192-b11 1.81 +3eb4c8be649b8772eb0e82ce80366e4625ea3397 jdk8u192-b12 1.82 +4bbe353fcc36f1da3ead0c874e15bb649337c183 jdk8u192-b26
2.1 --- a/THIRD_PARTY_README Thu Oct 04 10:19:35 2018 +0100 2.2 +++ b/THIRD_PARTY_README Mon Oct 15 15:27:46 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