Mercurial > hg > icedtea8-forest > corba
changeset 2135:29969b96b06f icedtea-3.17.0
Merge jdk8u272-ga
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Tue, 27 Oct 2020 06:33:35 +0000 |
parents | 968778c7586e (current diff) 4da61571ef68 (diff) |
children | 90a41113e1f3 |
files | .hgtags |
diffstat | 2 files changed, 47 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Oct 27 03:35:17 2020 +0000 +++ b/.hgtags Tue Oct 27 06:33:35 2020 +0000 @@ -1163,3 +1163,11 @@ a702bd3d9db12178cfdd95e862659fe2e8d43e30 jdk8u272-b02 eea7b1a818e9ed1019ebfeb15c4cbc82542c58ea jdk8u272-b03 8aafb146a99e013e197a27641bf1b7f3319133b0 icedtea-3.17.0pre02 +33e9ed39edb721cb28fb9892adba8215429a210e jdk8u272-b04 +dd27c46e8310ffde17f8f902d9d331b971facce2 jdk8u272-b05 +f4d4a3f880dab178d630b042be93528d6b2e8227 jdk8u272-b06 +2d2435272dddfcebdbb52b6217f51794a42016c2 jdk8u272-b07 +d652c48a90eb54c3d8ac7fd2d6bc98af2d6ca5f9 jdk8u272-b08 +244b07da2440e58627c8efea6c2095e6fde6fd10 jdk8u272-b09 +75460f3d14244842fa557130b7d573dafa0b55f0 jdk8u272-b10 +75460f3d14244842fa557130b7d573dafa0b55f0 jdk8u272-ga
--- a/THIRD_PARTY_README Tue Oct 27 03:35:17 2020 +0000 +++ b/THIRD_PARTY_README Tue Oct 27 06:33:35 2020 +0000 @@ -2240,7 +2240,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite v1.8.24, +%% This notice is provided with respect to PC/SC Lite v1.8.26, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- @@ -3242,3 +3242,41 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token +Interface v2.40, which may be included with JRE 8, JDK 8, and OpenJDK 8. + +--- begin of LICENSE --- + +Copyright (c) OASIS Open 2016. All Rights Reserved. + +All capitalized terms in the following text have the meanings assigned to them +in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The +full Policy may be found at the OASIS website: +[http://www.oasis-open.org/policies-guidelines/ipr] + +This document and translations of it may be copied and furnished to others, and +derivative works that comment on or otherwise explain it or assist in its +implementation may be prepared, copied, published, and distributed, in whole or +in part, without restriction of any kind, provided that the above copyright +notice and this section are included on all such copies and derivative works. +However, this document itself may not be modified in any way, including by +removing the copyright notice or references to OASIS, except as needed for the +purpose of developing any document or deliverable produced by an OASIS +Technical Committee (in which case the rules applicable to copyrights, as set +forth in the OASIS IPR Policy, must be followed) or as required to translate it +into languages other than English. + +The limited permissions granted above are perpetual and will not be revoked by +OASIS or its successors or assigns. + +This document and the information contained herein is provided on an "AS IS" +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT +INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR +FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR +ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE +OF THIS DOCUMENT OR ANY PART THEREOF. + +--- end of LICENSE --- + +-------------------------------------------------------------------------------