/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Feb 16 04:48:20 PST 2011
changeset 4ae21998a5aa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4ae21998a5aa
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 16 03:05:51 2011 +0000
Security updates from Oracle SSR.
S6878713, CVE-2010-4469: Hotspot backward jsr heap corruption
S6907662, CVE-2010-4465: Swing timer-based security manager bypass
S6994263, CVE-2010-4472: Untrusted code allowed to replace DSIG/C14N
implementation S6981922, CVE-2010-4448: DNS cache poisoning by
untrusted applets S6983554, CVE-2010-4450: Launcher incorrect
processing of empty library path entries
2011-02-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patches.
* NEWS: Updated.
* patches/icedtea-nio2.patch: Rejigged.
* patches/openjdk/6633275-shaped_translucent_windows.patch,
* patches/openjdk/6797195-hw_lw_mixing.patch: Fixed to
accomodate appearance of AWTAccessor via security patch.
* patches/security/20110215/6878713.patch,
* patches/security/20110215/6907662.patch,
* patches/security/20110215/6981922.patch,
* patches/security/20110215/6983554.patch,
* patches/security/20110215/6994263.patch: Security updates
from Oracle SSR.
changeset 6a5e37e3180b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6a5e37e3180b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 16 12:48:12 2011 +0000
Add 6985453 patch which was missing from first Oracle bundle.
S6985453, CVE-2010-4471: Java2D font-related system property leak
2011-02-10 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add additional patch.
* NEWS: Updated.
* patches/security/20110215/6985453.patch: Add patch for
6985453 missing from first Oracle bundle.
diffstat:
12 files changed, 2469 insertions(+), 1243 deletions(-)
ChangeLog | 24
Makefile.am | 9
NEWS | 6
patches/icedtea-nio2.patch | 159 -
patches/openjdk/6633275-shaped_translucent_windows.patch | 1904 ++++++--------
patches/openjdk/6797195-hw_lw_mixing.patch | 307 --
patches/security/20110215/6878713.patch | 143 +
patches/security/20110215/6907662.patch | 758 +++++
patches/security/20110215/6981922.patch | 245 +
patches/security/20110215/6983554.patch | 20
patches/security/20110215/6985453.patch | 104
patches/security/20110215/6994263.patch | 33
diffs (truncated from 4803 to 500 lines):
diff -r 817a086a2135 -r 6a5e37e3180b ChangeLog
--- a/ChangeLog Tue Feb 15 22:08:40 2011 +0000
+++ b/ChangeLog Wed Feb 16 12:48:12 2011 +0000
@@ -1,3 +1,27 @@ 2011-02-15 Andrew John Hughes <ahughes
+2011-02-10 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add additional patch.
+ * NEWS: Updated.
+ * patches/security/20110215/6985453.patch:
+ Add patch for 6985453 missing from first Oracle
+ bundle.
+
+2011-02-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patches.
+ * NEWS: Updated.
+ * patches/icedtea-nio2.patch: Rejigged.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/6797195-hw_lw_mixing.patch:
+ Fixed to accomodate appearance of AWTAccessor via
+ security patch.
+ * patches/security/20110215/6878713.patch,
+ * patches/security/20110215/6907662.patch,
+ * patches/security/20110215/6981922.patch,
+ * patches/security/20110215/6983554.patch,
+ * patches/security/20110215/6994263.patch:
+ Security updates from Oracle SSR.
+
2011-02-15 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Mention backports of copyright header
diff -r 817a086a2135 -r 6a5e37e3180b Makefile.am
--- a/Makefile.am Tue Feb 15 22:08:40 2011 +0000
+++ b/Makefile.am Wed Feb 16 12:48:12 2011 +0000
@@ -174,7 +174,14 @@ REWRITER_SRCS = $(abs_top_srcdir)/rewrit
ICEDTEA_FSG_PATCHES =
-SECURITY_PATCHES = patches/security/20110209/4421494.patch
+SECURITY_PATCHES = patches/security/20110209/4421494.patch \
+ patches/security/20110215/6878713.patch \
+ patches/security/20110215/6907662.patch \
+ patches/security/20110215/6981922.patch \
+ patches/security/20110215/6983554.patch \
+ patches/security/20110215/6994263.patch \
+ patches/security/20110215/6985453.patch
+
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
diff -r 817a086a2135 -r 6a5e37e3180b NEWS
--- a/NEWS Tue Feb 15 22:08:40 2011 +0000
+++ b/NEWS Wed Feb 16 12:48:12 2011 +0000
@@ -17,6 +17,12 @@ New in release 1.10 (2011-XX-XX):
* Support for building with HotSpot 20 from its stable tree
* Security updates
- S4421494, CVE-2010-4476: infinite loop while parsing double literal.
+ - S6878713, CVE-2010-4469: Hotspot backward jsr heap corruption
+ - S6907662, CVE-2010-4465: Swing timer-based security manager bypass
+ - S6994263, CVE-2010-4472: Untrusted code allowed to replace DSIG/C14N implementation
+ - S6981922, CVE-2010-4448: DNS cache poisoning by untrusted applets
+ - S6983554, CVE-2010-4450: Launcher incorrect processing of empty library path entries
+ - S6985453, CVE-2010-4471: Java2D font-related system property leak
* Import of OpenJDK6 b21 including upgrade to HotSpot 19
- S6961870: More rebranding fixes for templates/gpl-*-header files
- S6976186: Shark build system changes
diff -r 817a086a2135 -r 6a5e37e3180b patches/icedtea-nio2.patch
--- a/patches/icedtea-nio2.patch Tue Feb 15 22:08:40 2011 +0000
+++ b/patches/icedtea-nio2.patch Wed Feb 16 12:48:12 2011 +0000
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/common/s
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-10 23:04:50.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Defs-javadoc.gmk 2010-06-11 00:44:42.000000000 +0100
+--- 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
@@ -41,6 +41,7 @@
TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
JNLP_FIRST_COPYRIGHT_YEAR = 1998
@@ -10,8 +10,8 @@ diff -Nru openjdk.orig/jdk/make/common/s
# 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-05-26 09:32:35.000000000 +0100
-+++ openjdk/jdk/make/docs/CORE_PKGS.gmk 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -36,6 +36,7 @@
sunw.* \
com.sun.* \
@@ -21,8 +21,8 @@ diff -Nru openjdk.orig/jdk/make/docs/COR
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-10 23:04:50.000000000 +0100
-+++ openjdk/jdk/make/docs/Makefile 2010-06-11 00:42:38.000000000 +0100
+--- 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
@@ -1076,6 +1076,58 @@
#############################################################
@@ -83,8 +83,8 @@ diff -Nru openjdk.orig/jdk/make/docs/Mak
$(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 2010-06-11 00:14:21.000000000 +0100
-+++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -65,6 +65,16 @@
HTTPSERVER_PKGS = com.sun.net.httpserver \
com.sun.net.httpserver.spi
@@ -111,9 +111,9 @@ diff -Nru openjdk.orig/jdk/make/docs/NON
$(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 2010-06-11 00:14:20.000000000 +0100
-+++ openjdk/jdk/make/java/java/FILES_java.gmk 2010-06-11 00:35:39.000000000 +0100
-@@ -517,6 +517,13 @@
+--- 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
+@@ -518,6 +518,13 @@
sun/misc/JavaLangAccess.java \
sun/misc/JavaIOAccess.java \
sun/misc/JavaIODeleteOnExitAccess.java \
@@ -129,8 +129,8 @@ diff -Nru openjdk.orig/jdk/make/java/jav
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 2010-06-11 00:14:21.000000000 +0100
-+++ openjdk/jdk/make/java/nio/FILES_java.gmk 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -75,12 +75,13 @@
sun/nio/ch/DefaultSelectorProvider.java \
sun/nio/ch/DirectBuffer.java \
@@ -330,8 +330,8 @@ diff -Nru openjdk.orig/jdk/make/java/nio
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 2010-06-11 00:14:21.000000000 +0100
-+++ openjdk/jdk/make/java/nio/Makefile 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -40,6 +40,11 @@
SNIO_SRC = $(SHARE_SRC)/classes/sun/nio
SNIO_GEN = $(GENSRCDIR)/sun/nio
@@ -678,8 +678,8 @@ diff -Nru openjdk.orig/jdk/make/java/nio
+
.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-04-06 17:51:43.000000000 +0100
-+++ openjdk/jdk/make/java/nio/mapfile-linux 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -20,6 +20,14 @@
Java_sun_nio_ch_EPollArrayWrapper_interrupt;
Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
@@ -796,8 +796,8 @@ diff -Nru openjdk.orig/jdk/make/java/nio
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-04-06 17:51:43.000000000 +0100
-+++ openjdk/jdk/make/java/nio/mapfile-solaris 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -73,6 +73,75 @@
Java_sun_nio_ch_ServerSocketChannelImpl_listen;
Java_sun_nio_ch_SocketChannelImpl_checkConnect;
@@ -875,8 +875,8 @@ diff -Nru openjdk.orig/jdk/make/java/nio
local:
*;
diff -Nru openjdk.orig/jdk/make/mkdemo/Makefile openjdk/jdk/make/mkdemo/Makefile
---- openjdk.orig/jdk/make/mkdemo/Makefile 2010-05-26 09:32:36.000000000 +0100
-+++ openjdk/jdk/make/mkdemo/Makefile 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -31,7 +31,7 @@
PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk
@@ -887,8 +887,8 @@ diff -Nru openjdk.orig/jdk/make/mkdemo/M
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-05-26 09:32:36.000000000 +0100
-+++ openjdk/jdk/make/mksample/nio/Makefile 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -31,7 +31,7 @@
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
@@ -899,8 +899,8 @@ diff -Nru openjdk.orig/jdk/make/mksample
$(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-05-26 09:32:38.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/io/File.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -1958,6 +1958,13 @@
}
}
@@ -916,9 +916,9 @@ diff -Nru openjdk.orig/jdk/src/share/cla
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 2010-05-26 09:32:38.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-06-11 00:35:39.000000000 +0100
-@@ -533,4 +533,15 @@
+--- 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 @@
}
private static native void init();
@@ -935,8 +935,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+
}
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-05-26 09:32:39.000000000 +0100
-+++ openjdk/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -2004,4 +2004,23 @@
}
}
@@ -962,8 +962,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+
}
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-05-26 09:32:41.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -504,9 +504,33 @@
/**
* Sets all bytes in a given block of memory to a copy of another
@@ -1011,9 +1011,9 @@ diff -Nru openjdk.orig/jdk/src/share/cla
* 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 2010-05-26 09:32:41.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java 2010-06-11 00:35:39.000000000 +0100
-@@ -29,10 +29,28 @@
+--- 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
+@@ -29,11 +29,30 @@
import java.io.IOException;
import java.net.*;
import java.nio.ByteBuffer;
@@ -1029,6 +1029,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+import java.util.Set;
+
import java.lang.ref.SoftReference;
+-import sun.net.ResourceManager;
+import org.classpath.icedtea.java.net.ProtocolFamily;
+import org.classpath.icedtea.java.net.StandardProtocolFamily;
@@ -1041,10 +1042,12 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+import org.classpath.icedtea.java.nio.channels.spi.SelectorProvider;
+
+import org.classpath.icedtea.misc.SharedSecrets;
++
++import sun.net.ResourceManager;
/**
* An implementation of DatagramChannels.
-@@ -53,6 +71,9 @@
+@@ -54,6 +73,9 @@
// even after the value in the file descriptor object has been set to -1
int fdVal;
@@ -1054,7 +1057,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla
// IDs of native threads doing reads and writes, for signalling
private volatile long readerThread = 0;
private volatile long writerThread = 0;
-@@ -91,6 +112,9 @@
+@@ -92,6 +114,9 @@
// Our socket adaptor, if any
private DatagramSocket socket = null;
@@ -1064,27 +1067,29 @@ diff -Nru openjdk.orig/jdk/src/share/cla
// -- End of fields protected by stateLock
-@@ -98,15 +122,40 @@
- throws IOException
- {
+@@ -101,6 +126,8 @@
super(sp);
-+ this.family = Net.isIPv6Available() ?
-+ StandardProtocolFamily.INET6 : StandardProtocolFamily.INET;
- this.fd = Net.socket(false);
- this.fdVal = IOUtil.fdVal(fd);
- this.state = ST_UNCONNECTED;
+ ResourceManager.beforeUdpCreate();
+ try {
++ this.family = Net.isIPv6Available() ?
++ StandardProtocolFamily.INET6 : StandardProtocolFamily.INET;
+ this.fd = Net.socket(false);
+ this.fdVal = IOUtil.fdVal(fd);
+ this.state = ST_UNCONNECTED;
+@@ -110,10 +137,33 @@
+ }
}
+ public DatagramChannelImpl(SelectorProvider sp, ProtocolFamily family) {
+ super(sp);
+ if ((family != StandardProtocolFamily.INET) &&
+ (family != StandardProtocolFamily.INET6))
-+ {
-+ if (family == null)
-+ throw new NullPointerException("'family' is null");
-+ else
-+ throw new UnsupportedOperationException("Protocol family not supported");
-+ }
++ {
++ if (family == null)
++ throw new NullPointerException("'family' is null");
++ else
++ throw new UnsupportedOperationException("Protocol family not supported");
++ }
+ if (family == StandardProtocolFamily.INET6) {
+ if (!Net.isIPv6Available()) {
+ throw new UnsupportedOperationException("IPv6 not available");
@@ -1105,7 +1110,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla
this.fd = fd;
this.fdVal = IOUtil.fdVal(fd);
this.state = ST_UNCONNECTED;
-@@ -499,7 +548,7 @@
+@@ -506,7 +556,7 @@
}
}
@@ -1114,15 +1119,15 @@ diff -Nru openjdk.orig/jdk/src/share/cla
synchronized (readLock) {
synchronized (writeLock) {
synchronized (stateLock) {
-@@ -515,6 +564,7 @@
+@@ -522,6 +572,7 @@
}
}
}
-+ return this;
++ return this;
}
public boolean isConnected() {
-@@ -704,4 +754,350 @@
+@@ -712,4 +763,350 @@
initIDs();
}
@@ -1174,7 +1179,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+ throw new IllegalArgumentException("Cannot set IP_MULTICAST_IF to 'null'");
+ NetworkInterface interf = (NetworkInterface)value;
+ if (family == StandardProtocolFamily.INET6) {
-+ int index = SharedSecrets.getJavaNetGetIndexAccess().getIndex(interf);
++ int index = SharedSecrets.getJavaNetGetIndexAccess().getIndex(interf);
+ if (index == -1)
+ throw new IOException("Network interface cannot be identified");
+ Net.setInterface6(fd, index);
@@ -1474,8 +1479,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+
}
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-05-26 09:32:41.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -32,8 +32,15 @@
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -1525,8 +1530,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
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 2010-05-26 09:32:41.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/Net.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -30,6 +30,15 @@
import java.net.*;
import java.nio.channels.*;
@@ -1549,7 +1554,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+ static native boolean isIPv6Available0();
+
- static FileDescriptor socket(boolean stream) {
+ static FileDescriptor socket(boolean stream) throws IOException {
- return IOUtil.newFD(socket0(stream, false));
+ return socket(UNSPEC, stream);
+ }
@@ -1887,8 +1892,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+
}
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-05-26 09:32:41.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
@@ -1935,8 +1940,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
-
}
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-05-26 09:32:42.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/SecurityConstants.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -52,6 +52,7 @@
public static final String FILE_EXECUTE_ACTION = "execute";
public static final String FILE_READ_ACTION = "read";
@@ -1946,8 +1951,8 @@ diff -Nru openjdk.orig/jdk/src/share/cla
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-05-26 09:32:51.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -25,11 +25,12 @@
package sun.nio.ch;
@@ -1963,8 +1968,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
* 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-05-26 09:32:51.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/ch/FileDispatcher.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -35,6 +35,11 @@
class FileDispatcher extends NativeDispatcher
{
@@ -2026,8 +2031,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
+
}
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-05-26 09:32:51.000000000 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/nio/ch/InheritedChannel.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -34,7 +34,8 @@
import java.nio.channels.SocketChannel;
import java.nio.channels.ServerSocketChannel;
@@ -2039,8 +2044,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/c
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-05-26 09:32:51.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/Net.c 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -2723,8 +2728,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/n
/* 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-05-26 09:32:51.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/sun/nio/ch/nio_util.h 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
@@ -2749,8 +2754,8 @@ diff -Nru openjdk.orig/jdk/src/solaris/n
/* 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-05-26 09:32:51.000000000 +0100
-+++ openjdk/jdk/src/windows/classes/sun/nio/ch/FileDispatcher.java 2010-06-11 00:35:39.000000000 +0100
+--- 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
@@ -36,6 +36,11 @@
class FileDispatcher extends NativeDispatcher
{
diff -r 817a086a2135 -r 6a5e37e3180b patches/openjdk/6633275-shaped_translucent_windows.patch
--- a/patches/openjdk/6633275-shaped_translucent_windows.patch Tue Feb 15 22:08:40 2011 +0000
+++ b/patches/openjdk/6633275-shaped_translucent_windows.patch Wed Feb 16 12:48:12 2011 +0000
@@ -1,6 +1,6 @@ diff -r 6cf33f955d7d make/sun/awt/FILES_
-diff -r 6cf33f955d7d make/sun/awt/FILES_c_windows.gmk
---- openjdk/jdk/make/sun/awt/FILES_c_windows.gmk Fri Feb 04 16:32:49 2011 +0000
-+++ openjdk/jdk/make/sun/awt/FILES_c_windows.gmk Tue Feb 15 15:12:57 2011 +0000
+diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk openjdk/jdk/make/sun/awt/FILES_c_windows.gmk
+--- openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk 2011-02-16 00:40:21.000000000 +0000
++++ openjdk/jdk/make/sun/awt/FILES_c_windows.gmk 2011-02-16 01:27:24.988327481 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -18,9 +18,97 @@ diff -r 6cf33f955d7d make/sun/awt/FILES_
FILES_cpp = \
CmdIDList.cpp \
-diff -r 6cf33f955d7d make/sun/awt/Makefile
---- openjdk/jdk/make/sun/awt/Makefile Fri Feb 04 16:32:49 2011 +0000
-+++ openjdk/jdk/make/sun/awt/Makefile Tue Feb 15 15:12:57 2011 +0000
More information about the distro-pkg-dev
mailing list