# HG changeset patch # User Andrew John Hughes # Date 1363166337 0 # Node ID e0baa69f348f1d67a11883f9e6c1ae16c1c9e7ee # Parent 1b2d86fddd09de925ac8bed66947c19fe32abdf6 Sync with forest and remove local copies of upstream patches. 2013-03-13 Andrew John Hughes * patches/8002344-krb5loginmodule.patch, * patches/8004344-toolkiterrorhandler.patch, * patches/8006179-lookup_using_findvirtual.patch, * patches/8006882-sun.proxy.patch, * patches/no_stripping.patch, * patches/pr1303-ifdef_fix.patch: Remove local copies of upstream patches. * Makefile.am: (HOTSPOT_CHANGESET): Update to IcedTea7 2.1 forest head, bringing in upstream versions of local patches. (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. (ICEDTEA_PATCHES): Drop patches. diff -r 1b2d86fddd09 -r e0baa69f348f ChangeLog --- a/ChangeLog Tue Mar 12 20:01:24 2013 +0000 +++ b/ChangeLog Wed Mar 13 09:18:57 2013 +0000 @@ -1,3 +1,30 @@ +2013-03-13 Andrew John Hughes + + * patches/8002344-krb5loginmodule.patch, + * patches/8004344-toolkiterrorhandler.patch, + * patches/8006179-lookup_using_findvirtual.patch, + * patches/8006882-sun.proxy.patch, + * patches/no_stripping.patch, + * patches/pr1303-ifdef_fix.patch: + Remove local copies of upstream patches. + * Makefile.am: + (HOTSPOT_CHANGESET): Update to IcedTea7 2.1 forest head, + bringing in upstream versions of local patches. + (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. + (ICEDTEA_PATCHES): Drop patches. + 2013-03-12 Andrew John Hughes * configure.ac: Bump to 2.1.8pre. diff -r 1b2d86fddd09 -r e0baa69f348f Makefile.am --- a/Makefile.am Tue Mar 12 20:01:24 2013 +0000 +++ b/Makefile.am Wed Mar 13 09:18:57 2013 +0000 @@ -4,21 +4,21 @@ JDK_UPDATE_VERSION = 03 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -HOTSPOT_CHANGESET = d8b22e079abe -CORBA_CHANGESET = 4afc0be5b3c6 -JAXP_CHANGESET = efa047bf59e9 -JAXWS_CHANGESET = 52bbe659af64 -JDK_CHANGESET = 2989f7467d83 -LANGTOOLS_CHANGESET = ac6983a8bd4a -OPENJDK_CHANGESET = 7de37e3bcca6 +HOTSPOT_CHANGESET = f6f4d5e6c1dd +CORBA_CHANGESET = 313f1ee32118 +JAXP_CHANGESET = 691f82a0de0b +JAXWS_CHANGESET = a48ebab198a4 +JDK_CHANGESET = 1040c44a496d +LANGTOOLS_CHANGESET = c63c8a2164e4 +OPENJDK_CHANGESET = c1c649636704 -HOTSPOT_SHA256SUM = 28883ebefcfff1ba8b356a7fabf8e449c25fe7fffe1d563f1f58f887100063f0 -CORBA_SHA256SUM = 813e02861d89147c0547f4608fe69b0abd153cf548bf1f21ef9d16ea0a6d683e -JAXP_SHA256SUM = 20d745c58117d1eaa061edb689bb7569b512ac8fb3d0f3518b5fa8b17ba7012e -JAXWS_SHA256SUM = d8acabf54c1a4fe02e45ac4bdfe1ff9f3e7a3abc12884fcacd580bce9063a7c5 -JDK_SHA256SUM = 77471cc8744c6ec842ee158408a400db0f566f19ac978580c76d7af8ef24e154 -LANGTOOLS_SHA256SUM = 47db36264b345939176d1a5f36df84ad56d7fae76ce647ea1b619f7df0eb1eda -OPENJDK_SHA256SUM = a856008db052b7f7ec4b466eee117fcc72229531136f71d4dd712c2f6e71cbd6 +HOTSPOT_SHA256SUM = 52029034eb2140c06f567aad85f23e7a7d45977b6df441bf7f6ebe30767f9964 +CORBA_SHA256SUM = 9326c1fc0dedcbc2af386cb73b80727416e24664ccbf766221450f6e2138e952 +JAXP_SHA256SUM = 17a242852010f535c11f874aae07a6d60f7007541fe1586666638cc6d58f8f1f +JAXWS_SHA256SUM = 57dab4837468b775ff55e21352c7920f3f35c1e6ceb130154fb89eeb163e176f +JDK_SHA256SUM = e624a809f099870100330022bda9dafe30bfa4539ee14ec118ffa3ebbafa012d +LANGTOOLS_SHA256SUM = 46d93bd9069d86ea233464d5a9777b12f0a027142b9ac665e3b244f69a5416b6 +OPENJDK_SHA256SUM = 6cb4258bf22daba0dd5b8cbfee8acd8a378b3e1f36259b6437f7589c74ed6e4f CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 @@ -236,12 +236,6 @@ # Patch list ICEDTEA_PATCHES = \ - patches/8002344-krb5loginmodule.patch \ - patches/8004344-toolkiterrorhandler.patch \ - patches/8006179-lookup_using_findvirtual.patch \ - patches/8006882-sun.proxy.patch \ - patches/pr1303-ifdef_fix.patch \ - patches/no_stripping.patch \ patches/revert-7017193.patch # Conditional patches diff -r 1b2d86fddd09 -r e0baa69f348f patches/8002344-krb5loginmodule.patch --- a/patches/8002344-krb5loginmodule.patch Tue Mar 12 20:01:24 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,207 +0,0 @@ -# HG changeset patch -# User weijun -# Date 1353294788 -28800 -# Node ID 9dc51cdd7cec31aeaccf7e2a44de4d4110f19353 -# Parent 78fbbfe20edb9658c6ee59494b97f1735e73eab2 -8002344: Krb5LoginModule config class does not return proper KDC list from DNS -Reviewed-by: weijun -Contributed-by: Severin Gehwolf , Wang Weijun - -diff --git a/src/share/classes/sun/security/krb5/Config.java b/src/share/classes/sun/security/krb5/Config.java ---- openjdk/jdk/src/share/classes/sun/security/krb5/Config.java -+++ openjdk/jdk/src/share/classes/sun/security/krb5/Config.java -@@ -1233,7 +1233,7 @@ - */ - private String getKDCFromDNS(String realm) throws KrbException { - // use DNS to locate KDC -- String kdcs = null; -+ String kdcs = ""; - String[] srvs = null; - // locate DNS SRV record using UDP - if (DEBUG) { -@@ -1243,7 +1243,7 @@ - if (srvs == null) { - // locate DNS SRV record using TCP - if (DEBUG) { -- System.out.println("getKDCFromDNS using UDP"); -+ System.out.println("getKDCFromDNS using TCP"); - } - srvs = KrbServiceLocator.getKerberosService(realm, "_tcp"); - } -@@ -1252,14 +1252,15 @@ - throw new KrbException(Krb5.KRB_ERR_GENERIC, - "Unable to locate KDC for realm " + realm); - } -+ if (srvs.length == 0) { -+ return null; -+ } - for (int i = 0; i < srvs.length; i++) { -- String value = srvs[i]; -- for (int j = 0; j < srvs[i].length(); j++) { -- // filter the KDC name -- if (value.charAt(j) == ':') { -- kdcs = (value.substring(0, j)).trim(); -- } -- } -+ kdcs += srvs[i].trim() + " "; -+ } -+ kdcs = kdcs.trim(); -+ if (kdcs.equals("")) { -+ return null; - } - return kdcs; - } -diff --git a/test/sun/security/krb5/config/DNS.java b/test/sun/security/krb5/config/DNS.java -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/sun/security/krb5/config/DNS.java -@@ -0,0 +1,38 @@ -+/* -+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+// See dns.sh. -+import sun.security.krb5.Config; -+ -+public class DNS { -+ public static void main(String[] args) throws Exception { -+ System.setProperty("java.security.krb5.conf", -+ System.getProperty("test.src", ".") +"/nothing.conf"); -+ Config config = Config.getInstance(); -+ String kdcs = config.getKDCList("X"); -+ if (!kdcs.equals("a.com.:88 b.com.:99") && -+ !kdcs.equals("a.com. b.com.:99")) { -+ throw new Exception("Strange KDC: [" + kdcs + "]"); -+ }; -+ } -+} -diff --git a/test/sun/security/krb5/config/NamingManager.java b/test/sun/security/krb5/config/NamingManager.java -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/sun/security/krb5/config/NamingManager.java -@@ -0,0 +1,60 @@ -+/* -+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+package javax.naming.spi; -+ -+import com.sun.jndi.dns.DnsContext; -+import java.util.Hashtable; -+import javax.naming.Context; -+import javax.naming.NamingException; -+import javax.naming.directory.Attribute; -+import javax.naming.directory.Attributes; -+import javax.naming.directory.BasicAttribute; -+import javax.naming.directory.BasicAttributes; -+ -+/** -+ * A fake javax.naming.spi.NamingManager. It allows reading a DNS -+ * record without contacting a real server. -+ * -+ * See DNS.java and dns.sh. -+ */ -+public class NamingManager { -+ NamingManager() {} -+ public static Context getURLContext( -+ String scheme, Hashtable environment) -+ throws NamingException { -+ return new DnsContext("", null, new Hashtable()) { -+ public Attributes getAttributes(String name, String[] attrIds) -+ throws NamingException { -+ return new BasicAttributes() { -+ public Attribute get(String attrID) { -+ BasicAttribute ba = new BasicAttribute(attrID); -+ ba.add("1 1 99 b.com."); -+ ba.add("0 0 88 a.com."); // 2nd has higher priority -+ return ba; -+ } -+ }; -+ } -+ }; -+ } -+} -diff --git a/test/sun/security/krb5/config/dns.sh b/test/sun/security/krb5/config/dns.sh -new file mode 100644 ---- /dev/null -+++ openjdk/jdk/test/sun/security/krb5/config/dns.sh -@@ -0,0 +1,41 @@ -+# -+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+ -+# @test -+# @bug 8002344 -+# @summary Krb5LoginModule config class does not return proper KDC list from DNS -+# -+ -+if [ "${TESTJAVA}" = "" ] ; then -+ JAVAC_CMD=`which javac` -+ TESTJAVA=`dirname $JAVAC_CMD`/.. -+fi -+ -+if [ "${TESTSRC}" = "" ] ; then -+ TESTSRC="." -+fi -+ -+$TESTJAVA/bin/javac -d . \ -+ ${TESTSRC}/NamingManager.java ${TESTSRC}/DNS.java -+$TESTJAVA/bin/java -Xbootclasspath/p:. DNS -+ diff -r 1b2d86fddd09 -r e0baa69f348f patches/8004344-toolkiterrorhandler.patch --- a/patches/8004344-toolkiterrorhandler.patch Tue Mar 12 20:01:24 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -# HG changeset patch -# User aph -# Date 1354629728 0 -# Node ID 4d5e8509905e1d95a87e7ce769d8ee61083107a3 -# Parent 9dc51cdd7cec31aeaccf7e2a44de4d4110f19353 -8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c -Summary: Code does not check for JNU_GetEnv returning NULL. -Reviewed-by: anthony - -diff --git a/src/solaris/native/sun/xawt/XlibWrapper.c b/src/solaris/native/sun/xawt/XlibWrapper.c ---- openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c -+++ openjdk/jdk/src/solaris/native/sun/xawt/XlibWrapper.c -@@ -1260,13 +1260,15 @@ - - JavaVM* jvm = NULL; - static int ToolkitErrorHandler(Display * dpy, XErrorEvent * event) { -+ JNIEnv * env; - if (jvm != NULL) { -- JNIEnv * env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); -- return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I", -- ptr_to_jlong(dpy), ptr_to_jlong(event)).i; -- } else { -- return 0; -+ env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); -+ if (env) { -+ return JNU_CallStaticMethodByName(env, NULL, "sun/awt/X11/XToolkit", "globalErrorHandler", "(JJ)I", -+ ptr_to_jlong(dpy), ptr_to_jlong(event)).i; -+ } - } -+ return 0; - } - - /* diff -r 1b2d86fddd09 -r e0baa69f348f patches/8006179-lookup_using_findvirtual.patch --- a/patches/8006179-lookup_using_findvirtual.patch Tue Mar 12 20:01:24 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -# HG changeset patch -# User jrose -# Date 1358570871 28800 -# Node ID 90e4cb6f78bb0551ae23f88dd75cb57aad9d8662 -# Parent 0ad964f2ced1b4f12c1b30bd92dceb73ba15f608 -8006179: JSR292 MethodHandles lookup with interface using findVirtual() -Reviewed-by: twisti - -diff --git a/src/share/classes/java/lang/invoke/DirectMethodHandle.java b/src/share/classes/java/lang/invoke/DirectMethodHandle.java ---- openjdk/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java -+++ openjdk/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java -@@ -44,6 +44,15 @@ - if (!m.isResolved()) - throw new InternalError(); - -+ if (m.getDeclaringClass().isInterface() && !m.isAbstract()) { -+ // Check for corner case: invokeinterface of Object method. -+ MemberName m2 = new MemberName(Object.class, m.getName(), m.getMethodType(), m.getModifiers()); -+ m2 = MemberName.getFactory().resolveOrNull(m2, false, null); -+ if (m2 != null && m2.isPublic()) { -+ m = m2; -+ } -+ } -+ - MethodHandleNatives.init(this, (Object) m, doDispatch, lookupClass); - } - diff -r 1b2d86fddd09 -r e0baa69f348f patches/8006882-sun.proxy.patch --- a/patches/8006882-sun.proxy.patch Tue Mar 12 20:01:24 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1362989644 0 -# Node ID 1040c44a496db37f595fa66b71ef91e67598cbf4 -# Parent 90e4cb6f78bb0551ae23f88dd75cb57aad9d8662 -8006882: Proxy generated classes in sun.proxy package breaks JMockit -Reviewed-by: alanb, ahgross - -diff --git a/src/share/classes/java/lang/reflect/Proxy.java b/src/share/classes/java/lang/reflect/Proxy.java ---- openjdk/jdk/src/share/classes/java/lang/reflect/Proxy.java -+++ openjdk/jdk/src/share/classes/java/lang/reflect/Proxy.java -@@ -609,7 +609,7 @@ - } - - if (proxyPkg == null) { -- // if no non-public proxy interfaces, use sun.proxy package -+ // if no non-public proxy interfaces, use com.sun.proxy package - proxyPkg = ReflectUtil.PROXY_PACKAGE + "."; - } - -diff --git a/src/share/classes/sun/reflect/misc/ReflectUtil.java b/src/share/classes/sun/reflect/misc/ReflectUtil.java ---- openjdk/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java -+++ openjdk/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java -@@ -202,5 +202,5 @@ - } - } - -- public static final String PROXY_PACKAGE = "sun.proxy"; -+ public static final String PROXY_PACKAGE = "com.sun.proxy"; - } -diff --git a/src/share/lib/security/java.security b/src/share/lib/security/java.security ---- openjdk/jdk/src/share/lib/security/java.security -+++ openjdk/jdk/src/share/lib/security/java.security -@@ -128,6 +128,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -@@ -148,6 +149,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -diff --git a/src/share/lib/security/java.security-solaris b/src/share/lib/security/java.security-solaris ---- openjdk/jdk/src/share/lib/security/java.security-solaris -+++ openjdk/jdk/src/share/lib/security/java.security-solaris -@@ -129,6 +129,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -@@ -149,6 +150,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -diff --git a/src/share/lib/security/java.security-windows b/src/share/lib/security/java.security-windows ---- openjdk/jdk/src/share/lib/security/java.security-windows -+++ openjdk/jdk/src/share/lib/security/java.security-windows -@@ -129,6 +129,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -@@ -149,6 +150,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ diff -r 1b2d86fddd09 -r e0baa69f348f patches/no_stripping.patch --- a/patches/no_stripping.patch Tue Mar 12 20:01:24 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,180 +0,0 @@ -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make ---- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2013-02-15 00:04:42.000000000 +0000 -+++ openjdk/hotspot/make/linux/makefiles/defs.make 2013-03-11 15:29:11.691786343 +0000 -@@ -186,7 +186,9 @@ - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so - ifneq ($(ZERO_BUILD), true) - ifneq ($(OBJCOPY),) -- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo -+ ifneq ($(STRIP_POLICY),no_strip) -+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo -+ endif - endif - endif - -@@ -198,7 +200,9 @@ - EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so - ifneq ($(ZERO_BUILD), true) - ifneq ($(OBJCOPY),) -- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo -+ ifneq ($(STRIP_POLICY),no_strip) -+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo -+ endif - endif - endif - endif -@@ -208,7 +212,9 @@ - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so - ifneq ($(OBJCOPY),) -- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo -+ ifneq ($(STRIP_POLICY),no_strip) -+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo -+ endif - endif - endif - endif -@@ -221,8 +227,10 @@ - $(EXPORT_LIB_DIR)/sa-jdi.jar - ifneq ($(ZERO_BUILD), true) - ifneq ($(OBJCOPY),) -- ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo -- ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo -+ ifneq ($(STRIP_POLICY),no_strip) -+ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo -+ ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo -+ endif - endif - endif - ADD_SA_BINARIES/ppc = -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make ---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make 2013-02-15 00:04:42.000000000 +0000 -+++ openjdk/hotspot/make/linux/makefiles/jsig.make 2013-03-11 15:27:13.065876291 +0000 -@@ -59,8 +59,10 @@ - $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl - $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } - ifneq ($(OBJCOPY),) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make ---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make 2013-02-15 00:04:42.000000000 +0000 -+++ openjdk/hotspot/make/linux/makefiles/saproc.make 2013-03-11 15:27:13.065876291 +0000 -@@ -87,8 +87,10 @@ - -lthread_db - $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } - ifneq ($(OBJCOPY),) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make ---- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2013-02-15 00:04:42.000000000 +0000 -+++ openjdk/hotspot/make/linux/makefiles/vm.make 2013-03-11 15:27:13.065876291 +0000 -@@ -328,8 +328,10 @@ - } - ifeq ($(CROSS_COMPILE_ARCH),) - ifneq ($(OBJCOPY),) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/dtrace.make openjdk/hotspot/make/solaris/makefiles/dtrace.make ---- openjdk.orig/hotspot/make/solaris/makefiles/dtrace.make 2013-02-15 00:04:42.000000000 +0000 -+++ openjdk/hotspot/make/solaris/makefiles/dtrace.make 2013-03-11 15:27:13.065876291 +0000 -@@ -107,8 +107,10 @@ - $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc - [ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); } - ifneq ($(OBJCOPY),) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DB_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DB_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -@@ -127,8 +129,10 @@ - $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor - [ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); } - ifneq ($(OBJCOPY),) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DTRACE_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -@@ -186,8 +190,10 @@ - $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc - [ -f $(LIBJVM_DB_G) ] || { ln -s $@ $(LIBJVM_DB_G); } - ifneq ($(OBJCOPY),) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -@@ -205,8 +211,10 @@ - $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor - [ -f $(LIBJVM_DTRACE_G) ] || { ln -s $@ $(LIBJVM_DTRACE_G); } - ifneq ($(OBJCOPY),) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/jsig.make openjdk/hotspot/make/solaris/makefiles/jsig.make ---- openjdk.orig/hotspot/make/solaris/makefiles/jsig.make 2013-02-15 00:04:42.000000000 +0000 -+++ openjdk/hotspot/make/solaris/makefiles/jsig.make 2013-03-11 15:27:13.065876291 +0000 -@@ -55,8 +55,10 @@ - $(LFLAGS_JSIG) -o $@ $< -ldl - [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } - ifneq ($(OBJCOPY),) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/saproc.make openjdk/hotspot/make/solaris/makefiles/saproc.make ---- openjdk.orig/hotspot/make/solaris/makefiles/saproc.make 2013-02-15 00:04:42.000000000 +0000 -+++ openjdk/hotspot/make/solaris/makefiles/saproc.make 2013-03-11 15:27:13.065876291 +0000 -@@ -106,8 +106,10 @@ - -ldl -ldemangle -lthread -lc - [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } - ifneq ($(OBJCOPY),) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else -diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/vm.make openjdk/hotspot/make/solaris/makefiles/vm.make ---- openjdk.orig/hotspot/make/solaris/makefiles/vm.make 2013-02-15 00:04:42.000000000 +0000 -+++ openjdk/hotspot/make/solaris/makefiles/vm.make 2013-03-11 15:27:13.065876291 +0000 -@@ -284,8 +284,10 @@ - $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) - $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 - ifneq ($(OBJCOPY),) -+ ifneq ($(STRIP_POLICY),no_strip) - $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ -+ endif - ifeq ($(STRIP_POLICY),all_strip) - $(QUIETLY) $(STRIP) $@ - else diff -r 1b2d86fddd09 -r e0baa69f348f patches/pr1303-ifdef_fix.patch --- a/patches/pr1303-ifdef_fix.patch Tue Mar 12 20:01:24 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1362758030 0 -# Node ID 0ad964f2ced1b4f12c1b30bd92dceb73ba15f608 -# Parent 44d9f9e05ca4a7735685cb246c004a5f4abd19c7 -PR1303: Correct #ifdef to #if - -diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_gif.c b/src/share/native/sun/awt/splashscreen/splashscreen_gif.c ---- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c -@@ -316,7 +316,7 @@ - int - SplashDecodeGifStream(Splash * splash, SplashStream * stream) - { --#ifdef GIFLIB_MAJOR >= 5 -+#if GIFLIB_MAJOR >= 5 - int error = 0; - GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc, &error); -