/hg/icedtea7: Bump to icedtea-2.6pre23 and OpenJDK 7u80 b32.

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Sat Jun 13 16:43:00 UTC 2015


changeset 7040aac5c90e in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7040aac5c90e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sat Jun 13 01:03:13 2015 +0100

	Bump to icedtea-2.6pre23 and OpenJDK 7u80 b32.

	Upstream changes:
	* From 7u80
	  - S7178362: Socket impls should ignore unsupported proxy types rather than throwing
	  - S7180557: InetAddress.getLocalHost throws UnknownHostException on java7u5 on OSX
	  - S7196009: SunPkcs11 provider fails to parse config path containing parenthesis
	  - S8008386: (cs) Unmappable leading should be decoded to replacement.
	  - S8010371: getaddrinfo can fail with EAI_SYSTEM/EAGAIN, causes UnknownHostException to be thrown
	  - S8026245: InetAddress.getLocalHost crash if IPv6 disabled (macosx)
	  - S8027961: Inet[4|6]Address native initializing code should check field/MethodID values
	  - S8032573: CertificateFactory.getInstance("X.509").generateCertificates(InputStream) does not throw CertificateException for invalid input
	  - S8035938: Memory leak in JvmtiEnv::GetConstantPool
	  - S8037502: build.tools.javazic.Zoneinfo incorrectly calculates raw GMT offset change time
	  - S8055045: StringIndexOutOfBoundsException while reading krb5.conf
	  - S8057008: [TEST_BUG] Test java/awt/Focus/SortingFPT/JDK8048887.java fails with compilation error
	  - S8058113: Execution of OnOutOfMemoryError command hangs on linux-sparc
	  - S8058608: JVM crash during Kerberos logins using des3-cbc-md5 on OSX
	  - S8060170: Support SIO_LOOPBACK_FAST_PATH option on Windows
	  - S8062170: java.security.ProviderException: Error parsing configuration with space
	  - S8062923: XSL: Run-time internal error in 'substring()'
	  - S8062924: XSL: wrong answer from substring() function
	  - S8065238: javax.naming.NamingException after upgrade to JDK 8
	  - S8065553: Failed Java web start via IPv6 (Java7u71 or later)
	  - S8065994: HTTP Tunnel connection to NTLM proxy reauthenticates instead of using keep-alive
	  - S8068625: Remove extra year check for GenerateCurrencyData fix
	  - S8071423: Increment hsx 24.80 build to b08 for 7u80-b07
	  - S8071499: java/net/InetAddress/B5087907.java fails with jdk7u85
	  - S8071807: Increment hsx 24.80 build to b09 for 7u80-b08
	  - S8072040: jdk7u80 l10n resource file translation update
	  - S8072458: jdk/test/Makefile references (to be removed) win32 directory in jtreg
	  - S8072639: Increment hsx 24.80 build to b10 for 7u80-b09
	  - S8074855: [Regression] Test closed/java/awt/image/Raster/IncorrectScanlineStrideTest.java fails
	  - S8075092: Remove erroneous println statement from DoubleByteDecoder
	* From the PPC & AIX port
	  - Changes to make aix compile after the merge
	  - S8069590: AIX port of "8050807: Better performing performance data handling"
	  - S8078482, PR2307: ppc: pass thread to throw_AbstractMethodError
	  - S8080190: PPC64: Fix wrong rotate instructions in the .ad file

	2015-06-12  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* Makefile.am:
		(BUILD_VERSION): Bump to b32.
		(CORBA_CHANGESET): Update to icedtea-2.6pre23.
		(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.
		* NEWS: Updated and duplicates removed.
		* configure.ac: Bump to 2.6.0pre23.
		* hotspot.map.in: Update to icedtea-2.6pre23.
		* patches/boot/ecj-diamond.patch: Regenerated.
		Add new cases in
		com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC and
		sun.security.pkcs12.PKCS12KeyStore.java.


diffstat:

 ChangeLog                      |    24 +
 Makefile.am                    |    26 +-
 NEWS                           |    49 +-
 configure.ac                   |     2 +-
 hotspot.map.in                 |     2 +-
 patches/boot/ecj-diamond.patch |  1194 ++++++++++++++++++++-------------------
 6 files changed, 688 insertions(+), 609 deletions(-)

diffs (truncated from 3442 to 500 lines):

diff -r 909fa12f498c -r 7040aac5c90e ChangeLog
--- a/ChangeLog	Fri Jun 12 19:21:14 2015 +0100
+++ b/ChangeLog	Sat Jun 13 01:03:13 2015 +0100
@@ -1,3 +1,27 @@
+2015-06-12  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(BUILD_VERSION): Bump to b32.
+	(CORBA_CHANGESET): Update to icedtea-2.6pre23.
+	(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.
+	* NEWS: Updated and duplicates removed.
+	* configure.ac: Bump to 2.6.0pre23.
+	* hotspot.map.in: Update to icedtea-2.6pre23.
+	* patches/boot/ecj-diamond.patch: Regenerated.
+	Add new cases in
+	com.sun.org.apache.xalan.internal.xsltc.compiler.XSLTC and
+	sun.security.pkcs12.PKCS12KeyStore.java.
+
 2015-06-12  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* INSTALL:
diff -r 909fa12f498c -r 7040aac5c90e Makefile.am
--- a/Makefile.am	Fri Jun 12 19:21:14 2015 +0100
+++ b/Makefile.am	Sat Jun 13 01:03:13 2015 +0100
@@ -1,22 +1,22 @@
 # Dependencies
 
 JDK_UPDATE_VERSION = 80
-BUILD_VERSION = b05
+BUILD_VERSION = b32
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = c92957e8516c
-JAXP_CHANGESET = 8904cf73c048
-JAXWS_CHANGESET = d4de5503ba99
-JDK_CHANGESET = d17bcae64927
-LANGTOOLS_CHANGESET = a322987c412f
-OPENJDK_CHANGESET = 851deec2e741
+CORBA_CHANGESET = 9d5c92264131
+JAXP_CHANGESET = 9150a16a7b80
+JAXWS_CHANGESET = 87290096a2fa
+JDK_CHANGESET = ec336c81a545
+LANGTOOLS_CHANGESET = 403eeedf70f4
+OPENJDK_CHANGESET = 88ad67ad5b51
 
-CORBA_SHA256SUM = a07d372afc8d4478922dce71194f16dddaa339a590caac44ed63ec7a495419d0
-JAXP_SHA256SUM = ef5f00ad6ee1306502a75c4a99711cd4ec8202e891b734ab76f051255942bc46
-JAXWS_SHA256SUM = 809959c2c1a055e7997c064a5637e80b748f891a9908e37e4b97a8e9b5439868
-JDK_SHA256SUM = 542b0505e137e72148c948d92c3c1c280d01f46ed179b2e761b9f62935d3eae7
-LANGTOOLS_SHA256SUM = b83f713eb0908083f1535c99bb27715612ddd1be73a847518976d8cf2ea7ef2c
-OPENJDK_SHA256SUM = 29c4ec54bfaad49e3b1f144562975c6e22504b576a9984a7bd61f17928eba219
+CORBA_SHA256SUM = 744b293bd34a570bc2155698a3e46572cb0e8433f7edcdcb594a37d8f8ac1cdd
+JAXP_SHA256SUM = 7325b18725730e780049259b428c8814fa8686f49c27ff419e03cc6926e88f87
+JAXWS_SHA256SUM = 760c32f84da4cf8794d685431135a7017217f48a16449b78313648d8aeb89097
+JDK_SHA256SUM = 7019b768badebe30ec3cea2fe04b240b8760e9879d8d215f3b6151d8f1dce9ba
+LANGTOOLS_SHA256SUM = 4389ea4ab8032be7ad1e4ad5f16d6b563059776b766e1672ecfff4b80d46f3e1
+OPENJDK_SHA256SUM = f2c024cae6479b49a864685a7c87b0e8109099e8057de878147363b579aa33ff
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
diff -r 909fa12f498c -r 7040aac5c90e NEWS
--- a/NEWS	Fri Jun 12 19:21:14 2015 +0100
+++ b/NEWS	Sat Jun 13 01:03:13 2015 +0100
@@ -41,15 +41,20 @@
   - S7164841: Improvements to the GC log file rotation
   - S7172176: test/sun/tools/jconsole/ImmutableResourceTest.sh failing
   - S7172865: PropertyDescriptor fails to work with setter method name if setter is non-void
+  - S7178362: Socket impls should ignore unsupported proxy types rather than throwing
   - S7180038: regression test failure, SSLEngineBadBufferArrayAccess.java
+  - S7180557: InetAddress.getLocalHost throws UnknownHostException on java7u5 on OSX
+  - S7196009: SunPkcs11 provider fails to parse config path containing parenthesis
   - S7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx]
   - S8001633: Wrong alt processing during switching between windows.
   - S8002148: [TEST_BUG] The four lines printed are not the bold typeface.
   - S8004488: wrong permissions checked in krb5
   - S8006023: Embedded Builds fail management test because of requirement for UsePerfData being enabled.
   - S8008328: [partfait] Null pointer defererence in hotspot/src/cpu/x86/vm/frame_x86.inline.hpp
+  - S8008386: (cs) Unmappable leading should be decoded to replacement.
   - S8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
   - S8009258: TEST_BUG:java/io/pathNames/GeneralWin32.java fails intermittently
+  - S8010371: getaddrinfo can fail with EAI_SYSTEM/EAGAIN, causes UnknownHostException to be thrown
   - S8010738: G1: Output for full GCs with +PrintGCDetails should contain perm gen/meta data size change info
   - S8011795: DOM Serializer prints stack traces to System.err
   - S8012625: Incorrect handling of HTTP/1.1 " Expect: 100-continue " in HttpURLConnection
@@ -76,10 +81,12 @@
   - S8025644: java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java fails with TestData): failure java.lang.AssertionError: expected [true] but found [false]
   - S8025710: Proxied HTTPS connections reused by HttpClient can send CONNECT to the server
   - S8025917: JDK demo applets not running with >=7u40 or (JDK 8 and JDK 9)
