/hg/release/icedtea7-2.6: 4 new changesets

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

/hg/release/icedtea7-2.6: 4 new changesets

andrew-127
changeset 3826c120e160 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=3826c120e160
author: Andrew John Hughes <[hidden email]>
date: Tue Feb 07 04:14:47 2017 +0000

        Added tag icedtea-2.6.9pre01 for changeset e7d2eae14d02


changeset 270703ff63b4 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=270703ff63b4
author: Andrew John Hughes <[hidden email]>
date: Mon Feb 13 17:07:42 2017 +0000

        Bump to icedtea-2.6.9.

        Upstream changes:
          - Bump to icedtea-2.6.9
          - PR3324: Fix NSS_LIBDIR substitution in make_generic_profile.sh broken by PR1989
          - S6253144: Long narrowing conversion should describe the algorithm used and implied "risks"
          - S6328537: Improve javadocs for Socket class by adding references to SocketOptions
          - S6978886: javadoc shows stacktrace after print error resulting from disk full
          - S6995421: Eliminate the static dependency to sun.security.ec.ECKeyFactory
          - S6996372: synchronizing handshaking hash
          - S7027045: (doc) java/awt/Window.java has several typos in javadoc
          - S7054969: Null-check-in-finally pattern in java/security documentation
          - S7059542: JNDI name operations should be locale independent
          - S7072353: JNDI libraries do not build with javac -Xlint:all -Werror
          - S7075563: Broken link in "javax.swing.SwingWorker"
          - S7077672: jdk8_tl nightly fail in step-2 build on 8/10/11
          - S7088502: Security libraries don't build with javac -Werror
          - S7092447: Clarify the default locale used in each locale sensitive operation
          - S7093640: Enable client-side TLS 1.2 by default
          - S7103570: AtomicIntegerFieldUpdater does not work when SecurityManager is installed
          - S7117360: Warnings in java.util.concurrent.atomic package
          - S7117465: Warning cleanup for IMF classes
          - S7187144: JavaDoc for ScriptEngineFactory.getProgram() contains an error
          - S8000418: javadoc should used a standard "generated by javadoc" string
          - S8000666: javadoc should write directly to Writer instead of composing strings
          - S8000673: remove dead code from HtmlWriter and subtypes
          - S8000970: break out auxiliary classes that will prevent multi-core compilation of the JDK
          - S8001669: javadoc internal DocletAbortException should set cause when appropriate
          - S8008949: javadoc stopped copying doc-files
          - S8011402: Move blacklisting certificate logic from hard code to data
          - S8011547: Update XML Signature implementation to Apache Santuario 1.5.4
          - S8012288: XML DSig API allows wrong tag names and extra elements in SignedInfo
          - S8016217: More javadoc warnings
          - S8017325: Cleanup of the javadoc <code> tag in java.security.cert
          - S8017326: Cleanup of the javadoc <code> tag in java.security.spec
          - S8019772: Fix doclint issues in javax.crypto and javax.security subpackages
          - S8020557: javadoc cleanup in javax.security
          - S8020688: Broken links in documentation at http://docs.oracle.com/javase/6/docs/api/index.
          - S8021108: Clean up doclint warnings and errors in java.text package
          - S8021417: Fix doclint issues in java.util.concurrent
          - S8021833: javadoc cleanup in java.net
          - S8022120: JCK test api/javax_xml/crypto/dsig/TransformService/index_ParamMethods fails
          - S8022175: Fix doclint warnings in javax.print
          - S8022406: Fix doclint issues in java.beans
          - S8022746: List of spelling errors in API doc
          - S8024779: [macosx] SwingNode crashes on exit
          - S8025085: [javadoc] some errors in javax/swing
          - S8025218: [javadoc] some errors in java/awt classes
          - S8025249: [javadoc] fix some javadoc errors in javax/swing/
          - S8025409: Fix javadoc comments errors and warning reported by doclint report
          - S8026021: more fix of javadoc errors and warnings reported by doclint, see the description
          - S8026119: Regression test DHEKeySizing.java failing intermittently
          - S8037099: [macosx] Remove all references to GC from native OBJ-C code
          - S8038184: XMLSignature throws StringIndexOutOfBoundsException if ID attribute value is empty String
          - S8038349: Signing XML with DSA throws Exception when key is larger than 1024 bits
          - S8049244: XML Signature performance issue caused by unbuffered signature data
          - S8049432: New tests for TLS property jdk.tls.client.protocols
          - S8050893: (smartcardio) Invert reset argument in tests in sun/security/smartcardio
          - S8059212: Modify sun/security/smartcardio manual regression tests so that they do not just fail if no cardreader found
          - S8068279: (typo in the spec) javax.script.ScriptEngineFactory.getLanguageName
          - S8068491: Update the protocol for references of docs.oracle.com to HTTPS.
          - S8069038: javax/net/ssl/TLS/TLSClientPropertyTest.java needs to be updated for JDK-8061210
          - S8075118: JVM stuck in infinite loop during verification
          - S8076369: Introduce the jdk.tls.client.protocols system property for JDK 7u
          - S8138725: Add options for Javadoc generation
          - S8139565: Restrict certificates with DSA keys less than 1024 bits
          - S8140353: Improve signature checking
          - S8140422: Add mechanism to allow non default root CAs to be not subject to algorithm restrictions
          - S8140587: Atomic*FieldUpdaters should use Class.isInstance instead of direct class check
          - S8143959: Certificates requiring blacklisting
          - S8145984: [macosx] sun.lwawt.macosx.CAccessible leaks
          - S8148516: Improve the default strength of EC in JDK
          - S8149029: Secure validation of XML based digital signature always enabled when checking wrapping attacks
          - S8151893: Add security property to configure XML Signature secure validation mode
          - S8151934: Resolve class resolution
          - S8155760: Implement Serialization Filtering
          - S8156802: Better constraint checking
          - S8158406: Limited Parameter Processing
          - S8158997: JNDI Protocols Switch
          - S8159507: RuntimeVisibleAnnotation validation
          - S8161218: Better bytecode loading
          - S8161228: URL objects with custom protocol handlers have port changed after deserializing
          - S8161571: Verifying ECDSA signatures permits trailing bytes
          - S8161743: Provide proper login context
          - S8162577: Standardize logging levels
          - S8162973: Better component components
          - S8163304: jarsigner -verbose -verify should print the algorithms used to sign the jar
          - S8164143: Improve components for menu items
          - S8164147: Improve streaming socket output
          - S8164908: ReflectionFactory support for IIOP and custom serialization
          - S8165071: Expand TLS support
          - S8165230: RMIConnection addNotificationListeners failing with specific inputs
          - S8165344: Update concurrency support
          - S8166393: disabledAlgorithms property should not be strictly parsed
          - S8166591: [macos 10.12] Trackpad scrolling of text on OS X 10.12 Sierra is very fast (Trackpad, Retina only)
          - S8166739: Improve extensibility of ObjectInputFilter information passed to the filter
          - S8166875: (tz) Support tzdata2016g
          - S8166878: Connection reset during TLS handshake
          - S8166988: Improve image processing performance
          - S8167104: Additional class construction refinements
          - S8167223: URL handling improvements
          - S8167356: Follow up fix for jdk8 backport of 8164143. Changes for CMenuComponent.m were missed
          - S8167459: Add debug output for indicating if a chosen ciphersuite was legacy
          - S8167472: Chrome interop regression with JDK-8148516
          - S8167591: Add MD5 to signed JAR restrictions
          - S8168705: Better ObjectIdentifier validation
          - S8168714: Tighten ECDSA validation
          - S8168724: ECDSA signing improvments
          - S8168728: DSA signing improvments
          - S8168861: AnchorCertificates uses hardcoded password for cacerts keystore
          - S8168993: JDK8u121 L10n resource file update
          - S8169191: (tz) Support tzdata2016i
          - S8169688: Backout (remove) MD5 from jdk.jar.disabledAlgorithms for January CPU
          - S8169911: Enhanced tests for jarsigner -verbose -verify after JDK-8163304
          - S8170131: Certificates not being blocked by jdk.tls.disabledAlgorithms property
          - S8170268: 8u121 L10n resource file update - msgdrop 20
          - S8173622: Backport of 7180907 is incomplete
          - S8173849: Fix use of java.util.Base64 in test cases
          - S8173854: [TEST] Update DHEKeySizing test case following 8076328 & 8081760

        ChangeLog:

        2017-02-13  Andrew John Hughes  <[hidden email]>

                Bump to icedtea-2.6.9.
                * Makefile.am:
                (JDK_UPDATE_VERSION): Bump to 131.
                (CORBA_CHANGESET): Update to icedtea-2.6.9.
                (JAXP_CHANGESET): Likewise.
                (JAXWS_CHANGESET): Likewise.
                (JDK_CHANGESET): Likewise.
                (LANGTOOLS_CHANGESET): Likewise.
                (OPENJDK_CHANGESET): Likewise.
                (CORBA_SHA256SUM): Likewise.
                (JAXP_SHA256SUM): Likewise.
                (JAXWS_SHA256SUM): Likewise.
                (JDK_SHA256SUM): Likewise.
                (LANGTOOLS_SHA256SUM): Likewise.
                (OPENJDK_SHA256SUM): Likewise.
                (install-data-local): Install blacklisted.certs.
                * NEWS: Updated.
                * configure.ac: Bump to 2.6.9.
                * hotspot.map.in: Update to icedtea-2.6.9.
                * patches/boot/ecj-diamond.patch:
                Regenerated. Add new cases in
                com.sun.jndi.cosnaming.CNCtx,
                com.sun.jndi.cosnaming.CNNameParser,
                com.sun.jndi.cosnaming.IiopUrl,
                com.sun.jndi.dns.DnsContextFactory,
                com.sun.jndi.dns.DnsName,
                com.sun.jndi.dns.NameNode,
                com.sun.jndi.dns.ResourceRecords,
                com.sun.jndi.ldap.EventSupport,
                com.sun.jndi.ldap.LdapClient,
                com.sun.jndi.ldap.LdapCtxFactory,
                com.sun.jndi.ldap.LdapCtx,
                com.sun.jndi.ldap.LdapName,
                com.sun.jndi.ldap.LdapResult,
                com.sun.jndi.ldap.LdapSchemaParser,
                com.sun.jndi.ldap.NamingEventNotifier,
                com.sun.jndi.ldap.Obj,
                com.sun.jndi.ldap.pool.Connections,
                com.sun.jndi.ldap.pool.Pool,
                com.sun.jndi.ldap.sasl.LdapSasl,
                com.sun.jndi.toolkit.ctx.Continuation,
                com.sun.jndi.toolkit.dir.HierMemDirCtx,
                com.sun.jndi.toolkit.dir.SearchFilter,
                com.sun.jndi.toolkit.url.GenericURLContext,
                com.sun.naming.internal.FactoryEnumeration,
                com.sun.naming.internal.ResourceManager,
                com.sun.naming.internal.VersionHelper,
                java.util.logging.LogRecord,
                javax.naming.directory.BasicAttribute,
                javax.naming.directory.BasicAttributes,
                javax.naming.ldap.InitialLdapContext,
                javax.naming.ldap.LdapName,
                javax.naming.ldap.Rdn,
                javax.naming.ldap.Rdn,
                javax.naming.ldap.Rfc2253Parser,
                javax.naming.NamingImpl,
                javax.naming.Reference,
                javax.naming.spi.DirectoryManager,
                javax.naming.spi.NamingManager,
                org.jcp.xml.dsig.internal.dom.Policy,
                sun.awt.im.ExecutableInputMethodManager,
                sun.awt.im.InputContext,
                sun.misc.ObjectInputFilter,
                sun.security.ssl.ExtensionType,
                sun.security.ssl.SupportedEllipticCurvesExtension,
                sun.security.ssl.SupportedEllipticPointFormatsExtension,
                sun.security.tools.jarsigner.Main,
                sun.security.util.UntrustedCertificates,
                sun.security.util.AnchorCertificates,
                sun.security.util.DisabledAlgorithmConstraints and
                sun.security.x509.X509CertImpl.
                * patches/boot/ecj-multicatch.patch:
                Regenerated. Add new cases in
                com.sun.naming.internal.ResourceManager,
                sun.reflect.ReflectionFactory,
                sun.security.x509.X509CertImpl,
                com.sun.jndi.ldap.AbstractLdapNamingEnumeration,
                com.sun.jndi.ldap.Connection and
                com.sun.jndi.ldap.LdapCtx.
                Drop case in sun.security.util.UntrustedCertificates.
                * patches/boot/ecj-stringswitch.patch:
                Regenerated. Add new cases in
                com.sun.jndi.ldap.LdapCtx and
                org.jcp.xml.dsig.internal.dom.Policy.
                * patches/boot/ecj-trywithresources.patch:
                Regenerated. Updated case in
                sun.security.util.UntrustedCertificates.
                Add new cases in
                com.sun.jndi.ldap.Obj,
                sun.security.util.AnchorCertificates and
                sun.security.tools.jarsigner.Main.
                * patches/boot/ecj-underscored_literals.patch:
                Move case from sun.security.ssl.ServerHandshaker
                to sun.security.util.Parsing.
                * patches/pr2124.patch,
                Extend following changes made in 8148516.
                * patches/rh1022017.patch:
                Adapt to changes made in 8148516.


