Mercurial > hg > release > icedtea7-2.6
changeset 1977:52ca492dae93
Bump to b68. Add some generated files ecj just decided to start complaining about.
2009-08-07 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Bump to b68, remove additional -source option.
* generated/java/nio/channels/AcceptPendingException.java,
* generated/java/nio/channels/IllegalChannelGroupException.java,
* generated/java/nio/channels/InterruptedByTimeoutException.java,
* generated/java/nio/channels/ReadPendingException.java,
* generated/java/nio/channels/ShutdownChannelGroupException.java,
* generated/java/nio/channels/WritePendingException.java,
* generated/sun/nio/fs/UnixConstants.java:
Add generated files.
* javac.in: Update to build 1.7 code.
* patches/ecj/icedtea.patch: Remove patch removing use of 1.6
source and target options.
* patches/icedtea-clean-crypto.patch: Regenerated.
* patches/xrender/icedtea-007.patch: Remove non-ASCII characters.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 07 Aug 2009 21:46:15 +0100 |
| parents | 209e9a326eb9 |
| children | fa477700aaf3 |
| files | ChangeLog Makefile.am generated/java/nio/channels/AcceptPendingException.java generated/java/nio/channels/IllegalChannelGroupException.java generated/java/nio/channels/InterruptedByTimeoutException.java generated/java/nio/channels/ReadPendingException.java generated/java/nio/channels/ShutdownChannelGroupException.java generated/java/nio/channels/WritePendingException.java generated/sun/nio/fs/UnixConstants.java javac.in patches/ecj/icedtea.patch patches/icedtea-clean-crypto.patch patches/xrender/icedtea-007.patch |
| diffstat | 13 files changed, 465 insertions(+), 102 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Aug 07 11:53:17 2009 +0200 +++ b/ChangeLog Fri Aug 07 21:46:15 2009 +0100 @@ -1,3 +1,21 @@ +2009-08-07 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + Bump to b68, remove additional -source option. + * generated/java/nio/channels/AcceptPendingException.java, + * generated/java/nio/channels/IllegalChannelGroupException.java, + * generated/java/nio/channels/InterruptedByTimeoutException.java, + * generated/java/nio/channels/ReadPendingException.java, + * generated/java/nio/channels/ShutdownChannelGroupException.java, + * generated/java/nio/channels/WritePendingException.java, + * generated/sun/nio/fs/UnixConstants.java: + Add generated files. + * javac.in: Update to build 1.7 code. + * patches/ecj/icedtea.patch: Remove patch removing use of 1.6 + source and target options. + * patches/icedtea-clean-crypto.patch: Regenerated. + * patches/xrender/icedtea-007.patch: Remove non-ASCII characters. + 2009-08-07 Matthias Klose <doko@ubuntu.com> * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Add configure options
--- a/Makefile.am Fri Aug 07 11:53:17 2009 +0200 +++ b/Makefile.am Fri Aug 07 21:46:15 2009 +0100 @@ -1,20 +1,20 @@ -OPENJDK_VERSION = b67 +OPENJDK_VERSION = b68 -OPENJDK_CHANGESET = f24111620a51 -CORBA_CHANGESET = 1cb0098b53b2 -JAXP_CHANGESET = 45fc86d2aa5c -JAXWS_CHANGESET = 73440eb34fb0 -JDK_CHANGESET = cd7d9265b4e6 -LANGTOOLS_CHANGESET = 14b1a8ede954 -HOTSPOT_CHANGESET = 87c6731ab8d1 +OPENJDK_CHANGESET = d8f0e9685212 +CORBA_CHANGESET = 4d8317ea0eec +JAXP_CHANGESET = 216517ab5325 +JAXWS_CHANGESET = 4425f7c4fb5b +JDK_CHANGESET = df6fceba2e80 +LANGTOOLS_CHANGESET = 95c1212b07e3 +HOTSPOT_CHANGESET = 91fcd98a5ae1 -OPENJDK_MD5SUM = f5cc1b21cf1a805528300bf931aa821e -CORBA_MD5SUM = 00fa00a58b465cad40cab9ac05058c24 -JAXP_MD5SUM = 61230cee4199f91ed5675bcf2acad63d -JAXWS_MD5SUM = fc9d2659fb875ece0e3a5e7894c1bbf8 -JDK_MD5SUM = 8e3fa808fcad7713635a21e127dd0f72 -LANGTOOLS_MD5SUM = a3b15bcf5b76b1639600250fc29c057b -HOTSPOT_MD5SUM = d0632498485808fdf8f97ef1f388722d +OPENJDK_MD5SUM = 8c3d681d0a90ec9adf00870f5e20d09f +CORBA_MD5SUM = c1c9db96634876b2c522dc387dec3864 +JAXP_MD5SUM = 9a821849b2b9bdf2f8dc32168809a063 +JAXWS_MD5SUM = 2d9fbeb543ee7bcd6621a3f131649db2 +JDK_MD5SUM = 418d860925e69cca57253e62508234b6 +LANGTOOLS_MD5SUM = e29f65271621d80aa8a894fe13325f23 +HOTSPOT_MD5SUM = 88cc373d7d04a2c9c60fd9343a28818c CACAO_VERSION = 0.99.4 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa @@ -3006,14 +3006,12 @@ if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \ - -source 1.5 \ -sourcepath \ 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \ -bootclasspath \'\' @$< ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \ -d lib/hotspot-tools \ - -source 1.5 \ -sourcepath \ 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \ -bootclasspath \'\' @$< ; \ @@ -3058,13 +3056,11 @@ if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \ - -source 1.5 \ -classpath $(abs_top_builddir)/lib/hotspot-tools \ -sourcepath '$(SOURCEPATH_DIRS)' \ -bootclasspath \'\' @$< ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \ - -source 1.5 \ -classpath $(abs_top_builddir)/lib/hotspot-tools \ -sourcepath '$(SOURCEPATH_DIRS)' \ -bootclasspath \'\' @$< ; \ @@ -3103,14 +3099,12 @@ if ! test -d $(ICEDTEA_BOOT_DIR) ; \ then \ $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \ - -source 1.5 \ -classpath $(abs_top_builddir)/lib/hotspot-tools \ -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \ -bootclasspath \'\' \ @extra-source-files.txt ; \ else \ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \ - -source 1.5 \ -classpath $(abs_top_builddir)/lib/hotspot-tools \ -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \ -bootclasspath \'\' \ @@ -3147,7 +3141,6 @@ mkdir -p $(abs_top_builddir)/netx.build $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \ -d $(abs_top_builddir)/netx.build \ - -source 1.5 \ -classpath $(abs_top_builddir)/lib/hotspot-tools \ -sourcepath $(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS): \ -bootclasspath \'\' \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/java/nio/channels/AcceptPendingException.java Fri Aug 07 21:46:15 2009 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright 2000-2007 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. + * + */ + +// -- This file was mechanically generated: Do not edit! -- // + +package java.nio.channels; + + +/** + * Unchecked exception thrown when an attempt is made to initiate an accept + * operation on a channel and a previous accept operation has not completed. + * + * @since 1.7 + */ + +public class AcceptPendingException + extends IllegalStateException +{ + + private static final long serialVersionUID = 2721339977965416421L; + + /** + * Constructs an instance of this class. + */ + public AcceptPendingException() { } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/java/nio/channels/IllegalChannelGroupException.java Fri Aug 07 21:46:15 2009 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright 2000-2007 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. + * + */ + +// -- This file was mechanically generated: Do not edit! -- // + +package java.nio.channels; + + +/** + * Unchecked exception thrown when an attempt is made to open a channel + * in a group that was not created by the same provider. + * + * @since 1.7 + */ + +public class IllegalChannelGroupException + extends IllegalArgumentException +{ + + private static final long serialVersionUID = -2495041211157744253L; + + /** + * Constructs an instance of this class. + */ + public IllegalChannelGroupException() { } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/java/nio/channels/InterruptedByTimeoutException.java Fri Aug 07 21:46:15 2009 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright 2000-2007 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. + * + */ + +// -- This file was mechanically generated: Do not edit! -- // + +package java.nio.channels; + + +/** + * Checked exception received by a thread when a timeout elapses before an + * asynchronous operation completes. + * + * @since 1.7 + */ + +public class InterruptedByTimeoutException + extends java.io.IOException +{ + + private static final long serialVersionUID = -4268008601014042947L; + + /** + * Constructs an instance of this class. + */ + public InterruptedByTimeoutException() { } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/java/nio/channels/ReadPendingException.java Fri Aug 07 21:46:15 2009 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright 2000-2007 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. + * + */ + +// -- This file was mechanically generated: Do not edit! -- // + +package java.nio.channels; + + +/** + * Unchecked exception thrown when an attempt is made to read from an + * asynchronous socket channel and a previous read has not completed. + * + * @since 1.7 + */ + +public class ReadPendingException + extends IllegalStateException +{ + + private static final long serialVersionUID = 1986315242191227217L; + + /** + * Constructs an instance of this class. + */ + public ReadPendingException() { } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/java/nio/channels/ShutdownChannelGroupException.java Fri Aug 07 21:46:15 2009 +0100 @@ -0,0 +1,52 @@ +/* + * Copyright 2000-2007 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. + * + */ + +// -- This file was mechanically generated: Do not edit! -- // + +package java.nio.channels; + + +/** + * Unchecked exception thrown when an attempt is made to construct a channel in + * a group that is shutdown or the completion handler for an I/O operation + * cannot be invoked because the channel group is shutdown. + * + * @since 1.7 + */ + +public class ShutdownChannelGroupException + extends IllegalStateException +{ + + private static final long serialVersionUID = -3903801676350154157L; + + /** + * Constructs an instance of this class. + */ + public ShutdownChannelGroupException() { } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/java/nio/channels/WritePendingException.java Fri Aug 07 21:46:15 2009 +0100 @@ -0,0 +1,51 @@ +/* + * Copyright 2000-2007 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. + * + */ + +// -- This file was mechanically generated: Do not edit! -- // + +package java.nio.channels; + + +/** + * Unchecked exception thrown when an attempt is made to write to an + * asynchronous socket channel and a previous write has not completed. + * + * @since 1.7 + */ + +public class WritePendingException + extends IllegalStateException +{ + + private static final long serialVersionUID = 7031871839266032276L; + + /** + * Constructs an instance of this class. + */ + public WritePendingException() { } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generated/sun/nio/fs/UnixConstants.java Fri Aug 07 21:46:15 2009 +0100 @@ -0,0 +1,79 @@ +/* + * Copyright 2008-2009 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. + * + */ +// AUTOMATICALLY GENERATED FILE - DO NOT EDIT +package sun.nio.fs; +class UnixConstants { + private UnixConstants() { } + static final int O_RDONLY = 0; + static final int O_WRONLY = 1; + static final int O_RDWR = 2; + static final int O_APPEND = 0x400; + static final int O_CREAT = 0x40; + static final int O_EXCL = 0x80; + static final int O_TRUNC = 0x200; + static final int O_SYNC = 0x1000; + static final int O_DSYNC = 0x1000; + static final int O_NOFOLLOW = 0x20000; + static final int S_IAMB = 0x1ff; + static final int S_IRUSR = 256; + static final int S_IWUSR = 128; + static final int S_IXUSR = 64; + static final int S_IRGRP = 32; + static final int S_IWGRP = 16; + static final int S_IXGRP = 8; + static final int S_IROTH = 4; + static final int S_IWOTH = 2; + static final int S_IXOTH = 1; + static final int S_IFMT = 0xf000; + static final int S_IFREG = 0x8000; + static final int S_IFDIR = 0x4000; + static final int S_IFLNK = 0xa000; + static final int S_IFCHR = 0x2000; + static final int S_IFBLK = 0x6000; + static final int S_IFIFO = 0x1000; + static final int R_OK = 4; + static final int W_OK = 2; + static final int X_OK = 1; + static final int F_OK = 0; + static final int ENOENT = 2; + static final int EACCES = 13; + static final int EEXIST = 17; + static final int ENOTDIR = 20; + static final int EINVAL = 22; + static final int EXDEV = 18; + static final int EISDIR = 21; + static final int ENOTEMPTY = 39; + static final int ENOSPC = 28; + static final int EAGAIN = 11; + static final int ENOSYS = 38; + static final int ELOOP = 40; + static final int EROFS = 30; + static final int ENODATA = 61; + static final int ERANGE = 34; + static final int AT_SYMLINK_NOFOLLOW = 0x100; + static final int AT_REMOVEDIR = 0x200; +}
--- a/javac.in Fri Aug 07 11:53:17 2009 +0200 +++ b/javac.in Fri Aug 07 21:46:15 2009 +0100 @@ -47,14 +47,14 @@ if ( -e "@abs_top_builddir@/native-ecj" ) { my @ecj_args = gen_ecj_opts( \@ARGV ); - exec '@abs_top_builddir@/native-ecj', '-1.5', $ECJ_WARNINGS, @bcoption, @ecj_args ; + exec '@abs_top_builddir@/native-ecj', '-1.7', $ECJ_WARNINGS, @bcoption, @ecj_args ; } elsif ( -e "@JAVAC@" ) { if ("@USING_ECJ@" eq "yes") { my @ecj_args = gen_ecj_opts( \@ARGV ); - exec '@JAVAC@', '-1.5', $ECJ_WARNINGS, @bcoption, @ecj_args ; + exec '@JAVAC@', '-1.7', $ECJ_WARNINGS, @bcoption, @ecj_args ; } else { @@ -67,6 +67,6 @@ my @CLASSPATH = ('@ECJ_JAR@'); push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; $ENV{"CLASSPATH"} = join ':', @CLASSPATH; - exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', '-1.5', + exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', '-1.7', $ECJ_WARNINGS, @bcoption, @ecj_args; }
--- a/patches/ecj/icedtea.patch Fri Aug 07 11:53:17 2009 +0200 +++ b/patches/ecj/icedtea.patch Fri Aug 07 21:46:15 2009 +0100 @@ -761,20 +761,6 @@ /** * Evaluates to true if the given capability bitmask is present for the -diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties ---- openjdk-ecj.orig/langtools/make/build.properties 2009-06-30 14:25:18.000000000 +0100 -+++ openjdk-ecj/langtools/make/build.properties 2009-07-14 17:47:13.000000000 +0100 -@@ -32,8 +32,8 @@ - # boot.java.home = /opt/jdk/1.5.0 - boot.java = ${boot.java.home}/bin/java - boot.javac = ${boot.java.home}/bin/javac --boot.javac.source = 6 --boot.javac.target = 6 -+boot.javac.source = 5 -+boot.javac.target = 5 - - # This is the JDK used to run the product version of the tools, - # for example, for testing. If you're building a complete JDK, specify that. diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml --- openjdk-ecj.orig/langtools/make/build.xml 2009-06-30 14:25:18.000000000 +0100 +++ openjdk-ecj/langtools/make/build.xml 2009-07-14 17:47:13.000000000 +0100
--- a/patches/icedtea-clean-crypto.patch Fri Aug 07 11:53:17 2009 +0200 +++ b/patches/icedtea-clean-crypto.patch Fri Aug 07 21:46:15 2009 +0100 @@ -1,7 +1,7 @@ -diff -r 4aebfff4f8a2 jdk/make/javax/crypto/Makefile ---- openjdk.orig/jdk/make/javax/crypto/Makefile Mon Sep 15 11:38:34 2008 +0200 -+++ openjdk/jdk/make/javax/crypto/Makefile Thu Sep 25 17:45:37 2008 +0200 -@@ -155,7 +155,8 @@ +diff -Nru openjdk.orig/jdk/make/javax/crypto/Makefile openjdk/jdk/make/javax/crypto/Makefile +--- openjdk.orig/jdk/make/javax/crypto/Makefile 2009-08-07 02:44:13.000000000 +0100 ++++ openjdk/jdk/make/javax/crypto/Makefile 2009-08-07 11:26:43.000000000 +0100 +@@ -156,7 +156,8 @@ # ifdef OPENJDK @@ -11,9 +11,9 @@ else # OPENJDK ifeq ($(strip $(FILES_java)),) all: -diff -r 4aebfff4f8a2 jdk/src/share/classes/javax/crypto/Cipher.java ---- openjdk.orig/jdk/src/share/classes/javax/crypto/Cipher.java Mon Sep 15 11:38:34 2008 +0200 -+++ openjdk/jdk/src/share/classes/javax/crypto/Cipher.java Thu Sep 25 17:45:37 2008 +0200 +diff -Nru openjdk.orig/jdk/src/share/classes/javax/crypto/Cipher.java openjdk/jdk/src/share/classes/javax/crypto/Cipher.java +--- openjdk.orig/jdk/src/share/classes/javax/crypto/Cipher.java 2009-08-07 02:57:08.000000000 +0100 ++++ openjdk/jdk/src/share/classes/javax/crypto/Cipher.java 2009-08-07 11:26:43.000000000 +0100 @@ -144,12 +144,6 @@ // The transformation private String transformation; @@ -62,7 +62,7 @@ Transform tr = getTransform(s, transforms); if (tr == null) { // should never happen -@@ -570,26 +553,12 @@ +@@ -570,7 +553,6 @@ } Exception failure = null; List transforms = getTransforms(transformation); @@ -70,10 +70,10 @@ String paddingError = null; for (Iterator t = transforms.iterator(); t.hasNext();) { Transform tr = (Transform)t.next(); - Service s = provider.getService("Cipher", tr.transform); +@@ -578,19 +560,6 @@ if (s == null) { continue; -- } + } - if (providerChecked == false) { - // for compatibility, first do the lookup and then verify - // the provider. this makes the difference between a NSAE @@ -86,9 +86,10 @@ - throw new SecurityException(msg, ve); - } - providerChecked = true; - } +- } if (tr.supportsMode(s) == S_NO) { continue; + } @@ -603,7 +572,6 @@ tr.setModePadding(spi); Cipher cipher = new Cipher(spi, transformation); @@ -97,12 +98,10 @@ return cipher; } catch (Exception e) { failure = e; -@@ -620,22 +588,6 @@ - } - throw new NoSuchAlgorithmException +@@ -622,22 +590,6 @@ ("No such algorithm: " + transformation, failure); -- } -- + } + - // If the requested crypto service is export-controlled, - // determine the maximum allowable keysize. - private void initCryptoPermission() throws NoSuchAlgorithmException { @@ -117,9 +116,11 @@ - if (exmechName != null) { - exmech = ExemptionMechanism.getInstance(exmechName); - } - } +- } +- + // max number of debug warnings to print from chooseFirstProvider() + private static int warnCount = 10; - // max number of debug warnings to print from chooseFirstProvider() @@ -679,9 +631,6 @@ s = (Service)serviceIterator.next(); thisSpi = null; @@ -334,12 +335,12 @@ } /** -diff -r 4aebfff4f8a2 jdk/src/share/classes/javax/crypto/JarVerifier.java ---- openjdk/jdk/src/share/classes/javax/crypto/JarVerifier.java Mon Sep 15 11:38:34 2008 +0200 -+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 -@@ -1,170 +0,0 @@ +diff -Nru openjdk.orig/jdk/src/share/classes/javax/crypto/JarVerifier.java openjdk/jdk/src/share/classes/javax/crypto/JarVerifier.java +--- openjdk.orig/jdk/src/share/classes/javax/crypto/JarVerifier.java 2009-08-07 02:57:08.000000000 +0100 ++++ openjdk/jdk/src/share/classes/javax/crypto/JarVerifier.java 1970-01-01 01:00:00.000000000 +0100 +@@ -1,157 +0,0 @@ -/* -- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright 2007-2009 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 @@ -368,9 +369,7 @@ -import java.io.*; -import java.net.*; -import java.security.*; --import java.util.*; -import java.util.jar.*; --import javax.crypto.CryptoPolicyParser.ParsingException; - -/** - * This class verifies JAR files (and any supporting JAR files), and @@ -475,17 +474,6 @@ - } - - /** -- * Verify that the provided JarEntry was indeed signed by the -- * framework signing certificate. -- * -- * @param je the URL of the jar entry to be checked. -- * @throws Exception if the jar entry was not signed by -- * the proper certificate -- */ -- static void verifyFrameworkSigned(URL je) throws Exception { -- } -- -- /** - * Verify that the provided certs include the - * framework signing certificate. - * @@ -508,28 +496,25 @@ - return appPerms; - } -} -diff -r 4aebfff4f8a2 jdk/src/share/classes/javax/crypto/JceSecurity.java ---- openjdk.orig/jdk/src/share/classes/javax/crypto/JceSecurity.java Mon Sep 15 11:38:34 2008 +0200 -+++ openjdk/jdk/src/share/classes/javax/crypto/JceSecurity.java Thu Sep 25 17:45:37 2008 +0200 -@@ -25,11 +25,7 @@ +diff -Nru openjdk.orig/jdk/src/share/classes/javax/crypto/JceSecurity.java openjdk/jdk/src/share/classes/javax/crypto/JceSecurity.java +--- openjdk.orig/jdk/src/share/classes/javax/crypto/JceSecurity.java 2009-08-07 02:57:08.000000000 +0100 ++++ openjdk/jdk/src/share/classes/javax/crypto/JceSecurity.java 2009-08-07 11:31:24.000000000 +0100 +@@ -27,8 +27,6 @@ - package javax.crypto; - --import java.lang.ref.*; import java.util.*; --import java.util.jar.*; + import java.util.jar.*; -import java.io.*; -import java.net.URL; import java.security.*; import java.security.Provider.Service; -@@ -48,23 +44,8 @@ +@@ -47,72 +45,25 @@ final class JceSecurity { + // Used in KeyGenerator, Cipher and KeyAgreement. static final SecureRandom RANDOM = new SecureRandom(); -- + - // The defaultPolicy and exemptPolicy will be set up - // in the static initializer. - private static CryptoPermissions defaultPolicy = null; @@ -545,10 +530,10 @@ - - // Set the default value. May be changed in the static initializer. - private static boolean isRestricted = true; - +- /* * Don't let anyone instantiate this. -@@ -72,48 +53,16 @@ + */ private JceSecurity() { } @@ -597,7 +582,7 @@ return GetInstance.getInstance(s, clazz); } -@@ -123,10 +72,6 @@ +@@ -122,10 +73,6 @@ NoSuchAlgorithmException failure = null; for (Iterator t = services.iterator(); t.hasNext(); ) { Service s = (Service)t.next(); @@ -608,7 +593,7 @@ try { Instance instance = GetInstance.getInstance(s, clazz); return instance; -@@ -138,203 +83,10 @@ +@@ -137,198 +84,10 @@ + " not available", failure); } @@ -733,11 +718,6 @@ - ("Cannot locate policy or framework files!"); - } - -- // Enforce the signer restraint, i.e. signer of JCE framework -- // jar should also be the signer of the two jurisdiction policy -- // jar files. -- JarVerifier.verifyFrameworkSigned(jceCipherURL); -- - // Read jurisdiction policies. - CryptoPermissions defaultExport = new CryptoPermissions(); - CryptoPermissions exemptExport = new CryptoPermissions(); @@ -816,9 +796,9 @@ + return true; } } -diff -r 4aebfff4f8a2 jdk/src/share/classes/javax/crypto/JceSecurityManager.java ---- openjdk/jdk/src/share/classes/javax/crypto/JceSecurityManager.java Mon Sep 15 11:38:34 2008 +0200 -+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 +diff -Nru openjdk.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java openjdk/jdk/src/share/classes/javax/crypto/JceSecurityManager.java +--- openjdk.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2009-08-07 02:57:08.000000000 +0100 ++++ openjdk/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,252 +0,0 @@ -/* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. @@ -1072,9 +1052,9 @@ - return true; - } -} -diff -r 4aebfff4f8a2 jdk/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java ---- openjdk.orig/jdk/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java Mon Sep 15 11:38:34 2008 +0200 -+++ openjdk/jdk/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java Thu Sep 25 17:45:37 2008 +0200 +diff -Nru openjdk.orig/jdk/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java openjdk/jdk/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java +--- openjdk.orig/jdk/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java 2009-08-07 02:57:11.000000000 +0100 ++++ openjdk/jdk/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java 2009-08-07 11:26:43.000000000 +0100 @@ -44,18 +44,9 @@ } }
--- a/patches/xrender/icedtea-007.patch Fri Aug 07 11:53:17 2009 +0200 +++ b/patches/xrender/icedtea-007.patch Fri Aug 07 21:46:15 2009 +0100 @@ -139,7 +139,7 @@ + + /** + * Possible optimizations: -+ * - Nearest interpolation -> ExtraAlpha mit 1x1 maske durchführen ++ * - Nearest interpolation -> ExtraAlpha mit 1x1 maske durchfuehren + * - Mehere Maskengroessen anlegen, und skalieren + * - Ueberpruefen ob aktueller Maskeninhalt mit skalierung passen wuerde, bzw. nur so viel aendern bis passt (wenn bereich < maske) + * - Aendering entweder mit 2 filLRects, oder nur 1 fillrect je nach groesse @@ -249,7 +249,7 @@ + * integer only + */ + && trx.getTranslateY() == (int) trx.getTranslateY() && (trx.getShearX() == 0 && trx.getShearY() == 0 // Only -+ // "90°" ++ // "90 degrees" + // rotation + || trx.getShearX() == -trx.getShearY())) && ((AlphaComposite) comp).getAlpha() == 1.0f; // No + // ExtraAlpha!=1