+  - S8026245: InetAddress.getLocalHost crash if IPv6 disabled (macosx)
   - S8026303: CMS: JVM intermittently crashes with "FreeList of size 258 violates Conservation Principle" assert
   - S8027026: Change keytool -genkeypair to use -keyalg RSA
   - S8027348: (process) Enhancement of handling async close of ProcessInputStream
   - S8027695: There should be a space before % sign in Swedish locale
+  - S8027961: Inet[4|6]Address native initializing code should check field/MethodID values
   - S8028073: race condition in ObjectMonitor implementation causing deadlocks
   - S8028074: InetAddress.getByName fails with UHE "invalid IPv6 address" if host name starts with a-f
   - S8028159: C2: compiler stack overflow during inlining of @ForceInline methods
@@ -92,7 +99,6 @@
   - S8029775: Solaris code cleanup
   - S8030114: [parfait] warnings from b119 for jdk.src.share.native.sun.security.smartcardio: JNI exception pending
   - S8030192: TESTFAIL: java/util/logging/TestLoggerBundleSync.java failed with NPE
-  - S8030698: Several GUI labels in jconsole need correction
   - S8030712: TEST_BUG : java/lang/ProcessBuilder/BasicLauncher.java fails if java output contains VM warning
   - S8030878: JConsole issues meaningless message if SSL connection fails
   - S8030976: Untaken paths should be more vigorously pruned at highest optimization level