changeset 2e5d3ac98319 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=2e5d3ac98319
author: Andrew John Hughes <[hidden email]>
date: Tue Feb 14 00:36:37 2017 +0000

        Set release date for 2.6.9.

        2017-02-14  Andrew John Hughes  <[hidden email]>

                * NEWS: Set release date to today.


changeset 02db7a584b83 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=02db7a584b83
author: Andrew John Hughes <[hidden email]>
date: Tue Feb 14 03:22:55 2017 +0000

        Added tag icedtea-2.6.9 for changeset 2e5d3ac98319


diffstat:

 .hgtags                                     |     2 +
 ChangeLog                                   |   105 +
 Makefile.am                                 |    30 +-
 NEWS                                        |   119 +-
 configure.ac                                |     2 +-
 hotspot.map.in                              |     2 +-
 patches/boot/ecj-diamond.patch              |  2588 ++++++++++++++++++--------
 patches/boot/ecj-multicatch.patch           |  1244 +++++++-----
 patches/boot/ecj-stringswitch.patch         |  1285 ++++++++----
 patches/boot/ecj-trywithresources.patch     |   867 +++++----
 patches/boot/ecj-underscored_literals.patch |    29 +-
 patches/pr2124.patch                        |    57 +
 patches/rh1022017.patch                     |    70 +-
 13 files changed, 4107 insertions(+), 2293 deletions(-)

