- Add 2012/10/16 security patches from IcedTea6 1.11.5. [1]

http://icedtea.classpath.org/hg/release/icedtea6-1.11/rev/d9564350faa6
http://blog.fuseyism.com/index.php/2012/10/19/security-icedtea-1-10-10-1-11-15-2-1-3-2-2-3-2-3-3-released/

- Completely turn off parallel build by default and remove parallel build
hack for HotSpot.  There were several reports that it fails to build under
certain environment, ports/162991 for example.  Users can still do parallel
build by setting FORCE_MAKE_JOBS (and MAKE_JOBS_NUMBER if desired).
- Implement os::available_memory().  Now it is consistent with "vm.vmtotal"
sysctl(3) MIB rather than bogus (physical memory / 4).
- Prefer sysconf(_SC_NPROCESSORS_CONF) over HW_NCPU sysctl MIB to get the
number of installed processors.  There is no functional difference except
for CURRENT, which obtains the information from ELF aux vector.
- Prefer sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) over HW_USERMEM
sysctl MIB to get size of physical memory.  Although it looks more logical
to find currently available memory, it has an inevitable side-effect, i. e.,
it changes dynamically depending on current wired page count.  Therefore,
it is unpredictable and not too useful some times.  For example, launcher
uses the parameter to determine initial heap size and machine class for i386.
Now it is more consistent with other places (and Linux JDK/JREs, including
the ones we have in ports tree).
- Implement os::active_processor_count() using cpuset_getaffinity(2).  For
example, Runtime.getRuntime().availableProcessors() now returns number of
available processors for the current process as it should.
- Sync. launchers (java_md.c) for HotSpot and JDK as much as possible for
maintainability.  As a good side-effect, launcher for i386 can now determine
machine class based on the current hardware configuration.  Previously,
client VM was always chosen by default.
- Fix CounterGet(), which is only used for debugging launcher.
- Add swap info for os::print_memory_info().

Obtained from:	IcedTea project [1]
Feature safe:	yes

1 files changed, 349 insertions, 0 deletions