@@ -106,6 +112,7 @@
   - S8031764: tmtools/jmap/heap_config tests fail on Linux-ia32 because it Cant attach to the core file
   - S8031765: Child process error stream is not empty!
   - S8032466: serviceability/sa/jmap-hashcode/Test8028623.java fails with compilation errors
+  - S8032573: CertificateFactory.getInstance("X.509").generateCertificates(InputStream) does not throw CertificateException for invalid input
   - S8032808: Support Solaris SO_FLOW_SLA socket option
   - S8032832: Applet/browser deadlocks, when IIS integrated authentication is used
   - S8032864: [macosx] sigsegv (0Xb) Being Generated When Starting JDev With Voiceover Running
@@ -122,10 +129,11 @@
   - S8034920: new hotspot build - hs24.80-b03
   - S8035435: new hotspot build - hs24.80-b04
   - S8035973: NPE in ForwardBuilder
-  - S8035988: 7u60 l10n resource file translation update 1
+  - S8035938: Memory leak in JvmtiEnv::GetConstantPool
   - S8036778: new hotspot build - hs24.80-b05
   - S8036823: Stack trace sometimes shows 'locked' instead of 'waiting to lock'
   - S8036981: JAXB not preserving formatting for xsd:any Mixed content
+  - S8037502: build.tools.javazic.Zoneinfo incorrectly calculates raw GMT offset change time
   - S8037945: Paths.get("").normalize() throws ArrayIndexOutOfBoundsException
   - S8038274: update 8u fix for 8028073 now that 8028280 is backported to 8u
   - S8038440: backport few C2 fixes