diffs (truncated from 9686 to 500 lines):

diff -r e7d2eae14d02 -r 02db7a584b83 .hgtags
--- a/.hgtags Mon Feb 06 09:57:00 2017 +0000
+++ b/.hgtags Tue Feb 14 03:22:55 2017 +0000
@@ -71,3 +71,5 @@
 b7395c4715191762a0e2cbf4b3e964368ba8a32e icedtea-2.6.7
 8f4966ca94674e978325c47a17096486e2785a5a icedtea-2.6.8pre01
 be5bb5b9519d3fc4aa11c30c4237e9e2c1569445 icedtea-2.6.8
+e7d2eae14d02ff79293e5fe6322424669f31a2af icedtea-2.6.9pre01
+2e5d3ac9831958c65df8df48534d1c3159118c88 icedtea-2.6.9
diff -r e7d2eae14d02 -r 02db7a584b83 ChangeLog
--- a/ChangeLog Mon Feb 06 09:57:00 2017 +0000
+++ b/ChangeLog Tue Feb 14 03:22:55 2017 +0000
@@ -1,3 +1,108 @@
+2017-02-14  Andrew John Hughes  <[hidden email]>
+
+ * NEWS: Set release date to today.
+
+2017-02-13  Andrew John Hughes  <[hidden email]>
+
+ Bump to icedtea-2.6.9.
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 131.
+ (CORBA_CHANGESET): Update to icedtea-2.6.9.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (install-data-local): Install blacklisted.certs.
+ * NEWS: Updated.
+ * configure.ac: Bump to 2.6.9.
+ * hotspot.map.in: Update to icedtea-2.6.9.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated. Add new cases in
+ com.sun.jndi.cosnaming.CNCtx,
+ com.sun.jndi.cosnaming.CNNameParser,
+ com.sun.jndi.cosnaming.IiopUrl,
+ com.sun.jndi.dns.DnsContextFactory,
+ com.sun.jndi.dns.DnsName,
+ com.sun.jndi.dns.NameNode,
+ com.sun.jndi.dns.ResourceRecords,
+ com.sun.jndi.ldap.EventSupport,
+ com.sun.jndi.ldap.LdapClient,
+ com.sun.jndi.ldap.LdapCtxFactory,
+ com.sun.jndi.ldap.LdapCtx,
+ com.sun.jndi.ldap.LdapName,
+ com.sun.jndi.ldap.LdapResult,
+ com.sun.jndi.ldap.LdapSchemaParser,
+ com.sun.jndi.ldap.NamingEventNotifier,
+ com.sun.jndi.ldap.Obj,
+ com.sun.jndi.ldap.pool.Connections,
+ com.sun.jndi.ldap.pool.Pool,
+ com.sun.jndi.ldap.sasl.LdapSasl,
+ com.sun.jndi.toolkit.ctx.Continuation,
+ com.sun.jndi.toolkit.dir.HierMemDirCtx,
+ com.sun.jndi.toolkit.dir.SearchFilter,
+ com.sun.jndi.toolkit.url.GenericURLContext,
+ com.sun.naming.internal.FactoryEnumeration,
+ com.sun.naming.internal.ResourceManager,
+ com.sun.naming.internal.VersionHelper,
+ java.util.logging.LogRecord,
+ javax.naming.directory.BasicAttribute,
+ javax.naming.directory.BasicAttributes,
+ javax.naming.ldap.InitialLdapContext,
+ javax.naming.ldap.LdapName,
+ javax.naming.ldap.Rdn,
+ javax.naming.ldap.Rdn,
+ javax.naming.ldap.Rfc2253Parser,
+ javax.naming.NamingImpl,
+ javax.naming.Reference,
+ javax.naming.spi.DirectoryManager,
+ javax.naming.spi.NamingManager,
+ org.jcp.xml.dsig.internal.dom.Policy,
+ sun.awt.im.ExecutableInputMethodManager,
+ sun.awt.im.InputContext,
+ sun.misc.ObjectInputFilter,
+ sun.security.ssl.ExtensionType,
+ sun.security.ssl.SupportedEllipticCurvesExtension,
+ sun.security.ssl.SupportedEllipticPointFormatsExtension,
+ sun.security.tools.jarsigner.Main,
+ sun.security.util.UntrustedCertificates,
+ sun.security.util.AnchorCertificates,
+ sun.security.util.DisabledAlgorithmConstraints and
+ sun.security.x509.X509CertImpl.
+ * patches/boot/ecj-multicatch.patch:
+ Regenerated. Add new cases in
+ com.sun.naming.internal.ResourceManager,
+ sun.reflect.ReflectionFactory,
+ sun.security.x509.X509CertImpl,
+ com.sun.jndi.ldap.AbstractLdapNamingEnumeration,
+ com.sun.jndi.ldap.Connection and
+ com.sun.jndi.ldap.LdapCtx.
+ Drop case in sun.security.util.UntrustedCertificates.
+ * patches/boot/ecj-stringswitch.patch:
+ Regenerated. Add new cases in
+ com.sun.jndi.ldap.LdapCtx and
+ org.jcp.xml.dsig.internal.dom.Policy.
+ * patches/boot/ecj-trywithresources.patch:
+ Regenerated. Updated case in
+ sun.security.util.UntrustedCertificates.
+ Add new cases in
+ com.sun.jndi.ldap.Obj,
+ sun.security.util.AnchorCertificates and
+ sun.security.tools.jarsigner.Main.
+ * patches/boot/ecj-underscored_literals.patch:
+ Move case from sun.security.ssl.ServerHandshaker
+ to sun.security.util.Parsing.
+ * patches/pr2124.patch,
+ Extend following changes made in 8148516.
+ * patches/rh1022017.patch:
+ Adapt to changes made in 8148516.
+
 2017-01-24  Andrew John Hughes  <[hidden email]>
 
  PR3318: Replace 'infinality' with
