/hg/release/icedtea7-2.3: Sync to 2.3.10 forest tag, bringing in...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 25 19:45:35 PDT 2013
changeset 7e0d2c785516 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=7e0d2c785516
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jun 26 03:45:13 2013 +0100
Sync to 2.3.10 forest tag, bringing in security updates.
2013-06-25 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 25.
(OPENJDK_VERSION): Set to b30.
(CORBA_CHANGESET): Update to IcedTea 2.3.10 tag.
(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 2.3.10 tag.
* patches/boot/ecj-stringswitch.patch:
Update MethodHandleNatives patch.
* patches/boot/tobin.patch:
Update following move from sun.awt.X11
to sun.awt.
diffstat:
ChangeLog | 25 +++
Makefile.am | 28 ++--
hotspot.map | 2 +-
patches/boot/ecj-stringswitch.patch | 227 +++++++++++++++++------------------
patches/boot/tobin.patch | 38 +++--
5 files changed, 172 insertions(+), 148 deletions(-)
diffs (500 lines):
diff -r a91c52e39914 -r 7e0d2c785516 ChangeLog
--- a/ChangeLog Tue May 28 16:42:32 2013 +0100
+++ b/ChangeLog Wed Jun 26 03:45:13 2013 +0100
@@ -1,3 +1,28 @@
+2013-06-25 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 25.
+ (OPENJDK_VERSION): Set to b30.
+ (CORBA_CHANGESET): Update to IcedTea 2.3.10 tag.
+ (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 2.3.10 tag.
+ * patches/boot/ecj-stringswitch.patch:
+ Update MethodHandleNatives patch.
+ * patches/boot/tobin.patch:
+ Update following move from sun.awt.X11
+ to sun.awt.
+
2013-05-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4
diff -r a91c52e39914 -r 7e0d2c785516 Makefile.am
--- a/Makefile.am Tue May 28 16:42:32 2013 +0100
+++ b/Makefile.am Wed Jun 26 03:45:13 2013 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b02
-JDK_UPDATE_VERSION = 21
+OPENJDK_VERSION = b30
+JDK_UPDATE_VERSION = 25
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = affff8c7b584
-JAXP_CHANGESET = 26be0c933625
-JAXWS_CHANGESET = ba432018cb80
-JDK_CHANGESET = 073c0458daef
-LANGTOOLS_CHANGESET = 0d9ff3ffd433
-OPENJDK_CHANGESET = 73c29b209f76
+CORBA_CHANGESET = 8e581b671511
+JAXP_CHANGESET = 1a02956fcfaf
+JAXWS_CHANGESET = c0e829bfbf62
+JDK_CHANGESET = bd392c168d5c
+LANGTOOLS_CHANGESET = 8cf15d334ad3
+OPENJDK_CHANGESET = fb1ac57ada6c
-CORBA_SHA256SUM = 675d44ab92c3a86a91cbd23bf97ccdb6f3a1c3ac3d5a1191afd36790453270a8
-JAXP_SHA256SUM = 54c106a092f43431133cd6f149f8e615353a9b3c574eade7a444cf97ee92a379
-JAXWS_SHA256SUM = 07a47e77e78bb3bf4df6997eefa078631d7f69260966104d38590b7f499af14f
-JDK_SHA256SUM = 2c985f0b30b3f6762d99262d7b0b7dfa241fe5b9e8046c878148ef47ac09c82b
-LANGTOOLS_SHA256SUM = 53c6a2e450c3621379c26e3be6a72eebf6cae252dabaa7c79a3d786381e644f6
-OPENJDK_SHA256SUM = 8c9222984aa5f0dad7fc14c7b7d4bed354fb86027592896113301a1e97bdad18
+CORBA_SHA256SUM = 510ca43bc0d208f4cbbe716a1652871f63491f37b3e3902610a42d2e1870fd6c
+JAXP_SHA256SUM = acfd7789f0745a79306d339bbc55ad9d05c08b49b5058e7a804323cdced258fe
+JAXWS_SHA256SUM = 014d6f206b628d3d532c98420b8ebc6434c446497a55037aae6bc3535a858892
+JDK_SHA256SUM = f6c7d86b1b3cebb1f26f3d2735a3b7466b31d9c9e56950e4f24c6c1da436247c
+LANGTOOLS_SHA256SUM = e28ff622e407a915c31ba90d8056b3e08d051c9cd6c107c52b0ef4e246adcd23
+OPENJDK_SHA256SUM = 09fd1d517ed890924e580dd50af7d41e2f137668120e24eca4a7d887648f2335
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff -r a91c52e39914 -r 7e0d2c785516 hotspot.map
--- a/hotspot.map Tue May 28 16:42:32 2013 +0100
+++ b/hotspot.map Wed Jun 26 03:45:13 2013 +0100
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 332f7e24a493 da6f849e2b8c0e8c46de4171b9f14ec9d97bac76dd56006d9c33323b23f54f98
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0
zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot b965a723122e 43a5529b36cf619199e45832dead0c6b1841337b6416b0123b807e7312cb1912
diff -r a91c52e39914 -r 7e0d2c785516 patches/boot/ecj-stringswitch.patch
--- a/patches/boot/ecj-stringswitch.patch Tue May 28 16:42:32 2013 +0100
+++ b/patches/boot/ecj-stringswitch.patch Wed Jun 26 03:45:13 2013 +0100
@@ -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-02-17 18:47:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-20 01:19:23.757194433 +0000
+--- 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
@@ -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-02-17 18:47:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-20 01:19:23.757194433 +0000
+--- 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
@@ -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-02-17 18:47:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-20 01:19:23.757194433 +0000
+--- 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
@@ -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-02-17 18:47:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java 2013-02-20 01:19:23.757194433 +0000
+--- 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
@@ -64,17 +64,23 @@
protected NTLM(String version) throws NTLMException {
@@ -180,59 +180,29 @@
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-02-17 18:47:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-02-20 01:35:29.564524781 +0000
-@@ -411,111 +411,106 @@
- static boolean isCallerSensitive(MemberName mem) {
- if (!mem.isInvocable()) return false; // fields are not caller sensitive
- Class<?> defc = mem.getDeclaringClass();
-- switch (mem.getName()) {
+--- 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 @@
+ // this method is also called by test/sun/reflect/CallerSensitiveFinder
+ // to validate the hand-maintained list
+ private static boolean isCallerSensitiveMethod(Class<?> defc, String method) {
+- switch (method) {
- case "doPrivileged":
- case "doPrivilegedWithCombiner":
-+ String memName = mem.getName();
-+ if ("doPrivileged".equals(memName) ||
-+ "doPrivilegedWithCombiner".equals(memName)) {
++ if ("doPrivileged".equals(method) ||
++ "doPrivilegedWithCombiner".equals(method)) {
return defc == java.security.AccessController.class;
- case "checkMemberAccess":
-+ } else if ("checkMemberAccess".equals(memName)) {
- return canBeCalledVirtual(mem, java.lang.SecurityManager.class);
++ } else if ("checkMemberAccess".equals(method)) {
+ return defc == java.lang.SecurityManager.class;
- case "getUnsafe":
-+ } else if ("getUnsafe".equals(memName)) {
++ } else if ("getUnsafe".equals(method)) {
return defc == sun.misc.Unsafe.class;
- case "lookup":
-+ } else if ("lookup".equals(memName)) {
++ } else if ("lookup".equals(method)) {
return defc == java.lang.invoke.MethodHandles.class;
-- case "findStatic":
-- case "findVirtual":
-- case "findConstructor":
-- case "findSpecial":
-- case "findGetter":
-- case "findSetter":
-- case "findStaticGetter":
-- case "findStaticSetter":
-- case "bind":
-- case "unreflect":
-- case "unreflectSpecial":
-- case "unreflectConstructor":
-- case "unreflectGetter":
-- case "unreflectSetter":
-+ } else if ("findStatic".equals(memName) ||
-+ "findVirtual".equals(memName) ||
-+ "findConstructor".equals(memName) ||
-+ "findSpecial".equals(memName) ||
-+ "findGetter".equals(memName) ||
-+ "findSetter".equals(memName) ||
-+ "findStaticGetter".equals(memName) ||
-+ "findStaticSetter".equals(memName) ||
-+ "bind".equals(memName) ||
-+ "unreflect".equals(memName) ||
-+ "unreflectSpecial".equals(memName) ||
-+ "unreflectConstructor".equals(memName) ||
-+ "unreflectGetter".equals(memName) ||
-+ "unreflectSetter".equals(memName)) {
- return defc == java.lang.invoke.MethodHandles.Lookup.class;
- case "invoke":
-+ } else if ("invoke".equals(memName)) {
++ } else if ("invoke".equals(method)) {
return defc == java.lang.reflect.Method.class;
- case "get":
- case "getBoolean":
@@ -252,33 +222,37 @@
- 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)) {
++ } else if ("get".equals(method) ||
++ "getBoolean".equals(method) ||
++ "getByte".equals(method) ||
++ "getChar".equals(method) ||
++ "getShort".equals(method) ||
++ "getInt".equals(method) ||
++ "getLong".equals(method) ||
++ "getFloat".equals(method) ||
++ "getDouble".equals(method) ||
++ "set".equals(method) ||
++ "setBoolean".equals(method) ||
++ "setByte".equals(method) ||
++ "setChar".equals(method) ||
++ "setShort".equals(method) ||
++ "setInt".equals(method) ||
++ "setLong".equals(method) ||
++ "setFloat".equals(method) ||
++ "setDouble".equals(method)) {
return defc == java.lang.reflect.Field.class;
- case "newInstance":
-+ } else if ("newInstance".equals(memName)) {
++ } else if ("newInstance".equals(method)) {
if (defc == java.lang.reflect.Constructor.class) return true;
if (defc == java.lang.Class.class) return true;
- break;
+- case "getFields":
++ } else if ("getFields".equals(method)) {
+ return defc == java.lang.Class.class ||
+ defc == javax.sql.rowset.serial.SerialJavaObject.class;
- case "forName":
- case "getClassLoader":
- case "getClasses":
-- case "getFields":
- case "getMethods":
- case "getConstructors":
- case "getDeclaredClasses":
@@ -291,88 +265,107 @@
- 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)) {
+- case "getEnclosingClass":
+- case "getEnclosingMethod":
+- case "getEnclosingConstructor":
++ } else if ("forName".equals(method) ||
++ "getClassLoader".equals(method) ||
++ "getClasses".equals(method) ||
++ "getFields".equals(method) ||
++ "getMethods".equals(method) ||
++ "getConstructors".equals(method) ||
++ "getDeclaredClasses".equals(method) ||
++ "getDeclaredFields".equals(method) ||
++ "getDeclaredMethods".equals(method) ||
++ "getDeclaredConstructors".equals(method) ||
++ "getField".equals(method) ||
++ "getMethod".equals(method) ||
++ "getConstructor".equals(method) ||
++ "getDeclaredField".equals(method) ||
++ "getDeclaredMethod".equals(method) ||
++ "getDeclaredConstructor".equals(method) ||
++ "getEnclosingClass".equals(method) ||
++ "getEnclosingMethod".equals(method) ||
++ "getEnclosingConstructor".equals(method)) {
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)) {
++ } else if ("getConnection".equals(method) ||
++ "getDriver".equals(method) ||
++ "getDrivers".equals(method) ||
++ "deregisterDriver".equals(method)) {
return defc == java.sql.DriverManager.class;
+-
- case "newUpdater":
-+ } else if ("newUpdater".equals(memName)) {
++ } else if ("newUpdater".equals(method)) {
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 canBeCalledVirtual(mem, java.lang.Thread.class);
++ } else if ("getContextClassLoader".equals(method)) {
+ return defc == java.lang.Thread.class;
- case "getPackage":
- case "getPackages":
-+ } else if ("getPackage".equals(memName) ||
-+ "getPackages".equals(memName)) {
++ } else if ("getPackage".equals(method) ||
++ "getPackages".equals(method)) {
return defc == java.lang.Package.class;
- case "getParent":
- case "getSystemClassLoader":
-+ } else if ("getParent".equals(memName) ||
-+ "getSystemClassLoader".equals(memName)) {
++ } else if ("getParent".equals(method) ||
++ "getSystemClassLoader".equals(method)) {
return defc == java.lang.ClassLoader.class;
- case "load":
- case "loadLibrary":
-+ } else if ("load".equals(memName) ||
-+ "loadLibrary".equals(memName)) {
++ } else if ("load".equals(method) ||
++ "loadLibrary".equals(method)) {
if (defc == java.lang.Runtime.class) return true;
if (defc == java.lang.System.class) return true;
- break;
- case "getCallerClass":
-+ } else if ("getCallerClass".equals(memName)) {
++ } else if ("getCallerClass".equals(method)) {
if (defc == sun.reflect.Reflection.class) return true;
if (defc == java.lang.System.class) return true;
- break;
- case "getCallerClassLoader":
-+ } else if ("getCallerClassLoader".equals(memName)) {
++ } else if ("getCallerClassLoader".equals(method)) {
return defc == java.lang.ClassLoader.class;
- case "registerAsParallelCapable":
-+ } else if ("registerAsParallelCapable".equals(memName)) {
- return canBeCalledVirtual(mem, java.lang.ClassLoader.class);
++ } else if ("registerAsParallelCapable".equals(method)) {
+ return defc == java.lang.ClassLoader.class;
- case "getProxyClass":
- case "newProxyInstance":
-+ } else if ("getProxyClass".equals(memName) ||
-+ "newProxyInstance".equals(memName)) {
++ } else if ("getProxyClass".equals(method) ||
++ "newProxyInstance".equals(method)) {
return defc == java.lang.reflect.Proxy.class;
- case "asInterfaceInstance":
-+ } else if ("asInterfaceInstance".equals(memName)) {
++ } else if ("asInterfaceInstance".equals(method)) {
return defc == java.lang.invoke.MethodHandleProxies.class;
- case "getBundle":
- case "clearCache":
-+ } else if ("getBundle".equals(memName) ||
-+ "clearCache".equals(memName)) {
++ } else if ("getBundle".equals(method) ||
++ "clearCache".equals(method)) {
return defc == java.util.ResourceBundle.class;
+- case "getType":
++ } else if ("getType".equals(method)) {
+ return defc == java.io.ObjectStreamField.class;
+- case "forClass":
++ } else if ("forClass".equals(method)) {
+ return defc == java.io.ObjectStreamClass.class;
+- case "getLogger":
++ } else if ("getLogger".equals(method)) {
+ return defc == java.util.logging.Logger.class;
+- case "getAnonymousLogger":
++ } else if ("getAnonymousLogger".equals(method)) {
+ return defc == java.util.logging.Logger.class;
}
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-02-17 18:47:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java 2013-02-20 01:19:23.757194433 +0000
-@@ -268,14 +268,16 @@
+--- 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
+@@ -269,14 +269,16 @@
private static
boolean isObjectMethod(Method m) {
@@ -393,7 +386,7 @@
return (m.getReturnType() == boolean.class
&& m.getParameterTypes().length == 1
&& m.getParameterTypes()[0] == Object.class);
-@@ -286,12 +288,14 @@
+@@ -287,12 +289,14 @@
private static
Object callObjectMethod(Object self, Method m, Object[] args) {
assert(isObjectMethod(m)) : m;
@@ -413,8 +406,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-02-17 18:47:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2013-02-20 01:19:23.757194433 +0000
+--- 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
@@ -119,24 +119,20 @@
String optStr = (opts.length > 1 && opts[1] != null)
? opts[1].trim()
@@ -452,8 +445,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-02-17 18:47:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java 2013-02-20 01:19:23.757194433 +0000
+--- 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
@@ -378,19 +378,23 @@
GE; // ">="
diff -r a91c52e39914 -r 7e0d2c785516 patches/boot/tobin.patch
--- a/patches/boot/tobin.patch Tue May 28 16:42:32 2013 +0100
+++ b/patches/boot/tobin.patch Wed Jun 26 03:45:13 2013 +0100
@@ -1,38 +1,44 @@
-diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile
---- ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-30 16:49:39.000000000 +0000
-+++ openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-30 16:59:16.000000000 +0000
-@@ -294,11 +294,7 @@
+diff -Nru openjdk-boot.orig/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile
+--- openjdk-boot.orig/jdk/make/sun/awt/Makefile 2013-06-25 16:52:46.810177400 +0100
++++ openjdk-boot/jdk/make/sun/awt/Makefile 2013-06-25 16:54:43.856035962 +0100
+@@ -245,16 +245,12 @@
+ $(ICONPATH)/security-icon-yellow48.png
TEMPDIR_CLASSES = $(TEMPDIR)/classes
+-
++
+ generated.clean:
+ $(RM) -r $(GEN_DIR)/*.java
+ $(RM) -r $(TEMPDIR)/.gen_icons
--$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java
+-$(TEMPDIR_CLASSES)/sun/awt/ToBin.class: ToBin.java
- @$(prep-target)
- $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
-
--$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS)
+-$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/ToBin.class $(ICONS)
+$(TEMPDIR)/.gen_icons: $(ICONS)
$(prep-target)
for i in $(ICONS); do \
filename=`basename $$i`; \
-@@ -308,20 +304,14 @@
- $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
- $(ECHO) "public static int[] $$name = { " >> $$classname; \
+@@ -264,20 +260,14 @@
+ $(ECHO) "package sun.awt;" >> $$classname ; \
+ $(ECHO) "public class AWTIcon32_$$name {" >> $$classname; \
+ $(ECHO) "public final static int[] $$name = { " >> $$classname; \
- $(CAT) $$i | \
- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \
- -Djava.awt.headless=true \
-- sun.awt.X11.ToBin >> $$classname; \
+- sun.awt.ToBin >> $$classname; \
+ $(ECHO) "0,0" >> $$classname ; \
$(ECHO) "}; }" >> $$classname; \
- classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
+ classname=$(GEN_DIR)/AWTIcon64_$$name.java; \
$(RM) $$classname; \
- $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
- $(ECHO) "public static long[] $$name = { " >> $$classname; \
+ $(ECHO) "package sun.awt;" >> $$classname ; \
+ $(ECHO) "public class AWTIcon64_$$name {" >> $$classname; \
+ $(ECHO) "public final static long[] $$name = { " >> $$classname; \
- $(CAT) $$i | \
- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \
- -Djava.awt.headless=true \
-- sun.awt.X11.ToBin >> $$classname; \
+- sun.awt.ToBin >> $$classname; \
+ $(ECHO) "0,0" >> $$classname ; \
$(ECHO) "}; }" >> $$classname; \
done
More information about the distro-pkg-dev
mailing list