@@ -176,12 +184,9 @@
   - S8046516: Segmentation fault in JVM (easily reproducible)
   - S8046559: NPE when changing Windows theme
   - S8046588: test for SO_FLOW_SLA availability does not check for EACCESS
-  - S8046656: Update protocol support
-  - S8046769: Set T family feature bit on Niagara systems
   - S8047186: jdk.net.Sockets throws InvocationTargetException instead of original runtime exceptions
   - S8047187: Test jdk/net/Sockets/Test.java fails to compile after fix JDK-8046588
   - S8047340: (process) Runtime.exec() fails in Turkish locale
-  - S8048035: Ensure proper proxy protocols
   - S8048050: Agent NullPointerException when rmi.port in use
   - S8048110: Using tables in JTextPane leads to infinite loop in FlowLayout.layoutRow
   - S8048170: Test closed/java/text/Normalizer/ConformanceTest.java failed
@@ -200,31 +205,28 @@
   - S8052159: TEST_BUG: javax/swing/JTextField/8036819/bug8036819.java fails to compile
   - S8052406: SSLv2Hello protocol may be filter out unexpectedly
   - S8054019: Keytool Error publicKey's is not X.509, but X509
-  - S8054367: More references for endpoints
   - S8054478: C2: Incorrectly compiled char[] array access crashes JVM
   - S8054530: C2: assert(res == old_res) failed: Inconsistency between old and new
   - S8054817: File ccache only recognizes Linux and Solaris defaults
   - S8054841: (process) ProcessBuilder leaks native memory
   - S8054883: Segmentation error while running program
-  - S8055304: More boxing for DirectoryComboBoxModel
-  - S8055309: RMI needs better transportation considerations
+  - S8055045: StringIndexOutOfBoundsException while reading krb5.conf
   - S8055421: (fs) bad error handling in java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
-  - S8055489: Better substitution formats
   - S8055731: sun/security/smartcardio/TestDirect.java throws java.lang.IndexOutOfBoundsException
   - S8055949: ByteArrayOutputStream capacity should be maximal array size permitted by VM
   - S8056026: Debug security logging should print Provider used for each crypto operation
   - S8056156: [TEST_BUG] Test javax/swing/JFileChooser/8046391/bug8046391.java fails in Windows
-  - S8056264: Multicast support improvements
-  - S8056276: Fontmanager feature improvements
   - S8056309: Set minor version for hotspot in 7u76 to 76 and build number to b01
   - S8056914: Right Click Menu for Paste not showing after upgrading to java 7
+  - S8057008: [TEST_BUG] Test java/awt/Focus/SortingFPT/JDK8048887.java fails with compilation error
   - S8057530: (process) Runtime.exec throws garbled message in jp locale
-  - S8057555: Less cryptic cipher suite management
   - S8057564: JVM hangs at getAgentProperties after attaching to VM with lower
   - S8057813: Alterations to jdk_security3 test target
+  - S8058113: Execution of OnOutOfMemoryError command hangs on linux-sparc
   - S8058120: Rendering / caret errors with HTMLDocument
   - S8058473: "Comparison method violates its general contract" when using Clipboard
   - S8058583: Remove CompilationRepeat
+  - S8058608: JVM crash during Kerberos logins using des3-cbc-md5 on OSX
   - S8058927: ATG throws ClassNotFoundException
   - S8058932: java/net/InetAddress/IPv4Formats.java failed because hello.foo.bar does exist
   - S8058935: CPU detection gives 0 cores per cpu, 2 threads per core in Amazon EC2 environment
@@ -232,20 +234,22 @@
   - S8059216: Make PrintGCApplicationStoppedTime print information about stopping threads
   - S8059299: assert(adr_type != NULL) failed: expecting TypeKlassPtr
   - S8059327: XML parser returns corrupt attribute value