diff -r e7d2eae14d02 -r 02db7a584b83 Makefile.am
--- a/Makefile.am Mon Feb 06 09:57:00 2017 +0000
+++ b/Makefile.am Tue Feb 14 03:22:55 2017 +0000
@@ -1,22 +1,22 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 121
+JDK_UPDATE_VERSION = 131
 BUILD_VERSION = b00
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = ba84d0d43df1
-JAXP_CHANGESET = 6572cfcae345
-JAXWS_CHANGESET = 3301b643d02c
-JDK_CHANGESET = 296a14de4d24
-LANGTOOLS_CHANGESET = 4f7f0c054b2d
-OPENJDK_CHANGESET = 36a89571adf0
-
-CORBA_SHA256SUM = a2264e6fa08785b30fc4c4f224b7472abbeccae177848b392fc14a606f5de662
-JAXP_SHA256SUM = f600de4086fce75b5519e57c998b84d4785eb6496a28be7d256b4b975b2c8c11
-JAXWS_SHA256SUM = cbc47df67cac7bf68e002012e7cf002ec214b09be6c757d717592cfb699c6d35
-JDK_SHA256SUM = cd1d4e267f28b92e498a3e3b93152506bba522f4a4b24cbc8b7d25032f7c59f0
-LANGTOOLS_SHA256SUM = 20c8fa70545ca0a9d95b6b93258bd2ab3f1b93f45e3a966c5d83f066ced2815f
-OPENJDK_SHA256SUM = 354afc0c16e9813be742133d6751d46dcfdecdc58df1d941684e90f242199958
+CORBA_CHANGESET = 737fd3fbf139
+JAXP_CHANGESET = aa1c302a99fb
+JAXWS_CHANGESET = ea96df8beff4
+JDK_CHANGESET = ce87b1399385
+LANGTOOLS_CHANGESET = dd8e22d986c8
+OPENJDK_CHANGESET = 2dd04ef37829
+
+CORBA_SHA256SUM = 48df47fac80597978951125fda10366b4f65b73b322abb80aefbe1ec58227989
+JAXP_SHA256SUM = bf4e27af83fc88353986b906a0ac245658cf9d7b34629254e5e21b4aeff0621f
+JAXWS_SHA256SUM = a5d499825c2b7745b73b5e3596057013503bd1df3d60d04cd924e02b25313ca3
+JDK_SHA256SUM = 44feb033ad9ae3d4b10f6561f1743fe28a13bbcacd150f2f33f5ef116fece7c5
+LANGTOOLS_SHA256SUM = 3eb33811bf1f8a56ae19078e35da835273e828293bc355b5b04a416bd3c6c96a
+OPENJDK_SHA256SUM = 444c7dcfbcc665b4bb73b7c8b8256ac4d55fdb614ebdc3684a34d5f274684421
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -3322,6 +3322,8 @@
   $(DESTDIR)${prefix}/jre/lib/security
  $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/security/nss.cfg \
   $(DESTDIR)${prefix}/jre/lib/security
