/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 10 14:58:18 PDT 2011
changeset d35c67901351 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d35c67901351
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 10 22:53:54 2011 +0100
Security patches for 2011/06/07.
2011-05-23 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add security patches.
* patches/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/xjc.patch: Rerolled after 7013971.
changeset c51663f190c9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c51663f190c9
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 10 22:58:13 2011 +0100
Merge
diffstat:
ChangeLog | 28 +
Makefile.am | 20 +-
patches/nio2.patch | 69 +-
patches/security/20110607/6213702.patch | 105 +
patches/security/20110607/6618658.patch | 24 +
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 +
patches/xjc.patch | 14 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java | 28 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java | 2 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java | 102 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java | 354 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java | 180 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 826 +++---
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 728 ++--
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 120 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java | 1148 ++++----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerInfo.java | 28 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java | 32 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java | 72 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java | 180 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 450 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java | 68 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 554 ++--
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java | 60 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java | 86 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java | 28 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 1218 +++++-----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamBufferAttributes.java | 66 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java | 44 +-
pulseaudio/src/native/jni-common.c | 232 +-
pulseaudio/src/native/jni-common.h | 8 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c | 298 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c | 20 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c | 136 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c | 140 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 1138 ++++----
42 files changed, 5207 insertions(+), 4221 deletions(-)
diffs (truncated from 11423 to 500 lines):
diff -r 0a4cdcd1c6c6 -r c51663f190c9 ChangeLog
--- a/ChangeLog Fri Jun 10 16:45:31 2011 +0200
+++ b/ChangeLog Fri Jun 10 22:58:13 2011 +0100
@@ -1,3 +1,31 @@
+2011-05-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add security patches.
+ * patches/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/xjc.patch: Rerolled after 7013971.
+
+2011-06-10 Denis Lila <dlila at redhat.com>
+
+ * pulseaudio/*: Fix whitespace.
+
+2011-06-10 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am
+ (stamps/pulse-java-headers.stamp): Prepend the java build directory
+ to the boot class path to avoid generating headers for the system
+ pulse-java classes.
+
2011-06-10 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/font-rhel.patch:
diff -r 0a4cdcd1c6c6 -r c51663f190c9 Makefile.am
--- a/Makefile.am Fri Jun 10 16:45:31 2011 +0200
+++ b/Makefile.am Fri Jun 10 22:58:13 2011 +0100
@@ -186,7 +186,15 @@
ICEDTEA_FSG_PATCHES =
-SECURITY_PATCHES =
+SECURITY_PATCHES = 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
if WITH_ALT_HSBUILD
SECURITY_PATCHES += \
@@ -1745,15 +1753,15 @@
stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
org.classpath.icedtea.pulseaudio.EventLoop ; \
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
org.classpath.icedtea.pulseaudio.Stream ; \
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
org.classpath.icedtea.pulseaudio.Operation; \
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
mkdir -p stamps
touch stamps/pulse-java-headers.stamp
diff -r 0a4cdcd1c6c6 -r c51663f190c9 patches/nio2.patch
--- a/patches/nio2.patch Fri Jun 10 16:45:31 2011 +0200
+++ b/patches/nio2.patch Fri Jun 10 22:58:13 2011 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/common/shared/Defs-javadoc.gmk openjdk/jdk/make/common/shared/Defs-javadoc.gmk
---- openjdk.orig/jdk/make/common/shared/Defs-javadoc.gmk 2010-06-21 22:15:08.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Defs-javadoc.gmk 2011-02-08 23:10:59.370265518 +0000
+--- openjdk.orig/jdk/make/common/shared/Defs-javadoc.gmk 2011-02-28 16:06:10.000000000 +0000
++++ openjdk/jdk/make/common/shared/Defs-javadoc.gmk 2011-05-23 23:20:58.640622650 +0100
@@ -41,6 +41,7 @@
TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
JNLP_FIRST_COPYRIGHT_YEAR = 1998
@@ -10,8 +10,8 @@
# Oracle name
COMPANY_NAME = Oracle and/or its affiliates
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 2010-06-21 22:15:08.000000000 +0100
-+++ openjdk/jdk/make/docs/CORE_PKGS.gmk 2011-02-08 23:10:59.374265560 +0000
+--- openjdk.orig/jdk/make/docs/CORE_PKGS.gmk 2011-02-28 16:06:10.000000000 +0000
++++ openjdk/jdk/make/docs/CORE_PKGS.gmk 2011-05-23 23:20:58.656622907 +0100
@@ -36,6 +36,7 @@
sunw.* \
com.sun.* \
@@ -21,8 +21,8 @@
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 2010-06-21 22:15:08.000000000 +0100
-+++ openjdk/jdk/make/docs/Makefile 2011-02-08 23:10:59.374265560 +0000
+--- openjdk.orig/jdk/make/docs/Makefile 2011-02-28 16:06:10.000000000 +0000
++++ openjdk/jdk/make/docs/Makefile 2011-05-23 23:20:58.656622907 +0100
@@ -1076,6 +1076,58 @@
#############################################################
@@ -83,8 +83,8 @@
$(DIRECTORY_CACHE): $(ALL_SOURCE_DIRS)
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-08 22:57:19.000000000 +0000
-+++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2011-02-08 23:10:59.374265560 +0000
+--- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk 2011-02-28 16:06:10.000000000 +0000
++++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2011-05-23 23:20:58.656622907 +0100
@@ -65,6 +65,16 @@
HTTPSERVER_PKGS = com.sun.net.httpserver \
com.sun.net.httpserver.spi
@@ -102,17 +102,17 @@
DOCLETAPI_PKGS = com.sun.javadoc
TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
-@@ -93,6 +103,7 @@
+@@ -89,6 +99,7 @@
$(MGMT_PKGS) \
$(JAAS_PKGS) \
$(JGSS_PKGS) \
+ $(NIO2_PKGS) \
$(OLD_JSSE_PKGS) \
$(HTTPSERVER_PKGS) \
- $(SMARTCARDIO_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-08 22:57:17.000000000 +0000
-+++ openjdk/jdk/make/java/java/FILES_java.gmk 2011-02-08 23:10:59.374265560 +0000
+--- openjdk.orig/jdk/make/java/java/FILES_java.gmk 2011-05-23 23:03:36.000000000 +0100
++++ openjdk/jdk/make/java/java/FILES_java.gmk 2011-05-23 23:20:58.656622907 +0100
@@ -518,6 +518,13 @@
sun/misc/JavaLangAccess.java \
sun/misc/JavaIOAccess.java \
@@ -129,8 +129,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-08 22:57:17.000000000 +0000
-+++ openjdk/jdk/make/java/nio/FILES_java.gmk 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/make/java/nio/FILES_java.gmk 2011-05-23 23:03:36.000000000 +0100
++++ openjdk/jdk/make/java/nio/FILES_java.gmk 2011-05-23 23:20:58.656622907 +0100
@@ -75,12 +75,13 @@
sun/nio/ch/DefaultSelectorProvider.java \
sun/nio/ch/DirectBuffer.java \
@@ -330,8 +330,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-08 22:57:17.000000000 +0000
-+++ openjdk/jdk/make/java/nio/Makefile 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/make/java/nio/Makefile 2011-05-23 23:03:36.000000000 +0100
++++ openjdk/jdk/make/java/nio/Makefile 2011-05-23 23:20:58.656622907 +0100
@@ -40,6 +40,11 @@
SNIO_SRC = $(SHARE_SRC)/classes/sun/nio
SNIO_GEN = $(GENSRCDIR)/sun/nio
@@ -678,8 +678,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 2010-06-21 22:15:08.000000000 +0100
-+++ openjdk/jdk/make/java/nio/mapfile-linux 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/make/java/nio/mapfile-linux 2011-02-28 16:06:11.000000000 +0000
++++ openjdk/jdk/make/java/nio/mapfile-linux 2011-05-23 23:20:58.656622907 +0100
@@ -20,6 +20,14 @@
Java_sun_nio_ch_EPollArrayWrapper_interrupt;
Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
@@ -796,8 +796,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 2010-06-21 22:15:08.000000000 +0100
-+++ openjdk/jdk/make/java/nio/mapfile-solaris 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/make/java/nio/mapfile-solaris 2011-02-28 16:06:11.000000000 +0000
++++ openjdk/jdk/make/java/nio/mapfile-solaris 2011-05-23 23:20:58.656622907 +0100
@@ -73,6 +73,75 @@
Java_sun_nio_ch_ServerSocketChannelImpl_listen;
Java_sun_nio_ch_SocketChannelImpl_checkConnect;
@@ -875,8 +875,8 @@
local:
*;
diff -Nru openjdk.orig/jdk/make/mkdemo/Makefile openjdk/jdk/make/mkdemo/Makefile
---- openjdk.orig/jdk/make/mkdemo/Makefile 2010-06-21 22:15:08.000000000 +0100
-+++ openjdk/jdk/make/mkdemo/Makefile 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/make/mkdemo/Makefile 2011-02-28 16:06:11.000000000 +0000
++++ openjdk/jdk/make/mkdemo/Makefile 2011-05-23 23:20:58.656622907 +0100
@@ -31,7 +31,7 @@
PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk
@@ -887,8 +887,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 2010-06-21 22:15:08.000000000 +0100
-+++ openjdk/jdk/make/mksample/nio/Makefile 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/make/mksample/nio/Makefile 2011-02-28 16:06:11.000000000 +0000
++++ openjdk/jdk/make/mksample/nio/Makefile 2011-05-23 23:20:58.656622907 +0100
@@ -31,7 +31,7 @@
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
@@ -899,8 +899,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 2010-06-21 22:15:18.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/io/File.java 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/src/share/classes/java/io/File.java 2011-02-28 16:06:21.000000000 +0000
++++ openjdk/jdk/src/share/classes/java/io/File.java 2011-05-23 23:20:58.660622971 +0100
@@ -1958,6 +1958,13 @@
}
}
@@ -916,27 +916,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-08 22:57:12.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2011-02-08 23:10:59.378265602 +0000
-@@ -536,4 +536,15 @@
+--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java 2011-05-23 23:03:33.000000000 +0100
++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2011-05-23 23:21:33.029175274 +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 2010-06-21 22:15:21.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java 2011-02-28 16:06:24.000000000 +0000
++++ openjdk/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java 2011-05-23 23:20:58.660622971 +0100
@@ -2004,4 +2004,23 @@
}
}
@@ -962,8 +963,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 2010-06-21 22:15:30.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/misc/Unsafe.java 2011-02-28 16:06:34.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java 2011-05-23 23:20:58.660622971 +0100
@@ -504,9 +504,33 @@
/**
* Sets all bytes in a given block of memory to a copy of another
@@ -1011,8 +1012,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-08 22:57:12.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java 2011-02-08 23:40:00.916516539 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java 2011-02-28 16:06:34.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java 2011-05-23 23:20:58.660622971 +0100
@@ -29,11 +29,30 @@
import java.io.IOException;
import java.net.*;
@@ -1479,8 +1480,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 2010-06-21 22:15:30.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2011-02-28 16:06:34.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2011-05-23 23:20:58.660622971 +0100
@@ -32,8 +32,15 @@
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -1530,8 +1531,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-08 22:57:12.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/Net.java 2011-02-08 23:16:14.657580027 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Net.java 2011-02-28 16:06:35.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/nio/ch/Net.java 2011-05-23 23:20:58.660622971 +0100
@@ -30,6 +30,15 @@
import java.net.*;
import java.nio.channels.*;
@@ -1892,8 +1893,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 2010-06-21 22:15:30.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java 2011-02-28 16:06:35.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java 2011-05-23 23:20:58.660622971 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
@@ -1940,8 +1941,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 2010-06-21 22:15:35.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/SecurityConstants.java 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/src/share/classes/sun/security/util/SecurityConstants.java 2011-02-28 16:06:40.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/security/util/SecurityConstants.java 2011-05-23 23:20:58.660622971 +0100
@@ -52,6 +52,7 @@
public static final String FILE_EXECUTE_ACTION = "execute";
public static final String FILE_READ_ACTION = "read";
@@ -1951,8 +1952,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/DefaultSelectorProvider.java openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java
---- openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java 2010-06-21 22:15:44.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java 2011-02-28 16:06:48.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java 2011-05-23 23:20:58.660622971 +0100
@@ -25,11 +25,12 @@
package sun.nio.ch;
@@ -1968,8 +1969,8 @@
* Creates this platform's default SelectorProvider
*/
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 2010-06-21 22:15:44.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/ch/FileDispatcher.java 2011-02-08 23:10:59.378265602 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/FileDispatcher.java 2011-02-28 16:06:48.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/nio/ch/FileDispatcher.java 2011-05-23 23:20:58.660622971 +0100
@@ -35,6 +35,11 @@
class FileDispatcher extends NativeDispatcher
{
@@ -2031,8 +2032,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 2010-06-21 22:15:44.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java 2011-02-08 23:10:59.382265644 +0000
+--- openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java 2011-02-28 16:06:48.000000000 +0000
++++ openjdk/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java 2011-05-23 23:20:58.660622971 +0100
@@ -34,7 +34,8 @@
import java.nio.channels.SocketChannel;
import java.nio.channels.ServerSocketChannel;
@@ -2044,8 +2045,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 2010-06-21 22:15:45.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/Net.c 2011-02-08 23:10:59.382265644 +0000
+--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/Net.c 2011-02-28 16:06:50.000000000 +0000
++++ openjdk/jdk/src/solaris/native/sun/nio/ch/Net.c 2011-05-23 23:20:58.660622971 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -2728,8 +2729,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 2010-06-21 22:15:45.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/nio_util.h 2011-02-08 23:10:59.382265644 +0000
+--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/nio_util.h 2011-02-28 16:06:50.000000000 +0000
++++ openjdk/jdk/src/solaris/native/sun/nio/ch/nio_util.h 2011-05-23 23:20:58.660622971 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
@@ -2754,8 +2755,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 2010-06-21 22:15:46.000000000 +0100
-+++ openjdk/jdk/src/windows/classes/sun/nio/ch/FileDispatcher.java 2011-02-08 23:10:59.382265644 +0000
+--- openjdk.orig/jdk/src/windows/classes/sun/nio/ch/FileDispatcher.java 2011-02-28 16:06:51.000000000 +0000
++++ openjdk/jdk/src/windows/classes/sun/nio/ch/FileDispatcher.java 2011-05-23 23:20:58.660622971 +0100
@@ -36,6 +36,11 @@
class FileDispatcher extends NativeDispatcher
{
diff -r 0a4cdcd1c6c6 -r c51663f190c9 patches/security/20110607/6213702.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/20110607/6213702.patch Fri Jun 10 22:58:13 2011 +0100
@@ -0,0 +1,107 @@
+# HG changeset patch
+# User asaha
+# Date 1300988627 25200
+# Node ID bfc1a4516e20e13c84b6597d7bfcbd2fbc3e0c4d
+# Parent 16fbb8d0b834c3e0a95a4d51e22ec77b81192bb3
+6213702: (so) non-blocking sockets with TCP urgent disabled get still selected for read ops (win)
+Reviewed-by: alanb
+
+diff --git a/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java b/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
+--- openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
++++ openjdk/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -308,14 +308,17 @@ final class WindowsSelectorImpl extends
+ 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 @@ final class WindowsSelectorImpl extends
+ *
+ * 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 @@ final class WindowsSelectorImpl extends
+ if (me == null)
+ continue;
+ SelectionKeyImpl sk = me.ski;
++
++ // The descriptor may be in the exceptfds set because there is
++ // OOB data queued to the socket. If there is OOB data then it
++ // is discarded and the key is not added to the selected set.
++ if (isExceptFds &&
++ (sk.channel() instanceof SocketChannelImpl) &&
++ discardUrgentData(desc))
++ {
++ continue;
++ }
++
+ if (selectedKeys.contains(sk)) { // Key in selected set
+ if (me.clearedCount != updateCount) {
+ if (sk.channel.translateAndSetReadyOps(rOps, sk) &&
+@@ -448,6 +463,8 @@ final class WindowsSelectorImpl extends
+ }
+
+ private native void resetWakeupSocket0(int wakeupSourceFd);
++
++ private native boolean discardUrgentData(int fd);
+
+ // We increment this counter on each call to updateSelectedKeys()
+ // each entry in SubSelector.fdsMap has a memorized value of
+diff --git a/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c b/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c
+--- openjdk/jdk/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c
++++ openjdk/jdk/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -211,3 +211,20 @@ Java_sun_nio_ch_WindowsSelectorImpl_rese
+ recv(scinFd, bytes, WAKEUP_SOCKET_BUF_SIZE, 0);
+ }
+ }
++
++JNIEXPORT jboolean JNICALL
++Java_sun_nio_ch_WindowsSelectorImpl_discardUrgentData(JNIEnv* env, jobject this,
++ jint s)
++{
++ char data[8];
++ jboolean discarded = JNI_FALSE;
++ int n;
++ do {
++ n = recv(s, data, sizeof(data), MSG_OOB);
++ if (n > 0) {
++ discarded = JNI_TRUE;
++ }
++ } while (n > 0);
++ return discarded;
More information about the distro-pkg-dev
mailing list