/hg/release/icedtea6-1.9: 10 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Feb 15 13:47:28 PST 2011
changeset e3a80de31410 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=e3a80de31410
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 09 17:54:43 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/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 6c912b14089d in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=6c912b14089d
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 10 09:25:31 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.
changeset eaab590dcd87 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=eaab590dcd87
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 3439c902908c in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=3439c902908c
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 13 19:06:09 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 82703ea0d4bc in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=82703ea0d4bc
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 14 01:00:06 2011 +0000
RH676659: Pass -export-dynamic option to linker not gcc.
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 acbddaabc2e3 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=acbddaabc2e3
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 14 01:00:50 2011 +0000
Bump to 1.9.7.
2011-02-13 Andrew John Hughes <ahughes at redhat.com>
* configure.ac: Bump to 1.9.7.
changeset 66db0252562c in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=66db0252562c
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 14 02:17:45 2011 +0000
G344659: Fix issue when building on SPARC
2011-02-13 Andrew John Hughes <ahughes at redhat.com>
G344659: Fix issue when building on SPARC
* Makefile.am: Add new patch.
* NEWS: Updated.
* patches/g344659-sparc_fix.patch: Add fix for SPARC builds on
Gentoo.
changeset e524c624d58a in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=e524c624d58a
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 9822da18c162 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=9822da18c162
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 14 16:52:57 2011 +0000
Fix latent JAXP bug caused by 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 64b56daa6bc0 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=64b56daa6bc0
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 15 21:47:21 2011 +0000
Added tag icedtea6-1.9.7 for changeset 9822da18c162
diffstat:
36 files changed, 2397 insertions(+), 84 deletions(-)
"SchemaFactorySourceUnrecognized", | 8
.hgtags | 1
/ | 56 +
AbstractXMLSchema | 2
ChangeLog | 73 +
Makefile.am | 14
NEWS | 16
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/g344659-sparc_fix.patch | 12
patches/icedtea-nio2.patch | 159 +--
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 2989 to 500 lines):
diff -r 358ff8b91c6e -r 64b56daa6bc0 .hgtags
--- a/.hgtags Wed Feb 09 16:47:14 2011 +0000
+++ b/.hgtags Tue Feb 15 21:47:21 2011 +0000
@@ -26,3 +26,4 @@ fdefc65b1e3f7ab140ce4da42716c2439796dfda
fdefc65b1e3f7ab140ce4da42716c2439796dfda icedtea6-1.9.4
a55e0ec59e4287f9df15f666503dbe500f1a61ea icedtea6-1.9.5
03258f7ff9107c7e3be6931df2093b8395db89e4 icedtea6-1.9.6
+9822da18c162896b9da66d45bdc341a1cd53581b icedtea6-1.9.7
diff -r 358ff8b91c6e -r 64b56daa6bc0 ChangeLog
--- a/ChangeLog Wed Feb 09 16:47:14 2011 +0000
+++ b/ChangeLog Tue Feb 15 21:47:21 2011 +0000
@@ -1,3 +1,76 @@ 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>
+
+ G344659: Fix issue when building on SPARC
+ * Makefile.am: Add new patch.
+ * NEWS: Updated.
+ * patches/g344659-sparc_fix.patch:
+ Add fix for SPARC builds on Gentoo.
+
+2011-02-13 Andrew John Hughes <ahughes at redhat.com>
+
+ * configure.ac: Bump to 1.9.7.
+
+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-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-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:
+ Security updates from Oracle SSR.
+
2011-02-09 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add 1.9.7.
diff -r 358ff8b91c6e -r 64b56daa6bc0 Makefile.am
--- a/Makefile.am Wed Feb 09 16:47:14 2011 +0000
+++ b/Makefile.am Tue Feb 15 21:47:21 2011 +0000
@@ -219,7 +219,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) \
@@ -327,7 +334,10 @@ 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/g344659-sparc_fix.patch \
+ patches/latent_jaxp_bug.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 358ff8b91c6e -r 64b56daa6bc0 NEWS
--- a/NEWS Wed Feb 09 16:47:14 2011 +0000
+++ b/NEWS Tue Feb 15 21:47:21 2011 +0000
@@ -8,7 +8,21 @@ 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.9.7 (2011-XX-XX):
+New in release 1.9.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
+ - G344659: Fix issue when building on SPARC
+ - Fix latent JAXP bug caused by missing import
New in release 1.9.6 (2011-02-09):
diff -r 358ff8b91c6e -r 64b56daa6bc0 configure.ac
--- a/configure.ac Wed Feb 09 16:47:14 2011 +0000
+++ b/configure.ac Tue Feb 15 21:47:21 2011 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea6],[1.9.7pre],[distro-pk
-AC_INIT([icedtea6],[1.9.7pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.9.7],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r 358ff8b91c6e -r 64b56daa6bc0 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Feb 09 16:47:14 2011 +0000
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Feb 15 21:47:21 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 358ff8b91c6e -r 64b56daa6bc0 patches/g344659-sparc_fix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/g344659-sparc_fix.patch Tue Feb 15 21:47:21 2011 +0000
@@ -0,0 +1,12 @@
+diff -uNr openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/v_version_linux_sparc.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-06-21 22:12:15.000000000 +0100
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-11-29 20:15:36.179541001 +0000
+@@ -35,7 +35,7 @@
+ }
+
+ while (!feof(fp)) {
+- if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) {
++ if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu[0]) == 1) {
+ if (strstr(cpu, "Niagara") != NULL) {
+ rv = true;
+ }
diff -r 358ff8b91c6e -r 64b56daa6bc0 patches/icedtea-nio2.patch
--- a/patches/icedtea-nio2.patch Wed Feb 09 16:47:14 2011 +0000
+++ b/patches/icedtea-nio2.patch Tue Feb 15 21:47:21 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();
More information about the distro-pkg-dev
mailing list