/hg/release/icedtea6-1.8: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Feb 15 13:46:48 PST 2011
changeset ad0f435608c3 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=ad0f435608c3
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 10 08:34:04 2011 +0000
Add 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 S6985453, CVE-2010-4471:
Java2D font-related system property leak
2011-02-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patches.
* NEWS: Updated.
* patches/icedtea-nio2.patch: Rejigged.
* 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: Security updates
from Oracle SSR.
changeset 399774bc5f93 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=399774bc5f93
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 13 14:34:19 2011 +0000
Add patch finally supplied in third Oracle bundle.
2011-02-11 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add additional patch.
* NEWS: Updated.
* patches/security/20110215/6927050.patch, Add patch for
6927050 missing from first two Oracle bundles.
changeset 1677c90e2f8e in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=1677c90e2f8e
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 13 14:41:07 2011 +0000
Bump to 1.8.7 and set release date to 2011-02-15.
2011-02-11 Andrew John Hughes <ahughes at redhat.com>
* configure.ac: Bump to 1.8.7.
* NEWS: Set release date to 2011-02-15.
changeset 9d55580ba753 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=9d55580ba753
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 13 19:02:30 2011 +0000
Vulnerability in permissions assigned to applets with multiple JARs.
2011-02-13 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Updated.
2011-02-11 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
(initializeResources()): Only create a SecurityDesc with all
permissions when the jar is signed.
changeset 83b15d0d30ff in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=83b15d0d30ff
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 13 20:26:58 2011 +0000
RH676659: Pass -export-dynamic flag to linker using -Wl, as option
in gcc 4.6+ is broken
2011-02-13 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Updated.
2011-02-11 Omair Majid <omajid at redhat.com>
RH676659: Pass -export-dynamic option to linker not gcc.
* Makefile.am: Add new patch.
* patches/rh676659-gcc-export-dynamic.patch: Pass -Wl,-export-
dynamic rather than -export-dynamic.
changeset c1b2edb50af2 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=c1b2edb50af2
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 14 12:54:26 2011 +0000
Add CVE and RH bug ID for NetX security fix.
2011-02-14 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add CVE and bug ID for NetX security fix.
changeset 24dfe84f55e3 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=24dfe84f55e3
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 14 15:12:55 2011 +0000
Fix latent JAXP bug by adding missing import.
2011-02-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add patch.
* NEWS: Updated.
* patches/latent_jaxp_bug.patch: Add missing import.
changeset e196ef84ddb0 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=e196ef84ddb0
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 15 21:46:41 2011 +0000
Added tag icedtea6-1.8.7 for changeset 24dfe84f55e3
diffstat:
35 files changed, 2366 insertions(+), 83 deletions(-)
"SchemaFactorySourceUnrecognized", | 8
.hgtags | 1
/ | 56 +
AbstractXMLSchema | 2
ChangeLog | 59 +
Makefile.am | 13
NEWS | 15
SAXMessageFormatter.formatMessage(Locale.getDefault(), | 70 +
SAXMessageFormatter.formatMessage(null, | 8
String | 4
addRecognizedParamsAndSetDefaults(fSchemaValidator, | 1
configure.ac | 2
fComponents.put(SECURITY_MANAGER, | 34
fConfigUpdated | 3
final | 4
if | 4
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 12
patches/icedtea-nio2.patch | 155 +--
patches/latent_jaxp_bug.patch | 25
patches/rh676659-gcc-export-dynamic.patch | 12
patches/security/20110215/6878713.patch | 143 +++
patches/security/20110215/6907662.patch | 758 ++++++++++++++++
patches/security/20110215/6927050.patch | 33
patches/security/20110215/6981922.patch | 245 +++++
patches/security/20110215/6983554.patch | 20
patches/security/20110215/6985453.patch | 104 ++
patches/security/20110215/6994263.patch | 33
private | 110 ++
public | 100 ++
return | 10
schema | 8
setFeatureDefaults(component, | 16
setProperty(ERROR_HANDLER, | 41
throw | 50 +
} | 290 ++++++
diffs (truncated from 2949 to 500 lines):
diff -r 2b6e470ee8b5 -r e196ef84ddb0 .hgtags
--- a/.hgtags Wed Feb 09 17:56:54 2011 +0000
+++ b/.hgtags Tue Feb 15 21:46:41 2011 +0000
@@ -27,3 +27,4 @@ 975f7989ae6615f5d0cbce3089291a7c8841364f
975f7989ae6615f5d0cbce3089291a7c8841364f icedtea6-1.8.4
e41dfe105a4113a351e90bd1ce22c81f06f3e68c icedtea6-1.8.5
c43e42301ab86152257fc7eb9c249b2be2c1accc icedtea6-1.8.6
+24dfe84f55e3dc68d95c1688f8a678341c86ddf7 icedtea6-1.8.7
diff -r 2b6e470ee8b5 -r e196ef84ddb0 ChangeLog
--- a/ChangeLog Wed Feb 09 17:56:54 2011 +0000
+++ b/ChangeLog Tue Feb 15 21:46:41 2011 +0000
@@ -1,3 +1,62 @@ 2011-02-09 Andrew John Hughes <ahughes
+2011-02-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add patch.
+ * NEWS: Updated.
+ * patches/latent_jaxp_bug.patch:
+ Add missing import.
+
+2011-02-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Add CVE and bug ID for NetX
+ security fix.
+
+2011-02-13 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Updated.
+
+2011-02-11 Omair Majid <omajid at redhat.com>
+
+ RH676659: Pass -export-dynamic option to linker not gcc.
+ * Makefile.am: Add new patch.
+ * patches/rh676659-gcc-export-dynamic.patch:
+ Pass -Wl,-export-dynamic rather than -export-dynamic.
+
+2011-02-13 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Updated.
+
+2011-02-11 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+ (initializeResources()): Only create a SecurityDesc with
+ all permissions when the jar is signed.
+
+2011-02-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * configure.ac: Bump to 1.8.7.
+ * NEWS: Set release date to 2011-02-15.
+
+2011-02-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add additional patch.
+ * NEWS: Updated.
+ * patches/security/20110215/6927050.patch,
+ Add patch for 6927050 missing from first two
+ Oracle bundles.
+
+2011-02-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patches.
+ * NEWS: Updated.
+ * patches/icedtea-nio2.patch: Rejigged.
+ * 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:
+ Security updates from Oracle SSR.
+
2011-02-09 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add 1.8.7.
diff -r 2b6e470ee8b5 -r e196ef84ddb0 Makefile.am
--- a/Makefile.am Wed Feb 09 17:56:54 2011 +0000
+++ b/Makefile.am Tue Feb 15 21:46:41 2011 +0000
@@ -252,7 +252,14 @@ SECURITY_PATCHES = \
patches/security/20101012/6963285.patch \
patches/security/20101012/6981426.patch \
patches/security/20101012/6990437.patch \
- patches/security/20110209/4421494.patch
+ 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 \
+ patches/security/20110215/6927050.patch
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
@@ -364,7 +371,9 @@ ICEDTEA_PATCHES = \
patches/openjdk/6795356-proxylazyvalue-leak.patch \
patches/openjdk/6687968-pngimagereader_mem_leak.patch \
patches/openjdk/6541476-png-iTXt-chunk.patch \
- patches/openjdk/6782079-png_metadata_oom.patch
+ patches/openjdk/6782079-png_metadata_oom.patch \
+ patches/rh676659-gcc-export-dynamic.patch \
+ patches/latent_jaxp_bug.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
diff -r 2b6e470ee8b5 -r e196ef84ddb0 NEWS
--- a/NEWS Wed Feb 09 17:56:54 2011 +0000
+++ b/NEWS Tue Feb 15 21:46:41 2011 +0000
@@ -8,7 +8,20 @@ GX - http://bugs.gentoo.org/show_bug.cg
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.8.7 (2011-XX-XX):
+New in release 1.8.7 (2011-02-15):
+
+* Security updates
+ - 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
+ - S6927050, CVE-2010-4470: JAXP untrusted component state manipulation
+ - RH677332, CVE-2011-0706: Multiple signers privilege escalation
+* Bug fixes
+ - RH676659: Pass -export-dynamic flag to linker using -Wl, as option in gcc 4.6+ is broken
+ - Fix latent JAXP bug caused by missing import
New in release 1.8.6 (2011-02-09):
diff -r 2b6e470ee8b5 -r e196ef84ddb0 configure.ac
--- a/configure.ac Wed Feb 09 17:56:54 2011 +0000
+++ b/configure.ac Tue Feb 15 21:46:41 2011 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea6],[1.8.7pre],[distro-pk
-AC_INIT([icedtea6],[1.8.7pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.8.7],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r 2b6e470ee8b5 -r e196ef84ddb0 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Feb 09 17:56:54 2011 +0000
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Feb 15 21:46:41 2011 +0000
@@ -439,9 +439,15 @@ public class JNLPClassLoader extends URL
codebase = file.getResources().getMainJAR().getLocation();
}
- jarSecurity = new SecurityDesc(file,
- SecurityDesc.ALL_PERMISSIONS,
- codebase.getHost());
+ if (signing) {
+ jarSecurity = new SecurityDesc(file,
+ SecurityDesc.ALL_PERMISSIONS,
+ codebase.getHost());
+ } else {
+ jarSecurity = new SecurityDesc(file,
+ SecurityDesc.SANDBOX_PERMISSIONS,
+ codebase.getHost());
+ }
}
jarLocationSecurityMap.put(location, jarSecurity);
diff -r 2b6e470ee8b5 -r e196ef84ddb0 patches/icedtea-nio2.patch
--- a/patches/icedtea-nio2.patch Wed Feb 09 17:56:54 2011 +0000
+++ b/patches/icedtea-nio2.patch Tue Feb 15 21:46:41 2011 +0000
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/docs/COR
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-01-07 21:17:37.000000000 +0000
-+++ openjdk/jdk/make/docs/CORE_PKGS.gmk 2009-01-09 21:21:59.000000000 +0000
+--- 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
@@ -36,6 +36,7 @@
sunw.* \
com.sun.* \
@@ -10,8 +10,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 2009-02-03 16:20:38.000000000 +0000
-+++ openjdk/jdk/make/docs/Makefile 2009-02-03 19:40:10.000000000 +0000
+--- 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 @@
# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
@@ -68,8 +68,8 @@ diff -Nru openjdk.orig/jdk/make/docs/Mak
# 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 2009-01-07 21:27:46.000000000 +0000
-+++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2009-02-03 16:28:29.000000000 +0000
+--- 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
@@ -65,6 +65,16 @@
HTTPSERVER_PKGS = com.sun.net.httpserver \
com.sun.net.httpserver.spi
@@ -87,18 +87,18 @@ diff -Nru openjdk.orig/jdk/make/docs/NON
DOCLETAPI_PKGS = com.sun.javadoc
TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
-@@ -89,6 +99,7 @@
- $(MGMT_PKGS) \
+@@ -94,6 +104,7 @@
+ $(JAVASCRIPT_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 2009-01-07 21:35:50.000000000 +0000
-+++ openjdk/jdk/make/java/java/FILES_java.gmk 2009-01-12 15:24:01.000000000 +0000
-@@ -516,6 +516,13 @@
+--- 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 @@
sun/misc/JavaLangAccess.java \
sun/misc/JavaIOAccess.java \
sun/misc/JavaIODeleteOnExitAccess.java \
@@ -114,8 +114,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 2009-01-10 03:21:38.000000000 +0000
-+++ openjdk/jdk/make/java/nio/FILES_java.gmk 2009-01-19 19:13:49.000000000 +0000
+--- 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
@@ -75,12 +75,13 @@
sun/nio/ch/DefaultSelectorProvider.java \
sun/nio/ch/DirectBuffer.java \
@@ -315,8 +315,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 2009-01-10 03:22:13.000000000 +0000
-+++ openjdk/jdk/make/java/nio/Makefile 2009-01-15 16:35:28.000000000 +0000
+--- 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
@@ -40,6 +40,11 @@
SNIO_SRC = $(SHARE_SRC)/classes/sun/nio
SNIO_GEN = $(GENSRCDIR)/sun/nio
@@ -663,8 +663,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 2009-01-07 22:08:47.000000000 +0000
-+++ openjdk/jdk/make/java/nio/mapfile-linux 2009-01-29 01:13:17.000000000 +0000
+--- 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
@@ -20,6 +20,14 @@
Java_sun_nio_ch_EPollArrayWrapper_interrupt;
Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
@@ -781,8 +781,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 2009-01-07 22:08:47.000000000 +0000
-+++ openjdk/jdk/make/java/nio/mapfile-solaris 2009-01-07 22:18:51.000000000 +0000
+--- 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
@@ -73,6 +73,75 @@
Java_sun_nio_ch_ServerSocketChannelImpl_listen;
Java_sun_nio_ch_SocketChannelImpl_checkConnect;
@@ -860,8 +860,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 2009-01-07 22:23:02.000000000 +0000
-+++ openjdk/jdk/make/mkdemo/Makefile 2009-01-07 22:23:48.000000000 +0000
+--- 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
@@ -31,7 +31,7 @@
PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk
@@ -872,8 +872,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 2009-01-07 22:23:19.000000000 +0000
-+++ openjdk/jdk/make/mksample/nio/Makefile 2009-01-07 22:24:06.000000000 +0000
+--- 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
@@ -31,7 +31,7 @@
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
@@ -884,9 +884,9 @@ 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 2009-01-12 13:32:17.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/io/File.java 2009-01-12 13:35:18.000000000 +0000
-@@ -1957,6 +1957,13 @@
+--- 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
+@@ -1958,6 +1958,13 @@
}
}
);
@@ -901,9 +901,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 2009-01-16 04:07:15.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2009-01-19 19:12:21.000000000 +0000
-@@ -529,4 +529,15 @@
+--- 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 @@
}
private static native void init();
@@ -920,8 +920,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 2009-01-13 23:54:13.000000000 +0000
-+++ openjdk/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java 2009-01-15 01:21:36.000000000 +0000
+--- 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
@@ -2004,4 +2004,23 @@
}
}
@@ -947,8 +947,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 2009-01-19 15:44:19.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java 2009-01-19 15:47:42.000000000 +0000
+--- 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
@@ -504,9 +504,33 @@
/**
* Sets all bytes in a given block of memory to a copy of another
@@ -996,9 +996,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 2009-01-16 03:10:17.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java 2009-01-19 21:04:48.000000000 +0000
-@@ -29,10 +29,28 @@
+--- 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
+@@ -29,9 +29,29 @@
import java.io.IOException;
import java.net.*;
import java.nio.ByteBuffer;
@@ -1014,7 +1014,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla
+import java.util.Set;
+
import java.lang.ref.SoftReference;
-
++
+import org.classpath.icedtea.java.net.ProtocolFamily;
+import org.classpath.icedtea.java.net.StandardProtocolFamily;
+import org.classpath.icedtea.java.net.SocketOption;
@@ -1026,10 +1026,11 @@ 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 +74,9 @@
// even after the value in the file descriptor object has been set to -1
int fdVal;
@@ -1039,7 +1040,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 +115,9 @@
// Our socket adaptor, if any
private DatagramSocket socket = null;
@@ -1049,15 +1050,17 @@ diff -Nru openjdk.orig/jdk/src/share/cla
// -- End of fields protected by stateLock
-@@ -98,15 +122,40 @@
- throws IOException
- {
+@@ -101,6 +127,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 +138,33 @@
+ }
}
+ public DatagramChannelImpl(SelectorProvider sp, ProtocolFamily family) {
@@ -1090,7 +1093,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 +557,7 @@
}
}
@@ -1099,15 +1102,15 @@ diff -Nru openjdk.orig/jdk/src/share/cla
synchronized (readLock) {
synchronized (writeLock) {
synchronized (stateLock) {
-@@ -515,6 +564,7 @@
+@@ -522,6 +573,7 @@
}
}
}
-+ return this;
++ return this;
}
public boolean isConnected() {
-@@ -704,4 +754,350 @@
+@@ -712,4 +764,350 @@
initIDs();
}
@@ -1159,7 +1162,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);
@@ -1459,8 +1462,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 2009-01-20 13:37:15.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2009-01-27 02:33:08.000000000 +0000
+--- 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
@@ -32,8 +32,15 @@
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -1510,8 +1513,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 2009-01-15 17:37:33.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/Net.java 2009-02-01 00:35:31.000000000 +0000
+--- 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
@@ -30,6 +30,15 @@
import java.net.*;
import java.nio.channels.*;
@@ -1528,13 +1531,13 @@ diff -Nru openjdk.orig/jdk/src/share/cla
class Net { // package-private
-@@ -108,16 +117,24 @@
+@@ -111,16 +120,24 @@
// -- Socket operations --
+ 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);
+ }
@@ -1556,7 +1559,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla
static native void bind(FileDescriptor fd, InetAddress addr, int port)
throws IOException;
-@@ -179,4 +196,314 @@
+@@ -182,4 +199,314 @@
initIDs();
}
@@ -1872,8 +1875,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 2009-01-16 03:01:03.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java 2009-01-16 03:56:55.000000000 +0000
+--- 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
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved.
More information about the distro-pkg-dev
mailing list