diff --git a/java/openjdk6/files/icedtea/security/7169884.patch b/java/openjdk6/files/icedtea/security/7169884.patch
new file mode 100644
index 000000000000..e0f023038ade
--- /dev/null
+++ b/java/openjdk6/files/icedtea/security/7169884.patch
@@ -0,0 +1,349 @@
+# HG changeset patch
+# User robm
+# Date 1347903606 -3600
+# Node ID 47e7c8e33cd82dade3e84af94bff125cdbdae062
+# Parent  d04575148db287475168da344159e583f7bff02c
+7169884: LogManager checks do not work correctly for sub-types
+Reviewed-by: alanb
+
+diff --git a/src/share/classes/java/util/logging/FileHandler.java b/src/share/classes/java/util/logging/FileHandler.java
+--- jdk/src/share/classes/java/util/logging/FileHandler.java
++++ jdk/src/share/classes/java/util/logging/FileHandler.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -220,7 +220,7 @@
+      * @exception  NullPointerException if pattern property is an empty String.
+      */
+     public FileHandler() throws IOException, SecurityException {
+-        checkAccess();
++        checkPermission();
+         configure();
+         openFiles();
+     }
+@@ -246,7 +246,7 @@
+         if (pattern.length() < 1 ) {
+             throw new IllegalArgumentException();
+         }
+-        checkAccess();
++        checkPermission();
+         configure();
+         this.pattern = pattern;
+         this.limit = 0;
+@@ -278,7 +278,7 @@
+         if (pattern.length() < 1 ) {
+             throw new IllegalArgumentException();
+         }
+-        checkAccess();
++        checkPermission();
+         configure();
+         this.pattern = pattern;
+         this.limit = 0;
+@@ -315,7 +315,7 @@
+         if (limit < 0 || count < 1 || pattern.length() < 1) {
+             throw new IllegalArgumentException();
+         }
+-        checkAccess();
++        checkPermission();
+         configure();
+         this.pattern = pattern;
+         this.limit = limit;
+@@ -354,7 +354,7 @@
+         if (limit < 0 || count < 1 || pattern.length() < 1) {
+             throw new IllegalArgumentException();
+         }
+-        checkAccess();
++        checkPermission();
+         configure();
+         this.pattern = pattern;
+         this.limit = limit;
+@@ -367,7 +367,7 @@
+     // configured instance variables.
+     private void openFiles() throws IOException {
+         LogManager manager = LogManager.getLogManager();
+-        manager.checkAccess();
++        manager.checkPermission();
+         if (count < 1) {
+            throw new IllegalArgumentException("file count = " + count);
+         }
+diff --git a/src/share/classes/java/util/logging/Handler.java b/src/share/classes/java/util/logging/Handler.java
+--- jdk/src/share/classes/java/util/logging/Handler.java
++++ jdk/src/share/classes/java/util/logging/Handler.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -111,7 +111,7 @@
+      *             the caller does not have <tt>LoggingPermission("control")</tt>.
+      */
+     public void setFormatter(Formatter newFormatter) throws SecurityException {
+-        checkAccess();
++        checkPermission();
+         // Check for a null pointer:
+         newFormatter.getClass();
+         formatter = newFormatter;
+@@ -140,7 +140,7 @@
+      */
+     public void setEncoding(String encoding)
+                         throws SecurityException, java.io.UnsupportedEncodingException {
+-        checkAccess();
++        checkPermission();
+         if (encoding != null) {
+             try {
+                 if(!java.nio.charset.Charset.isSupported(encoding)) {
+@@ -175,7 +175,7 @@
+      *             the caller does not have <tt>LoggingPermission("control")</tt>.
+      */
+     public void setFilter(Filter newFilter) throws SecurityException {
+-        checkAccess();
++        checkPermission();
+         filter = newFilter;
+     }
+ 
+@@ -199,7 +199,7 @@
+      *             the caller does not have <tt>LoggingPermission("control")</tt>.
+      */
+     public void setErrorManager(ErrorManager em) {
+-        checkAccess();
++        checkPermission();
+         if (em == null) {
+            throw new NullPointerException();
+         }
+@@ -213,7 +213,7 @@
+      *             the caller does not have <tt>LoggingPermission("control")</tt>.
+      */
+     public ErrorManager getErrorManager() {
+-        checkAccess();
++        checkPermission();
+         return errorManager;
+     }
+ 
+@@ -253,7 +253,7 @@
+         if (newLevel == null) {
+             throw new NullPointerException();
+         }
+-        checkAccess();
++        checkPermission();
+         logLevel = newLevel;
+     }
+ 
+@@ -296,9 +296,9 @@
+     // If "sealed" is true, we check that the caller has
+     // appropriate security privileges to update Handler
+     // state and if not throw a SecurityException.
+-    void checkAccess() throws SecurityException {
++    void checkPermission() throws SecurityException {
+         if (sealed) {
+-            manager.checkAccess();
++            manager.checkPermission();
+         }
+     }
+ }
+diff --git a/src/share/classes/java/util/logging/LogManager.java b/src/share/classes/java/util/logging/LogManager.java
+--- jdk/src/share/classes/java/util/logging/LogManager.java
++++ jdk/src/share/classes/java/util/logging/LogManager.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -303,7 +303,7 @@
+         if (l == null) {
+             throw new NullPointerException();
+         }
+-        checkAccess();
++        checkPermission();
+         changes.addPropertyChangeListener(l);
+     }
+ 
+@@ -322,7 +322,7 @@
+      *             the caller does not have LoggingPermission("control").
+      */
+     public void removePropertyChangeListener(PropertyChangeListener l) throws SecurityException {
+-        checkAccess();
++        checkPermission();
+         changes.removePropertyChangeListener(l);
+     }
+ 
+@@ -740,7 +740,7 @@
+      * @exception  IOException if there are IO problems reading the configuration.
+      */
+     public void readConfiguration() throws IOException, SecurityException {
+-        checkAccess();
++        checkPermission();
+ 
+         // if a configuration class is specified, load it and use it.
+         String cname = System.getProperty("java.util.logging.config.class");
+@@ -798,7 +798,7 @@
+      */
+ 
+     public void reset() throws SecurityException {
+-        checkAccess();
++        checkPermission();
+         synchronized (this) {
+             props = new Properties();
+             // Since we are doing a reset we no longer want to initialize
+@@ -883,7 +883,7 @@
+      * @exception  IOException if there are problems reading from the stream.
+      */
+     public void readConfiguration(InputStream ins) throws IOException, SecurityException {
+-        checkAccess();
++        checkPermission();
+         reset();
+ 
+         // Load the properties
+@@ -1045,7 +1045,13 @@
+     }
+ 
+ 
+-    private Permission ourPermission = new LoggingPermission("control", null);
++    private final Permission controlPermission = new LoggingPermission("control", null);
++  
++    void checkPermission() {
++        SecurityManager sm = System.getSecurityManager();
++        if (sm != null)
++            sm.checkPermission(controlPermission);
++    }
+ 
+     /**
+      * Check that the current context is trusted to modify the logging
+@@ -1058,11 +1064,7 @@
+      *             the caller does not have LoggingPermission("control").
+      */
+     public void checkAccess() throws SecurityException {
+-        SecurityManager sm = System.getSecurityManager();
+-        if (sm == null) {
+-            return;
+-        }
+-        sm.checkPermission(ourPermission);
++        checkPermission();
+     }
+ 
+     // Nested class to represent a node in our tree of named loggers.
+diff --git a/src/share/classes/java/util/logging/Logger.java b/src/share/classes/java/util/logging/Logger.java
+--- jdk/src/share/classes/java/util/logging/Logger.java
++++ jdk/src/share/classes/java/util/logging/Logger.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -266,13 +266,13 @@
+         this.manager = manager;
+     }
+ 
+-    private void checkAccess() throws SecurityException {
++    private void checkPermission() throws SecurityException {
+         if (!anonymous) {
+             if (manager == null) {
+                 // Complete initialization of the global Logger.
+                 manager = LogManager.getLogManager();
+             }
+-            manager.checkAccess();
++            manager.checkPermission();
+         }
+     }
+ 
+@@ -454,7 +454,7 @@
+      *             the caller does not have LoggingPermission("control").
+      */
+     public synchronized void setFilter(Filter newFilter) throws SecurityException {
+-        checkAccess();
++        checkPermission();
+         filter = newFilter;
+     }
+ 
+@@ -1145,7 +1145,7 @@
+      *             the caller does not have LoggingPermission("control").
+      */
+     public void setLevel(Level newLevel) throws SecurityException {
+-        checkAccess();
++        checkPermission();
+         synchronized (treeLock) {
+             levelObject = newLevel;
+             updateEffectiveLevel();
+@@ -1200,7 +1200,7 @@
+     public synchronized void addHandler(Handler handler) throws SecurityException {
+         // Check for null handler
+         handler.getClass();
+-        checkAccess();
++        checkPermission();
+         if (handlers == null) {
+             handlers = new ArrayList<Handler>();
+         }
+@@ -1217,7 +1217,7 @@
+      *             the caller does not have LoggingPermission("control").
+      */
+     public synchronized void removeHandler(Handler handler) throws SecurityException {
+-        checkAccess();
++        checkPermission();
+         if (handler == null) {
+             return;
+         }
+@@ -1251,7 +1251,7 @@
+      *             the caller does not have LoggingPermission("control").
+      */
+     public synchronized void setUseParentHandlers(boolean useParentHandlers) {
+-        checkAccess();
++        checkPermission();
+         this.useParentHandlers = useParentHandlers;
+     }
+ 
+@@ -1388,7 +1388,7 @@
+         if (parent == null) {
+             throw new NullPointerException();
+         }
+-        manager.checkAccess();
++        manager.checkPermission();
+         doSetParent(parent);
+     }
+ 
+diff --git a/src/share/classes/java/util/logging/MemoryHandler.java b/src/share/classes/java/util/logging/MemoryHandler.java
+--- jdk/src/share/classes/java/util/logging/MemoryHandler.java
++++ jdk/src/share/classes/java/util/logging/MemoryHandler.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -238,7 +238,7 @@
+             throw new NullPointerException();
+         }
+         LogManager manager = LogManager.getLogManager();
+-        checkAccess();
++        checkPermission();
+         pushLevel = newLevel;
+     }
+ 
+diff --git a/src/share/classes/java/util/logging/StreamHandler.java b/src/share/classes/java/util/logging/StreamHandler.java
+--- jdk/src/share/classes/java/util/logging/StreamHandler.java
++++ jdk/src/share/classes/java/util/logging/StreamHandler.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -249,7 +249,7 @@
+     }
+ 
+     private synchronized void flushAndClose() throws SecurityException {
+-        checkAccess();
++        checkPermission();
+         if (writer != null) {
+             try {
+                 if (!doneHeader) {