-  - S8059485: Resolve parsing ambiguity
   - S8059563: (proxy) sun.misc.ProxyGenerator.generateProxyClass should create intermediate directories
   - S8060006: No Russian time zones mapping for Windows
   - S8060169: Update the Crash Reporting URL in the Java crash log
-  - S8061210: Issues in TLS
+  - S8060170: Support SIO_LOOPBACK_FAST_PATH option on Windows
   - S8061507: Increment hsx 24.76 build to b02 for 7u76-b05
   - S8061694: Increment hsx 24.76 build to b03 for 7u76-b06
   - S8061954: 7u76 - deployment warning dialogs do not work on Linux
   - S8062021: NPE in sun/lwawt/macosx/CPlatformWindow::toFront after JDK-8060146
+  - S8062170: java.security.ProviderException: Error parsing configuration with space
   - S8062178: merge issue: Test closed/java/util/TimeZone/Bug6329116.java fails in 7u-cpu nightly
   - S8062608: BCEL corrupts debug data of methods that use generics
   - S8062672: JVM crashes during GC on various asserts which checks that HeapWord ptr is an oop
   - S8062744: jdk.net.Sockets.setOption/getOption does not support IP_TOS
   - S8062771: Core reflection should use final fields whenever possible
+  - S8062923: XSL: Run-time internal error in 'substring()'
+  - S8062924: XSL: wrong answer from substring() function
   - S8064391: More thread safety problems in core reflection
   - S8064407: (fc) FileChannel transferTo should use TransmitFile on Windows
   - S8064493: Increment the build value to b04 for hs24.76 in 7u76-b08
@@ -254,11 +258,14 @@
   - S8064667: Add -XX:+CheckEndorsedAndExtDirs flag to JDK 8
   - S8064846: Lazy-init thread safety problems in core reflection
   - S8065098: JColorChooser no longer supports drag and drop between two JVM instances
+  - S8065238: javax.naming.NamingException after upgrade to JDK 8
   - S8065552: setAccessible(true) on fields of Class may throw a SecurityException
+  - S8065553: Failed Java web start via IPv6 (Java7u71 or later)
   - S8065609: 7u76 l10n resource file translation update
   - S8065618: C2 RA incorrectly removes kill projections
   - S8065674: javac generates incorrect LVT table for trivial cases
   - S8065765: Missing space in output message from -XX:+CheckEndorsedAndExtDirs
+  - S8065994: HTTP Tunnel connection to NTLM proxy reauthenticates instead of using keep-alive
   - S8066045: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1
   - S8066103: C2's range check smearing allows out of bound array accesses
   - S8066612: Add a test that will call getDeclaredFields() on all classes and try to set them accessible.
@@ -267,7 +274,16 @@
   - S8066775: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1
   - S8068338: Better message about incompatible zlib in Deflater.init
   - S8068507: (fc) Rename the new jdk.net.enableFastFileTransfer system property to jdk.nio.enableFastFileTransfer
+  - S8068625: Remove extra year check for GenerateCurrencyData fix
   - S8068639: Make certain annotation classfile warnings opt-in
+  - S8071423: Increment hsx 24.80 build to b08 for 7u80-b07
+  - S8071499: java/net/InetAddress/B5087907.java fails with jdk7u85
+  - S8071807: Increment hsx 24.80 build to b09 for 7u80-b08
+  - S8072040: jdk7u80 l10n resource file translation update
+  - S8072458: jdk/test/Makefile references (to be removed) win32 directory in jtreg
+  - S8072639: Increment hsx 24.80 build to b10 for 7u80-b09
+  - S8074855: [Regression] Test closed/java/awt/image/Raster/IncorrectScanlineStrideTest.java fails
+  - S8075092: Remove erroneous println statement from DoubleByteDecoder
 * Backports
   - S4890063, PR2305, RH1214835: HPROF: default text truncated when using doe=n option
   - S6991580, PR2308, RH1210739: IPv6 Nameservers in resolv.conf throws NumberFormatException
@@ -304,6 +320,11 @@
   - S8076467: AARCH64: assertion fail with -XX:+UseG1GC
   - S8079203: AARCH64: Need to cater for different partner implementations
   - S8080586: aarch64: hotspot test compiler/codegen/7184394/TestAESMain.java fails
