Mon, 15 Oct 2018 15:33:48 +0100
Merge
1.1 --- a/.hgtags Tue Sep 25 15:58:42 2018 +0200 1.2 +++ b/.hgtags Mon Oct 15 15:33:48 2018 +0100 1.3 @@ -821,6 +821,13 @@ 1.4 3b37f1a6ba6b98a8aa9b0b43e96b374a22a21b99 jdk8u162-b11 1.5 173b2b978c05e59aa471e82be9013955ebd6b4de jdk8u162-b12 1.6 a127ef57877d806f0840ccd6e7a2be337692fe6e jdk8u162-b31 1.7 +2c309abde14fbef07fe07304f493f770da0f5564 jdk8u162-b32 1.8 +f8f11c61855441c2d2ec1f87ba76e379fb371cd5 jdk8u162-b33 1.9 +a916a62cdb9cbdd7fd6ef5fa2e69092454f4fbab jdk8u162-b34 1.10 +6b0ed08eb07843e581354b94c2b48bf0bac59161 jdk8u162-b35 1.11 +539957b71bf6f416e16f9509c385eeca0a4e796b jdk8u162-b36 1.12 +aa85fe4a8d6932cdf0c2db76ee5183c14e6febbb jdk8u162-b37 1.13 +2b939db00d3b3403aa2c755d22a35e358d491a6a jdk8u162-b38 1.14 d66f57333c7fcc735f87eb0903ffdc0aaf899b32 jdk8u171-b00 1.15 6e7e84f6107b55b5cb98f5ac5e3bffa3e4b8892f jdk8u171-b01 1.16 28f638905f78913e5b6dc89dd88e37223984a105 jdk8u171-b02 1.17 @@ -839,6 +846,8 @@ 1.18 315185c9100a22c0f881de8014623dd352eaf6f5 jdk8u172-b02 1.19 7204958a8c003cc1c79d520d9e7a5c0157e783b3 jdk8u172-b03 1.20 a80949c226a2d13ad5d8dd63b200a999538fa2c2 jdk8u172-b04 1.21 +f2d13f7195163a34af334e0613c953ddec40e115 jdk8u181-b00 1.22 +dda7b81e20a3bb3ea6877d93dd6145381b52b6e4 jdk8u191-b00 1.23 c6ca716659af42fa850dc3fdf0f5d0ae2d6951af jdk8u172-b05 1.24 7a95a1d55d534d0bb8ea398e1eaf85721766a63c jdk8u172-b06 1.25 c3d51ddc22653f63cd6c06e5f2c5b1e7192194e6 jdk8u172-b07 1.26 @@ -849,6 +858,16 @@ 1.27 031aebc4b792ba53dbc384f68bca53c839e8c397 jdk8u181-b01 1.28 a0101c7abbb958c25082a6781e54ce7799178b3e jdk8u181-b02 1.29 71a97231f84e45bc8139dc709807204f3f8bfd8f jdk8u181-b03 1.30 +573414d6be0c77e09b4f50553f5d833c6fd7bf0d jdk8u172-b31 1.31 +ea4cf13643e9816fa7a65ff71879b8a857338910 jdk8u172-b32 1.32 +f4698fa3bdce5852b30efaddb22b904f27ce5d41 jdk8u172-b33 1.33 +c4b95b1dd0c7841a2e51114f2c469896c8b95700 jdk8u172-b34 1.34 +da93fac3ac5f62f74f71c8eecb0619ddb815c8a3 jdk8u172-b35 1.35 +22943cc23d71510d79562c95570eb797c5e198ca jdk8u172-b36 1.36 +25b4e9a6bf41f0b614bfb90c71130aeb6ddada3e jdk8u172-b37 1.37 +031aebc4b792ba53dbc384f68bca53c839e8c397 jdk8u181-b01 1.38 +a0101c7abbb958c25082a6781e54ce7799178b3e jdk8u181-b02 1.39 +71a97231f84e45bc8139dc709807204f3f8bfd8f jdk8u181-b03 1.40 0e936c8f9a27e7841934bcc729b7a371ab701fa1 jdk8u181-b04 1.41 a3d84a257447e53c136d06a2da427cb9b5699cb6 jdk8u181-b05 1.42 685d529a725cd5f820d532e1b8f890707310833e jdk8u181-b06 1.43 @@ -859,9 +878,38 @@ 1.44 e19e26e852d6250739f4ce4de92d4a5bcdd56926 jdk8u181-b11 1.45 760af13b89232fe5387667f3848be95cfead953e jdk8u181-b12 1.46 ead7f893fb2c4a919820497f39a51fa640f4753e jdk8u181-b13 1.47 +c87c3a9a789e8bad94fb39bc3c2c7c4a532f7330 jdk8u191-b01 1.48 +d6007fa4ffae140f4c4ad551a1ee290a0704a094 jdk8u191-b02 1.49 +99395ddbb670d9621c9755afa330c579a57dfd9b jdk8u191-b03 1.50 +25e7fdd40996864b76cce08ba688f6e8281097a6 jdk8u191-b04 1.51 +9eb563f6079523a5e99d44e2d9fe5158d7474186 jdk8u191-b05 1.52 +a8e49c4cae5e46b748ac9ddbc0befc87fea2a7d1 jdk8u191-b06 1.53 +2b457fbca0fc5bdf8e19cc0435fb989edcc15b36 jdk8u191-b07 1.54 +e5404b63db4a10aae7fa4a5639af5e08518c31e7 jdk8u191-b08 1.55 +4c2d3b4689ab5d92c42a4d1e1fa79db16de7bf06 jdk8u191-b09 1.56 +7d04f40e401d762c5a35e932fd9bc22c8448ab96 jdk8u191-b10 1.57 +58ce5d3a1323f868c1a7fa007bd89fc69871c99f jdk8u191-b25 1.58 +2199d624d9e577744d843aa0f25f9b7ebb09d566 jdk8u191-b11 1.59 +6432b2dd408c2e31cbf02acd41e87e4c63f4c69a jdk8u191-b12 1.60 +3322b7fdc03fcbef2ee5328ef75f613a1f71e340 jdk8u191-b26 1.61 3b5b53db61f2aaa5a94fd9ca51162d83565faabe jdk8u182-b00 1.62 dcfe85bcd9017741198b4e4a2045fdaaab212c74 jdk8u192-b00 1.63 7abd14dd301d8a927450a7623c2e5913a5bfa891 jdk8u192-b01 1.64 1380ce862bbd0b65c619bfcea454d612b240e332 jdk8u192-b02 1.65 6d8d269ee313fb1420375c2a81dd71c0b660a65f jdk8u192-b03 1.66 6d8d269ee313fb1420375c2a81dd71c0b660a65f jdk8u202-b00 1.67 +866ed739fa56f9c9d807c70078d28e2e5f52bdcb jdk8u192-b04 1.68 +8ea6a32042c67c34e5cfde7f97184d596602e7b6 jdk8u192-b05 1.69 +b88b6acd0e11adba0de591e562ca14d1d3d4347a jdk8u192-b06 1.70 +b96c7dda62dae179c8b885942d51b5f5f1e0905f jdk8u192-b07 1.71 +8f51ed70d93378f70d0288f8795f0bb0c64a6283 jdk8u192-b08 1.72 +d7057bcda329b0b4368d34465caefef5b3b15f0b jdk8u192-b09 1.73 +34976d70945ff79ce4ea734fdebae826c141256a jdk8u192-b10 1.74 +34976d70945ff79ce4ea734fdebae826c141256a jdk8u192-b10 1.75 +0000000000000000000000000000000000000000 jdk8u192-b10 1.76 +0000000000000000000000000000000000000000 jdk8u192-b10 1.77 +15cc8dfafe99078995d306cbafdbce8c218d4d8c jdk8u192-b10 1.78 +940952a0d50ffb71692f6a4bc03987296e89706e jdk8u192-b25 1.79 +5d4431231254f3ee61ae17c22fcb2b6ca2a09aa3 jdk8u192-b11 1.80 +4d3fefdd2f98b55eaad22525ccf10b9d437b6cdb jdk8u192-b12 1.81 +e131417abf593b920e685f83a744029b340a637e jdk8u192-b26
2.1 --- a/THIRD_PARTY_README Tue Sep 25 15:58:42 2018 +0200 2.2 +++ b/THIRD_PARTY_README Mon Oct 15 15:33:48 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
3.1 --- a/common/autoconf/generated-configure.sh Tue Sep 25 15:58:42 2018 +0200 3.2 +++ b/common/autoconf/generated-configure.sh Mon Oct 15 15:33:48 2018 +0100 3.3 @@ -4337,7 +4337,7 @@ 3.4 #CUSTOM_AUTOCONF_INCLUDE 3.5 3.6 # Do not change or remove the following line, it is needed for consistency checks: 3.7 -DATE_WHEN_GENERATED=1538732652 3.8 +DATE_WHEN_GENERATED=1539613812 3.9 3.10 ############################################################################### 3.11 #