/hg/release/icedtea6-1.8: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 18 17:24:17 PDT 2011
changeset 7524f507af5c in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=7524f507af5c
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Oct 17 15:40:23 2011 +0100
Apply latest security patches.
2011-10-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add patches.
* NEWS: List security updates.
* patches/icedtea-rhino.patch: Change after 7046823 is applied.
* patches/icedtea-xjc.patch: Update against 7046794.
* patches/security/20111018/7000600.patch,
* patches/security/20111018/7019773.patch,
* patches/security/20111018/7023640.patch,
* patches/security/20111018/7032417.patch,
* patches/security/20111018/7046823.patch,
* patches/security/20111018/7055902.patch,
* patches/security/20111018/7057857.patch,
* patches/security/20111018/7064341.patch,
* patches/security/20111018/7083012.patch,
* patches/security/20111018/7096936.patch,
* patches/security/20111018/7046794.patch,
* patches/security/20111018/7077466.patch: Add security
patches.
changeset d29047ebebcb in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=d29047ebebcb
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Oct 18 13:54:08 2011 +0100
PR764: icedtea 1.8.9 fails to build in CachedJarFileCallback.java
2011-10-17 Andrew John Hughes <ahughes at redhat.com>
PR764: icedtea 1.8.9 fails to build in
CachedJarFileCallback.java
* netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java:
(retrieve(URL)): Remove @Override annotations. (run()):
Likewise.
* NEWS: Updated.
changeset 878baf89f19a in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=878baf89f19a
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Oct 18 15:04:40 2011 +0100
Support building against libpng 1.5.
2011-10-13 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
* patches/libpng-1.5.patch: Support building against libpng
1.5.
changeset 17524de1ad5c in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=17524de1ad5c
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 19 01:23:33 2011 +0100
Bump to 1.8.10 proper.
2011-10-18 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Set date for 1.8.10.
* configure.ac: Bump to 1.8.10 proper.
changeset 8a57ae84ba3d in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=8a57ae84ba3d
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 19 01:23:38 2011 +0100
Added tag icedtea6-1.8.10 for changeset 17524de1ad5c
diffstat:
.hgtags | 1 +
ChangeLog | 39 +
Makefile.am | 17 +-
NEWS | 16 +-
configure.ac | 2 +-
netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java | 2 -
patches/icedtea-rhino.patch | 134 +-
patches/icedtea-xjc.patch | 4 +-
patches/libpng-1.5.patch | 41 +
patches/security/20111018/7000600.patch | 45 +
patches/security/20111018/7019773.patch | 116 +
patches/security/20111018/7023640.patch | 90 +
patches/security/20111018/7032417.patch | 29 +
patches/security/20111018/7046794.patch | 28 +
patches/security/20111018/7046823.patch | 126 +
patches/security/20111018/7055902.patch | 32 +
patches/security/20111018/7057857.patch | 52 +
patches/security/20111018/7064341.patch | 398 +
patches/security/20111018/7070134.patch | 97771 ++++++++++
patches/security/20111018/7077466.patch | 23 +
patches/security/20111018/7083012.patch | 952 +
patches/security/20111018/7096936.patch | 36 +
22 files changed, 99885 insertions(+), 69 deletions(-)
diffs (truncated from 100214 to 500 lines):
diff -r a31e65674d37 -r 8a57ae84ba3d .hgtags
--- a/.hgtags Thu Sep 29 16:40:51 2011 -0400
+++ b/.hgtags Wed Oct 19 01:23:38 2011 +0100
@@ -30,3 +30,4 @@
24dfe84f55e3dc68d95c1688f8a678341c86ddf7 icedtea6-1.8.7
2cc9c0e4eadeacc5f52aae1424917aceeebe00c4 icedtea6-1.8.8
ae7e52528576f9f176761d4d41219084682be3df icedtea6-1.8.9
+17524de1ad5c9871b0e2a96381630ef4d11ee737 icedtea6-1.8.10
diff -r a31e65674d37 -r 8a57ae84ba3d ChangeLog
--- a/ChangeLog Thu Sep 29 16:40:51 2011 -0400
+++ b/ChangeLog Wed Oct 19 01:23:38 2011 +0100
@@ -1,3 +1,42 @@
+2011-10-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Set date for 1.8.10.
+ * configure.ac: Bump to 1.8.10 proper.
+
+2011-10-13 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * patches/libpng-1.5.patch:
+ Support building against libpng 1.5.
+
+2011-10-17 Andrew John Hughes <ahughes at redhat.com>
+
+ PR764: icedtea 1.8.9 fails to build in CachedJarFileCallback.java
+ * netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java:
+ (retrieve(URL)): Remove @Override annotations.
+ (run()): Likewise.
+ * NEWS: Updated.
+
+2011-10-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add patches.
+ * NEWS: List security updates.
+ * patches/icedtea-rhino.patch: Change after 7046823 is applied.
+ * patches/icedtea-xjc.patch: Update against 7046794.
+ * patches/security/20111018/7000600.patch,
+ * patches/security/20111018/7019773.patch,
+ * patches/security/20111018/7023640.patch,
+ * patches/security/20111018/7032417.patch,
+ * patches/security/20111018/7046823.patch,
+ * patches/security/20111018/7055902.patch,
+ * patches/security/20111018/7057857.patch,
+ * patches/security/20111018/7064341.patch,
+ * patches/security/20111018/7083012.patch,
+ * patches/security/20111018/7096936.patch,
+ * patches/security/20111018/7046794.patch,
+ * patches/security/20111018/7077466.patch:
+ Add security patches.
+
2011-09-29 Deepak Bhole <dbhole at redhat.com>
PR794: javaws does not work if a Web Start app jar has a Class-Path
diff -r a31e65674d37 -r 8a57ae84ba3d Makefile.am
--- a/Makefile.am Thu Sep 29 16:40:51 2011 -0400
+++ b/Makefile.am Wed Oct 19 01:23:38 2011 +0100
@@ -268,7 +268,19 @@
patches/security/20110607/7013971.patch \
patches/security/20110607/7016495.patch \
patches/security/20110607/7020198.patch \
- patches/security/20110607/7020373.patch
+ patches/security/20110607/7020373.patch \
+ patches/security/20111018/7000600.patch \
+ patches/security/20111018/7019773.patch \
+ patches/security/20111018/7023640.patch \
+ patches/security/20111018/7032417.patch \
+ patches/security/20111018/7046823.patch \
+ patches/security/20111018/7055902.patch \
+ patches/security/20111018/7057857.patch \
+ patches/security/20111018/7064341.patch \
+ patches/security/20111018/7083012.patch \
+ patches/security/20111018/7096936.patch \
+ patches/security/20111018/7046794.patch \
+ patches/security/20111018/7077466.patch
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
@@ -388,7 +400,8 @@
patches/openjdk/6691503-malicious-applet-always-on-top.patch \
patches/jtreg-LastErrorString.patch \
patches/mark_sun_toolkit_privileged_code.patch \
- patches/support_linux_3.patch
+ patches/support_linux_3.patch \
+ patches/libpng-1.5.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
diff -r a31e65674d37 -r 8a57ae84ba3d NEWS
--- a/NEWS Thu Sep 29 16:40:51 2011 -0400
+++ b/NEWS Wed Oct 19 01:23:38 2011 +0100
@@ -8,10 +8,24 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.8.10 (2011-XX-XX):
+New in release 1.8.10 (2011-10-18):
+* 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)
+ - 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
* NetX
- PR794: javaws does not work if a Web Start app jar has a Class-Path element in the manifest
+ - PR764: icedtea 1.8.9 fails to build in CachedJarFileCallback.java
New in release 1.8.9 (2011-07-20):
diff -r a31e65674d37 -r 8a57ae84ba3d configure.ac
--- a/configure.ac Thu Sep 29 16:40:51 2011 -0400
+++ b/configure.ac Wed Oct 19 01:23:38 2011 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.8.10pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.8.10],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r a31e65674d37 -r 8a57ae84ba3d netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
--- a/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java Thu Sep 29 16:40:51 2011 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java Wed Oct 19 01:23:38 2011 +0100
@@ -80,7 +80,6 @@
mapping.put(remoteUrl, localUrl);
}
- @Override
public JarFile retrieve(URL url) throws IOException {
URL localUrl = mapping.get(url);
@@ -133,7 +132,6 @@
try {
result =
AccessController.doPrivileged(new PrivilegedExceptionAction<JarFile>() {
- @Override
public JarFile run() throws IOException {
OutputStream out = null;
File tmpFile = null;
diff -r a31e65674d37 -r 8a57ae84ba3d patches/icedtea-rhino.patch
--- a/patches/icedtea-rhino.patch Thu Sep 29 16:40:51 2011 -0400
+++ b/patches/icedtea-rhino.patch Wed Oct 19 01:23:38 2011 +0100
@@ -8,19 +8,9 @@
"%/classes";
char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
if (sysclasspath == NULL) return false;
---- openjdk/jdk/make/com/sun/script/Makefile.orig 2008-11-25 09:01:10.000000000 +0000
-+++ openjdk/jdk/make/com/sun/script/Makefile 2008-12-03 21:13:14.000000000 +0000
-@@ -31,6 +31,8 @@
-
- AUTO_FILES_JAVA_DIRS = com/sun/script
-
-+OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
-+
- #
- # Files that need to be copied
- #
---- openjdk/jdk/make/com/sun/Makefile.orig 2008-11-25 09:01:09.000000000 +0000
-+++ openjdk/jdk/make/com/sun/Makefile 2008-12-03 21:14:36.000000000 +0000
+diff -Nru openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile
+--- openjdk.orig/jdk/make/com/sun/Makefile 2011-02-28 16:06:10.000000000 +0000
++++ openjdk/jdk/make/com/sun/Makefile 2011-10-13 17:46:30.119082413 +0100
@@ -31,15 +31,8 @@
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -38,8 +28,21 @@
java inputmethods org rowset net/httpserver net/ssl demo \
tools jarsigner
---- openjdk/jdk/make/common/Release.gmk.orig 2008-12-03 21:12:23.000000000 +0000
-+++ openjdk/jdk/make/common/Release.gmk 2008-12-03 21:13:14.000000000 +0000
+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-02-28 16:06:10.000000000 +0000
++++ openjdk/jdk/make/com/sun/script/Makefile 2011-10-13 17:46:30.103082160 +0100
+@@ -31,6 +31,8 @@
+
+ AUTO_FILES_JAVA_DIRS = com/sun/script
+
++OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
++
+ #
+ # 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-10-13 17:44:00.000000000 +0100
++++ openjdk/jdk/make/common/Release.gmk 2011-10-13 17:46:30.123082475 +0100
@@ -772,6 +772,7 @@
$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
@@ -48,19 +51,69 @@
@# Generate meta-index to make boot and extension class loaders lazier
$(CD) $(JRE_IMAGE_DIR)/lib && \
$(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java.orig 2008-11-25 09:02:56.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2008-12-03 21:13:13.000000000 +0000
+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 2011-02-28 16:06:18.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2011-10-13 17:46:30.123082475 +0100
+@@ -24,7 +24,7 @@
+ */
+
+ package com.sun.script.javascript;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+ import javax.script.*;
+ 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 2011-02-28 16:06:18.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2011-10-13 17:46:30.123082475 +0100
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+
+ import javax.script.Invocable;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+
+ /**
+ * 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 2011-02-28 16:06:18.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2011-10-13 17:46:30.123082475 +0100
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
- import javax.script.*;
+ import java.util.*;
/**
---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java.orig 2008-11-25 09:02:56.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2008-12-03 21:13:05.000000000 +0000
+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 2011-02-28 16:06:18.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2011-10-13 17:46:30.123082475 +0100
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+
+ import java.util.*;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+
+ /**
+ * 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 2011-02-28 16:06:18.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2011-10-13 17:46:30.123082475 +0100
+@@ -25,7 +25,7 @@
+
+ package com.sun.script.javascript;
+ import javax.script.*;
+-import sun.org.mozilla.javascript.internal.*;
++import sun.org.mozilla.javascript.*;
+
+ /**
+ * 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-02-28 16:06:18.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2011-10-13 17:46:30.123082475 +0100
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import javax.script.*;
@@ -70,19 +123,9 @@
import com.sun.script.util.*;
/**
---- openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java.orig 2008-11-25 09:02:56.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2008-12-03 21:13:14.000000000 +0000
-@@ -24,7 +24,7 @@
- */
-
- package com.sun.script.javascript;
--import sun.org.mozilla.javascript.internal.*;
-+import sun.org.mozilla.javascript.*;
- import javax.script.*;
- import java.util.*;
-
---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.orig 2008-11-25 09:02:56.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2008-12-03 21:13:05.000000000 +0000
+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-10-13 17:43:47.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2011-10-13 17:46:30.123082475 +0100
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import com.sun.script.util.*;
@@ -91,42 +134,22 @@
+import sun.org.mozilla.javascript.*;
import java.lang.reflect.Method;
import java.io.*;
- import java.util.*;
---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java.orig 2008-11-25 09:02:56.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2008-12-03 21:13:05.000000000 +0000
-@@ -26,7 +26,7 @@
- package com.sun.script.javascript;
-
- import java.util.*;
--import sun.org.mozilla.javascript.internal.*;
-+import sun.org.mozilla.javascript.*;
-
- /**
- * This class prevents script access to certain sensitive classes.
---- openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java.orig 2008-11-25 09:02:56.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2008-12-03 21:13:14.000000000 +0000
-@@ -26,7 +26,7 @@
- package com.sun.script.javascript;
-
- import javax.script.Invocable;
--import sun.org.mozilla.javascript.internal.*;
-+import sun.org.mozilla.javascript.*;
-
- /**
- * This class implements Rhino-like JavaAdapter to help implement a Java
---- openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java.orig 2008-11-25 09:02:56.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2008-12-03 21:13:05.000000000 +0000
+ 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-10-13 17:43:47.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2011-10-13 17:46:45.947332953 +0100
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
- import java.util.*;
+ import java.security.AccessControlContext;
+ import javax.script.*;
- /**
---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.orig 2008-11-25 09:02:56.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2008-12-03 21:13:14.000000000 +0000
+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 2011-02-28 16:06:18.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2011-10-13 17:46:30.123082475 +0100
@@ -27,7 +27,7 @@
import java.lang.reflect.*;
@@ -136,14 +159,3 @@
/**
* This wrap factory is used for security reasons. JSR 223 script
---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java.orig 2008-11-25 09:02:56.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2008-12-03 21:13:05.000000000 +0000
-@@ -25,7 +25,7 @@
-
- package com.sun.script.javascript;
- import javax.script.*;
--import sun.org.mozilla.javascript.internal.*;
-+import sun.org.mozilla.javascript.*;
-
- /**
- * Represents compiled JavaScript code.
diff -r a31e65674d37 -r 8a57ae84ba3d patches/icedtea-xjc.patch
--- a/patches/icedtea-xjc.patch Thu Sep 29 16:40:51 2011 -0400
+++ b/patches/icedtea-xjc.patch Wed Oct 19 01:23:38 2011 +0100
@@ -5,8 +5,8 @@
patches.dir=patches
# Patches to apply
--jaxws_src.patch.list=7013971.patch
-+jaxws_src.patch.list=7013971.patch xjc.patch
+-jaxws_src.patch.list=7013971.patch 7046794.patch
++jaxws_src.patch.list=7013971.patch 7046794.patch xjc.patch
# Sanity information
sanity.info= Sanity Settings:${line.separator}\
diff -r a31e65674d37 -r 8a57ae84ba3d patches/libpng-1.5.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libpng-1.5.patch Wed Oct 19 01:23:38 2011 +0100
@@ -0,0 +1,42 @@
+diff -r b139627f7bc3 src/share/native/sun/awt/splashscreen/splashscreen_png.c
+--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c Mon Nov 22 09:43:58 2010 +0800
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c Tue Oct 18 13:55:10 2011 +0100
+@@ -31,12 +31,22 @@
+
+ #define SIG_BYTES 8
+
++#if (PNG_LIBPNG_VER < 10500)
++#define GET_IO_PTR(png_ptr) png_ptr->io_ptr
++#define JMPBUF(png_ptr) png_ptr->jmpbuf
++#define SET_READ_FN(png_ptr,iop,read_func) png_ptr->io_ptr = iop; png_ptr->read_data_fn = read_func;
++#else
++#define GET_IO_PTR(png_ptr) png_get_io_ptr(png_ptr)
++#define JMPBUF(png_ptr) png_jmpbuf(png_ptr)
++#define SET_READ_FN(png_ptr,iop,read_func) png_set_read_fn(png_ptr,iop,read_func);
++#endif
++
+ void PNGAPI
+ my_png_read_stream(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+ png_uint_32 check;
+
+- SplashStream * stream = (SplashStream*)png_ptr->io_ptr;
++ SplashStream * stream = (SplashStream*)GET_IO_PTR(png_ptr);
+ check = stream->read(stream, data, length);
+ if (check != length)
+ png_error(png_ptr, "Read Error");
+@@ -71,12 +81,11 @@
+ goto done;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(JMPBUF(png_ptr))) {
+ goto done;
+ }
+
+- png_ptr->io_ptr = io_ptr;
+- png_ptr->read_data_fn = read_func;
++ SET_READ_FN(png_ptr, io_ptr, read_func)
+
+ png_set_sig_bytes(png_ptr, SIG_BYTES); /* we already read the 8 signature bytes */
+
diff -r a31e65674d37 -r 8a57ae84ba3d patches/security/20111018/7000600.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/20111018/7000600.patch Wed Oct 19 01:23:38 2011 +0100
@@ -0,0 +1,46 @@
+diff -Nru openjdk.orig/jdk/src/share/classes/java/io/InputStream.java openjdk/jdk/src/share/classes/java/io/InputStream.java
+--- openjdk.orig/jdk/src/share/classes/java/io/InputStream.java 2010-02-17 03:14:22.000000000 +0000
++++ openjdk/jdk/src/share/classes/java/io/InputStream.java 2011-10-17 14:22:11.496003587 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
++ * Copyright 1994-2011 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
+@@ -44,10 +44,9 @@
+ */
+ public abstract class InputStream implements Closeable {
+
+- // SKIP_BUFFER_SIZE is used to determine the size of skipBuffer
+- private static final int SKIP_BUFFER_SIZE = 2048;
+- // skipBuffer is initialized in skip(long), if needed.
+- private static byte[] skipBuffer;
++ // MAX_SKIP_BUFFER_SIZE is used to determine the maximum buffer skip to
++ // use when skipping.
++ private static final int MAX_SKIP_BUFFER_SIZE = 2048;
+
+ /**
+ * Reads the next byte of data from the input stream. The value byte is
+@@ -212,18 +211,15 @@
+
+ long remaining = n;
+ int nr;
+- if (skipBuffer == null)
+- skipBuffer = new byte[SKIP_BUFFER_SIZE];
+-
+- byte[] localSkipBuffer = skipBuffer;
+
+ if (n <= 0) {
+ return 0;
+ }
+
++ int size = (int)Math.min(MAX_SKIP_BUFFER_SIZE, remaining);
++ byte[] skipBuffer = new byte[size];
+ while (remaining > 0) {
+- nr = read(localSkipBuffer, 0,
+- (int) Math.min(SKIP_BUFFER_SIZE, remaining));
++ nr = read(skipBuffer, 0, (int)Math.min(size, remaining));
+ if (nr < 0) {
+ break;
+ }
diff -r a31e65674d37 -r 8a57ae84ba3d patches/security/20111018/7019773.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/20111018/7019773.patch Wed Oct 19 01:23:38 2011 +0100
@@ -0,0 +1,117 @@
+--- openjdk/jdk/src/share/classes/java/awt/AWTKeyStroke.java 2011-07-21 16:52:23.399614830 +0400
++++ openjdk/jdk/src/share/classes/java/awt/AWTKeyStroke.java 2011-07-21 16:52:23.075617350 +0400
+@@ -25,6 +25,7 @@
+ package java.awt;
+
+ import java.awt.event.KeyEvent;
++import sun.awt.AppContext;
+ import java.awt.event.InputEvent;
+ import java.util.Collections;
+ import java.util.HashMap;
+@@ -66,9 +67,6 @@
+ public class AWTKeyStroke implements Serializable {
+ static final long serialVersionUID = -6430539691155161871L;
+
+- private static Map cache;
+- private static AWTKeyStroke cacheKey;
+- private static Constructor ctor = getCtor(AWTKeyStroke.class);
+ private static Map modifierKeywords;
+ /**
+ * Associates VK_XXX (as a String) with code (as Integer). This is
+@@ -77,6 +75,25 @@
+ */
+ private static VKCollection vks;
+
++ //A key for the collection of AWTKeyStrokes within AppContext.
++ private static Object APP_CONTEXT_CACHE_KEY = new Object();
More information about the distro-pkg-dev
mailing list