+ $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/security/blacklisted.certs \
+  $(DESTDIR)${prefix}/jre/lib/security
  for files in $(BUILD_SDK_DIR)/jre/lib/security/*.jar; do \
   $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/security,$(INSTALL_DATA)) ; \
  done
diff -r e7d2eae14d02 -r 02db7a584b83 NEWS
--- a/NEWS Mon Feb 06 09:57:00 2017 +0000
+++ b/NEWS Tue Feb 14 03:22:55 2017 +0000
@@ -12,8 +12,122 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.6.9 (2017-02-XX):
-
+New in release 2.6.9 (2017-02-14):
+
+* Security fixes
+  - S8138725: Add options for Javadoc generation
+  - S8140353: Improve signature checking
+  - S8151934, CVE-2017-3231: Resolve class resolution
+  - S8156804, CVE-2017-3241: Better constraint checking
+  - S8158406: Limited Parameter Processing
+  - S8158997: JNDI Protocols Switch
+  - S8159507: RuntimeVisibleAnnotation validation
+  - S8161218: Better bytecode loading
+  - S8161743, CVE-2017-3252: Provide proper login context
+  - S8162577: Standardize logging levels
+  - S8162973: Better component components
+  - S8164143, CVE-2017-3260: Improve components for menu items
+  - S8164147, CVE-2017-3261: Improve streaming socket output
+  - S8165071, CVE-2016-2183: Expand TLS support
+  - S8165344, CVE-2017-3272: Update concurrency support
+  - S8166988, CVE-2017-3253: Improve image processing performance
+  - S8167104, CVE-2017-3289: Additional class construction refinements
+  - S8167223, CVE-2016-5552: URL handling improvements
+  - S8168705, CVE-2016-5547: Better ObjectIdentifier validation
+  - S8168714, CVE-2016-5546: Tighten ECDSA validation
+  - S8168728, CVE-2016-5548: DSA signing improvments
+  - S8168724, CVE-2016-5549: ECDSA signing improvments
+* Import of OpenJDK 7 u131 build 0
+  - S6253144: Long narrowing conversion should describe the algorithm used and implied "risks"
+  - S6328537: Improve javadocs for Socket class by adding references to SocketOptions
+  - S6978886: javadoc shows stacktrace after print error resulting from disk full
+  - S6995421: Eliminate the static dependency to sun.security.ec.ECKeyFactory
+  - S6996372: synchronizing handshaking hash
+  - S7027045: (doc) java/awt/Window.java has several typos in javadoc
+  - S7054969: Null-check-in-finally pattern in java/security documentation
+  - S7072353: JNDI libraries do not build with javac -Xlint:all -Werror
+  - S7075563: Broken link in "javax.swing.SwingWorker"
+  - S7077672: jdk8_tl nightly fail in step-2 build on 8/10/11
+  - S7088502: Security libraries don't build with javac -Werror
+  - S7092447: Clarify the default locale used in each locale sensitive operation
+  - S7093640: Enable client-side TLS 1.2 by default
+  - S7103570: AtomicIntegerFieldUpdater does not work when SecurityManager is installed
+  - S7117360: Warnings in java.util.concurrent.atomic package
+  - S7117465: Warning cleanup for IMF classes
+  - S7187144: JavaDoc for ScriptEngineFactory.getProgram() contains an error
+  - S8000418: javadoc should used a standard "generated by javadoc" string
+  - S8000666: javadoc should write directly to Writer instead of composing strings
+  - S8000673: remove dead code from HtmlWriter and subtypes
+  - S8000970: break out auxiliary classes that will prevent multi-core compilation of the JDK
+  - S8001669: javadoc internal DocletAbortException should set cause when appropriate
+  - S8008949: javadoc stopped copying doc-files
+  - S8011402: Move blacklisting certificate logic from hard code to data
+  - S8011547: Update XML Signature implementation to Apache Santuario 1.5.4
+  - S8012288: XML DSig API allows wrong tag names and extra elements in SignedInfo
+  - S8016217: More javadoc warnings
+  - S8017325: Cleanup of the javadoc <code> tag in java.security.cert
+  - S8017326: Cleanup of the javadoc <code> tag in java.security.spec
+  - S8019772: Fix doclint issues in javax.crypto and javax.security subpackages
+  - S8020557: javadoc cleanup in javax.security
+  - S8020688: Broken links in documentation at http://docs.oracle.com/javase/6/docs/api/index.
+  - S8021108: Clean up doclint warnings and errors in java.text package
+  - S8021417: Fix doclint issues in java.util.concurrent
+  - S8021833: javadoc cleanup in java.net
+  - S8022120: JCK test api/javax_xml/crypto/dsig/TransformService/index_ParamMethods fails
+  - S8022175: Fix doclint warnings in javax.print
+  - S8022406: Fix doclint issues in java.beans
+  - S8022746: List of spelling errors in API doc
+  - S8024779: [macosx] SwingNode crashes on exit
+  - S8025085: [javadoc] some errors in javax/swing
+  - S8025218: [javadoc] some errors in java/awt classes
+  - S8025249: [javadoc] fix some javadoc errors in javax/swing/
+  - S8025409: Fix javadoc comments errors and warning reported by doclint report
+  - S8026021: more fix of javadoc errors and warnings reported by doclint, see the description
+  - S8037099: [macosx] Remove all references to GC from native OBJ-C code
+  - S8038184: XMLSignature throws StringIndexOutOfBoundsException if ID attribute value is empty String
+  - S8038349: Signing XML with DSA throws Exception when key is larger than 1024 bits
+  - S8049244: XML Signature performance issue caused by unbuffered signature data
+  - S8049432: New tests for TLS property jdk.tls.client.protocols
+  - S8050893: (smartcardio) Invert reset argument in tests in sun/security/smartcardio
+  - S8059212: Modify sun/security/smartcardio manual regression tests so that they do not just fail if no cardreader found
+  - S8068279: (typo in the spec) javax.script.ScriptEngineFactory.getLanguageName
+  - S8068491: Update the protocol for references of docs.oracle.com to HTTPS.
+  - S8069038: javax/net/ssl/TLS/TLSClientPropertyTest.java needs to be updated for JDK-8061210
+  - S8076369: Introduce the jdk.tls.client.protocols system property for JDK 7u
+  - S8139565: Restrict certificates with DSA keys less than 1024 bits
+  - S8140422: Add mechanism to allow non default root CAs to be not subject to algorithm restrictions
+  - S8140587: Atomic*FieldUpdaters should use Class.isInstance instead of direct class check
+  - S8143959: Certificates requiring blacklisting
+  - S8145984: [macosx] sun.lwawt.macosx.CAccessible leaks
+  - S8148516: Improve the default strength of EC in JDK
+  - S8149029: Secure validation of XML based digital signature always enabled when checking wrapping attacks
+  - S8151893: Add security property to configure XML Signature secure validation mode
+  - S8155760: Implement Serialization Filtering
+  - S8156802: Better constraint checking
+  - S8161228: URL objects with custom protocol handlers have port changed after deserializing
+  - S8161571: Verifying ECDSA signatures permits trailing bytes
+  - S8163304: jarsigner -verbose -verify should print the algorithms used to sign the jar
+  - S8164908: ReflectionFactory support for IIOP and custom serialization
+  - S8165230: RMIConnection addNotificationListeners failing with specific inputs
+  - S8166393: disabledAlgorithms property should not be strictly parsed
+  - S8166591: [macos 10.12] Trackpad scrolling of text on OS X 10.12 Sierra is very fast (Trackpad, Retina only)
+  - S8166739: Improve extensibility of ObjectInputFilter information passed to the filter
+  - S8166875: (tz) Support tzdata2016g
+  - S8166878: Connection reset during TLS handshake
+  - S8167356: Follow up fix for jdk8 backport of 8164143. Changes for CMenuComponent.m were missed
+  - S8167459: Add debug output for indicating if a chosen ciphersuite was legacy
+  - S8167472: Chrome interop regression with JDK-8148516
+  - S8167591: Add MD5 to signed JAR restrictions
+  - S8168861: AnchorCertificates uses hardcoded password for cacerts keystore
+  - S8168993: JDK8u121 L10n resource file update
+  - S8169191: (tz) Support tzdata2016i
+  - S8169688: Backout (remove) MD5 from jdk.jar.disabledAlgorithms for January CPU
+  - S8169911: Enhanced tests for jarsigner -verbose -verify after JDK-8163304
+  - S8170131: Certificates not being blocked by jdk.tls.disabledAlgorithms property
+  - S8170268: 8u121 L10n resource file update - msgdrop 20
+  - S8173622: Backport of 7180907 is incomplete
+  - S8173849: Fix use of java.util.Base64 in test cases
+  - S8173854: [TEST] Update DHEKeySizing test case following 8076328 & 8081760
 * Backports
   - S7102489, PR3316, RH1390708: RFE: cleanup jlong typedef on __APPLE__and _LLP64 systems.
   - S8000351, PR3316, RH1390708: Tenuring threshold should be unsigned
@@ -25,6 +139,7 @@
   - PR3318: Fix glyph y advance
   - PR3318: Always round glyph advance in 26.6 space
   - PR3318: Simplify glyph advance handling
+  - PR3324: Fix NSS_LIBDIR substitution in make_generic_profile.sh broken by PR1989
 * AArch64 port
   - S8165673, PR3320: AArch64: Fix JNI floating point argument handling
 
diff -r e7d2eae14d02 -r 02db7a584b83 configure.ac
--- a/configure.ac Mon Feb 06 09:57:00 2017 +0000
+++ b/configure.ac Tue Feb 14 03:22:55 2017 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.9pre01], [[hidden email]])
+AC_INIT([icedtea], [2.6.9], [[hidden email]])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
diff -r e7d2eae14d02 -r 02db7a584b83 hotspot.map.in
--- a/hotspot.map.in Mon Feb 06 09:57:00 2017 +0000
+++ b/hotspot.map.in Tue Feb 14 03:22:55 2017 +0000
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1d30f5a7723e 525ef3ceb9ed008650c6ced02808e90bc52643230cc5dd7f19815412c07c07a6
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 9fc0d63c2a74 d4ff2b6d44192a796af70e663b3ed2c7dd9e320729929ac650b4a1bc90ef329a
diff -r e7d2eae14d02 -r 02db7a584b83 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Mon Feb 06 09:57:00 2017 +0000
+++ b/patches/boot/ecj-diamond.patch Tue Feb 14 03:22:55 2017 +0000
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-10-28 08:01:29.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-11-11 07:02:18.764911241 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2017-02-07 04:06:20.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2017-02-13 06:52:07.784253574 +0000
 @@ -58,7 +58,7 @@
      private CorbaConnection conn;
 
@@ -11,8 +11,8 @@
      public static synchronized void cleanCache( ORB orb ) {
          synchronized (iorMapLock) {
 diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-10-28 08:01:29.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-11-11 07:02:18.764911241 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2017-02-07 04:06:20.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2017-02-13 06:52:07.784253574 +0000
 @@ -50,7 +50,7 @@
       */
      private class HookPutFields extends ObjectOutputStream.PutField
