Date: Wed, 6 Mar 2013 00:50:29 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313491 - in head/java: openjdk6 openjdk6-jre openjdk6/files openjdk6/files/icedtea/security openjdk6/files/icedtea/security/20120830 openjdk6/files/icedtea/security/20130201 openjdk6/f... Message-ID: <201303060050.r260oTTX096729@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Mar 6 00:50:28 2013 New Revision: 313491 URL: http://svnweb.freebsd.org/changeset/ports/313491 Log: Add multiple security patches from IcedTea6 1.12.3. http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-February/021858.html http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-February/021998.html Obtained from: IcedTea Project Added: head/java/openjdk6/files/icedtea/security/ head/java/openjdk6/files/icedtea/security/20120830/ head/java/openjdk6/files/icedtea/security/20120830/7182135-impossible_to_use_some_editors_directly.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/ head/java/openjdk6/files/icedtea/security/20130201/6563318.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/6664509.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/6776941.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7141694.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7173145.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7186945.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7186948.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7186952.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7186954.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7192392.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7192393.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7192977.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7197546.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7200491.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7200500.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7201064.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7201066.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7201068.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7201070.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/7201071.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/8000210.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/8000537.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/8000540.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/8000631.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/8001235.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/8001242.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/8001307.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/8001972.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130201/8002325.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130219/ head/java/openjdk6/files/icedtea/security/20130219/8006446.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130219/8006777.patch (contents, props changed) head/java/openjdk6/files/icedtea/security/20130219/8007688.patch (contents, props changed) Modified: head/java/openjdk6-jre/Makefile head/java/openjdk6/Makefile head/java/openjdk6/files/patch-set Modified: head/java/openjdk6-jre/Makefile ============================================================================== --- head/java/openjdk6-jre/Makefile Wed Mar 6 00:48:35 2013 (r313490) +++ head/java/openjdk6-jre/Makefile Wed Mar 6 00:50:28 2013 (r313491) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel PKGNAMESUFFIX= -jre Modified: head/java/openjdk6/Makefile ============================================================================== --- head/java/openjdk6/Makefile Wed Mar 6 00:48:35 2013 (r313490) +++ head/java/openjdk6/Makefile Wed Mar 6 00:50:28 2013 (r313491) @@ -3,7 +3,7 @@ PORTNAME= openjdk6 PORTVERSION= b27 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \ http://download.java.net/jaxp/openjdk/jdk6/:jaxp \ @@ -39,6 +39,40 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/jav OPENJDK_BUILDDATE= 26_oct_2012 +EXTRA_PATCHES= ${FILESDIR}/icedtea/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ + ${FILESDIR}/icedtea/security/20130201/7201068.patch \ + ${FILESDIR}/icedtea/security/20130201/6563318.patch \ + ${FILESDIR}/icedtea/security/20130201/6664509.patch \ + ${FILESDIR}/icedtea/security/20130201/6776941.patch \ + ${FILESDIR}/icedtea/security/20130201/7141694.patch \ + ${FILESDIR}/icedtea/security/20130201/7173145.patch \ + ${FILESDIR}/icedtea/security/20130201/7186945.patch \ + ${FILESDIR}/icedtea/security/20130201/7186948.patch \ + ${FILESDIR}/icedtea/security/20130201/7186952.patch \ + ${FILESDIR}/icedtea/security/20130201/7186954.patch \ + ${FILESDIR}/icedtea/security/20130201/7192392.patch \ + ${FILESDIR}/icedtea/security/20130201/7192393.patch \ + ${FILESDIR}/icedtea/security/20130201/7192977.patch \ + ${FILESDIR}/icedtea/security/20130201/7197546.patch \ + ${FILESDIR}/icedtea/security/20130201/7200491.patch \ + ${FILESDIR}/icedtea/security/20130201/7200500.patch \ + ${FILESDIR}/icedtea/security/20130201/7201064.patch \ + ${FILESDIR}/icedtea/security/20130201/7201066.patch \ + ${FILESDIR}/icedtea/security/20130201/7201070.patch \ + ${FILESDIR}/icedtea/security/20130201/7201071.patch \ + ${FILESDIR}/icedtea/security/20130201/8000210.patch \ + ${FILESDIR}/icedtea/security/20130201/8000537.patch \ + ${FILESDIR}/icedtea/security/20130201/8000540.patch \ + ${FILESDIR}/icedtea/security/20130201/8000631.patch \ + ${FILESDIR}/icedtea/security/20130201/8001242.patch \ + ${FILESDIR}/icedtea/security/20130201/8001307.patch \ + ${FILESDIR}/icedtea/security/20130201/8001972.patch \ + ${FILESDIR}/icedtea/security/20130201/8002325.patch \ + ${FILESDIR}/icedtea/security/20130201/8001235.patch \ + ${FILESDIR}/icedtea/security/20130219/8006446.patch \ + ${FILESDIR}/icedtea/security/20130219/8006777.patch \ + ${FILESDIR}/icedtea/security/20130219/8007688.patch + OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE ICEDTEA_DESC= Apply additional patches from IcedTea Added: head/java/openjdk6/files/icedtea/security/20120830/7182135-impossible_to_use_some_editors_directly.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk6/files/icedtea/security/20120830/7182135-impossible_to_use_some_editors_directly.patch Wed Mar 6 00:50:28 2013 (r313491) @@ -0,0 +1,519 @@ +diff --git a/make/sun/Makefile b/make/sun/Makefile +--- jdk/make/sun/Makefile ++++ jdk/make/sun/Makefile +@@ -64,7 +64,7 @@ + SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \ + awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \ + $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ +- font jpeg cmm applet rmi $(JDBC_SUBDIR) \ ++ font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ + jawt text nio launcher management $(ORG_SUBDIR) \ + native2ascii serialver tools jconsole + +diff --git a/make/sun/beans/Makefile b/make/sun/beans/Makefile +new file mode 100644 +--- /dev/null ++++ jdk/make/sun/beans/Makefile +@@ -0,0 +1,43 @@ ++# ++# Copyright (c) 1997, 2005, 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 ++# under the terms of the GNU General Public License version 2 only, as ++# published by the Free Software Foundation. Oracle designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++# or visit www.oracle.com if you need additional information or have any ++# questions. ++# ++ ++# ++# Makefile for building sun.beans.* ++# ++ ++BUILDDIR = ../.. ++PACKAGE = sun.beans ++PRODUCT = sun ++include $(BUILDDIR)/common/Defs.gmk ++ ++# ++# Files ++# ++AUTO_FILES_JAVA_DIRS = sun/beans ++ ++# ++# Rules ++# ++include $(BUILDDIR)/common/Classes.gmk +diff --git a/src/share/classes/com/sun/beans/editors/EnumEditor.java b/src/share/classes/com/sun/beans/editors/EnumEditor.java +--- jdk/src/share/classes/com/sun/beans/editors/EnumEditor.java ++++ jdk/src/share/classes/com/sun/beans/editors/EnumEditor.java +@@ -42,7 +42,7 @@ + * + * @author Sergey A. Malenkov + */ +-public final class EnumEditor implements PropertyEditor { ++public class EnumEditor implements PropertyEditor { + private final List<PropertyChangeListener> listeners = new ArrayList<PropertyChangeListener>(); + + private final Class type; +diff --git a/src/share/classes/sun/beans/editors/BooleanEditor.java b/src/share/classes/sun/beans/editors/BooleanEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/BooleanEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class BooleanEditor extends com.sun.beans.editors.BooleanEditor { ++} +diff --git a/src/share/classes/sun/beans/editors/ByteEditor.java b/src/share/classes/sun/beans/editors/ByteEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/ByteEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class ByteEditor extends com.sun.beans.editors.ByteEditor { ++} +diff --git a/src/share/classes/sun/beans/editors/ColorEditor.java b/src/share/classes/sun/beans/editors/ColorEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/ColorEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class ColorEditor extends com.sun.beans.editors.ColorEditor { ++} +diff --git a/src/share/classes/sun/beans/editors/DoubleEditor.java b/src/share/classes/sun/beans/editors/DoubleEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/DoubleEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class DoubleEditor extends com.sun.beans.editors.DoubleEditor { ++} +diff --git a/src/share/classes/sun/beans/editors/EnumEditor.java b/src/share/classes/sun/beans/editors/EnumEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/EnumEditor.java +@@ -0,0 +1,35 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class EnumEditor extends com.sun.beans.editors.EnumEditor { ++ public EnumEditor(Class type) { ++ super(type); ++ } ++} +diff --git a/src/share/classes/sun/beans/editors/FloatEditor.java b/src/share/classes/sun/beans/editors/FloatEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/FloatEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class FloatEditor extends com.sun.beans.editors.FloatEditor { ++} +diff --git a/src/share/classes/sun/beans/editors/FontEditor.java b/src/share/classes/sun/beans/editors/FontEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/FontEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class FontEditor extends com.sun.beans.editors.FontEditor { ++} +diff --git a/src/share/classes/sun/beans/editors/IntegerEditor.java b/src/share/classes/sun/beans/editors/IntegerEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/IntegerEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class IntegerEditor extends com.sun.beans.editors.IntegerEditor { ++} +diff --git a/src/share/classes/sun/beans/editors/LongEditor.java b/src/share/classes/sun/beans/editors/LongEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/LongEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class LongEditor extends com.sun.beans.editors.LongEditor { ++} +diff --git a/src/share/classes/sun/beans/editors/NumberEditor.java b/src/share/classes/sun/beans/editors/NumberEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/NumberEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++abstract public class NumberEditor extends com.sun.beans.editors.NumberEditor { ++} +diff --git a/src/share/classes/sun/beans/editors/ShortEditor.java b/src/share/classes/sun/beans/editors/ShortEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/ShortEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class ShortEditor extends com.sun.beans.editors.ShortEditor { ++} +diff --git a/src/share/classes/sun/beans/editors/StringEditor.java b/src/share/classes/sun/beans/editors/StringEditor.java +new file mode 100644 +--- /dev/null ++++ jdk/src/share/classes/sun/beans/editors/StringEditor.java +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 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 ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++package sun.beans.editors; ++ ++/** ++ * FOR BACKWARD COMPATIBILITY ONLY - DO NOT USE. ++ */ ++public class StringEditor extends com.sun.beans.editors.StringEditor { ++} Added: head/java/openjdk6/files/icedtea/security/20130201/6563318.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk6/files/icedtea/security/20130201/6563318.patch Wed Mar 6 00:50:28 2013 (r313491) @@ -0,0 +1,36 @@ +# HG changeset patch +# User coffeys +# Date 1355323250 0 +# Node ID 0da6d4cbcc77b3326756b52e6086b1262d52c214 +# Parent 042882b32f75d0e736c19f93688d37fb98d7d26d +6563318: RMI data sanitization +Reviewed-by: dmocek + +diff --git a/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java b/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java +--- jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java ++++ jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1996, 1998, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1996, 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 +@@ -150,7 +150,7 @@ public final class CGIHandler { + returnServerError(e.getMessage()); + } + else +- returnClientError("invalid command: " + command); ++ returnClientError("Invalid command."); + } catch (Exception e) { + returnServerError("internal error: " + e.getMessage()); + } +@@ -217,7 +217,7 @@ final class CGIForwardCommand implements + try { + port = Integer.parseInt(param); + } catch (NumberFormatException e) { +- throw new CGIClientException("invalid port number: " + param); ++ throw new CGIClientException("invalid port number."); + } + if (port <= 0 || port > 0xFFFF) + throw new CGIClientException("invalid port: " + port); Added: head/java/openjdk6/files/icedtea/security/20130201/6664509.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk6/files/icedtea/security/20130201/6664509.patch Wed Mar 6 00:50:28 2013 (r313491) @@ -0,0 +1,1322 @@ +# HG changeset patch +# User coffeys +# Date 1355432912 0 +# Node ID eed3ef0116a18e006c4e062b3c8d6d5a5e503a43 +# Parent bedb05bba7fc681e34f9c3ce03dc2daa4ec2ce28 +6664509: Add logging context +6664528: Find log level matching its name or value given at construction time +Reviewed-by: mchung + +diff --git a/src/share/classes/java/util/logging/Level.java b/src/share/classes/java/util/logging/Level.java +--- jdk/src/share/classes/java/util/logging/Level.java ++++ jdk/src/share/classes/java/util/logging/Level.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 +@@ -24,6 +24,10 @@ + */ + + package java.util.logging; ++import java.util.ArrayList; ++import java.util.HashMap; ++import java.util.List; ++import java.util.Map; + import java.util.ResourceBundle; + + /** +@@ -59,7 +63,6 @@ import java.util.ResourceBundle; + */ + + public class Level implements java.io.Serializable { +- private static java.util.ArrayList<Level> known = new java.util.ArrayList<Level>(); + private static String defaultBundle = "sun.util.logging.resources.logging"; + + /** +@@ -76,6 +79,9 @@ public class Level implements java.io.Se + * @serial The resource bundle name to be used in localizing the level name. + */ + private final String resourceBundleName; ++ ++ // localized level name ++ private String localizedLevelName; + + /** + * OFF is a special level that can be used to turn off logging. +@@ -202,9 +208,8 @@ public class Level implements java.io.Se + this.name = name; + this.value = value; + this.resourceBundleName = resourceBundleName; +- synchronized (Level.class) { +- known.add(this); +- } ++ this.localizedLevelName = resourceBundleName == null ? name : null; ++ KnownLevel.add(this); + } + + /** +@@ -236,12 +241,76 @@ public class Level implements java.io.Se + * @return localized name + */ + public String getLocalizedName() { ++ return getLocalizedLevelName(); ++ } ++ ++ // package-private getLevelName() is used by the implementation ++ // instead of getName() to avoid calling the subclass's version ++ final String getLevelName() { ++ return this.name; ++ } ++ ++ final synchronized String getLocalizedLevelName() { ++ if (localizedLevelName != null) { ++ return localizedLevelName; ++ } ++ + try { + ResourceBundle rb = ResourceBundle.getBundle(resourceBundleName); +- return rb.getString(name); ++ localizedLevelName = rb.getString(name); + } catch (Exception ex) { +- return name; ++ localizedLevelName = name; + } ++ return localizedLevelName; ++ } ++ ++ // Returns a mirrored Level object that matches the given name as ++ // specified in the Level.parse method. Returns null if not found. ++ // ++ // It returns the same Level object as the one returned by Level.parse ++ // method if the given name is a non-localized name or integer. ++ // ++ // If the name is a localized name, findLevel and parse method may ++ // return a different level value if there is a custom Level subclass ++ // that overrides Level.getLocalizedName() to return a different string ++ // than what's returned by the default implementation. ++ // ++ static Level findLevel(String name) { ++ if (name == null) { ++ throw new NullPointerException(); ++ } ++ ++ KnownLevel level; ++ ++ // Look for a known Level with the given non-localized name. ++ level = KnownLevel.findByName(name); ++ if (level != null) { ++ return level.mirroredLevel; ++ } ++ ++ // Now, check if the given name is an integer. If so, ++ // first look for a Level with the given value and then ++ // if necessary create one. ++ try { ++ int x = Integer.parseInt(name); ++ level = KnownLevel.findByValue(x); ++ if (level == null) { ++ // add new Level ++ Level levelObject = new Level(name, x); ++ level = KnownLevel.findByValue(x); ++ } ++ return level.mirroredLevel; ++ } catch (NumberFormatException ex) { ++ // Not an integer. ++ // Drop through. ++ } ++ ++ level = KnownLevel.findByLocalizedLevelName(name); ++ if (level != null) { ++ return level.mirroredLevel; ++ } ++ ++ return null; + } + + /** +@@ -266,21 +335,15 @@ public class Level implements java.io.Se + // Serialization magic to prevent "doppelgangers". + // This is a performance optimization. + private Object readResolve() { +- synchronized (Level.class) { +- for (int i = 0; i < known.size(); i++) { +- Level other = known.get(i); +- if (this.name.equals(other.name) && this.value == other.value +- && (this.resourceBundleName == other.resourceBundleName || +- (this.resourceBundleName != null && +- this.resourceBundleName.equals(other.resourceBundleName)))) { +- return other; +- } +- } +- // Woops. Whoever sent us this object knows +- // about a new log level. Add it to our list. +- known.add(this); +- return this; ++ KnownLevel o = KnownLevel.matches(this); ++ if (o != null) { ++ return o.levelObject; + } ++ ++ // Woops. Whoever sent us this object knows ++ // about a new log level. Add it to our list. ++ Level level = new Level(this.name, this.value, this.resourceBundleName); ++ return level; + } + + /** +@@ -294,6 +357,7 @@ public class Level implements java.io.Se + * <li> "SEVERE" + * <li> "1000" + * </ul> ++ * + * @param name string to be parsed + * @throws NullPointerException if the name is null + * @throws IllegalArgumentException if the value is not valid. +@@ -313,12 +377,12 @@ public class Level implements java.io.Se + // Check that name is not null. + name.length(); + ++ KnownLevel level; ++ + // Look for a known Level with the given non-localized name. +- for (int i = 0; i < known.size(); i++) { +- Level l = known.get(i); +- if (name.equals(l.name)) { +- return l; +- } ++ level = KnownLevel.findByName(name); ++ if (level != null) { ++ return level.levelObject; + } + + // Now, check if the given name is an integer. If so, +@@ -326,27 +390,23 @@ public class Level implements java.io.Se + // if necessary create one. + try { + int x = Integer.parseInt(name); +- for (int i = 0; i < known.size(); i++) { +- Level l = known.get(i); +- if (l.value == x) { +- return l; +- } ++ level = KnownLevel.findByValue(x); ++ if (level == null) { ++ // add new Level ++ Level levelObject = new Level(name, x); ++ level = KnownLevel.findByValue(x); + } +- // Create a new Level. +- return new Level(name, x); ++ return level.levelObject; + } catch (NumberFormatException ex) { + // Not an integer. + // Drop through. + } +- +- // Finally, look for a known level with the given localized name, ++ // Finally, look for a known level with the given localized name, + // in the current default locale. + // This is relatively expensive, but not excessively so. +- for (int i = 0; i < known.size(); i++) { +- Level l = known.get(i); +- if (name.equals(l.getLocalizedName())) { +- return l; +- } ++ level = KnownLevel.findByLocalizedName(name); ++ if (level != null) { ++ return level.levelObject; + } + + // OK, we've tried everything and failed +@@ -373,4 +433,125 @@ public class Level implements java.io.Se + public int hashCode() { + return this.value; + } ++ ++ // KnownLevel class maintains the global list of all known levels. ++ // The API allows multiple custom Level instances of the same name/value ++ // be created. This class provides convenient methods to find a level ++ // by a given name, by a given value, or by a given localized name. ++ // ++ // KnownLevel wraps the following Level objects: ++ // 1. levelObject: standard Level object or custom Level object ++ // 2. mirroredLevel: Level object representing the level specified in the ++ // logging configuration. ++ // ++ // Level.getName, Level.getLocalizedName, Level.getResourceBundleName methods ++ // are non-final but the name and resource bundle name are parameters to ++ // the Level constructor. Use the mirroredLevel object instead of the ++ // levelObject to prevent the logging framework to execute foreign code ++ // implemented by untrusted Level subclass. ++ // ++ // Implementation Notes: ++ // If Level.getName, Level.getLocalizedName, Level.getResourceBundleName methods ++ // were final, the following KnownLevel implementation can be removed. ++ // Future API change should take this into consideration. ++ static final class KnownLevel { ++ private static Map<String, List<KnownLevel>> nameToLevels = ++ new HashMap<String, List<KnownLevel>>(); ++ private static Map<Integer, List<KnownLevel>> intToLevels = ++ new HashMap<Integer, List<KnownLevel>>(); ++ final Level levelObject; // instance of Level class or Level subclass ++ final Level mirroredLevel; // instance of Level class ++ KnownLevel(Level l) { ++ this.levelObject = l; ++ if (l.getClass() == Level.class) { ++ this.mirroredLevel = l; ++ } else { ++ this.mirroredLevel = new Level(l.name, l.value, l.resourceBundleName); ++ } ++ } ++ ++ static synchronized void add(Level l) { ++ // the mirroredLevel object is always added to the list ++ // before the custom Level instance ++ KnownLevel o = new KnownLevel(l); ++ List<KnownLevel> list = nameToLevels.get(l.name); ++ if (list == null) { ++ list = new ArrayList<KnownLevel>(); ++ nameToLevels.put(l.name, list); ++ } ++ list.add(o); ++ ++ list = intToLevels.get(l.value); ++ if (list == null) { ++ list = new ArrayList<KnownLevel>(); ++ intToLevels.put(l.value, list); ++ } ++ list.add(o); ++ } ++ ++ // Returns a KnownLevel with the given non-localized name. ++ static synchronized KnownLevel findByName(String name) { ++ List<KnownLevel> list = nameToLevels.get(name); ++ if (list != null) { ++ return list.get(0); ++ } ++ return null; ++ } ++ ++ // Returns a KnownLevel with the given value. ++ static synchronized KnownLevel findByValue(int value) { ++ List<KnownLevel> list = intToLevels.get(value); ++ if (list != null) { ++ return list.get(0); ++ } ++ return null; ++ } ++ ++ // Returns a KnownLevel with the given localized name matching ++ // by calling the Level.getLocalizedLevelName() method (i.e. found ++ // from the resourceBundle associated with the Level object). ++ // This method does not call Level.getLocalizedName() that may ++ // be overridden in a subclass implementation ++ static synchronized KnownLevel findByLocalizedLevelName(String name) { ++ for (List<KnownLevel> levels : nameToLevels.values()) { ++ for (KnownLevel l : levels) { ++ String lname = l.levelObject.getLocalizedLevelName(); ++ if (name.equals(lname)) { ++ return l; ++ } ++ } ++ } ++ return null; ++ } ++ ++ // Returns a KnownLevel with the given localized name matching ++ // by calling the Level.getLocalizedName() method ++ static synchronized KnownLevel findByLocalizedName(String name) { ++ for (List<KnownLevel> levels : nameToLevels.values()) { ++ for (KnownLevel l : levels) { ++ String lname = l.levelObject.getLocalizedName(); ++ if (name.equals(lname)) { ++ return l; ++ } ++ } ++ } ++ return null; ++ } ++ ++ static synchronized KnownLevel matches(Level l) { ++ List<KnownLevel> list = nameToLevels.get(l.name); ++ if (list != null) { ++ for (KnownLevel level : list) { ++ Level other = level.mirroredLevel; ++ if (l.value == other.value && ++ (l.resourceBundleName == other.resourceBundleName || ++ (l.resourceBundleName != null && ++ l.resourceBundleName.equals(other.resourceBundleName)))) { ++ return level; ++ } ++ } ++ } ++ return null; ++ } ++ } + } +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 +@@ -34,6 +34,8 @@ import java.beans.PropertyChangeListener + import java.beans.PropertyChangeListener; + import java.beans.PropertyChangeSupport; + import java.net.URL; ++import sun.misc.JavaAWTAccess; ++import sun.misc.SharedSecrets; + import sun.security.action.GetPropertyAction; + + /** +@@ -155,11 +157,9 @@ public class LogManager { + = new PropertyChangeSupport(LogManager.class); + private final static Level defaultLevel = Level.INFO; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303060050.r260oTTX096729>