/hg/release/icedtea7-2.3: Update with 2012/10/16 security fixes.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 16 21:10:21 PDT 2012
changeset faad80f467c0 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=faad80f467c0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 17 05:09:54 2012 +0100
Update with 2012/10/16 security fixes.
2011-10-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 09.
(CORBA_CHANGESET): Update to IcedTea7 2.3 forest head;
the tag icedtea-2.3.3.
(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 IcedTea7 2.3.3
& zero to IcedTea7 2.1.3.
* patches/boot/ecj-autoboxing.patch:
Add additional case in
java.lang.invoke.MethodHandleImpl.
* patches/boot/ecj-diamond.patch:
Add additional case in
com.sun.beans.decoder.DocumentHandler.
* patches/boot/ecj-stringswitch.patch:
Add additional case in
java.lang.invoke.MethodHandleNatives.
* patches/boot/ecj-trywithresources.patch:
Add additional case in
java.lang.invoke.MethodHandleImpl.
diffstat:
ChangeLog | 32 ++++++
Makefile.am | 26 ++--
hotspot.map | 4 +-
patches/boot/ecj-autoboxing.patch | 12 ++
patches/boot/ecj-diamond.patch | 17 +++
patches/boot/ecj-stringswitch.patch | 150 ++++++++++++++++++++++++++++++++
patches/boot/ecj-trywithresources.patch | 20 ++++
7 files changed, 246 insertions(+), 15 deletions(-)
diffs (321 lines):
diff -r b5dcc4ea49a8 -r faad80f467c0 ChangeLog
--- a/ChangeLog Wed Sep 26 12:05:38 2012 +0200
+++ b/ChangeLog Wed Oct 17 05:09:54 2012 +0100
@@ -1,3 +1,35 @@
+2011-10-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 09.
+ (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head;
+ the tag icedtea-2.3.3.
+ (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 IcedTea7 2.3.3
+ & zero to IcedTea7 2.1.3.
+ * patches/boot/ecj-autoboxing.patch:
+ Add additional case in
+ java.lang.invoke.MethodHandleImpl.
+ * patches/boot/ecj-diamond.patch:
+ Add additional case in
+ com.sun.beans.decoder.DocumentHandler.
+ * patches/boot/ecj-stringswitch.patch:
+ Add additional case in
+ java.lang.invoke.MethodHandleNatives.
+ * patches/boot/ecj-trywithresources.patch:
+ Add additional case in
+ java.lang.invoke.MethodHandleImpl.
+
2012-09-26 Xerxes RÃ¥nby <xerxes at zafena.se>
JamVM
diff -r b5dcc4ea49a8 -r faad80f467c0 Makefile.am
--- a/Makefile.am Wed Sep 26 12:05:38 2012 +0200
+++ b/Makefile.am Wed Oct 17 05:09:54 2012 +0100
@@ -1,22 +1,22 @@
# Dependencies
OPENJDK_VERSION = b30
-JDK_UPDATE_VERSION = 07
+JDK_UPDATE_VERSION = 09
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 7fae6a3a68c7
-JAXP_CHANGESET = ee4bd94136ec
-JAXWS_CHANGESET = c89c6ac953e7
-JDK_CHANGESET = f78eb7e08ee1
-LANGTOOLS_CHANGESET = 867d5041bee6
-OPENJDK_CHANGESET = acba2d30209d
+CORBA_CHANGESET = 9a95d714d136
+JAXP_CHANGESET = f45296ac69be
+JAXWS_CHANGESET = 03f54ef33914
+JDK_CHANGESET = 5ec94d162f05
+LANGTOOLS_CHANGESET = ec73c6927fb7
+OPENJDK_CHANGESET = 301e79a966b4
-CORBA_SHA256SUM = 8d94e9b594e4ae0eff6899cb4ff899ce66db3b4d6ef158e019b7be96e193ec0f
-JAXP_SHA256SUM = 26991edc468b7599a332753a60ff861fde78af439d0a5b87d0e5b389d5e53fb5
-JAXWS_SHA256SUM = a411bdde270bb0451b74fc9ba890159ed1f7070bc25f21b3ebd17b79b42805f8
-JDK_SHA256SUM = 74cd8b7c7ed1d80dd4cfa45565584ec1c24cfd5e10a32fc026b92f0ce27ff224
-LANGTOOLS_SHA256SUM = ded69ccf2baea82b7baf9050c64160733ff45c10c0a363de80d795618c494707
-OPENJDK_SHA256SUM = ae63f88590d4aa82de82322e6bb61b31157e49617a4f8c310fc4c4ab4690f528
+CORBA_SHA256SUM = 4ad0ab1e0ab6f1e0402fd5a5f0b388bb33cc2c553df867e4c5e6ca78a4ede9bb
+JAXP_SHA256SUM = b088dd5d383f27b2ccd433eebcbf3f73c016b3359abdae2a5575455d56668141
+JAXWS_SHA256SUM = 86dfb4fda79de7459b17b6efac6b8d5d6fd7bb1175b7e4ff22ba2ce4a903c05a
+JDK_SHA256SUM = 11a77a35661b2239e73c3fb1318fb6371d0cd7130594d1405df1cb1b17040ea6
+LANGTOOLS_SHA256SUM = c7c67f6805d05c0fa5ddd2a7e406a6adcd0823dd008005563f2b2a88d1f3e6b6
+OPENJDK_SHA256SUM = dce85d9bcc6e213240b6ad49755bf57fc60a515461664890efcce2ed615ca70b
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff -r b5dcc4ea49a8 -r faad80f467c0 hotspot.map
--- a/hotspot.map Wed Sep 26 12:05:38 2012 +0200
+++ b/hotspot.map Wed Oct 17 05:09:54 2012 +0100
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot ea39d76b3bde 25733b44590c950adc42a2e9c366b8a3992803c06dedcc16d2bf0d50fed54844
-zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 47a867dd3005 9f9c2fb9eea9cc2e2d44f23d46615522b09ad0b5dbce2e448458a44e05161e3e
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot d2d0a106917c 872e9e0c36b9fd93e81ac131e60deadb0afa22aa77447150bb45ede77ee6db8b
+zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 767fdaea4155 a2a2c610e9ebb97a3c95be233533035cf4f59c4cc45a553ba09e52106fbad113
diff -r b5dcc4ea49a8 -r faad80f467c0 patches/boot/ecj-autoboxing.patch
--- a/patches/boot/ecj-autoboxing.patch Wed Sep 26 12:05:38 2012 +0200
+++ b/patches/boot/ecj-autoboxing.patch Wed Oct 17 05:09:54 2012 +0100
@@ -243,6 +243,15 @@
return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7);
return fallback.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7);
}
+@@ -1374,7 +1374,7 @@
+ MH_checkCallerClass = IMPL_LOOKUP
+ .findStatic(THIS_CLASS, "checkCallerClass",
+ MethodType.methodType(boolean.class, Class.class, Class.class));
+- assert((boolean) MH_checkCallerClass.invokeExact(THIS_CLASS, THIS_CLASS));
++ assert((Boolean) MH_checkCallerClass.invokeExact(THIS_CLASS, THIS_CLASS));
+ } catch (Throwable ex) {
+ throw new InternalError(ex.toString());
+ }
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/ToGeneric.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java
--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/ToGeneric.java 2011-06-11 00:38:08.000000000 +0100
+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java 2011-07-12 15:12:13.214932157 +0100
@@ -285,3 +294,6 @@
else
return (int) unboxLong(x, false);
}
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2012-10-17 03:17:03.331299684 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2012-10-17 03:19:49.546110492 +0100
diff -r b5dcc4ea49a8 -r faad80f467c0 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Sep 26 12:05:38 2012 +0200
+++ b/patches/boot/ecj-diamond.patch Wed Oct 17 05:09:54 2012 +0100
@@ -6216,3 +6216,20 @@
List<Thread> threads = new ArrayList<Thread>();
for (int i = 0; i < threadCount; i++) {
RandomCollector r = new RandomCollector();
+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 2012-10-17 02:42:13.610815469 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2012-10-17 02:43:02.995461481 +0100
+@@ -62,9 +62,10 @@
+ */
+ public final class DocumentHandler extends DefaultHandler {
+ private final AccessControlContext acc = AccessController.getContext();
+- private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<>();
+- private final Map<String, Object> environment = new HashMap<>();
+- private final List<Object> objects = new ArrayList<>();
++ private final Map<String, Class<? extends ElementHandler>> handlers =
++ new HashMap<String, Class<? extends ElementHandler>>();
++ private final Map<String, Object> environment = new HashMap<String, Object>();
++ private final List<Object> objects = new ArrayList<Object>();
+
+ private Reference<ClassLoader> loader;
+ private ExceptionListener listener;
diff -r b5dcc4ea49a8 -r faad80f467c0 patches/boot/ecj-stringswitch.patch
--- a/patches/boot/ecj-stringswitch.patch Wed Sep 26 12:05:38 2012 +0200
+++ b/patches/boot/ecj-stringswitch.patch Wed Oct 17 05:09:54 2012 +0100
@@ -301,3 +301,153 @@
}
throw new IllegalArgumentException(
+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 2012-10-17 03:48:53.678554395 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2012-10-17 04:20:20.203700764 +0100
+@@ -411,89 +411,84 @@
+ static boolean isCallerSensitive(MemberName mem) {
+ assert(mem.isInvocable());
+ Class<?> defc = mem.getDeclaringClass();
+- switch (mem.getName()) {
+- case "doPrivileged":
++ String memName = mem.getName();
++ if ("doPrivileged".equals(memName)) {
+ return defc == java.security.AccessController.class;
+- case "getUnsafe":
++ } else if ("getUnsafe".equals(memName)) {
+ return defc == sun.misc.Unsafe.class;
+- case "lookup":
++ } else if ("lookup".equals(memName)) {
+ return defc == java.lang.invoke.MethodHandles.class;
+- case "invoke":
++ } else if ("invoke".equals(memName)) {
+ return defc == java.lang.reflect.Method.class;
+- case "get":
+- case "getBoolean":
+- case "getByte":
+- case "getChar":
+- case "getShort":
+- case "getInt":
+- case "getLong":
+- case "getFloat":
+- case "getDouble":
+- case "set":
+- case "setBoolean":
+- case "setByte":
+- case "setChar":
+- case "setShort":
+- case "setInt":
+- case "setLong":
+- case "setFloat":
+- case "setDouble":
++ } else if ("get".equals(memName) ||
++ "getBoolean".equals(memName) ||
++ "getByte".equals(memName) ||
++ "getChar".equals(memName) ||
++ "getShort".equals(memName) ||
++ "getInt".equals(memName) ||
++ "getFloat".equals(memName) ||
++ "getDouble".equals(memName) ||
++ "set".equals(memName) ||
++ "setBoolean".equals(memName) ||
++ "setByte".equals(memName) ||
++ "setChar".equals(memName) ||
++ "setShort".equals(memName) ||
++ "setInt".equals(memName) ||
++ "setLong".equals(memName) ||
++ "setFloat".equals(memName) ||
++ "setDouble".equals(memName)) {
+ return defc == java.lang.reflect.Field.class;
+- case "newInstance":
++ } else if ("newInstance".equals(memName)) {
+ if (defc == java.lang.reflect.Constructor.class) return true;
+ if (defc == java.lang.Class.class) return true;
+- break;
+- case "forName":
+- case "getClassLoader":
+- case "getClasses":
+- case "getFields":
+- case "getMethods":
+- case "getConstructors":
+- case "getDeclaredClasses":
+- case "getDeclaredFields":
+- case "getDeclaredMethods":
+- case "getDeclaredConstructors":
+- case "getField":
+- case "getMethod":
+- case "getConstructor":
+- case "getDeclaredField":
+- case "getDeclaredMethod":
+- case "getDeclaredConstructor":
++ } else if ("forName".equals(memName) ||
++ "getClassLoader".equals(memName) ||
++ "getClasses".equals(memName) ||
++ "getFields".equals(memName) ||
++ "getMethods".equals(memName) ||
++ "getConstructors".equals(memName) ||
++ "getDeclaredClasses".equals(memName) ||
++ "getDeclaredFields".equals(memName) ||
++ "getDeclaredMethods".equals(memName) ||
++ "getDeclaredConstructors".equals(memName) ||
++ "getField".equals(memName) ||
++ "getMethod".equals(memName) ||
++ "getConstructor".equals(memName) ||
++ "getDeclaredField".equals(memName) ||
++ "getDeclaredMethod".equals(memName) ||
++ "getDeclaredConstructor".equals(memName)) {
+ return defc == java.lang.Class.class;
+- case "getConnection":
+- case "getDriver":
+- case "getDrivers":
+- case "deregisterDriver":
++ } else if ("getConnection".equals(memName) ||
++ "getDriver".equals(memName) ||
++ "getDrivers".equals(memName) ||
++ "deregisterDriver".equals(memName)) {
+ return defc == java.sql.DriverManager.class;
+- case "newUpdater":
++ } else if ("newUpdater".equals(memName)) {
+ if (defc == java.util.concurrent.atomic.AtomicIntegerFieldUpdater.class) return true;
+ if (defc == java.util.concurrent.atomic.AtomicLongFieldUpdater.class) return true;
+ if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class) return true;
+- break;
+- case "getContextClassLoader":
++ } else if ("getContextClassLoader".equals(memName)) {
+ return defc == java.lang.Thread.class;
+- case "getPackage":
+- case "getPackages":
++ } else if ("getPackage".equals(memName) ||
++ "getPackages".equals(memName)) {
+ return defc == java.lang.Package.class;
+- case "getParent":
+- case "getSystemClassLoader":
++ } else if ("getParent".equals(memName) ||
++ "getSystemClassLoader".equals(memName)) {
+ return defc == java.lang.ClassLoader.class;
+- case "load":
+- case "loadLibrary":
++ } else if ("load".equals(memName) ||
++ "loadLibrary".equals(memName)) {
+ if (defc == java.lang.Runtime.class) return true;
+ if (defc == java.lang.System.class) return true;
+- break;
+- case "getCallerClass":
++ } else if ("getCallerClass".equals(memName)) {
+ if (defc == sun.reflect.Reflection.class) return true;
+ if (defc == java.lang.System.class) return true;
+- break;
+- case "getCallerClassLoader":
++ } else if ("getCallerClassLoader".equals(memName)) {
+ return defc == java.lang.ClassLoader.class;
+- case "getProxyClass":
+- case "newProxyInstance":
++ } else if ("getProxyClass".equals(memName) ||
++ "newProxyInstance".equals(memName)) {
+ return defc == java.lang.reflect.Proxy.class;
+- case "getBundle":
+- case "clearCache":
++ } else if ("getBundle".equals(memName) ||
++ "clearCache".equals(memName)) {
+ return defc == java.util.ResourceBundle.class;
+ }
+ return false;
diff -r b5dcc4ea49a8 -r faad80f467c0 patches/boot/ecj-trywithresources.patch
--- a/patches/boot/ecj-trywithresources.patch Wed Sep 26 12:05:38 2012 +0200
+++ b/patches/boot/ecj-trywithresources.patch Wed Oct 17 05:09:54 2012 +0100
@@ -1056,3 +1056,23 @@
} catch (IOException x) {
}
return result;
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2012-10-17 03:17:03.331299684 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2012-10-17 03:18:04.192329905 +0100
+@@ -1401,10 +1401,14 @@
+ java.net.URLConnection uconn = tClass.getResource(tResource).openConnection();
+ int len = uconn.getContentLength();
+ byte[] bytes = new byte[len];
+- try (java.io.InputStream str = uconn.getInputStream()) {
++ java.io.InputStream str = null;
++ try {
++ str = uconn.getInputStream();
+ int nr = str.read(bytes);
+ if (nr != len) throw new java.io.IOException(tResource);
+- }
++ } finally {
++ str.close();
++ }
+ values[0] = bytes;
+ } catch (java.io.IOException ex) {
+ throw new InternalError(ex.toString());
More information about the distro-pkg-dev
mailing list