+* PPC & AIX port
+  - Changes to make aix compile after the merge
+  - S8069590: AIX port of "8050807: Better performing performance data handling"
+  - S8078482, PR2307: ppc: pass thread to throw_AbstractMethodError
+  - S8080190: PPC64: Fix wrong rotate instructions in the .ad file
 
 New in release 2.5.5 (2015-04-14):
 
diff -r 909fa12f498c -r 7040aac5c90e configure.ac
--- a/configure.ac	Fri Jun 12 19:21:14 2015 +0100
+++ b/configure.ac	Sat Jun 13 01:03:13 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.0pre22], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6.0pre23], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
diff -r 909fa12f498c -r 7040aac5c90e hotspot.map.in
--- a/hotspot.map.in	Fri Jun 12 19:21:14 2015 +0100
+++ b/hotspot.map.in	Sat Jun 13 01:03:13 2015 +0100
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ cb42e88f9787 a5d774f3d3fe6589fb24d16307070489acb6f68903495c472d3f552284321e08
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1afefe2d5f90 e12e2d3d7b228abc3fa12a75455d3af883bce94f58df65e16e7f953592747054
diff -r 909fa12f498c -r 7040aac5c90e patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch	Fri Jun 12 19:21:14 2015 +0100
+++ b/patches/boot/ecj-diamond.patch	Sat Jun 13 01:03:13 2015 +0100
@@ -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	2015-01-29 22:20:19.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2015-01-30 03:30:15.833325373 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2015-06-12 17:38:31.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2015-06-12 23:34:39.974231621 +0100
 @@ -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	2015-01-29 22:20:19.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-01-30 03:30:15.833325373 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-06-12 17:38:31.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java	2015-06-12 23:34:39.978231551 +0100
 @@ -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	2015-01-29 22:20:19.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2015-01-30 03:30:15.833325373 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2015-06-12 17:38:31.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2015-06-12 23:34:39.978231551 +0100
 @@ -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	2015-01-29 22:20:19.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2015-01-30 03:30:15.833325373 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2015-06-12 17:38:31.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2015-06-12 23:34:39.978231551 +0100
 @@ -108,7 +108,7 @@
      private ThreadGroup threadGroup;
  
@@ -55,9 +55,21 @@
          }
  
          for (WorkerThread wt : copy) {
+diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	2015-06-12 17:38:32.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java	2015-06-12 23:34:39.978231551 +0100
+@@ -173,7 +173,7 @@
+         _parser = new Parser(this, useServicesMechanism);
+         _featureManager = featureManager;
+         _extensionClassLoader = null;
+-        _externalExtensionFunctions = new HashMap<>();
++        _externalExtensionFunctions = new HashMap<String, Class>();
+     }
+ 
+     /**
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-01-30 03:29:04.252446195 +0000
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-01-30 03:30:15.833325373 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-06-12 23:14:47.187405507 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2015-06-12 23:34:39.978231551 +0100
 @@ -297,8 +297,8 @@
      //
      private final static class EncodingInfos {
@@ -79,8 +91,8 @@
                      final String javaName = (String) keys.nextElement();
                      final String[] mimes = parseMimeTypes(props.getProperty(javaName));
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2015-01-29 22:21:31.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2015-01-30 03:30:15.833325373 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2015-06-12 18:17:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2015-06-12 23:34:39.978231551 +0100
 @@ -63,9 +63,10 @@
   */
  public final class DocumentHandler extends DefaultHandler {
@@ -96,8 +108,8 @@
      private Reference<ClassLoader> loader;
      private ExceptionListener listener;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2015-01-29 22:21:31.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2015-06-12 18:17:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2015-06-12 23:34:39.978231551 +0100
 @@ -46,7 +46,7 @@
   */
  public final class TypeResolver {
@@ -117,8 +129,8 @@
                      CACHE.put(actual, map);
                  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-01-29 22:21:31.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-06-12 18:17:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java	2015-06-12 23:34:39.978231551 +0100
 @@ -45,7 +45,7 @@
      private final Kind keyKind; // a reference kind for the cache keys
      private final Kind valueKind; // a reference kind for the cache values
@@ -165,8 +177,8 @@
          };
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2015-01-29 22:21:31.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2015-06-12 18:17:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2015-06-12 23:34:39.978231551 +0100
 @@ -104,9 +104,9 @@
          return this.def.compareTo(that.def);
      }
