/hg/icedtea6-hg: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Feb 18 05:18:47 PST 2011
changeset 9882da94debb in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9882da94debb
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 17 22:34:54 2011 +0000
Fix placement of PR632 NEWS item.
2011-02-17 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Fix placement of PR632.
changeset 728aac195993 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=728aac195993
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 18 00:34:56 2011 +0000
S6444769:
java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html
fails
2011-02-18 Andrew John Hughes <ahughes at redhat.com>
S6444769:
java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html
fails
* Makefile.am: Add patch.
* NEWS: Updated.
* patches/openjdk/6444769-windowwithwarningtest.patch: Remove
obsolete WindowWithWarningTest.
changeset 1402c8ddaa03 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1402c8ddaa03
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 18 12:11:08 2011 +0000
Move to security-fixed JAXP tarball and drop local patch.
2011-02-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (JAXP_DROP_ZIP): Use zip with
security fix. (JAXP_DROP_SHA256SUM): Likewise.
(SECURITY_PATCHES): Drop local JAXP security fix.
changeset 70ea35e42b14 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=70ea35e42b14
author: ptisnovs
date: Fri Feb 18 11:38:42 2011 +0100
Removed patch for obsolete test.
changeset b2d846905f82 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b2d846905f82
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 18 13:17:32 2011 +0000
Merge
changeset 4b7c7f2492bc in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4b7c7f2492bc
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 18 13:18:26 2011 +0000
Merge
diffstat:
12 files changed, 401 insertions(+), 1473 deletions(-)
ChangeLog | 42 +
Makefile.am | 18
NEWS | 3
patches/jtreg-WindowWithWarningTest.patch | 50 -
patches/openjdk/6444769-windowwithwarningtest.patch | 352 ++++++++
patches/security/20110209/4421494.patch | 106 --
patches/security/20110215/6878713.patch | 143 ---
patches/security/20110215/6907662.patch | 758 -------------------
patches/security/20110215/6981922.patch | 245 ------
patches/security/20110215/6983554.patch | 20
patches/security/20110215/6985453.patch | 104 --
patches/security/20110215/6994263.patch | 33
diffs (truncated from 1980 to 500 lines):
diff -r 2d689773ef17 -r 4b7c7f2492bc ChangeLog
--- a/ChangeLog Thu Feb 17 21:44:24 2011 +0000
+++ b/ChangeLog Fri Feb 18 13:18:26 2011 +0000
@@ -1,3 +1,40 @@ 2011-02-17 Andrew John Hughes <ahughes
+2011-02-18 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Updated.
+ * patches/jtreg-WindowWithWarningTest:
+ Removed patch for obsolete test.
+
+2011-02-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (JAXP_DROP_ZIP): Use zip with security fix.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (SECURITY_PATCHES): Drop local JAXP security fix.
+
+2011-02-17 Andrew John Hughes <ahughes at redhat.com>
+
+ S6444769: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html fails
+ * Makefile.am: Add patch.
+ * NEWS: Updated.
+ * patches/openjdk/6444769-windowwithwarningtest.patch:
+ Remove obsolete WindowWithWarningTest.
+
+2011-02-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * 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/6985453.patch,
+ * patches/security/20110215/6994263.patch:
+ Drop security patches available upstream.
+ * Makefile.am: Remove above.
+
+2011-02-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Fix placement of PR632.
+
2011-02-17 Andrew John Hughes <ahughes at redhat.com>
6693253: Security Warning appearance requires enhancements
@@ -270,6 +307,11 @@ 2010-01-22 Mark Wielaard <mark at klomp.o
2010-01-22 Mark Wielaard <mark at klomp.org>
* Makefile.am (ICEDTEA_PATCHES): Add missing backslash.
+
+2011-01-22 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Bump to b22.
2011-01-22 Andrew John Hughes <ahughes at redhat.com>
diff -r 2d689773ef17 -r 4b7c7f2492bc Makefile.am
--- a/Makefile.am Thu Feb 17 21:44:24 2011 +0000
+++ b/Makefile.am Fri Feb 18 13:18:26 2011 +0000
@@ -2,7 +2,7 @@
OPENJDK_DATE = 20_jan_2011
OPENJDK_MD5SUM = 595125cd17441122074a4fe0f78c0252
-OPENJDK_VERSION = b21
+OPENJDK_VERSION = b22
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = 6a5eda011e49
@@ -18,8 +18,8 @@ JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp-1_4_4.zip
-JAXP_DROP_SHA256SUM = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
+JAXP_DROP_ZIP = jaxp144_01.zip
+JAXP_DROP_SHA256SUM = d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
@@ -174,15 +174,7 @@ REWRITER_SRCS = $(abs_top_srcdir)/rewrit
ICEDTEA_FSG_PATCHES =
-SECURITY_PATCHES = 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
-
+SECURITY_PATCHES =
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
@@ -200,6 +192,7 @@ ICEDTEA_PATCHES = \
patches/openjdk/6755274-glgetstring-crash.patch \
patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
patches/openjdk/6693253-security_warning.patch \
+ patches/openjdk/6444769-windowwithwarningtest.patch \
patches/icedtea-notice-safepoints.patch \
patches/icedtea-parisc-opt.patch \
patches/icedtea-lucene-crash.patch \
@@ -283,7 +276,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-jtreg-international-fonts.patch \
patches/openjdk/6967436-6976265-6967434-pisces.patch \
patches/f14-fonts.patch \
- patches/jtreg-WindowWithWarningTest.patch \
patches/jtreg-T6638712-fix.patch \
patches/jtreg-T6650759m-fix.patch \
patches/openjdk/7003777-bad-html-entity-parse.patch \
diff -r 2d689773ef17 -r 4b7c7f2492bc NEWS
--- a/NEWS Thu Feb 17 21:44:24 2011 +0000
+++ b/NEWS Fri Feb 18 13:18:26 2011 +0000
@@ -418,15 +418,16 @@ New in release 1.10 (2011-XX-XX):
- S7015232: missing copyright header in CheckZOrderChange.java
- S7017581: missing copyright header in test/sun/java2d/pipe/RegionOps.java
- S6896068: SunGraphics2D exposes a reference to itself while non fully initialised.
- - PR632: patches/security/20110215/6878713.patch breaks shark zero build
- S6749060: LCD AA text rendered incorrectly when destination is non opaque (sw pipeline only)
- S6728834: D3D/OGL: LCD AA text becomes bold and blurred when rendering to a non-opaque destination
- S6693253: Security Warning appearance requires enhancements
- S6779717: A Window does not show applet security warning icon on X platforms
- S6785058: Parent don't get the focus after dialog is closed if security warning is applied
+ - S6444769: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html fails
* Bug fixes
- RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
- PR616, PR99: Don't statically link libstdc++ or libgcc
+ - PR632: patches/security/20110215/6878713.patch breaks shark zero build
New in release 1.9.7 (2011-02-15):
diff -r 2d689773ef17 -r 4b7c7f2492bc patches/jtreg-WindowWithWarningTest.patch
--- a/patches/jtreg-WindowWithWarningTest.patch Thu Feb 17 21:44:24 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
---- /dev/null 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/applet.policy 2010-11-26 18:01:32.000000000 +0100
-@@ -0,0 +1,13 @@
-+
-+// Standard extensions get all permissions by default
-+
-+grant codeBase "file:${{java.ext.dirs}}/*" {
-+ permission java.security.AllPermission;
-+};
-+
-+// default permissions granted to all domains
-+
-+grant {
-+ permission java.awt.AWTPermission "createRobot", "enabled";
-+};
-+
---- openjdk-old/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html 2010-06-21 23:15:49.000000000 +0200
-+++ openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html 2010-11-26 18:29:25.622555000 +0100
-@@ -4,7 +4,7 @@
- @bug 6391770
- @summary Content of the Window should be laid out in the area left after WarningWindow was added.
- @author Yuri Nesterenko
-- @run applet WindowWithWarningTest.html
-+ @run applet/othervm/policy=applet.policy WindowWithWarningTest.html
- -->
-
- <head>
---- openjdk-old/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java 2010-06-21 23:15:49.000000000 +0200
-+++ openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java 2010-11-26 18:10:15.000000000 +0100
-@@ -53,6 +53,7 @@
- import java.awt.*;
- import java.awt.event.*;
- import javax.swing.*;
-+import java.security.*;
-
- //Automated tests should run as applet tests if possible because they
- // get their environments cleaned up, including AWT threads, any
-@@ -91,12 +92,6 @@
- public void start ()
- {
- //Get things going. Request focus, set size, et cetera
-- System.setSecurityManager( new SecurityManager() {
-- // deny AWTPermission("showWindowWithoutWarningBanner")
-- public boolean checkTopLevelWindow(Object window) {
-- return false;
-- }
-- });
- JFrame frame = new JFrame("Window Test");
- frame.setBounds(50, 50, 200, 200);
- frame.show();
diff -r 2d689773ef17 -r 4b7c7f2492bc patches/openjdk/6444769-windowwithwarningtest.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6444769-windowwithwarningtest.patch Fri Feb 18 13:18:26 2011 +0000
@@ -0,0 +1,352 @@
+# HG changeset patch
+# User andrew
+# Date 1292334667 0
+# Node ID ff5b73fcc2ac8d72c0df5d31b6210ecb73eb4391
+# Parent 3d243dc7441260f121db54cca6fbc99fec1e929a
+6444769: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html fails
+Summary: Remove unneeded test
+Reviewed-by: anthony
+
+diff -r 3d243dc74412 -r ff5b73fcc2ac test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html
+--- openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html Thu Feb 17 20:36:45 2011 +0000
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,20 +0,0 @@
+-<html>
+-<!--
+- @test
+- @bug 6391770
+- @summary Content of the Window should be laid out in the area left after WarningWindow was added.
+- @author Yuri Nesterenko
+- @run applet WindowWithWarningTest.html
+--->
+-
+- <head>
+- <title>WindowWithWarningTest</title>
+- </head>
+- <pre>
+- This test will run automatically.
+- </pre>
+- <body>
+- <applet code="WindowWithWarningTest.class" width=350 height=300></applet>
+- </body>
+-</html>
+-
+diff -r 3d243dc74412 -r ff5b73fcc2ac test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java
+--- openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java Thu Feb 17 20:36:45 2011 +0000
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,315 +0,0 @@
+-/*
+- * Copyright (c) 2006, 2008, 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.
+- *
+- * 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.
+- */
+-
+-
+-/*
+- test
+- @bug 6391770
+- @summary Content of the Window should be laid out in the area left after WarningWindow was added.
+- @author yuri nesterenko: area=
+- @run applet WindowWithWarningTest.html
+-*/
+-
+-// Note there is no @ in front of test above. This is so that the
+-// harness will not mistake this file as a test file. It should
+-// only see the html file as a test file. (the harness runs all
+-// valid test files, so it would run this test twice if this file
+-// were valid as well as the html file.)
+-// Also, note the area= after Your Name in the author tag. Here, you
+-// should put which functional area the test falls in. See the
+-// AWT-core home page -> test areas and/or -> AWT team for a list of
+-// areas.
+-// Note also the 'AutomaticAppletTest.html' in the run tag. This should
+-// be changed to the name of the test.
+-
+-
+-/**
+- * WindowWithWarningTest.java
+- *
+- * summary:
+- */
+-
+-import java.applet.Applet;
+-import java.awt.*;
+-import java.awt.event.*;
+-import javax.swing.*;
+-
+-//Automated tests should run as applet tests if possible because they
+-// get their environments cleaned up, including AWT threads, any
+-// test created threads, and any system resources used by the test
+-// such as file descriptors. (This is normally not a problem as
+-// main tests usually run in a separate VM, however on some platforms
+-// such as the Mac, separate VMs are not possible and non-applet
+-// tests will cause problems). Also, you don't have to worry about
+-// synchronisation stuff in Applet tests they way you do in main
+-// tests...
+-
+-
+-public class WindowWithWarningTest extends Applet
+-{
+- //Declare things used in the test, like buttons and labels here
+- boolean buttonClicked = false;
+- public static final int MAX_COUNT = 100;
+-
+- public void init()
+- {
+- //Create instructions for the user here, as well as set up
+- // the environment -- set the layout manager, add buttons,
+- // etc.
+-
+- this.setLayout (new BorderLayout ());
+-
+- String[] instructions =
+- {
+- "This is an AUTOMATIC test",
+- "simply wait until it is done"
+- };
+- //Sysout.createDialog( );
+- //Sysout.printInstructions( instructions );
+-
+- }//End init()
+- public void start ()
+- {
+- //Get things going. Request focus, set size, et cetera
+- System.setSecurityManager( new SecurityManager() {
+- // deny AWTPermission("showWindowWithoutWarningBanner")
+- public boolean checkTopLevelWindow(Object window) {
+- return false;
+- }
+- });
+- JFrame frame = new JFrame("Window Test");
+- frame.setBounds(50, 50, 200, 200);
+- frame.show();
+-
+- JWindow window = new JWindow( frame );
+- JButton jbutton1 = new JButton( "First" );
+- jbutton1.addMouseListener( new MouseAdapter() {
+- public void mousePressed( MouseEvent me ) {
+- buttonClicked = true;
+- }
+- });
+- JButton jbutton2 = new JButton( "Second" );
+- window.setLocation( 300, 300 );
+-
+- window.add("North", jbutton1);
+- window.add("South", jbutton2);
+-
+- window.pack();
+- window.show();
+- //wait for frame to show:
+- getLocation( frame );
+- window.toFront();
+-
+- Dimension size0 = window.getSize();
+- Dimension size1 = null;
+- try {
+- Robot robot = new Robot();
+-
+- robot.delay(500);
+- window.pack();
+- robot.delay(500);
+- window.pack();
+- // size1 must be the same as size0
+- size1 = window.getSize();
+- robot.delay(500);
+- Point pt = jbutton1.getLocationOnScreen();
+- robot.mouseMove((int) jbutton1.getLocationOnScreen().x + jbutton1.getWidth() / 2,
+- (int) jbutton1.getLocationOnScreen().y + jbutton1.getHeight() / 2);
+- robot.delay(500);
+- robot.mousePress(MouseEvent.BUTTON1_MASK);
+- robot.delay(100);
+- robot.mouseRelease(MouseEvent.BUTTON1_MASK);
+- robot.delay(2000);
+- }catch(Exception e) {
+- throw new RuntimeException( "Exception "+e );
+- }
+- if( !size0.equals(size1) ) {
+- throw new RuntimeException( "Wrong Window size after multiple pack()s");
+- }
+- if( !buttonClicked ) {
+- throw new RuntimeException( "Button was not clicked");
+- }
+- window.dispose();
+- frame.dispose();
+-
+- System.out.println("Test Passed.");
+- }// start()
+- public static Point getLocation( Component co ) throws RuntimeException {
+- Point pt = null;
+- boolean bFound = false;
+- int count = 0;
+- while( !bFound ) {
+- try {
+- pt = co.getLocationOnScreen();
+- bFound = true;
+- }catch( Exception ex ) {
+- bFound = false;
+- count++;
+- }
+- if( !bFound && count > MAX_COUNT ) {
+- throw new RuntimeException("don't see a component to get location");
+- }
+- }
+- return pt;
+- }
+-
+-
+-}// class AutomaticAppletTest
+-
+-
+-/****************************************************
+- Standard Test Machinery
+- DO NOT modify anything below -- it's a standard
+- chunk of code whose purpose is to make user
+- interaction uniform, and thereby make it simpler
+- to read and understand someone else's test.
+- ****************************************************/
+-
+-/**
+- This is part of the standard test machinery.
+- It creates a dialog (with the instructions), and is the interface
+- for sending text messages to the user.
+- To print the instructions, send an array of strings to Sysout.createDialog
+- WithInstructions method. Put one line of instructions per array entry.
+- To display a message for the tester to see, simply call Sysout.println
+- with the string to be displayed.
+- This mimics System.out.println but works within the test harness as well
+- as standalone.
+- */
+-
+-class Sysout
+-{
+- private static TestDialog dialog;
+-
+- public static void createDialogWithInstructions( String[] instructions )
+- {
+- dialog = new TestDialog( new Frame(), "Instructions" );
+- dialog.printInstructions( instructions );
+- dialog.setVisible(true);
+- println( "Any messages for the tester will display here." );
+- }
+-
+- public static void createDialog( )
+- {
+- dialog = new TestDialog( new Frame(), "Instructions" );
+- String[] defInstr = { "Instructions will appear here. ", "" } ;
+- dialog.printInstructions( defInstr );
+- dialog.setVisible(true);
+- println( "Any messages for the tester will display here." );
+- }
+-
+-
+- public static void printInstructions( String[] instructions )
+- {
+- dialog.printInstructions( instructions );
+- }
+-
+-
+- public static void println( String messageIn )
+- {
+- dialog.displayMessage( messageIn );
+- }
+-
+-}// Sysout class
+-
+-/**
+- This is part of the standard test machinery. It provides a place for the
+- test instructions to be displayed, and a place for interactive messages
+- to the user to be displayed.
+- To have the test instructions displayed, see Sysout.
+- To have a message to the user be displayed, see Sysout.
+- Do not call anything in this dialog directly.
+- */
+-class TestDialog extends Dialog
+-{
+-
+- TextArea instructionsText;
+- TextArea messageText;
+- int maxStringLength = 80;
+-
+- //DO NOT call this directly, go through Sysout
+- public TestDialog( Frame frame, String name )
+- {
+- super( frame, name );
+- int scrollBoth = TextArea.SCROLLBARS_BOTH;
+- instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+- add( "North", instructionsText );
+-
+- messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+- add("Center", messageText);
+-
+- pack();
+-
+- show();
+- }// TestDialog()
+-
+- //DO NOT call this directly, go through Sysout
+- public void printInstructions( String[] instructions )
+- {
+- //Clear out any current instructions
+- instructionsText.setText( "" );
+-
+- //Go down array of instruction strings
More information about the distro-pkg-dev
mailing list