/hg/icedtea6: Remove unneeded files from overlay.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sun Apr 18 13:05:03 PDT 2010
changeset 8048dccbf481 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8048dccbf481
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Apr 18 21:04:29 2010 +0100
Remove unneeded files from overlay.
2010-04-18 Andrew John Hughes <ahughes at redhat.com>
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/D
efaultSelectorProvider.java: Alters an existing file so
converted to a patch.
* overlays/openjdk/jdk/test/java/util/TimeZone/TimeZoneDatePermissionC
heck.java,
* overlays/openjdk/jdk/test/java/util/TimeZone/TimeZoneDatePermissionC
heck.sh: Removed, available upstream.
* patches/icedtea-nio2.patch: Extend with above NIO2 patch.
diffstat:
5 files changed, 27 insertions(+), 177 deletions(-)
ChangeLog | 10 +
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java | 76 ----------
overlays/openjdk/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.java | 40 -----
overlays/openjdk/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh | 61 --------
patches/icedtea-nio2.patch | 17 ++
diffs (230 lines):
diff -r 17a509b8bf75 -r 8048dccbf481 ChangeLog
--- a/ChangeLog Sun Apr 18 18:07:25 2010 +0100
+++ b/ChangeLog Sun Apr 18 21:04:29 2010 +0100
@@ -1,3 +1,13 @@ 2010-04-18 Andrew John Hughes <ahughes
+2010-04-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java:
+ Alters an existing file so converted to a patch.
+ * overlays/openjdk/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.java,
+ * overlays/openjdk/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh:
+ Removed, available upstream.
+ * patches/icedtea-nio2.patch:
+ Extend with above NIO2 patch.
+
2010-04-18 Andrew John Hughes <ahughes at redhat.com>
* patches/zero/shark_do_nothing_on_stub_frame.patch:
diff -r 17a509b8bf75 -r 8048dccbf481 overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java Sun Apr 18 18:07:25 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright 2001-2005 Sun Microsystems, Inc. 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package sun.nio.ch;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import sun.security.action.GetPropertyAction;
-
-import org.classpath.icedtea.java.nio.channels.spi.SelectorProvider;
-
-/**
- * Creates this platform's default SelectorProvider
- */
-
-public class DefaultSelectorProvider {
-
- /**
- * Prevent instantiation.
- */
- private DefaultSelectorProvider() { }
-
- /**
- * Returns the default SelectorProvider.
- */
- public static SelectorProvider create() {
- String osname = AccessController.doPrivileged(
- new GetPropertyAction("os.name"));
- if ("SunOS".equals(osname)) {
- return new sun.nio.ch.DevPollSelectorProvider();
- }
-
- // use EPollSelectorProvider for Linux kernels >= 2.6
- if ("Linux".equals(osname)) {
- String osversion = AccessController.doPrivileged(
- new GetPropertyAction("os.version"));
- String[] vers = osversion.split("\\.", 0);
- if (vers.length >= 2) {
- try {
- int major = Integer.parseInt(vers[0]);
- int minor = Integer.parseInt(vers[1]);
- if (major > 2 || (major == 2 && minor >= 6)) {
- return new sun.nio.ch.EPollSelectorProvider();
- }
- } catch (NumberFormatException x) {
- // format not recognized
- }
- }
- }
-
- return new sun.nio.ch.PollSelectorProvider();
- }
-
-}
diff -r 17a509b8bf75 -r 8048dccbf481 overlays/openjdk/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.java
--- a/overlays/openjdk/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.java Sun Apr 18 18:07:25 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/* Testcase for PR381 Stackoverflow error with security manager, signed jars
- and -Djava.security.debug set.
-
-Copyright (c) 2009, Red Hat Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-IcedTea is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-*/
-
-
-import java.util.Date;
-
-/**
- * Test class. Create a test keystore and dummy cert, create a jar file to
- * sign with the test class in it. Sign it run it with the security manager
- * on, plus accesscontroller debugging, will go into infinite recursion
- * trying to get enough permissions for printing Date of failing
- * certificate, unless fix is applied.
- */
-public class TimeZoneDatePermissionCheck
-{
- public static void main(String[] args)
- {
- System.out.println(new Date());
- }
-}
diff -r 17a509b8bf75 -r 8048dccbf481 overlays/openjdk/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh
--- a/overlays/openjdk/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh Sun Apr 18 18:07:25 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-# Testcase for PR381 Stackoverflow error with security manager, signed jars
-# and -Djava.security.debug set.
-#
-# Copyright (c) 2009, Red Hat Inc.
-#
-# This file is part of IcedTea.
-#
-# IcedTea is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# IcedTea is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with IcedTea; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA.
-
-# @test
-# @bug 0000381
-# @summary Stackoverflow error with security manager, signed jars and debug.
-# @build TimeZoneDatePermissionCheck
-# @run shell TimeZoneDatePermissionCheck.sh
-
-# Set default if not run under jtreg from test dir itself
-if [ "${TESTCLASSES}" = "" ] ; then
- TESTCLASSES="."
-fi
-if [ "${TESTJAVA}" = "" ] ; then
- TESTJAVA=/usr
-fi
-
-# create a test keystore and dummy cert
-rm -f ${TESTCLASSES}/timezonedatetest.store
-${TESTJAVA}/bin/keytool -genkeypair -alias testcert \
- -keystore ${TESTCLASSES}/timezonedatetest.store \
- -storepass testpass -validity 360 \
- -dname "cn=Mark Wildebeest, ou=FreeSoft, o=Red Hat, c=NL" \
- -keypass testpass
-
-# create a jar file to sign with the test class in it.
-rm -f ${TESTCLASSES}/timezonedatetest.jar
-${TESTJAVA}/bin/jar cf \
- ${TESTCLASSES}/timezonedatetest.jar \
- -C ${TESTCLASSES} TimeZoneDatePermissionCheck.class
-
-# sign it
-${TESTJAVA}/bin/jarsigner \
- -keystore ${TESTCLASSES}/timezonedatetest.store \
- -storepass testpass ${TESTCLASSES}/timezonedatetest.jar testcert
-
-# run it with the security manager on, plus accesscontroller debugging
-# will go into infinite recursion trying to get enough permissions for
-# printing Date of failing certificate unless fix is applied.
-${TESTJAVA}/bin/java -Djava.security.manager \
- -Djava.security.debug=access,failure,policy \
- -cp ${TESTCLASSES}/timezonedatetest.jar TimeZoneDatePermissionCheck
diff -r 17a509b8bf75 -r 8048dccbf481 patches/icedtea-nio2.patch
--- a/patches/icedtea-nio2.patch Sun Apr 18 18:07:25 2010 +0100
+++ b/patches/icedtea-nio2.patch Sun Apr 18 21:04:29 2010 +0100
@@ -2778,3 +2778,20 @@ diff -Nru openjdk.orig/jdk/src/windows/c
+ static native void release0(FileDescriptor fd, long pos, long size)
+ throws IOException;
}
+diff -r e1d1417392db src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java
+--- openjdk.orig/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java Wed Apr 14 14:36:11 2010 -0700
++++ openjdk/jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java Sun Apr 18 19:46:48 2010 +0100
+@@ -25,11 +25,12 @@
+
+ package sun.nio.ch;
+
+-import java.nio.channels.spi.SelectorProvider;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+ import sun.security.action.GetPropertyAction;
+
++import org.classpath.icedtea.java.nio.channels.spi.SelectorProvider;
++
+ /**
+ * Creates this platform's default SelectorProvider
+ */
More information about the distro-pkg-dev
mailing list