@@ -23,8 +23,8 @@
          /**
           * Put the value of the named boolean field into the persistent field.
 diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-10-28 08:01:29.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-11-11 07:02:18.764911241 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2017-02-07 04:06:20.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2017-02-13 06:52:07.784253574 +0000
 @@ -1315,7 +1315,7 @@
      protected void shutdownServants(boolean wait_for_completion) {
          Set<ObjectAdapterFactory> oaset;
@@ -35,8 +35,8 @@
 
          for (ObjectAdapterFactory oaf : oaset)
 diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-10-28 08:01:29.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2017-02-07 04:06:20.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2017-02-13 06:52:07.784253574 +0000
 @@ -108,7 +108,7 @@
      private ThreadGroup threadGroup;
 
@@ -56,8 +56,8 @@
 
          for (WorkerThread wt : copy) {
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2017-02-13 06:52:07.788253508 +0000
 @@ -192,7 +192,7 @@
      NodeSet dist = new NodeSet();
      dist.setShouldCacheNodes(true);
@@ -68,8 +68,8 @@
      for (int i = 0; i < nl.getLength(); i++)
      {
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2017-02-13 06:52:07.788253508 +0000
 @@ -220,7 +220,7 @@
    public Map<String, Object> getEnvironmentHash()
    {
@@ -188,8 +188,8 @@
      jarVersions.put(new Long(440237), "xalan.jar from xalan-j_1_2");
      jarVersions.put(new Long(436094), "xalan.jar from xalan-j_1_2_1");
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2017-02-13 06:52:07.788253508 +0000
 @@ -51,7 +51,7 @@
      /**
       * Legal conversions between internal types.
@@ -200,8 +200,8 @@
      static {
          // Possible type conversions between internal types
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2017-02-13 06:52:07.788253508 +0000
 @@ -139,7 +139,7 @@
      private boolean       _isStatic = false;
 
@@ -225,8 +225,8 @@
          // Possible conversions between Java and internal types
          java2Internal.put(Boolean.TYPE, Type.Boolean);
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2017-02-13 06:52:07.788253508 +0000
 @@ -107,7 +107,7 @@
 
          // Check if we have any declared namespaces
@@ -273,8 +273,8 @@
                               SyntaxTreeNode n = _attributeElements.get(k);
                               if (n instanceof LiteralAttribute) {
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2017-02-13 06:52:07.788253508 +0000
 @@ -129,22 +129,22 @@
      /**
       * A mapping between templates and test sequences.
@@ -327,8 +327,8 @@
          _rootPattern = null;
 
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2017-02-13 06:52:07.788253508 +0000
 @@ -107,11 +107,11 @@
      }
 
@@ -365,8 +365,8 @@
          _prefixMapping.put(prefix, uri);
      }
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2017-02-13 06:52:07.788253508 +0000
 @@ -121,7 +121,7 @@
      /**
       * Mapping between mode names and Mode instances.
@@ -395,8 +395,8 @@
      /**
       * A reference to the SourceLoader set by the user (a URIResolver
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2017-02-13 06:52:07.788253508 +0000
 @@ -38,8 +38,8 @@
  final class SymbolTable {
 
@@ -479,8 +479,8 @@
          // Register the namespace URI
          Integer refcnt = _excludedURI.get(uri);
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2017-02-13 06:52:07.788253508 +0000
 @@ -70,7 +70,7 @@
      protected SyntaxTreeNode _parent;          // Parent node
      private Stylesheet       _stylesheet;      // Stylesheet ancestor node
@@ -509,8 +509,8 @@
                  locals.add(varOrParamName);
              }
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2017-02-13 06:52:07.788253508 +0000
 @@ -127,7 +127,7 @@
                   * times. Note that patterns whose kernels are "*", "node()"
                   * and "@*" can between shared by test sequences.
@@ -521,8 +521,8 @@
 
      public MethodGenerator(int access_flags, Type return_type,
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2016-10-28 08:01:30.000000000 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2016-11-11 07:02:18.768911176 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2017-02-07 04:06:22.000000000 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2017-02-13 06:52:07.788253508 +0000
 @@ -37,7 +37,7 @@
  public final class MultiHashtable<K,V> {
      static final long serialVersionUID = -6151608290510033572L;
@@ -542,8 +542,8 @@