changeset 2698:a612a04781bd icedtea-3.17.0

Merge jdk8u272-ga
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 27 Oct 2020 06:33:34 +0000
parents 62b39c4669fc (current diff) 0080765dcdd2 (diff)
children a43996de60fa
files .hgtags
diffstat 2 files changed, 47 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Oct 27 03:35:19 2020 +0000
+++ b/.hgtags	Tue Oct 27 06:33:34 2020 +0000
@@ -1090,3 +1090,11 @@
 1059e4b7426a1ab9c52ce9aa55daf11d97b13607 jdk8u272-b02
 fbad06cacb73f4ca1701c789f7c1bc3f5c6f08c9 jdk8u272-b03
 aedccd51873f083dda0b571d24076142b9312d91 icedtea-3.17.0pre02
+a0dd128191fdce8034be8bd4c7a1f47ee2426e6d jdk8u272-b04
+afbc213b114cfc20b07318d4c1b2550211e77682 jdk8u272-b05
+e68b51b4e55a792c78f6f043738e75755571d92d jdk8u272-b06
+fec6ed779ae6ebe1cd2b3a97963026b3104f8ded jdk8u272-b07
+34c6baf214648afedf83625ed18a2650ed280c36 jdk8u272-b08
+7f60c2d9823ea2928db8eee582fbc736bd8d962c jdk8u272-b09
+6464ce0569e764ec2c6533f6bf4ca1725a618bdf jdk8u272-b10
+6464ce0569e764ec2c6533f6bf4ca1725a618bdf jdk8u272-ga
--- a/THIRD_PARTY_README	Tue Oct 27 03:35:19 2020 +0000
+++ b/THIRD_PARTY_README	Tue Oct 27 06:33:34 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 ---
+
+-------------------------------------------------------------------------------