/hg/release/icedtea6-1.8: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 7 13:47:48 PDT 2011
changeset e11a3915d1cf in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=e11a3915d1cf
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue May 24 23:28:49 2011 +0100
Apply 2011/06/07 security patches.
2011-05-23 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add security patches.
* NEWS: List security patches.
* patches/icedtea-nio2.patch: Rerolled post-security patching.
* patches/security/20110607/6213702.patch,
* patches/security/20110607/6618658.patch,
* patches/security/20110607/7012520.patch,
* patches/security/20110607/7013519.patch,
* patches/security/20110607/7013969.patch,
* patches/security/20110607/7013971.patch,
* patches/security/20110607/7016495.patch,
* patches/security/20110607/7020198.patch,
* patches/security/20110607/7020373.patch: New security
patches.
* patches/icedtea-xjc.patch: Rerolled after 7013971.
changeset 2cc9c0e4eade in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=2cc9c0e4eade
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue May 24 23:30:02 2011 +0100
Bump to 1.8.8.
2011-05-24 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Set date of 1.8.8 release.
* configure.ac: Bump to 1.8.8.
changeset d09d718a9828 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=d09d718a9828
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 07 21:34:18 2011 +0100
Added tag icedtea6-1.8.8 for changeset 2cc9c0e4eade
diffstat:
.hgtags | 1 +
ChangeLog | 23 +
Makefile.am | 11 +-
NEWS | 13 +-
configure.ac | 2 +-
patches/icedtea-nio2.patch | 77 ++--
patches/icedtea-xjc.patch | 14 +-
patches/security/20110607/6213702.patch | 83 ++++++
patches/security/20110607/6618658.patch | 17 +
patches/security/20110607/7012520.patch | 24 +
patches/security/20110607/7013519.patch | 48 +++
patches/security/20110607/7013969.patch | 25 +
patches/security/20110607/7013971.patch | 128 +++++++++
patches/security/20110607/7016495.patch | 422 ++++++++++++++++++++++++++++++++
patches/security/20110607/7020198.patch | 138 ++++++++++
patches/security/20110607/7020373.patch | 37 ++
16 files changed, 1014 insertions(+), 49 deletions(-)
diffs (truncated from 1431 to 500 lines):
diff -r b0f229f276be -r d09d718a9828 .hgtags
--- a/.hgtags Fri Apr 15 15:21:25 2011 +0200
+++ b/.hgtags Tue Jun 07 21:34:18 2011 +0100
@@ -28,3 +28,4 @@
e41dfe105a4113a351e90bd1ce22c81f06f3e68c icedtea6-1.8.5
c43e42301ab86152257fc7eb9c249b2be2c1accc icedtea6-1.8.6
24dfe84f55e3dc68d95c1688f8a678341c86ddf7 icedtea6-1.8.7
+2cc9c0e4eadeacc5f52aae1424917aceeebe00c4 icedtea6-1.8.8
diff -r b0f229f276be -r d09d718a9828 ChangeLog
--- a/ChangeLog Fri Apr 15 15:21:25 2011 +0200
+++ b/ChangeLog Tue Jun 07 21:34:18 2011 +0100
@@ -1,3 +1,26 @@
+2011-05-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Set date of 1.8.8 release.
+ * configure.ac: Bump to 1.8.8.
+
+2011-05-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add security patches.
+ * NEWS: List security patches.
+ * patches/icedtea-nio2.patch: Rerolled post-security
+ patching.
+ * patches/security/20110607/6213702.patch,
+ * patches/security/20110607/6618658.patch,
+ * patches/security/20110607/7012520.patch,
+ * patches/security/20110607/7013519.patch,
+ * patches/security/20110607/7013969.patch,
+ * patches/security/20110607/7013971.patch,
+ * patches/security/20110607/7016495.patch,
+ * patches/security/20110607/7020198.patch,
+ * patches/security/20110607/7020373.patch:
+ New security patches.
+ * patches/icedtea-xjc.patch: Rerolled after 7013971.
+
2011-04-15 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: Add new patch.
diff -r b0f229f276be -r d09d718a9828 Makefile.am
--- a/Makefile.am Fri Apr 15 15:21:25 2011 +0200
+++ b/Makefile.am Tue Jun 07 21:34:18 2011 +0100
@@ -259,7 +259,16 @@
patches/security/20110215/6983554.patch \
patches/security/20110215/6994263.patch \
patches/security/20110215/6985453.patch \
- patches/security/20110215/6927050.patch
+ patches/security/20110215/6927050.patch \
+ patches/security/20110607/6213702.patch \
+ patches/security/20110607/6618658.patch \
+ patches/security/20110607/7012520.patch \
+ patches/security/20110607/7013519.patch \
+ patches/security/20110607/7013969.patch \
+ patches/security/20110607/7013971.patch \
+ patches/security/20110607/7016495.patch \
+ patches/security/20110607/7020198.patch \
+ patches/security/20110607/7020373.patch
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
diff -r b0f229f276be -r d09d718a9828 NEWS
--- a/NEWS Fri Apr 15 15:21:25 2011 +0200
+++ b/NEWS Tue Jun 07 21:34:18 2011 +0100
@@ -8,8 +8,19 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.8.8 (20XX-XX-XX):
+New in release 1.8.8 (2011-06-07):
+* Security fixes
+ - S6213702, CVE-2011-0872: (so) non-blocking sockets with TCP urgent disabled get still selected for read ops (win)
+ - S6618658, CVE-2011-0865: Vulnerability in deserialization
+ - S7012520, CVE-2011-0815: Heap overflow vulnerability in FileDialog.show()
+ - S7013519, CVE-2011-0822, CVE-2011-0862: Integer overflows in 2D code
+ - S7013969, CVE-2011-0867: NetworkInterface.toString can reveal bindings
+ - S7013971, CVE-2011-0869: Vulnerability in SAAJ
+ - S7016340, CVE-2011-0870: Vulnerability in SAAJ
+ - S7016495, CVE-2011-0868: Crash in Java 2D transforming an image with scale close to zero
+ - S7020198, CVE-2011-0871: ImageIcon creates Component with null acc
+ - S7020373, CVE-2011-0864: JSR rewriting can overflow memory address size variables
* Backports
- S6675802: Regression: heavyweight popups cause SecurityExceptions in applets
- S6691503: Malicious applet can show always-on-top popup menu which has whole screen size
diff -r b0f229f276be -r d09d718a9828 configure.ac
--- a/configure.ac Fri Apr 15 15:21:25 2011 +0200
+++ b/configure.ac Tue Jun 07 21:34:18 2011 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.8.8pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.8.8],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r b0f229f276be -r d09d718a9828 patches/icedtea-nio2.patch
--- a/patches/icedtea-nio2.patch Fri Apr 15 15:21:25 2011 +0200
+++ b/patches/icedtea-nio2.patch Tue Jun 07 21:34:18 2011 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/docs/CORE_PKGS.gmk openjdk/jdk/make/docs/CORE_PKGS.gmk
---- openjdk.orig/jdk/make/docs/CORE_PKGS.gmk 2009-10-14 18:17:14.000000000 +0100
-+++ openjdk/jdk/make/docs/CORE_PKGS.gmk 2011-02-09 18:08:16.658865718 +0000
+--- openjdk.orig/jdk/make/docs/CORE_PKGS.gmk 2010-02-17 03:14:12.000000000 +0000
++++ openjdk/jdk/make/docs/CORE_PKGS.gmk 2011-05-24 16:56:10.111489988 +0100
@@ -36,6 +36,7 @@
sunw.* \
com.sun.* \
@@ -10,9 +10,9 @@
org.w3c.dom.css \
org.w3c.dom.html \
diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
---- openjdk.orig/jdk/make/docs/Makefile 2011-02-09 18:07:27.000000000 +0000
-+++ openjdk/jdk/make/docs/Makefile 2011-02-09 18:08:16.666865802 +0000
-@@ -404,6 +404,29 @@
+--- openjdk.orig/jdk/make/docs/Makefile 2011-05-24 16:39:30.000000000 +0100
++++ openjdk/jdk/make/docs/Makefile 2011-05-24 16:56:10.115490058 +0100
+@@ -405,6 +405,29 @@
# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
#
@@ -42,7 +42,7 @@
# Path where javadoc should find source files for release docs
#
RELEASEDOCS_SRCPATH = "$(SHARE_SRC)/classes$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/doc/stub$(CLASSPATH_SEPARATOR)$(CLOSED_SRC)/share/classes$(CLASSPATH_SEPARATOR)$(IMPORTSRCDIR)"
-@@ -429,7 +452,8 @@
+@@ -430,7 +453,8 @@
httpserverdocs \
mgmtdocs \
attachdocs \
@@ -52,7 +52,7 @@
ifdef LANGTOOLS_DIST
ALL_OTHER_TARGETS += \
-@@ -646,6 +670,14 @@
+@@ -647,6 +671,14 @@
$(TREEAPI_LINKOPT) \
$(TREEAPI_PKGS)
@@ -68,8 +68,8 @@
# List the values defined in the makefile hierarchy, to make sure everything
# is set properly, and to help identify values we can use instead of making new ones.
diff -Nru openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk openjdk/jdk/make/docs/NON_CORE_PKGS.gmk
---- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk 2011-02-09 18:07:28.000000000 +0000
-+++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2011-02-09 18:08:16.666865802 +0000
+--- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk 2011-05-24 16:39:31.000000000 +0100
++++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2011-05-24 16:56:10.115490058 +0100
@@ -65,6 +65,16 @@
HTTPSERVER_PKGS = com.sun.net.httpserver \
com.sun.net.httpserver.spi
@@ -87,8 +87,8 @@
DOCLETAPI_PKGS = com.sun.javadoc
TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
-@@ -94,6 +104,7 @@
- $(JAVASCRIPT_PKGS) \
+@@ -93,6 +103,7 @@
+ $(MGMT_PKGS) \
$(JAAS_PKGS) \
$(JGSS_PKGS) \
+ $(NIO2_PKGS) \
@@ -96,9 +96,9 @@
$(HTTPSERVER_PKGS) \
$(SMARTCARDIO_PKGS) \
diff -Nru openjdk.orig/jdk/make/java/java/FILES_java.gmk openjdk/jdk/make/java/java/FILES_java.gmk
---- openjdk.orig/jdk/make/java/java/FILES_java.gmk 2011-02-09 18:07:21.000000000 +0000
-+++ openjdk/jdk/make/java/java/FILES_java.gmk 2011-02-09 18:08:16.666865802 +0000
-@@ -517,6 +517,13 @@
+--- openjdk.orig/jdk/make/java/java/FILES_java.gmk 2011-05-24 16:39:29.000000000 +0100
++++ openjdk/jdk/make/java/java/FILES_java.gmk 2011-05-24 16:56:10.115490058 +0100
+@@ -518,6 +518,13 @@
sun/misc/JavaLangAccess.java \
sun/misc/JavaIOAccess.java \
sun/misc/JavaIODeleteOnExitAccess.java \
@@ -114,8 +114,8 @@
FILES_java = $(JAVA_JAVA_java)
diff -Nru openjdk.orig/jdk/make/java/nio/FILES_java.gmk openjdk/jdk/make/java/nio/FILES_java.gmk
---- openjdk.orig/jdk/make/java/nio/FILES_java.gmk 2011-02-09 18:07:22.000000000 +0000
-+++ openjdk/jdk/make/java/nio/FILES_java.gmk 2011-02-09 18:08:16.666865802 +0000
+--- openjdk.orig/jdk/make/java/nio/FILES_java.gmk 2011-05-24 16:39:30.000000000 +0100
++++ openjdk/jdk/make/java/nio/FILES_java.gmk 2011-05-24 16:56:10.115490058 +0100
@@ -75,12 +75,13 @@
sun/nio/ch/DefaultSelectorProvider.java \
sun/nio/ch/DirectBuffer.java \
@@ -139,7 +139,7 @@
sun/nio/ch/SocketOpts.java \
sun/nio/ch/SocketOptsImpl.java \
sun/nio/ch/SourceChannelImpl.java \
-@@ -144,7 +146,150 @@
+@@ -145,7 +147,150 @@
java/lang/StringCoding.java \
\
sun/misc/Cleaner.java \
@@ -291,7 +291,7 @@
# Generated coder classes
#
-@@ -263,10 +408,20 @@
+@@ -264,10 +409,20 @@
\
java/nio/charset/CharacterCodingException.java \
java/nio/charset/IllegalCharsetNameException.java \
@@ -315,8 +315,8 @@
FILES_java = $(FILES_src) $(FILES_gen)
diff -Nru openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
---- openjdk.orig/jdk/make/java/nio/Makefile 2011-02-09 18:07:22.000000000 +0000
-+++ openjdk/jdk/make/java/nio/Makefile 2011-02-09 18:08:16.666865802 +0000
+--- openjdk.orig/jdk/make/java/nio/Makefile 2011-05-24 16:39:30.000000000 +0100
++++ openjdk/jdk/make/java/nio/Makefile 2011-05-24 16:56:10.119490127 +0100
@@ -40,6 +40,11 @@
SNIO_SRC = $(SHARE_SRC)/classes/sun/nio
SNIO_GEN = $(GENSRCDIR)/sun/nio
@@ -663,8 +663,8 @@
+
.PHONY: sources
diff -Nru openjdk.orig/jdk/make/java/nio/mapfile-linux openjdk/jdk/make/java/nio/mapfile-linux
---- openjdk.orig/jdk/make/java/nio/mapfile-linux 2009-10-14 18:17:15.000000000 +0100
-+++ openjdk/jdk/make/java/nio/mapfile-linux 2011-02-09 18:08:16.666865802 +0000
+--- openjdk.orig/jdk/make/java/nio/mapfile-linux 2010-02-17 03:14:13.000000000 +0000
++++ openjdk/jdk/make/java/nio/mapfile-linux 2011-05-24 16:56:10.119490127 +0100
@@ -20,6 +20,14 @@
Java_sun_nio_ch_EPollArrayWrapper_interrupt;
Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
@@ -781,8 +781,8 @@
local:
*;
diff -Nru openjdk.orig/jdk/make/java/nio/mapfile-solaris openjdk/jdk/make/java/nio/mapfile-solaris
---- openjdk.orig/jdk/make/java/nio/mapfile-solaris 2009-10-14 18:17:15.000000000 +0100
-+++ openjdk/jdk/make/java/nio/mapfile-solaris 2011-02-09 18:08:16.666865802 +0000
+--- openjdk.orig/jdk/make/java/nio/mapfile-solaris 2010-02-17 03:14:13.000000000 +0000
++++ openjdk/jdk/make/java/nio/mapfile-solaris 2011-05-24 16:56:10.119490127 +0100
@@ -73,6 +73,75 @@
Java_sun_nio_ch_ServerSocketChannelImpl_listen;
Java_sun_nio_ch_SocketChannelImpl_checkConnect;
@@ -860,8 +860,8 @@
local:
*;
diff -Nru openjdk.orig/jdk/make/mkdemo/Makefile openjdk/jdk/make/mkdemo/Makefile
---- openjdk.orig/jdk/make/mkdemo/Makefile 2009-10-14 18:17:15.000000000 +0100
-+++ openjdk/jdk/make/mkdemo/Makefile 2011-02-09 18:08:16.666865802 +0000
+--- openjdk.orig/jdk/make/mkdemo/Makefile 2010-02-17 03:14:13.000000000 +0000
++++ openjdk/jdk/make/mkdemo/Makefile 2011-05-24 16:56:10.119490127 +0100
@@ -31,7 +31,7 @@
PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk
@@ -872,8 +872,8 @@
all build:: nbproject
$(SUBDIRS-loop)
diff -Nru openjdk.orig/jdk/make/mksample/nio/Makefile openjdk/jdk/make/mksample/nio/Makefile
---- openjdk.orig/jdk/make/mksample/nio/Makefile 2009-10-14 18:17:15.000000000 +0100
-+++ openjdk/jdk/make/mksample/nio/Makefile 2011-02-09 18:08:16.666865802 +0000
+--- openjdk.orig/jdk/make/mksample/nio/Makefile 2010-02-17 03:14:13.000000000 +0000
++++ openjdk/jdk/make/mksample/nio/Makefile 2011-05-24 16:56:10.119490127 +0100
@@ -31,7 +31,7 @@
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
@@ -884,8 +884,8 @@
$(SUBDIRS-loop)
diff -Nru openjdk.orig/jdk/src/share/classes/java/io/File.java openjdk/jdk/src/share/classes/java/io/File.java
---- openjdk.orig/jdk/src/share/classes/java/io/File.java 2011-02-09 18:07:20.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/io/File.java 2011-02-09 18:08:16.666865802 +0000
+--- openjdk.orig/jdk/src/share/classes/java/io/File.java 2011-05-24 16:39:24.000000000 +0100
++++ openjdk/jdk/src/share/classes/java/io/File.java 2011-05-24 16:56:10.119490127 +0100
@@ -1958,6 +1958,13 @@
}
}
@@ -901,27 +901,28 @@
diff -Nru openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
---- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java 2011-02-09 18:07:20.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2011-02-09 18:08:16.666865802 +0000
-@@ -536,4 +536,15 @@
+--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java 2011-05-24 16:39:28.000000000 +0100
++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2011-05-24 16:56:33.199889370 +0100
+@@ -531,4 +531,16 @@
}
+
private static native void init();
-
++
+ // Set up JavaIODeleteOnExitAccess in SharedSecrets
+ // Added here as getIndex is package-private and SharedSecrets cannot easily access it.
+ static {
-+ org.classpath.icedtea.misc.SharedSecrets.setJavaNetGetIndexAccess(
++ org.classpath.icedtea.misc.SharedSecrets.setJavaNetGetIndexAccess(
+ new org.classpath.icedtea.misc.JavaNetGetIndexAccess() {
-+ public int getIndex(NetworkInterface nf) { return nf.getIndex(); }
-+ public NetworkInterface getByIndex(int i) { return getByIndex(i); }
++ public int getIndex(NetworkInterface nf) { return nf.getIndex(); }
++ public NetworkInterface getByIndex(int i) { return getByIndex(i); }
+ }
-+ );
++ );
+ }
+
}
diff -Nru openjdk.orig/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java openjdk/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java
---- openjdk.orig/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java 2009-10-14 18:17:30.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java 2011-02-09 18:08:16.666865802 +0000
+--- openjdk.orig/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java 2010-02-17 03:14:25.000000000 +0000
++++ openjdk/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java 2011-05-24 16:56:10.119490127 +0100
@@ -2004,4 +2004,23 @@
}
}
@@ -947,8 +948,8 @@
+
}
diff -Nru openjdk.orig/jdk/src/share/classes/sun/misc/Unsafe.java openjdk/jdk/src/share/classes/sun/misc/Unsafe.java
---- openjdk.orig/jdk/src/share/classes/sun/misc/Unsafe.java 2009-10-14 18:17:41.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java 2011-02-09 18:08:16.682865972 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/misc/Unsafe.java 2010-02-17 03:14:33.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java 2011-05-24 16:56:10.119490127 +0100
@@ -504,9 +504,33 @@
/**
* Sets all bytes in a given block of memory to a copy of another
@@ -996,8 +997,8 @@
* Report the scale factor for addressing elements in the storage
* allocation of a given array class. However, arrays of "narrow" types
diff -Nru openjdk.orig/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java openjdk/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java 2011-02-09 18:07:20.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java 2011-02-09 18:09:30.467645679 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java 2011-05-24 16:39:25.000000000 +0100
++++ openjdk/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java 2011-05-24 16:56:10.119490127 +0100
@@ -29,9 +29,29 @@
import java.io.IOException;
import java.net.*;
@@ -1462,8 +1463,8 @@
+
}
diff -Nru openjdk.orig/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java openjdk/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2009-10-14 18:17:41.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2011-02-09 18:08:16.682865972 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2010-02-17 03:14:34.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2011-05-24 16:56:10.119490127 +0100
@@ -32,8 +32,15 @@
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -1513,8 +1514,8 @@
ensureOpen();
int rv = -1;
diff -Nru openjdk.orig/jdk/src/share/classes/sun/nio/ch/Net.java openjdk/jdk/src/share/classes/sun/nio/ch/Net.java
---- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Net.java 2011-02-09 18:07:20.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/Net.java 2011-02-09 18:10:11.680081053 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Net.java 2011-05-24 16:39:25.000000000 +0100
++++ openjdk/jdk/src/share/classes/sun/nio/ch/Net.java 2011-05-24 16:56:10.119490127 +0100
@@ -30,6 +30,15 @@
import java.net.*;
import java.nio.channels.*;
@@ -1875,8 +1876,8 @@
+
}
diff -Nru openjdk.orig/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java openjdk/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java 2009-10-14 18:17:42.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java 2011-02-09 18:08:16.682865972 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java 2010-02-17 03:14:34.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java 2011-05-24 16:56:10.119490127 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved.
@@ -1923,8 +1924,8 @@
-
}
diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/util/SecurityConstants.java openjdk/jdk/src/share/classes/sun/security/util/SecurityConstants.java
---- openjdk.orig/jdk/src/share/classes/sun/security/util/SecurityConstants.java 2009-10-14 18:17:47.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/SecurityConstants.java 2011-02-09 18:08:16.682865972 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/security/util/SecurityConstants.java 2010-02-17 03:14:39.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/security/util/SecurityConstants.java 2011-05-24 16:56:10.119490127 +0100
@@ -52,6 +52,7 @@
public static final String FILE_EXECUTE_ACTION = "execute";
public static final String FILE_READ_ACTION = "read";
@@ -1934,8 +1935,8 @@
public static final String SOCKET_RESOLVE_ACTION = "resolve";
public static final String SOCKET_CONNECT_ACTION = "connect";
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/FileDispatcher.java openjdk/jdk/src/solaris/classes/sun/nio/ch/FileDispatcher.java
---- openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/FileDispatcher.java 2009-10-14 18:17:57.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/ch/FileDispatcher.java 2011-02-09 18:08:16.682865972 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/FileDispatcher.java 2010-02-17 03:14:46.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/nio/ch/FileDispatcher.java 2011-05-24 16:56:10.119490127 +0100
@@ -35,6 +35,11 @@
class FileDispatcher extends NativeDispatcher
{
@@ -1997,8 +1998,8 @@
+
}
diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java openjdk/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java
---- openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java 2009-10-14 18:17:57.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java 2011-02-09 18:08:16.682865972 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java 2010-02-17 03:14:46.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java 2011-05-24 16:56:10.119490127 +0100
@@ -34,7 +34,8 @@
import java.nio.channels.SocketChannel;
import java.nio.channels.ServerSocketChannel;
@@ -2010,8 +2011,8 @@
class InheritedChannel {
diff -Nru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/Net.c openjdk/jdk/src/solaris/native/sun/nio/ch/Net.c
---- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/Net.c 2009-10-14 18:17:59.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/Net.c 2011-02-09 18:08:16.682865972 +0000
+--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/Net.c 2010-02-17 03:14:48.000000000 +0000
++++ openjdk/jdk/src/solaris/native/sun/nio/ch/Net.c 2011-05-24 16:56:10.123490196 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
@@ -2694,8 +2695,8 @@
/* Declared in nio_util.h */
diff -Nru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/nio_util.h openjdk/jdk/src/solaris/native/sun/nio/ch/nio_util.h
---- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/nio_util.h 2009-10-14 18:17:59.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/nio_util.h 2011-02-09 18:08:16.682865972 +0000
+--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/nio_util.h 2010-02-17 03:14:48.000000000 +0000
++++ openjdk/jdk/src/solaris/native/sun/nio/ch/nio_util.h 2011-05-24 16:56:10.123490196 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2002 Sun Microsystems, Inc. All Rights Reserved.
@@ -2720,8 +2721,8 @@
/* NIO utility procedures */
diff -Nru openjdk.orig/jdk/src/windows/classes/sun/nio/ch/FileDispatcher.java openjdk/jdk/src/windows/classes/sun/nio/ch/FileDispatcher.java
---- openjdk.orig/jdk/src/windows/classes/sun/nio/ch/FileDispatcher.java 2009-10-14 18:18:00.000000000 +0100
-+++ openjdk/jdk/src/windows/classes/sun/nio/ch/FileDispatcher.java 2011-02-09 18:08:16.682865972 +0000
+--- openjdk.orig/jdk/src/windows/classes/sun/nio/ch/FileDispatcher.java 2010-02-17 03:14:49.000000000 +0000
++++ openjdk/jdk/src/windows/classes/sun/nio/ch/FileDispatcher.java 2011-05-24 16:56:10.123490196 +0100
@@ -36,6 +36,11 @@
class FileDispatcher extends NativeDispatcher
{
diff -r b0f229f276be -r d09d718a9828 patches/icedtea-xjc.patch
--- a/patches/icedtea-xjc.patch Fri Apr 15 15:21:25 2011 +0200
+++ b/patches/icedtea-xjc.patch Tue Jun 07 21:34:18 2011 +0100
@@ -1,19 +1,18 @@
diff -Nru openjdk.orig/jaxws/build.properties openjdk/jaxws/build.properties
---- openjdk.orig/jaxws/build.properties 2009-12-04 16:41:02.000000000 +0000
-+++ openjdk/jaxws/build.properties 2009-12-04 16:41:47.000000000 +0000
-@@ -73,6 +73,9 @@
- # Where patches to drop bundle sources live
+--- openjdk.orig/jaxws/build.properties 2011-05-23 23:27:25.858844463 +0100
++++ openjdk/jaxws/build.properties 2011-05-23 23:28:12.143588051 +0100
+@@ -78,7 +78,7 @@
patches.dir=patches
-+# Patches to apply
-+jaxws_src.patch.list=xjc.patch
-+
+ # Patches to apply
+-jaxws_src.patch.list=7013971.patch
++jaxws_src.patch.list=7013971.patch xjc.patch
+
# Sanity information
sanity.info= Sanity Settings:${line.separator}\
- ant.home=${ant.home}${line.separator}\
diff -Nru openjdk.orig/jaxws/patches/jaxws_src/xjc.patch openjdk/jaxws/patches/jaxws_src/xjc.patch
--- openjdk.orig/jaxws/patches/jaxws_src/xjc.patch 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jaxws/patches/jaxws_src/xjc.patch 2009-12-04 16:40:10.000000000 +0000
++++ openjdk/jaxws/patches/jaxws_src/xjc.patch 2011-05-23 23:28:02.719436649 +0100
@@ -0,0 +1,17 @@
+--- src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java.prev 2008-10-21 15:50:20.000000000 +0100
++++ src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java 2008-10-21 15:57:37.000000000 +0100
diff -r b0f229f276be -r d09d718a9828 patches/security/20110607/6213702.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/20110607/6213702.patch Tue Jun 07 21:34:18 2011 +0100
@@ -0,0 +1,85 @@
+diff -Nru openjdk.orig/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
+--- openjdk.orig/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java 2010-02-17 03:14:49.000000000 +0000
++++ openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java 2011-05-24 16:36:14.987888272 +0100
+@@ -308,14 +308,17 @@
+ private int processSelectedKeys(long updateCount) {
+ int numKeysUpdated = 0;
+ numKeysUpdated += processFDSet(updateCount, readFds,
+- PollArrayWrapper.POLLIN);
++ PollArrayWrapper.POLLIN,
++ false);
+ numKeysUpdated += processFDSet(updateCount, writeFds,
+ PollArrayWrapper.POLLCONN |
+- PollArrayWrapper.POLLOUT);
++ PollArrayWrapper.POLLOUT,
++ false);
+ numKeysUpdated += processFDSet(updateCount, exceptFds,
+ PollArrayWrapper.POLLIN |
+ PollArrayWrapper.POLLCONN |
+- PollArrayWrapper.POLLOUT);
++ PollArrayWrapper.POLLOUT,
++ true);
+ return numKeysUpdated;
+ }
+
+@@ -327,7 +330,8 @@
+ *
+ * me.updateCount <= me.clearedCount <= updateCount
+ */
+- private int processFDSet(long updateCount, int[] fds, int rOps) {
++ private int processFDSet(long updateCount, int[] fds, int rOps,
++ boolean isExceptFds) {
+ int numKeysUpdated = 0;
+ for (int i = 1; i <= fds[0]; i++) {
+ int desc = fds[i];
+@@ -343,6 +347,17 @@
+ if (me == null)
+ continue;
+ SelectionKeyImpl sk = me.ski;
++
++ // The descriptor may be in the exceptfds set because there is
More information about the distro-pkg-dev
mailing list