/hg/icedtea7: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 18 22:37:43 PDT 2011
changeset c141efcd6191 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=c141efcd6191
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 19 06:30:36 2011 +0100
Get CACAO at least as far as the failing ./configure.
2011-10-19 Andrew John Hughes <ahughes at redhat.com>
* patches/cacao/6714758.patch: Removed; upstream.
* Makefile.am: (ICEDTEA_PATCHES): Drop above patch.
(extract-cacao): Use gzip not bzip2. (extract-jamvm):
Explicitly use gzip.
changeset c448ba9ca41b in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=c448ba9ca41b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 19 03:24:31 2011 +0100
Import security updates.
2011-10-19 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Bring in security updates.
(CORBA_CHANGESET): Updated. (JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise.
* patches/rhino.patch: Updated to work after 7046823 is
applied.
* NEWS: Updated.
changeset 78b0126c1595 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=78b0126c1595
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 19 06:33:03 2011 +0100
Bump to 2.1pre.
2011-10-19 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Set release date of 2.0 and add section for
2.1.
* configure.ac: Bump to 2.1pre.
changeset 956bad867ba0 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=956bad867ba0
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 19 06:35:01 2011 +0100
Merge
changeset fb206d077513 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=fb206d077513
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 19 06:37:14 2011 +0100
Move JamVM updates to correct section.
2011-10-19 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Move recent JamVM changes to correct
section. Sync with 2.0.
diffstat:
ChangeLog | 53 ++++++++++++++++
Makefile.am | 25 +++----
NEWS | 25 +++++++-
configure.ac | 2 +-
patches/cacao/6714758.patch | 38 -----------
patches/jamvm/gb-memory-fix.patch | 24 -------
patches/jamvm/ignore-assertions-and-verify-options.patch | 19 -----
patches/rhino.patch | 30 ++++----
8 files changed, 104 insertions(+), 112 deletions(-)
diffs (429 lines):
diff -r fbad82bc6985 -r fb206d077513 ChangeLog
--- a/ChangeLog Fri Sep 30 16:32:13 2011 +0100
+++ b/ChangeLog Wed Oct 19 06:37:14 2011 +0100
@@ -1,3 +1,56 @@
+2011-10-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Move recent JamVM changes
+ to correct section. Sync with 2.0.
+
+2011-10-10 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ JamVM
+ - Implement classlibCheckIfOnLoad().
+ - Make thread states JVMTI compatible.
+ - Add OpenBSD/sparc to list of recognised hosts.
+ - Handle 'g' when specifying memory + extra checks.
+ - Make command line compatibility options table-driven.
+ * NEWS: Updated.
+ * patches/jamvm/gb-memory-fix.patch: Replaced by upstream,
+ Handle 'g' when specifying memory + extra checks,
+ changeset 5b66309e20cfd9fe1119e0c9231060a9a583d846.
+ * patches/jamvm/ignore-assertions-and-verify-options.patch:
+ Replaced by upstream, Make command line compatibility options
+ table-driven, changeset d689b6527e26ef1098583ba39725d6e675f8b649.
+ * Makefile.am
+ (ICEDTEA_PATCHES): Remove upstreamed JamVM patches.
+ (JAMVM_VERSION): Updated JamVM to 2011-10-07 revision.
+ (JAMVM_SHA256SUM): Updated.
+
+2011-10-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Set release date of 2.0 and
+ add section for 2.1.
+ * configure.ac: Bump to 2.1pre.
+
+2011-10-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/cacao/6714758.patch:
+ Removed; upstream.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Drop above patch.
+ (extract-cacao): Use gzip not bzip2.
+ (extract-jamvm): Explicitly use gzip.
+
+2011-10-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Bring in security updates.
+ (CORBA_CHANGESET): Updated.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ * patches/rhino.patch: Updated to work
+ after 7046823 is applied.
+ * NEWS: Updated.
+
2011-09-30 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
diff -r fbad82bc6985 -r fb206d077513 Makefile.am
--- a/Makefile.am Fri Sep 30 16:32:13 2011 +0100
+++ b/Makefile.am Wed Oct 19 06:37:14 2011 +0100
@@ -2,19 +2,19 @@
OPENJDK_VERSION = b147
-CORBA_CHANGESET = 953de8c7bccb
+CORBA_CHANGESET = 4d9e4fb8af09
HOTSPOT_CHANGESET = b28ae681bae0
JAXP_CHANGESET = 948e734135ea
-JAXWS_CHANGESET = 5d3734549424
-JDK_CHANGESET = d9fca71ba183
+JAXWS_CHANGESET = a2ebfdc9db7e
+JDK_CHANGESET = 2054526dd141
LANGTOOLS_CHANGESET = 9b85f1265346
OPENJDK_CHANGESET = 0a76e5390e68
-CORBA_SHA256SUM = 303d862f722d34ede330e9afdb0f2c9d61e02134beb4d562957e9574a91f8cca
+CORBA_SHA256SUM = 9579b9f47c45d4e6f4eb080a7a27886163691a77c193d83423389cb87656aec5
HOTSPOT_SHA256SUM = dcb5a8d4a0a466e3673f891cea40ce163c02f26b0054dfc41c30e0f87c5c2f64
JAXP_SHA256SUM = 66948dee25e0224b12587ba150b21dab2e21b260a853bd1272e07c8d08d2e586
-JAXWS_SHA256SUM = 6aace2cc9f1a98a3822733ad568cc070ec178ff3618c05229c68072af3ed4765
-JDK_SHA256SUM = d8e9bb264f2a31424764466273f10c05d4247328ab4c08a0f4b8123993d78e65
+JAXWS_SHA256SUM = 6edd17ac49c33a32538262486c0b8147954100cab43a6ee7023789f3840f22a8
+JDK_SHA256SUM = 4cd94391909ca86d2a5e25e3378c8fde1b1368076577fc58fed57097932750e1
LANGTOOLS_SHA256SUM = 03a256afc7371b3b0fbbbfd80a318e22984f6cbff26082948e8d5845ba193aee
OPENJDK_SHA256SUM = aa3b3cf17081cde2a4014e5dffec75f5b5402ad48f7f9943c32a2fa4544a8746
@@ -24,8 +24,8 @@
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
-JAMVM_VERSION = 310c491ddc14e92a6ffff27030a1a1821e6395a8
-JAMVM_SHA256SUM = b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a
+JAMVM_VERSION = 4617da717ecb05654ea5bb9572338061106a414d
+JAMVM_SHA256SUM = 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d
JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
@@ -247,7 +247,6 @@
patches/cacao/launcher.patch \
patches/cacao/version.patch \
patches/cacao/jsig.patch \
- patches/cacao/6714758.patch \
patches/cacao/memory.patch
endif
@@ -258,9 +257,7 @@
if BUILD_JAMVM
ICEDTEA_PATCHES += \
- patches/jamvm/remove-sun.misc.Perf-debug-code.patch \
- patches/jamvm/gb-memory-fix.patch \
- patches/jamvm/ignore-assertions-and-verify-options.patch
+ patches/jamvm/remove-sun.misc.Perf-debug-code.patch
endif
if ENABLE_PULSE_JAVA
@@ -1194,7 +1191,7 @@
if ! test -d cacao/cacao ; \
then \
mkdir cacao ; \
- $(TAR) xjf $(CACAO_SRC_ZIP) -C cacao ; \
+ $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
dir=$$(basename cacao/cacao-*) ; \
ln -s $$dir cacao/cacao ; \
cd cacao/cacao ; \
@@ -1214,7 +1211,7 @@
if ! test -d jamvm ; \
then \
mkdir jamvm ; \
- $(TAR) xf $(JAMVM_SRC_ZIP) -C jamvm ; \
+ $(TAR) xzf $(JAMVM_SRC_ZIP) -C jamvm ; \
dir=$$(basename jamvm/jamvm-*) ; \
ln -s $$dir jamvm/jamvm ; \
fi
diff -r fbad82bc6985 -r fb206d077513 NEWS
--- a/NEWS Fri Sep 30 16:32:13 2011 +0100
+++ b/NEWS Wed Oct 19 06:37:14 2011 +0100
@@ -10,8 +10,30 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.0 (2011-XX-XX):
+New in release 2.1 (20XX-XX-XX):
+* JamVM
+ - Implement classlibCheckIfOnLoad().
+ - Make thread states JVMTI compatible.
+ - Add OpenBSD/sparc to list of recognised hosts.
+ - Handle 'g' when specifying memory + extra checks.
+
+New in release 2.0 (2011-10-19):
+
+* Security fixes
+ - S7000600, CVE-2011-3547: InputStream skip() information leak
+ - S7019773, CVE-2011-3548: mutable static AWTKeyStroke.ctor
+ - S7023640, CVE-2011-3551: Java2D TransformHelper integer overflow
+ - S7032417, CVE-2011-3552: excessive default UDP socket limit under SecurityManager
+ - S7046794, CVE-2011-3553: JAX-WS stack-traces information leak
+ - S7046823, CVE-2011-3544: missing SecurityManager checks in scripting engine
+ - S7055902, CVE-2011-3521: IIOP deserialization code execution
+ - S7057857, CVE-2011-3554: insufficient pack200 JAR files uncompress error checks
+ - S7064341, CVE-2011-3389: HTTPS: block-wise chosen-plaintext attack against SSL/TLS (BEAST)
+ - S7070134, CVE-2011-3558: HotSpot crashes with sigsegv from PorterStemmer
+ - S7077466, CVE-2011-3556: RMI DGC server remote code execution
+ - S7083012, CVE-2011-3557: RMI registry privileged code execution
+ - S7096936, CVE-2011-3560: missing checkSetFactory calls in HttpsURLConnection
* Bug fixes
- Allow the compiler used to be overridden by setting BUILD_GCC/BUILD_CPP.
- Fixed regression test runtime/7020373.
@@ -25,6 +47,7 @@
- S7044738: Loop unroll optimization causes incorrect result
- S7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
- S7073913: Avoid random segfaults.
+ - PR751: IcedTea7 should bootstrap with IcedTea7
* Zero/Shark
- PR757, S7066143: 7009309 regression: x86 stubRoutines
- PR753, S7066143: 7009923 regression
diff -r fbad82bc6985 -r fb206d077513 configure.ac
--- a/configure.ac Fri Sep 30 16:32:13 2011 +0100
+++ b/configure.ac Wed Oct 19 06:37:14 2011 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.0pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.1pre], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r fbad82bc6985 -r fb206d077513 patches/cacao/6714758.patch
--- a/patches/cacao/6714758.patch Fri Sep 30 16:32:13 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-diff -Nru cacao.orig/cacaog/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product
---- cacao.orig/cacao/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100
-@@ -86,6 +86,7 @@
- JVM_EnableCompiler;
- JVM_Exit;
- JVM_FillInStackTrace;
-+ JVM_FindClassFromBootLoader;
- JVM_FindClassFromClass;
- JVM_FindClassFromClassLoader;
- JVM_FindLibraryEntry;
-diff -Nru cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp
---- cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100
-@@ -668,6 +668,9 @@
-
- assert(throwError == false);
-
-+ if (name == NULL)
-+ return NULL;
-+
- u = utf_new_char(name);
- cl = loader_hashtable_classloader_add((java_handle_t *) loader);
-
-@@ -685,6 +688,15 @@
- }
-
-
-+/* JVM_FindClassFromBootLoader */
-+
-+jclass JVM_FindClassFromBootLoader(JNIEnv* env, const char* name)
-+{
-+ TRACEJVMCALLS(("JVM_FindClassFromBootLoader(name=%s)", name));
-+ return JVM_FindClassFromClassLoader(env, name, JNI_FALSE,
-+ (jobject)NULL, false);
-+}
-+
- /* JVM_FindClassFromClass */
-
- jclass JVM_FindClassFromClass(JNIEnv *env, const char *name, jboolean init, jclass from)
diff -r fbad82bc6985 -r fb206d077513 patches/jamvm/gb-memory-fix.patch
--- a/patches/jamvm/gb-memory-fix.patch Fri Sep 30 16:32:13 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-diff -Nru jamvm/jamvm/src/init.c jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa/src/init.c
---- jamvm.orig/jamvm/src/init.c 2011-03-25 17:36:12.000000000 +0800
-+++ jamvm/jamvm/src/init.c 2011-09-26 16:54:08.000000000 +0800
-@@ -123,6 +123,11 @@
- case '\0':
- break;
-
-+ case 'G':
-+ case 'g':
-+ n *= GB;
-+ break;
-+
- case 'M':
- case 'm':
- n *= MB;
-diff -Nru jamvm/jamvm/src/jam.h jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa/src/jam.h
---- jamvm.orig/jamvm/src/jam.h 2011-03-25 17:36:12.000000000 +0800
-+++ jamvm/jamvm/src/jam.h 2011-09-26 16:51:56.000000000 +0800
-@@ -734,6 +734,7 @@
-
- #define KB 1024
- #define MB (KB*KB)
-+#define GB (MB*KB)
-
- /* minimum allowable size of object heap */
- #define MIN_HEAP 4*KB
diff -r fbad82bc6985 -r fb206d077513 patches/jamvm/ignore-assertions-and-verify-options.patch
--- a/patches/jamvm/ignore-assertions-and-verify-options.patch Fri Sep 30 16:32:13 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Index: jamvm/jamvm/src/init.c
-===================================================================
---- jamvm.orig/jamvm/src/init.c 2011-08-12 14:12:00.775411188 +0200
-+++ jamvm/jamvm/src/init.c 2011-08-12 16:22:24.110205028 +0200
-@@ -272,6 +272,15 @@
- /* Compatibility options */
- } else if(strcmp(string, "-Xcomp") == 0 ||
- strcmp(string, "-Xbatch") == 0 ||
-+ strcmp(string, "-ea") == 0 ||
-+ strcmp(string, "-da") == 0 ||
-+ strcmp(string, "-dsa") == 0 ||
-+ strcmp(string, "-esa") == 0 ||
-+ strncmp(string, "-ea:", 4) == 0 ||
-+ strncmp(string, "-da:", 4) == 0 ||
-+ strncmp(string, "-dsa:", 5) == 0 ||
-+ strncmp(string, "-esa:", 5) == 0 ||
-+ strncmp(string, "-Xverify:", 9) == 0 ||
- strncmp(string, "-XX:", 4) == 0) {
- /* Ignore */
- } else
diff -r fbad82bc6985 -r fb206d077513 patches/rhino.patch
--- a/patches/rhino.patch Fri Sep 30 16:32:13 2011 +0100
+++ b/patches/rhino.patch Wed Oct 19 06:37:14 2011 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile
---- openjdk.orig/jdk/make/com/sun/Makefile 2011-04-20 04:40:20.000000000 +0100
-+++ openjdk/jdk/make/com/sun/Makefile 2011-04-21 22:36:31.443422475 +0100
+--- openjdk.orig/jdk/make/com/sun/Makefile 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/make/com/sun/Makefile 2011-10-19 01:57:22.982499164 +0100
@@ -31,13 +31,6 @@
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -16,8 +16,8 @@
SUBDIRS = java security net/ssl jarsigner
diff -Nru openjdk.orig/jdk/make/com/sun/script/Makefile openjdk/jdk/make/com/sun/script/Makefile
---- openjdk.orig/jdk/make/com/sun/script/Makefile 2011-04-20 04:40:20.000000000 +0100
-+++ openjdk/jdk/make/com/sun/script/Makefile 2011-04-21 22:36:31.443422475 +0100
+--- openjdk.orig/jdk/make/com/sun/script/Makefile 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/make/com/sun/script/Makefile 2011-10-19 01:57:22.994499353 +0100
@@ -31,6 +31,8 @@
AUTO_FILES_JAVA_DIRS = com/sun/script
@@ -28,9 +28,9 @@
# Files that need to be copied
#
diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
---- openjdk.orig/jdk/make/common/Release.gmk 2011-04-21 20:56:37.000000000 +0100
-+++ openjdk/jdk/make/common/Release.gmk 2011-04-21 22:36:31.443422475 +0100
-@@ -735,6 +735,7 @@
+--- openjdk.orig/jdk/make/common/Release.gmk 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/make/common/Release.gmk 2011-10-19 01:57:22.994499353 +0100
+@@ -756,6 +756,7 @@
$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
@@ -39,8 +39,8 @@
$(CD) $(JRE_IMAGE_DIR)/lib && \
$(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2010-07-29 21:55:35.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2011-04-21 22:36:31.443422475 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2011-10-19 01:57:22.994499353 +0100
@@ -24,7 +24,7 @@
*/
@@ -51,8 +51,8 @@
import java.util.*;
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2010-07-29 21:55:35.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2011-04-21 22:36:31.455422660 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2011-10-19 01:57:22.994499353 +0100
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
@@ -63,8 +63,8 @@
/**
* This class implements Rhino-like JavaAdapter to help implement a Java
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2010-07-29 21:55:35.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2011-04-21 22:36:31.455422660 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2011-10-19 01:57:22.994499353 +0100
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
@@ -75,8 +75,8 @@
/**
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2010-07-29 21:55:35.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2011-04-21 22:36:31.455422660 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2011-10-19 01:57:22.994499353 +0100
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
@@ -87,8 +87,8 @@
/**
* This class prevents script access to certain sensitive classes.
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2010-07-29 21:55:35.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2011-04-21 22:36:31.455422660 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2011-10-19 01:57:22.994499353 +0100
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
@@ -99,8 +99,8 @@
/**
* Represents compiled JavaScript code.
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2011-04-18 18:04:37.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2011-04-21 22:36:31.455422660 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2011-10-19 01:57:22.994499353 +0100
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import javax.script.*;
@@ -111,8 +111,8 @@
/**
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2011-04-20 04:40:21.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2011-04-21 22:36:31.455422660 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2011-10-19 01:57:22.994499353 +0100
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import com.sun.script.util.*;
@@ -121,22 +121,22 @@
+import sun.org.mozilla.javascript.*;
import java.lang.reflect.Method;
import java.io.*;
- import java.util.*;
+ import java.security.*;
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2011-04-11 12:34:30.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2011-04-21 22:36:31.455422660 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2011-10-19 01:57:37.454729539 +0100
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
+ import java.security.AccessControlContext;
import javax.script.*;
- /**
diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2010-07-29 21:55:35.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2011-04-21 22:36:31.455422660 +0100
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2011-10-14 03:02:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2011-10-19 01:57:22.994499353 +0100
@@ -27,7 +27,7 @@
import java.lang.reflect.*;
More information about the distro-pkg-dev
mailing list