Mercurial > hg > release > icedtea7-2.2
changeset 2582:e9a086e0d69c
Include security updates.
2013-02-20 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am,
(HOTSPOT_CHANGESET): Update to IcedTea7 2.2 forest head,
bringing in latest security updates.
(HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* patches/boot/ecj-stringswitch.patch:
Update MethodHandleNatives case.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Wed, 20 Feb 2013 03:57:32 +0000 |
parents | d4583451ffa3 |
children | bc2e3e5429e2 |
files | ChangeLog Makefile.am patches/boot/ecj-stringswitch.patch |
diffstat | 3 files changed, 50 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 14 00:48:42 2013 +0000 +++ b/ChangeLog Wed Feb 20 03:57:32 2013 +0000 @@ -1,3 +1,24 @@ +2013-02-20 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am, + (HOTSPOT_CHANGESET): Update to IcedTea7 2.2 forest head, + bringing in latest security updates. + (HOTSPOT_CHANGESET): Likewise. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (HOTSPOT_SHA256SUM): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * patches/boot/ecj-stringswitch.patch: + Update MethodHandleNatives case. + 2013-02-13 Andrew John Hughes <gnu.andrew@member.fsf.org> * configure.ac: Bump to 2.2.6pre.
--- a/Makefile.am Thu Feb 14 00:48:42 2013 +0000 +++ b/Makefile.am Wed Feb 20 03:57:32 2013 +0000 @@ -4,21 +4,21 @@ JDK_UPDATE_VERSION = 05 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -HOTSPOT_CHANGESET = d2e4bf94d38d -CORBA_CHANGESET = 5a9a1b4aecd3 -JAXP_CHANGESET = 7d285e628870 -JAXWS_CHANGESET = acf0bd2643a5 -JDK_CHANGESET = 59849a48553a -LANGTOOLS_CHANGESET = de74a816c73a -OPENJDK_CHANGESET = ac5792f240c0 +HOTSPOT_CHANGESET = de365dd26484 +CORBA_CHANGESET = 5fcf70e41383 +JAXP_CHANGESET = 988fa5bfeeec +JAXWS_CHANGESET = 1b6e40dd0756 +JDK_CHANGESET = 6a419ec930a6 +LANGTOOLS_CHANGESET = e89d5b6f21a6 +OPENJDK_CHANGESET = cf1afd9bb936 -HOTSPOT_SHA256SUM = 0023b69aa7e7b6c821b0d49bc28c56cf4cc5651f7e8816cb9b841f306ad14a7e -CORBA_SHA256SUM = d093c8317798b47462022c0944da1146677c58f687e599475103ce65292ac0bc -JAXP_SHA256SUM = 89456507df28350f22f3809744b5997164a2e7576d63e9a7472dab37700c8e19 -JAXWS_SHA256SUM = 24044a7f4bdc2368026aaefc7b25f2fc5c6a2b4145a8af7dc9393252dee5e238 -JDK_SHA256SUM = b0a1193a299a0d03cb040cdb538fcefb43bc72e9f61e5b209441931f58c1f351 -LANGTOOLS_SHA256SUM = b96dff5fe7a5a7fa90a73aacd9d67e70ee3598e7ea904e09a841d2e56fb86d9e -OPENJDK_SHA256SUM = 47c661b2bda7167184d91bf7d7010f4ccf94a6b75298961da40c0eefe40fef53 +HOTSPOT_SHA256SUM = c964a3660ba4769f921ad4ebd552b1b4941a30dbe171c48357e42998ca268765 +CORBA_SHA256SUM = e7cb1e30f10dc2135fc8634c38def04efb979fef53633ebeb657cdafd1a649a8 +JAXP_SHA256SUM = 5b2401b3da99da631aa2b6b59e53c1e503e0202574d7b5f64d3d2d5b7049d2a1 +JAXWS_SHA256SUM = d16ed9287454b14a25690afb22dfc956d84458b4f563d3d59e9b0a028f377564 +JDK_SHA256SUM = 94f5f4aaa96eeeaabb0c99a4296ce1d2072b63e974e9fa610df7bff80bd0b9e5 +LANGTOOLS_SHA256SUM = 71cc9ffe06e82df584b7afce8ee95e69d746577cc9a1eca29ce3412c45ccb1a7 +OPENJDK_SHA256SUM = 0be0f572242de2744dcf290a7a1cbf9e70ce18f9c02ee0c18d8c3e0563f7203a CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
--- a/patches/boot/ecj-stringswitch.patch Thu Feb 14 00:48:42 2013 +0000 +++ b/patches/boot/ecj-stringswitch.patch Wed Feb 20 03:57:32 2013 +0000 @@ -304,15 +304,20 @@ 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-01-14 22:25:02.000000000 +0000 +++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-01-15 02:19:34.315049222 +0000 -@@ -411,104 +411,99 @@ +@@ -411,111 +411,106 @@ static boolean isCallerSensitive(MemberName mem) { - assert(mem.isInvocable()); + if (!mem.isInvocable()) return false; // fields are not caller sensitive Class<?> defc = mem.getDeclaringClass(); - switch (mem.getName()) { - case "doPrivileged": +- case "doPrivilegedWithCombiner": + String memName = mem.getName(); -+ if ("doPrivileged".equals(memName)) { ++ if ("doPrivileged".equals(memName) || ++ "doPrivilegedWithCombiner".equals(memName)) { return defc == java.security.AccessController.class; +- case "checkMemberAccess": ++ } else if ("checkMemberAccess".equals(memName)) { + return canBeCalledVirtual(mem, java.lang.SecurityManager.class); - case "getUnsafe": + } else if ("getUnsafe".equals(memName)) { return defc == sun.misc.Unsafe.class; @@ -442,7 +447,7 @@ - break; - case "getContextClassLoader": + } else if ("getContextClassLoader".equals(memName)) { - return defc == java.lang.Thread.class; + return canBeCalledVirtual(mem, java.lang.Thread.class); - case "getPackage": - case "getPackages": + } else if ("getPackage".equals(memName) || @@ -468,11 +473,17 @@ - case "getCallerClassLoader": + } else if ("getCallerClassLoader".equals(memName)) { return defc == java.lang.ClassLoader.class; +- case "registerAsParallelCapable": ++ } else if ("registerAsParallelCapable".equals(memName)) { + return canBeCalledVirtual(mem, java.lang.ClassLoader.class); - case "getProxyClass": - case "newProxyInstance": + } else if ("getProxyClass".equals(memName) || + "newProxyInstance".equals(memName)) { return defc == java.lang.reflect.Proxy.class; +- case "asInterfaceInstance": ++ } else if ("asInterfaceInstance".equals(memName)) { + return defc == java.lang.invoke.MethodHandleProxies.class; - case "getBundle": - case "clearCache": + } else if ("getBundle".equals(memName) ||