@@ -238,8 +250,8 @@
          for (int i = 0; i < layout.length(); i++) {
              if (layout.charAt(i++) != '[')
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2015-01-30 03:29:05.176457544 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2015-06-12 23:14:47.231404715 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2015-06-12 23:34:39.978231551 +0100
 @@ -257,7 +257,7 @@
          assert(basicCodings[_meta_default] == null);
          assert(basicCodings[_meta_canon_min] != null);
@@ -302,8 +314,8 @@
          return true;
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2015-01-30 03:29:02.384423250 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2015-06-12 23:14:47.135406443 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2015-06-12 23:34:39.978231551 +0100
 @@ -466,7 +466,7 @@
  
      void readInnerClasses(Class cls) throws IOException {
@@ -314,8 +326,8 @@
              InnerClass ic =
                  new InnerClass(readClassRef(),
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2015-01-29 22:21:31.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2015-06-12 18:17:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2015-06-12 23:34:39.978231551 +0100
 @@ -743,9 +743,9 @@
          // Steps 1/2/3 are interdependent, and may be iterated.
          // Steps 4 and 5 may be decided independently afterward.
@@ -352,8 +364,8 @@
                  if (popset.add(values[i]))  popvals.add(values[i]);
              }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2015-01-29 22:21:31.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2015-06-12 18:17:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2015-06-12 23:34:39.978231551 +0100
 @@ -402,7 +402,7 @@
      private static Map<Coding, Coding> codeMap;
  
@@ -364,8 +376,8 @@
          Coding x1 = codeMap.get(x0);
          if (x1 == null)  codeMap.put(x0, x1 = x0);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2015-01-29 22:21:31.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2015-06-12 18:17:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2015-06-12 23:34:39.982231481 +0100
 @@ -921,7 +921,7 @@
      public static
      Index[] partition(Index ix, int[] keys) {
@@ -394,8 +406,8 @@
              Entry e = work.previous();
              work.remove();          // pop stack
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2015-01-30 03:29:05.180457593 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2015-06-12 23:14:47.231404715 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2015-06-12 23:34:39.982231481 +0100
 @@ -61,7 +61,7 @@
                  ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
  
@@ -433,8 +445,8 @@
          for (String optline : options.split("\n")) {
              String[] words = optline.split("\\p{Space}+");
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2015-01-29 22:21:31.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2015-06-12 18:17:17.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2015-06-12 23:34:39.982231481 +0100
 @@ -45,7 +45,7 @@
      private final ArrayList<E> flist;
  
@@ -445,8 +457,8 @@
          for (int i = 0 ; i < capacity ; i++) {
              flist.add(null);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-01-30 03:29:02.616426100 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-01-30 03:30:15.837325421 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-06-12 23:14:47.135406443 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2015-06-12 23:34:39.982231481 +0100
 @@ -112,7 +112,7 @@
      public static final Attribute.Layout attrSourceFileSpecial;
      public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -602,8 +614,8 @@
              // Add to the end of ths list:
              if (!fileSet.contains(cls.file))
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2015-01-30 03:29:05.180457593 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2015-01-30 03:30:15.841325470 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2015-06-12 23:14:47.231404715 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2015-06-12 23:34:39.982231481 +0100
 @@ -686,7 +686,7 @@
          cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
          cp_Signature_classes.readFrom(in);
@@ -717,8 +729,8 @@
              ClassEntry thisClass  = curClass.thisClass;
              ClassEntry superClass = curClass.superClass;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2015-01-30 03:29:05.180457593 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2015-01-30 03:30:15.841325470 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2015-06-12 23:14:47.231404715 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2015-06-12 23:34:39.982231481 +0100
 @@ -116,7 +116,7 @@
      int[][]     attrCounts;       // count attr. occurences
  
@@ -774,8 +786,8 @@
          for (Class cls : pkg.classes) {
              if (!cls.hasInnerClasses())  continue;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2015-01-29 22:21:31.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2015-01-30 03:30:15.841325470 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2015-06-12 18:17:17.000000000 +0100


More information about the distro-pkg-dev mailing list