# HG changeset patch # User Andrew John Hughes # Date 1389186864 21600 # Node ID b06fa297bd6adfd72e3759d762c8a5bb095d74f0 # Parent 9f0405f155d92b68585ba358b88dd0b6571fdbf1 Sync with 2.3 forest, bringing in security fixes. 2014-01-08 Andrew John Hughes * Makefile.am: (CORBA_CHANGESET): Update to IcedTea 2.3 HEAD. (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. * hotspot.map: Update default to IcedTea 2.3 HotSpot HEAD. * patches/boot/ecj-stringswitch.patch: Update MethodHandleNatives change to include getDeclaringClass and getInvocationHandler. diff -r 9f0405f155d9 -r b06fa297bd6a ChangeLog --- a/ChangeLog Tue Aug 06 14:42:42 2013 +0100 +++ b/ChangeLog Wed Jan 08 07:14:24 2014 -0600 @@ -1,3 +1,24 @@ +2014-01-08 Andrew John Hughes + + * Makefile.am: + (CORBA_CHANGESET): Update to IcedTea 2.3 HEAD. + (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. + * hotspot.map: Update default to IcedTea 2.3 HotSpot + HEAD. + * patches/boot/ecj-stringswitch.patch: + Update MethodHandleNatives change to include getDeclaringClass + and getInvocationHandler. + 2013-08-06 Andrew John Hughes * Makefile.am: diff -r 9f0405f155d9 -r b06fa297bd6a Makefile.am --- a/Makefile.am Tue Aug 06 14:42:42 2013 +0100 +++ b/Makefile.am Wed Jan 08 07:14:24 2014 -0600 @@ -4,19 +4,19 @@ JDK_UPDATE_VERSION = 25 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 7f6068c72726 -JAXP_CHANGESET = 5393f32bae76 -JAXWS_CHANGESET = ab28ab1e1484 -JDK_CHANGESET = 64c0a3fb78cd -LANGTOOLS_CHANGESET = 7bd72dadca4a -OPENJDK_CHANGESET = 8f7b2e697b59 +CORBA_CHANGESET = 3850cca0da9a +JAXP_CHANGESET = 190a4ffa6a95 +JAXWS_CHANGESET = bb0717b2e410 +JDK_CHANGESET = 7b65a4d96959 +LANGTOOLS_CHANGESET = 96fc7f35fbed +OPENJDK_CHANGESET = 2ce335eb4926 -CORBA_SHA256SUM = 2ce092d00be6c04fb6f3bdba8d9ffb0efcf8da339a3be3d124603faf61e62ba5 -JAXP_SHA256SUM = 1017d087c3c6b89c1b20bcf7802d384db492cfc7e5ba998e11124330ea8623f1 -JAXWS_SHA256SUM = b9bb3c916abb5dfe80c48c4918a2e52ee488404db10927b7c3a85b40f7215225 -JDK_SHA256SUM = 221a2961a004d45b1cfb5ce7d08225dca46a8bef1930f26fb1cf10c52a29e9d5 -LANGTOOLS_SHA256SUM = 160b1d61c22c5d4d6bc63c80acc7926791310b0ee8827ba5e15c5b36123dc012 -OPENJDK_SHA256SUM = 2b12839074a86cafbe78b5fc8a8c36cc9e8f3d497079a9c45a3c0bf9fe8a8644 +CORBA_SHA256SUM = fdb1bfaa1e9cf23df3b7dbcf13519e666ba9a775c2c1ac428e82c21cde311840 +JAXP_SHA256SUM = d53adc4b9679914da3f8ddf3ec06e6e8bc8d39392a94f45b346f33840df015c5 +JAXWS_SHA256SUM = 12c18a698d391b82f390e8b510cd1b4dc5a1fb8d86db51b9f04cc069696cf8bd +JDK_SHA256SUM = ed0ac5b438b4a9b831763705e97aadbd8cf355adfc510068219ccd52ce8feea5 +LANGTOOLS_SHA256SUM = 16692b0413b923895bfb96784e7de87697bae647939ae151d7b5891911c9f019 +OPENJDK_SHA256SUM = 9c82391dcbde566f79203beb49b6bdaedcdecbcb6264596ada94be9bf60670b0 CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 diff -r 9f0405f155d9 -r b06fa297bd6a hotspot.map --- a/hotspot.map Tue Aug 06 14:42:42 2013 +0100 +++ b/hotspot.map Wed Jan 08 07:14:24 2014 -0600 @@ -1,2 +1,2 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot a6502a8a6b31 5c73225a03c33109a4cbea6274bf5af634a14feddb80ed7471af0c1445c93204 +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot db4c82656465 c7fd9e168f50054640eebc6d019b99d35a57cc71e4cdeeb003d3416357ae6503 diff -r 9f0405f155d9 -r b06fa297bd6a patches/boot/ecj-stringswitch.patch --- a/patches/boot/ecj-stringswitch.patch Tue Aug 06 14:42:42 2013 +0100 +++ b/patches/boot/ecj-stringswitch.patch Wed Jan 08 07:14:24 2014 -0600 @@ -1,6 +1,6 @@ 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 2013-06-21 21:46:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-06-25 21:52:46.683943837 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-12-26 11:50:47.000000000 -0600 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-01-08 05:28:03.697183409 -0600 @@ -350,18 +350,15 @@ if (attrCommands != null) { Attribute.Layout lkey = Attribute.keyForLookup(ctype, name); @@ -30,8 +30,8 @@ } // Find canonical instance of the requested attribute. 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 2013-06-21 21:46:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-06-25 21:52:46.707944219 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-12-26 11:50:47.000000000 -0600 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-01-08 05:28:03.698183413 -0600 @@ -73,16 +73,14 @@ { // Non-standard, undocumented "--unpack" switch enables unpack mode. @@ -89,8 +89,8 @@ if (logFile != null && !logFile.equals("")) { 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 2013-06-21 21:46:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-06-25 21:52:46.707944219 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-12-26 11:50:47.000000000 -0600 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-01-08 05:28:03.716183481 -0600 @@ -1107,30 +1107,25 @@ // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses } if (verbose > 0) @@ -142,8 +142,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-06-21 21:46:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-06-25 21:52:46.707944219 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-12-26 11:50:47.000000000 -0600 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2014-01-08 05:28:03.717183484 -0600 @@ -64,17 +64,23 @@ protected NTLM(String version) throws NTLMException { @@ -180,9 +180,9 @@ fac = SecretKeyFactory.getInstance ("DES"); cipher = Cipher.getInstance ("DES/ECB/NoPadding"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-06-21 21:46:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-06-26 02:23:21.025257579 +0100 -@@ -421,110 +421,105 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-12-26 11:50:47.000000000 -0600 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2014-01-08 05:33:22.980367423 -0600 +@@ -421,112 +421,107 @@ // this method is also called by test/sun/reflect/CallerSensitiveFinder // to validate the hand-maintained list private static boolean isCallerSensitiveMethod(Class defc, String method) { @@ -265,6 +265,7 @@ - case "getDeclaredField": - case "getDeclaredMethod": - case "getDeclaredConstructor": +- case "getDeclaringClass": - case "getEnclosingClass": - case "getEnclosingMethod": - case "getEnclosingConstructor": @@ -284,6 +285,7 @@ + "getDeclaredField".equals(method) || + "getDeclaredMethod".equals(method) || + "getDeclaredConstructor".equals(method) || ++ "getDeclaringClass".equals(method) || + "getEnclosingClass".equals(method) || + "getEnclosingMethod".equals(method) || + "getEnclosingConstructor".equals(method)) { @@ -335,9 +337,11 @@ - case "registerAsParallelCapable": + } else if ("registerAsParallelCapable".equals(method)) { return defc == java.lang.ClassLoader.class; +- case "getInvocationHandler": - case "getProxyClass": - case "newProxyInstance": + } else if ("getProxyClass".equals(method) || ++ "getInvocationHandler".equals(method) || + "newProxyInstance".equals(method)) { return defc == java.lang.reflect.Proxy.class; - case "asInterfaceInstance": @@ -362,7 +366,7 @@ return defc == java.util.logging.Logger.class; } return false; -@@ -528,10 +528,10 @@ +@@ -535,10 +530,10 @@ private static boolean canBeCalledVirtual(MemberName mem) { assert(mem.isInvocable()); Class defc = mem.getDeclaringClass(); @@ -377,8 +381,8 @@ } return false; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-06-21 21:46:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-06-25 21:52:46.711944282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-12-26 11:50:47.000000000 -0600 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2014-01-08 05:28:03.717183484 -0600 @@ -269,14 +269,16 @@ private static @@ -420,8 +424,8 @@ } return null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-06-21 21:46:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-06-25 21:52:46.711944282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-12-26 11:50:47.000000000 -0600 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2014-01-08 05:28:03.718183487 -0600 @@ -119,24 +119,20 @@ String optStr = (opts.length > 1 && opts[1] != null) ? opts[1].trim() @@ -441,17 +445,17 @@ - stackSize, isServer); - break; - case "properties": -+ stackSize, isServer); - printProperties(ostream); +- printProperties(ostream); - break; - case "locale": - printLocale(ostream); +- printLocale(ostream); - break; - default: - printVmSettings(ostream, initialHeapSize, maxHeapSize, - stackSize, isServer); -- printProperties(ostream); -- printLocale(ostream); ++ stackSize, isServer); + printProperties(ostream); + printLocale(ostream); - break; - } + } @@ -459,8 +463,8 @@ /* diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-06-21 21:46:14.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-06-25 21:52:46.711944282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-12-26 11:50:47.000000000 -0600 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2014-01-08 05:28:03.718183487 -0600 @@ -378,19 +378,23 @@ GE; // ">="