/hg/icedtea7: PR717: Remove all non-bootstrap non-conditional pa...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Sep 23 09:30:39 PDT 2011
changeset 48d7359c75f6 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=48d7359c75f6
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 23 17:30:26 2011 +0100
PR717: Remove all non-bootstrap non-conditional patches.
2011-09-21 Andrew John Hughes <ahughes at redhat.com>
PR717: Remove all non-bootstrap non-conditional
patches.
* patches/6592792.patch,
* patches/6733959.patch,
* patches/6755943.patch: Remove unused patches.
* patches/alpha-fixes.patch,
* patches/alt-jar.patch,
* patches/cacao/arch.patch,
* patches/clean-crypto.patch,
* patches/debian/uname.patch,
* patches/disable-intree-ec.patch: Moved upstream.
* patches/javafiles.patch: Moved to boot.
* patches/jtreg-httpTest.patch,
* patches/jvmtiEnv.patch,
* patches/lc_ctype.patch,
* patches/override-redirect-metacity.patch,
* patches/params-cast-size_t.patch: Moved upstream.
* patches/parisc-opt.patch: Obsolete.
* patches/parisc.patch,
* patches/samejvm-safe.patch,
* patches/security-updates.patch,
* patches/security/6592792.patch,
* patches/security/6733959.patch,
* patches/security/6755943.patch,
* patches/sh4-support.patch,
* patches/signed-types.patch: Moved upstream.
* patches/sources.patch: Obsolete.
* patches/sparc-ptracefix.patch,
* patches/sparc-trapsfix.patch,
* patches/systemtap-gcc-4.5.patch,
* patches/tests-jdk.patch,
* patches/update-bootclasspath.patch,
* patches/use-idx_t.patch: Moved upstream.
* Makefile.am: (JDK_CHANGESET): Bring in upstreamed patches.
(JDK_SHA256SUM): Likewise. (CORBA_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise. (HOTSPOT_CHANGESET): Likewise.
(HOTSPOT_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Set to
empty, bar conditional additions.
(ICEDTEA_BOOT_PATCHES): Add javafiles.patch.
* patches/boot/javafiles.patch: Only needed for bootstrapping
to ensure all classes are included.
* patches/nss-config.patch,
* patches/nss-not-enabled-config.patch: Updated against
upstream disable-intree-ec.
* NEWS: Updated.
diffstat:
ChangeLog | 59 +
Makefile.am | 52 +-
NEWS | 1 +
patches/6592792.patch | 290 --------
patches/6733959.patch | 222 ------
patches/6755943.patch | 372 ----------
patches/alpha-fixes.patch | 31 -
patches/alt-jar.patch | 14 -
patches/boot/javafiles.patch | 157 ++++
patches/cacao/arch.patch | 151 ----
patches/clean-crypto.patch | 1072 ------------------------------
patches/debian/uname.patch | 24 -
patches/disable-intree-ec.patch | 22 -
patches/javafiles.patch | 157 ----
patches/jtreg-httpTest.patch | 36 -
patches/jvmtiEnv.patch | 11 -
patches/lc_ctype.patch | 30 -
patches/nss-config.patch | 7 +-
patches/nss-not-enabled-config.patch | 7 +-
patches/override-redirect-metacity.patch | 10 -
patches/params-cast-size_t.patch | 97 --
patches/parisc-opt.patch | 26 -
patches/parisc.patch | 13 -
patches/samejvm-safe.patch | 11 -
patches/security-updates.patch | 100 --
patches/security/6592792.patch | 68 -
patches/security/6733959.patch | 18 -
patches/security/6755943.patch | 372 ----------
patches/sh4-support.patch | 154 ----
patches/signed-types.patch | 33 -
patches/sources.patch | 16 -
patches/sparc-ptracefix.patch | 33 -
patches/sparc-trapsfix.patch | 19 -
patches/systemtap-gcc-4.5.patch | 10 -
patches/tests-jdk.patch | 13 -
patches/update-bootclasspath.patch | 12 -
patches/use-idx_t.patch | 43 -
37 files changed, 236 insertions(+), 3527 deletions(-)
diffs (truncated from 4055 to 500 lines):
diff -r e8227389e2e0 -r 48d7359c75f6 ChangeLog
--- a/ChangeLog Wed Sep 21 18:56:43 2011 +0100
+++ b/ChangeLog Fri Sep 23 17:30:26 2011 +0100
@@ -1,3 +1,62 @@
+2011-09-21 Andrew John Hughes <ahughes at redhat.com>
+
+ PR717: Remove all non-bootstrap non-conditional
+ patches.
+ * patches/6592792.patch,
+ * patches/6733959.patch,
+ * patches/6755943.patch:
+ Remove unused patches.
+ * patches/alpha-fixes.patch,
+ * patches/alt-jar.patch,
+ * patches/cacao/arch.patch,
+ * patches/clean-crypto.patch,
+ * patches/debian/uname.patch,
+ * patches/disable-intree-ec.patch:
+ Moved upstream.
+ * patches/javafiles.patch:
+ Moved to boot.
+ * patches/jtreg-httpTest.patch,
+ * patches/jvmtiEnv.patch,
+ * patches/lc_ctype.patch,
+ * patches/override-redirect-metacity.patch,
+ * patches/params-cast-size_t.patch:
+ Moved upstream.
+ * patches/parisc-opt.patch: Obsolete.
+ * patches/parisc.patch,
+ * patches/samejvm-safe.patch,
+ * patches/security-updates.patch,
+ * patches/security/6592792.patch,
+ * patches/security/6733959.patch,
+ * patches/security/6755943.patch,
+ * patches/sh4-support.patch,
+ * patches/signed-types.patch:
+ Moved upstream.
+ * patches/sources.patch: Obsolete.
+ * patches/sparc-ptracefix.patch,
+ * patches/sparc-trapsfix.patch,
+ * patches/systemtap-gcc-4.5.patch,
+ * patches/tests-jdk.patch,
+ * patches/update-bootclasspath.patch,
+ * patches/use-idx_t.patch:
+ Moved upstream.
+ * Makefile.am:
+ (JDK_CHANGESET): Bring in upstreamed patches.
+ (JDK_SHA256SUM): Likewise.
+ (CORBA_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (HOTSPOT_CHANGESET): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Set to empty, bar conditional
+ additions.
+ (ICEDTEA_BOOT_PATCHES): Add javafiles.patch.
+ * patches/boot/javafiles.patch:
+ Only needed for bootstrapping to ensure
+ all classes are included.
+ * patches/nss-config.patch,
+ * patches/nss-not-enabled-config.patch:
+ Updated against upstream disable-intree-ec.
+ * NEWS: Updated.
+
2011-09-21 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r e8227389e2e0 -r 48d7359c75f6 Makefile.am
--- a/Makefile.am Wed Sep 21 18:56:43 2011 +0100
+++ b/Makefile.am Fri Sep 23 17:30:26 2011 +0100
@@ -2,19 +2,19 @@
OPENJDK_VERSION = b147
-CORBA_CHANGESET = 616c760dc288
-HOTSPOT_CHANGESET = 1dd9b3d73b22
+CORBA_CHANGESET = d034cc90ecc2
+HOTSPOT_CHANGESET = 7693eb0fce1f
JAXP_CHANGESET = c40983d6ae70
JAXWS_CHANGESET = 83db5e316798
-JDK_CHANGESET = 0cb15650412a
+JDK_CHANGESET = 7ec1845521ed
LANGTOOLS_CHANGESET = fb7fb3071b64
OPENJDK_CHANGESET = 3defd24c2671
-CORBA_SHA256SUM = 7589c42e88b4342750bea5afa306cc662cc9c5f7607fad96f70083ce70f4526e
-HOTSPOT_SHA256SUM = ffb1831a63e950bb7ade46a5382cb71d2603e0f40b3f758eb346833e18fca150
+CORBA_SHA256SUM = 06e7778aa1670f064e2c9fef7bdedc66fc679262ab8ee7aee018329e1ec787a8
+HOTSPOT_SHA256SUM = 6b2c9b21918183a383ab380c57f70d4be6199df0e2127bb762a20b6eca39e3a2
JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d
JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21
-JDK_SHA256SUM = ef2310b4df9e8a7891b927846badadf5441df8ac6203a215c8ef1a7676dfee36
+JDK_SHA256SUM = 843e7ccd4c2bad5c96aaa983e34f1eb27510229f138115fa0951e05358c50b2b
LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1
OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e
@@ -245,33 +245,7 @@
# Patch list
-ICEDTEA_PATCHES = \
- patches/debian/uname.patch \
- patches/sparc-ptracefix.patch \
- patches/sparc-trapsfix.patch \
- patches/override-redirect-metacity.patch \
- patches/security-updates.patch \
- patches/alpha-fixes.patch \
- patches/alt-jar.patch \
- patches/use-idx_t.patch \
- patches/params-cast-size_t.patch \
- patches/clean-crypto.patch \
- patches/cacao/arch.patch \
- patches/signed-types.patch \
- patches/lc_ctype.patch \
- patches/tests-jdk.patch \
- patches/samejvm-safe.patch \
- patches/parisc-opt.patch \
- patches/security/6592792.patch \
- patches/security/6733959.patch \
- patches/security/6755943.patch \
- patches/jvmtiEnv.patch \
- patches/disable-intree-ec.patch \
- patches/sources.patch \
- patches/parisc.patch \
- patches/sh4-support.patch \
- patches/jtreg-httpTest.patch \
- patches/update-bootclasspath.patch
+ICEDTEA_PATCHES =
# Conditional patches
@@ -306,14 +280,8 @@
patches/pulse-soundproperties.patch
endif
-if !USE_CVMI
-ICEDTEA_PATCHES += \
- patches/javafiles.patch
-endif
-
if ENABLE_SYSTEMTAP
ICEDTEA_PATCHES += patches/systemtap.patch \
- patches/systemtap-gcc-4.5.patch \
patches/systemtap-alloc-size-workaround.patch
endif
@@ -327,7 +295,9 @@
# Bootstrapping patches
-ICEDTEA_BOOT_PATCHES = patches/boot/ant-javac.patch \
+ICEDTEA_BOOT_PATCHES = \
+ patches/boot/javafiles.patch \
+ patches/boot/ant-javac.patch \
patches/boot/corba-defs.patch \
patches/boot/corba-idlj.patch \
patches/boot/corba-no-gen.patch \
@@ -361,7 +331,7 @@
patches/boot/ecj-trywithresources.patch \
patches/boot/ecj-autoboxing.patch \
patches/boot/xsltproc.patch \
- patches/boot/use_target_6_for_bootstrap_classes.patch
+ patches/boot/use_target_6_for_bootstrap_classes.patch
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
diff -r e8227389e2e0 -r 48d7359c75f6 NEWS
--- a/NEWS Wed Sep 21 18:56:43 2011 +0100
+++ b/NEWS Fri Sep 23 17:30:26 2011 +0100
@@ -17,6 +17,7 @@
- Fixed regression test runtime/7020373.
- Convert to optional system library usage via USE_SYSTEM_ZLIB/JPEG/PNG/GIF.
- PR586: Add missing sources to src.zip.
+ - PR717: All non-bootstrap non-conditional patches in IcedTea7 should be in the forest or dropped.
- PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException
- G356743: Support building against libpng 1.5.
- S7070134: Hotspot crashes with sigsegv from PorterStemmer
diff -r e8227389e2e0 -r 48d7359c75f6 patches/6592792.patch
--- a/patches/6592792.patch Wed Sep 21 18:56:43 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,297 +0,0 @@
-diff -Nru openjdk.orig/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java openjdk/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java
---- openjdk.orig/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java 2008-12-02 15:25:05.000000000 +0000
-+++ openjdk/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java 2008-12-02 15:29:09.000000000 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
-+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
-@@ -128,12 +128,7 @@
- throws JAXBException
- {
- try {
-- Class spiClass;
-- if (classLoader == null) {
-- spiClass = Class.forName(className);
-- } else {
-- spiClass = classLoader.loadClass(className);
-- }
-+ Class spiClass = safeLoadClass(className,classLoader);
-
- /*
- * javax.xml.bind.context.factory points to a class which has a
-@@ -205,11 +200,7 @@
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- Class spi;
- try {
-- logger.fine("Trying to load "+className);
-- if (cl != null)
-- spi = cl.loadClass(className);
-- else
-- spi = Class.forName(className);
-+ spi = safeLoadClass(className,cl);
- } catch (ClassNotFoundException e) {
- throw new JAXBException(e);
- }
-@@ -483,4 +474,31 @@
- * For this reason, we have to hard-code the class name into the API.
- */
- private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.bind.v2.ContextFactory";
-+
-+ /**
-+ * Loads the class, provided that the calling thread has an access to the class being loaded.
-+ */
-+ private static Class safeLoadClass(String className, ClassLoader classLoader) throws ClassNotFoundException {
-+ logger.fine("Trying to load "+className);
-+ try {
-+ // make sure that the current thread has an access to the package of the given name.
-+ SecurityManager s = System.getSecurityManager();
-+ if (s != null) {
-+ int i = className.lastIndexOf('.');
-+ if (i != -1) {
-+ s.checkPackageAccess(className.substring(0,i));
-+ }
-+ }
-+
-+ if (classLoader == null)
-+ return Class.forName(className);
-+ else
-+ return classLoader.loadClass(className);
-+ } catch (SecurityException se) {
-+ // anyone can access the platform default factory class without permission
-+ if (PLATFORM_DEFAULT_FACTORY_CLASS.equals(className))
-+ return Class.forName(className);
-+ throw se;
-+ }
-+ }
- }
-diff -Nru openjdk.orig/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java openjdk/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java
---- openjdk.orig/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java 2008-12-02 15:25:04.000000000 +0000
-+++ openjdk/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java 2008-12-02 15:29:09.000000000 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
-+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
-@@ -47,12 +47,7 @@
- ClassLoader classLoader)
- {
- try {
-- Class spiClass;
-- if (classLoader == null) {
-- spiClass = Class.forName(className);
-- } else {
-- spiClass = classLoader.loadClass(className);
-- }
-+ Class spiClass = safeLoadClass(className, classLoader);
- return spiClass.newInstance();
- } catch (ClassNotFoundException x) {
- throw new WebServiceException(
-@@ -152,4 +147,33 @@
-
- return newInstance(fallbackClassName, classLoader);
- }
-+
-+
-+ private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.ws.spi.ProviderImpl";
-+
-+ /**
-+ * Loads the class, provided that the calling thread has an access to the class being loaded.
-+ */
-+ private static Class safeLoadClass(String className, ClassLoader classLoader) throws ClassNotFoundException {
-+ try {
-+ // make sure that the current thread has an access to the package of the given name.
-+ SecurityManager s = System.getSecurityManager();
-+ if (s != null) {
-+ int i = className.lastIndexOf('.');
-+ if (i != -1) {
-+ s.checkPackageAccess(className.substring(0,i));
-+ }
-+ }
-+
-+ if (classLoader == null)
-+ return Class.forName(className);
-+ else
-+ return classLoader.loadClass(className);
-+ } catch (SecurityException se) {
-+ // anyone can access the platform default factory class without permission
-+ if (PLATFORM_DEFAULT_FACTORY_CLASS.equals(className))
-+ return Class.forName(className);
-+ throw se;
-+ }
-+ }
- }
-diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security openjdk/jdk/src/share/lib/security/java.security
---- openjdk.orig/jdk/src/share/lib/security/java.security 2008-11-20 08:44:48.000000000 +0000
-+++ openjdk/jdk/src/share/lib/security/java.security 2008-12-02 15:29:09.000000000 +0000
-@@ -127,7 +127,7 @@
- # passed to checkPackageAccess unless the
- # corresponding RuntimePermission ("accessClassInPackage."+package) has
- # been granted.
--package.access=sun.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
-
- #
- # List of comma-separated packages that start with or equal this string
-diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-solaris openjdk/jdk/src/share/lib/security/java.security-solaris
---- openjdk.orig/jdk/src/share/lib/security/java.security-solaris 2008-11-20 08:44:48.000000000 +0000
-+++ openjdk/jdk/src/share/lib/security/java.security-solaris 2008-12-02 15:29:09.000000000 +0000
-@@ -128,7 +128,7 @@
- # passed to checkPackageAccess unless the
- # corresponding RuntimePermission ("accessClassInPackage."+package) has
- # been granted.
--package.access=sun.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
-
- #
- # List of comma-separated packages that start with or equal this string
-diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-windows openjdk/jdk/src/share/lib/security/java.security-windows
---- openjdk.orig/jdk/src/share/lib/security/java.security-windows 2008-11-20 08:44:48.000000000 +0000
-+++ openjdk/jdk/src/share/lib/security/java.security-windows 2008-12-02 15:29:09.000000000 +0000
-@@ -128,7 +128,7 @@
- # passed to checkPackageAccess unless the
- # corresponding RuntimePermission ("accessClassInPackage."+package) has
- # been granted.
--package.access=sun.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
-
- #
- # List of comma-separated packages that start with or equal this string
-diff -Nru openjdk.orig/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh openjdk/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh
---- openjdk.orig/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh 2008-12-02 15:29:09.000000000 +0000
-@@ -0,0 +1,61 @@
-+#!/bin/sh
-+
-+if [ "${TESTSRC}" = "" ]
-+then TESTSRC=.
-+fi
-+
-+if [ "${TESTJAVA}" = "" ]
-+then
-+ PARENT=`dirname \`which java\``
-+ TESTJAVA=`dirname ${PARENT}`
-+ echo "TESTJAVA not set, selecting " ${TESTJAVA}
-+ echo "If this is incorrect, try setting the variable manually."
-+fi
-+
-+if [ "${TESTCLASSES}" = "" ]
-+then
-+ echo "TESTCLASSES not set. Test cannot execute. Failed."
-+ exit 1
-+fi
-+
-+BIT_FLAG=""
-+
-+# set platform-dependent variables
-+OS=`uname -s`
-+case "$OS" in
-+ SunOS | Linux )
-+ NULL=/dev/null
-+ PS=":"
-+ FS="/"
-+ ## for solaris, linux it's HOME
-+ FILE_LOCATION=$HOME
-+ if [ -f ${FILE_LOCATION}${FS}JDK64BIT -a ${OS} = "SunOS" ]
-+ then
-+ BIT_FLAG=`cat ${FILE_LOCATION}${FS}JDK64BIT`
-+ fi
-+ ;;
-+ Windows_* )
-+ NULL=NUL
-+ PS=";"
-+ FS="\\"
-+ ;;
-+ * )
-+ echo "Unrecognized system!"
-+ exit 1;
-+ ;;
-+esac
-+
-+JEMMYPATH=${CPAPPEND}
-+CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
-+
-+THIS_DIR=`pwd`
-+
-+${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -version
-+
-+${TESTJAVA}${FS}bin${FS}javac ${BIT_FLAG} -d . -cp ${TESTJAVA}${FS}jre${FS}lib${FS}rt.jar ${TESTSRC}${FS}Test.java
-+
-+${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -cp . Test
-+
-+STATUS=$?
-+
-+exit $STATUS
-diff -Nru openjdk.orig/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test.java openjdk/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test.java
---- openjdk.orig/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test.java 2008-12-02 15:29:09.000000000 +0000
-@@ -0,0 +1,65 @@
-+/*
-+ * @test
-+ * @bug 6592792
-+ * @summary Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security
-+ * @run shell Test6592792.sh
-+ */
-+
-+import java.lang.*;
-+import java.lang.reflect.*;
-+import com.sun.xml.internal.ws.server.*;
-+import com.sun.xml.internal.ws.server.SingletonResolver;
-+import com.sun.xml.internal.ws.api.server.*;
-+
-+public class Test {
-+
-+ public static void main(String[] args) throws Exception{
-+ // Enable the security manager
-+ SecurityManager sm = new SecurityManager();
-+ System.setSecurityManager(sm);
-+ new Test();
-+ }
-+
-+ Object invokeMethod(Object target,Method m,Object args[]) throws Exception {
-+ SingletonResolver r = new SingletonResolver(target);
-+ Invoker invoker = r.createInvoker();
-+ return invoker.invoke(null, m, args);
-+ }
-+
-+ public Test() throws Exception{
-+ try {
-+ Class c=Class.forName("java.lang.Class");
-+
-+ Class ctab[]=new Class[1];
-+ ctab[0]=Class.forName("java.lang.String");
-+ Method forName=c.getMethod("forName",ctab);
-+
-+ Class gtab[]=new Class[2];
-+ gtab[0]=Class.forName("java.lang.String");
-+ gtab[1]=Class[].class;
-+ Method getMethod=c.getMethod("getMethod",gtab);
-+
-+ Method newInstance=c.getMethod("newInstance",(Class[])null);
-+
-+ Object otab[]=new Object[1];
-+ otab[0]="sun.misc.Unsafe";
-+
-+ Object o=invokeMethod(null,forName,otab);
-+ c = (Class)o; // sun.misc.Unsafe class
-+ // Test FAILED: Should n't have got the reference.
-+ throw new RuntimeException("Test Failed: Got reference to: "+o);
-+
-+
-+ //o=invokeMethod(c,getMethod, new Object[]{"getUnsafe", (Class[])null});
-+ //System.out.println("Got reference to: "+o);
-+ //throw new RuntimeException("Got reference to: "+o);
-+ //o=invokeMethod(c,(Method)o,null);
-+ //System.out.println("Got reference to: "+o);
-+ //throw new RuntimeException("Got reference to: "+o);
-+
-+ } catch(java.security.AccessControlException e) {
-+ System.out.println("Test passed");
-+ //e.printStackTrace();
-+ }
-+ }
-+}
diff -r e8227389e2e0 -r 48d7359c75f6 patches/6733959.patch
--- a/patches/6733959.patch Wed Sep 21 18:56:43 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,225 +0,0 @@
-diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c
---- openjdk.orig/jdk/src/share/bin/java.c 2008-12-02 16:28:05.000000000 +0000
-+++ openjdk/jdk/src/share/bin/java.c 2008-12-02 17:08:57.000000000 +0000
-@@ -885,8 +885,14 @@
- * "Valid" returns (other than unrecoverable errors) follow. Set
- * main_class as a side-effect of this routine.
- */
-- if (info.main_class != NULL)
-+ if (info.main_class != NULL) {
-+ if (strlen(info.main_class) <= MAXNAMELEN) {
- *main_class = JLI_StringDup(info.main_class);
-+ } else {
-+ JLI_ReportErrorMessage("Error: main-class: attribute exceeds system limits\n", JNI_TRUE);
-+ exit(1);
-+ }
-+ }
-
- /*
- * If no version selection information is found either on the command
More information about the distro-pkg-dev
mailing list