/hg/icedtea: Bump to b143.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 24 11:09:41 PDT 2011
changeset 7ca2cb0df928 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7ca2cb0df928
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 24 19:07:40 2011 +0100
Bump to b143.
2011-06-24 Andrew John Hughes <ahughes at redhat.com>
* patches/rmi_amd64.patch: Removed, upsteam
(OpenJDK).
* patches/testenv.patch: Removed, upstream (IcedTea forest).
* Makefile.am: (OPENJDK_VERSION): Bumped to b143.
(CORBA_CHANGESET): Updated. (HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM):
Likewise. (JAXWS_DROP_ZIP): Likewise.
(JAXWS_DROP_SHA256SUM): Likewise. (JAXP_DROP_ZIP): Likewise.
(JAXP_DROP_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Drop
rmi_amd64 and testenv patch.
* generated/sun/nio/ch/SocketOptionRegistry.java: Use version
from latest build.
* patches/boot/ecj-autoboxing.patch,
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-multicatch.patch,
* patches/boot/ecj-trywithresources.patch: Extended with new
cases introduced since b136.
* patches/boot/jar.patch: Recreated against b143.
* patches/boot/revert-6941137.patch: Updated for b143.
* patches/boot/symbols.patch: Likewise.
* patches/libraries.patch: Likewise.
* patches/linker-libs-order.patch: Likewise.
diffstat:
ChangeLog | 42 +
Makefile.am | 40 +-
generated/sun/nio/ch/SocketOptionRegistry.java | 51 +-
patches/boot/ecj-autoboxing.patch | 23 +
patches/boot/ecj-diamond.patch | 1085 ++++++++++++++++-------
patches/boot/ecj-multicatch.patch | 41 +
patches/boot/ecj-trywithresources.patch | 69 +
patches/boot/jar.patch | 29 +-
patches/boot/revert-6941137.patch | 6 +-
patches/boot/symbols.patch | 6 +-
patches/libraries.patch | 44 +-
patches/linker-libs-order.patch | 16 +-
patches/rmi_amd64.patch | 14 -
patches/testenv.patch | 45 -
14 files changed, 1025 insertions(+), 486 deletions(-)
diffs (truncated from 3922 to 500 lines):
diff -r 53d922289489 -r 7ca2cb0df928 ChangeLog
--- a/ChangeLog Mon Jun 06 15:30:31 2011 +0200
+++ b/ChangeLog Fri Jun 24 19:07:40 2011 +0100
@@ -1,3 +1,45 @@
+2011-06-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/rmi_amd64.patch:
+ Removed, upsteam (OpenJDK).
+ * patches/testenv.patch:
+ Removed, upstream (IcedTea forest).
+ * Makefile.am:
+ (OPENJDK_VERSION): Bumped to b143.
+ (CORBA_CHANGESET): Updated.
+ (HOTSPOT_CHANGESET): Likewise.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (JAXWS_DROP_ZIP): Likewise.
+ (JAXWS_DROP_SHA256SUM): Likewise.
+ (JAXP_DROP_ZIP): Likewise.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Drop rmi_amd64 and testenv patch.
+ * generated/sun/nio/ch/SocketOptionRegistry.java:
+ Use version from latest build.
+ * patches/boot/ecj-autoboxing.patch,
+ * patches/boot/ecj-diamond.patch,
+ * patches/boot/ecj-multicatch.patch,
+ * patches/boot/ecj-trywithresources.patch:
+ Extended with new cases introduced since b136.
+ * patches/boot/jar.patch:
+ Recreated against b143.
+ * patches/boot/revert-6941137.patch:
+ Updated for b143.
+ * patches/boot/symbols.patch: Likewise.
+ * patches/libraries.patch: Likewise.
+ * patches/linker-libs-order.patch: Likewise.
+
2011-06-06 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am:
diff -r 53d922289489 -r 7ca2cb0df928 Makefile.am
--- a/Makefile.am Mon Jun 06 15:30:31 2011 +0200
+++ b/Makefile.am Fri Jun 24 19:07:40 2011 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b136
+OPENJDK_VERSION = b143
-CORBA_CHANGESET = b62418551e20
-HOTSPOT_CHANGESET = 591c7dc0b2ee
-JAXP_CHANGESET = 1c2f25bf36b1
-JAXWS_CHANGESET = 339c2d381d80
-JDK_CHANGESET = 1571aa7abe47
-LANGTOOLS_CHANGESET = 8e26c4aee63c
-OPENJDK_CHANGESET = d4aea1a51d62
+CORBA_CHANGESET = 279c876d1001
+HOTSPOT_CHANGESET = b8227c320dec
+JAXP_CHANGESET = d8cdc48a42bd
+JAXWS_CHANGESET = e514ae6ec042
+JDK_CHANGESET = d28f54a421b1
+LANGTOOLS_CHANGESET = 1316e51b3995
+OPENJDK_CHANGESET = 2108c94c0d3d
-CORBA_SHA256SUM = 734085b7c91240bce89f0fc28f29b1bbe9b41da706ad0230fe341b5effbd2554
-HOTSPOT_SHA256SUM = bbc9cdefbb0811f9b7b7006c69cff64bbbe067a6762c49000fdb2ae29e6e610e
-JAXP_SHA256SUM = b980bd552f421a2560257f67358ea2adc68556accd719cac0c7980259e13b460
-JAXWS_SHA256SUM = 32507d9499987b92e88a036dd6e3784acf4ebec74902891c87a0db05ffe375f5
-JDK_SHA256SUM = b2a7d77a0807f79dd1569160549cc8038696fbce506f916fe9ea6f02eb514f0c
-LANGTOOLS_SHA256SUM = 8bb857b59ea2ffd7421bc91bbeb9c99831827a2119a3479c119a6a20ceba4b07
-OPENJDK_SHA256SUM = 74916d6627ea7f058981140a018e93b33393be961e4c670a96e6cf9ddcf0923d
+CORBA_SHA256SUM = 8d0b3dcbc5e160b0909e66a7b2aaa5f0783892d7ce2df4b7c3a00bb4eee7e882
+HOTSPOT_SHA256SUM = 506d69b628e1a15375bd81775be906fce6990e10a9cc2b6904a4485fa8dce518
+JAXP_SHA256SUM = 9244b44984c255e54e37a4556c4985f5356bd611de536f2bae58f9aa1d82bb7d
+JAXWS_SHA256SUM = 44022c1546f6589f9bac6aa8079642aadf0c43e61afc074b841d3f6dd6e30609
+JDK_SHA256SUM = ba69d9e4cdd1a92bda3aaaf0fcabafa3663f01e19ee3575fd3d81c6c2027e653
+LANGTOOLS_SHA256SUM = 022e167d31a948cebe9ea163b4e3dafdc6d23acba16b40170b00c4b24f4a14d0
+OPENJDK_SHA256SUM = e2ce820b0da226ef334252469ba9e7a6186b35023f3c68751befaaffc6f86ee0
CACAO_VERSION = d6264eb66506
CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c
@@ -31,14 +31,14 @@
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXWS_DROP_ZIP = jdk7-jaxws2_2_2-2010_12_14.zip
-JAXWS_DROP_SHA256SUM = ef3115dde8ed9a7129e65aab8b1499e11621e343559e6e5a8df9c4542848fb9b
+JAXWS_DROP_ZIP = jdk7-jaxws2_2_4-b02-2011_05_09.zip
+JAXWS_DROP_SHA256SUM = 2fd874aae97a4206c8f4cd93ee419c09f95c3f684349182b66b6ee9010c72f84
JAF_DROP_URL = http://icedtea.classpath.org/download/drops
JAF_DROP_ZIP = jdk7-jaf-2010_08_19.zip
JAF_DROP_SHA256SUM = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp-1_4_5-dev1.zip
-JAXP_DROP_SHA256SUM = 050cba755c2632dc5ec5ffcdb17f2f4d36a018306c357fdd5c8996d877954de5
+JAXP_DROP_ZIP = jaxp-1_4_5.zip
+JAXP_DROP_SHA256SUM = 8145a789a61d21d0ff9902e4dc1c7ba492bb407ee614187dc933321922249ddb
ICEDTEA_PREFIX = icedtea7-forest
ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
@@ -247,7 +247,6 @@
ICEDTEA_PATCHES = \
patches/text-relocations.patch \
- patches/rmi_amd64.patch \
patches/demos.patch \
patches/headers.patch \
patches/gcc-suffix.patch \
@@ -272,7 +271,6 @@
patches/lc_ctype.patch \
patches/tests-jdk.patch \
patches/linker-libs-order.patch \
- patches/testenv.patch \
patches/samejvm-safe.patch \
patches/pr261.patch \
patches/parisc-opt.patch \
diff -r 53d922289489 -r 7ca2cb0df928 generated/sun/nio/ch/SocketOptionRegistry.java
--- a/generated/sun/nio/ch/SocketOptionRegistry.java Mon Jun 06 15:30:31 2011 +0200
+++ b/generated/sun/nio/ch/SocketOptionRegistry.java Fri Jun 24 19:07:40 2011 +0100
@@ -1,17 +1,13 @@
/*
-<<<<<<< local
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
-=======
- * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved.
->>>>>>> other
+ * Copyright (c) 2008, 2009, 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. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * 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
@@ -23,28 +19,25 @@
* 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.
+ * 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.
*
*/
// AUTOMATICALLY GENERATED FILE - DO NOT EDIT
package sun.nio.ch;
-
import java.net.SocketOption;
-import java.net.StandardSocketOption;
+import java.net.StandardSocketOptions;
import java.net.ProtocolFamily;
import java.net.StandardProtocolFamily;
-
import java.util.Map;
import java.util.HashMap;
-
class SocketOptionRegistry {
private SocketOptionRegistry() { }
private static class RegistryKey {
private final SocketOption<?> name;
private final ProtocolFamily family;
- RegistryKey(SocketOption<?> name, ProtocolFamily family) {
+ RegistryKey(SocketOption<?> name, ProtocolFamily family) {
this.name = name;
this.family = family;
}
@@ -65,20 +58,20 @@
private static Map<RegistryKey,OptionKey> options() {
Map<RegistryKey,OptionKey> map =
new HashMap<RegistryKey,OptionKey>();
- map.put(new RegistryKey(StandardSocketOption.SO_BROADCAST, Net.UNSPEC), new OptionKey(1, 6));
- map.put(new RegistryKey(StandardSocketOption.SO_KEEPALIVE, Net.UNSPEC), new OptionKey(1, 9));
- map.put(new RegistryKey(StandardSocketOption.SO_LINGER, Net.UNSPEC), new OptionKey(1, 13));
- map.put(new RegistryKey(StandardSocketOption.SO_SNDBUF, Net.UNSPEC), new OptionKey(1, 7));
- map.put(new RegistryKey(StandardSocketOption.SO_RCVBUF, Net.UNSPEC), new OptionKey(1, 8));
- map.put(new RegistryKey(StandardSocketOption.SO_REUSEADDR, Net.UNSPEC), new OptionKey(1, 2));
- map.put(new RegistryKey(StandardSocketOption.TCP_NODELAY, Net.UNSPEC), new OptionKey(6, 1));
- map.put(new RegistryKey(StandardSocketOption.IP_TOS, StandardProtocolFamily.INET), new OptionKey(0, 1));
- map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_IF, StandardProtocolFamily.INET), new OptionKey(0, 32));
- map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_TTL, StandardProtocolFamily.INET), new OptionKey(0, 33));
- map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_LOOP, StandardProtocolFamily.INET), new OptionKey(0, 34));
- map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_IF, StandardProtocolFamily.INET6), new OptionKey(41, 17));
- map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_TTL, StandardProtocolFamily.INET6), new OptionKey(41, 18));
- map.put(new RegistryKey(StandardSocketOption.IP_MULTICAST_LOOP, StandardProtocolFamily.INET6), new OptionKey(41, 19));
+ map.put(new RegistryKey(StandardSocketOptions.SO_BROADCAST, Net.UNSPEC), new OptionKey(1, 6));
+ map.put(new RegistryKey(StandardSocketOptions.SO_KEEPALIVE, Net.UNSPEC), new OptionKey(1, 9));
+ map.put(new RegistryKey(StandardSocketOptions.SO_LINGER, Net.UNSPEC), new OptionKey(1, 13));
+ map.put(new RegistryKey(StandardSocketOptions.SO_SNDBUF, Net.UNSPEC), new OptionKey(1, 7));
+ map.put(new RegistryKey(StandardSocketOptions.SO_RCVBUF, Net.UNSPEC), new OptionKey(1, 8));
+ map.put(new RegistryKey(StandardSocketOptions.SO_REUSEADDR, Net.UNSPEC), new OptionKey(1, 2));
+ map.put(new RegistryKey(StandardSocketOptions.TCP_NODELAY, Net.UNSPEC), new OptionKey(6, 1));
+ map.put(new RegistryKey(StandardSocketOptions.IP_TOS, StandardProtocolFamily.INET), new OptionKey(0, 1));
+ map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_IF, StandardProtocolFamily.INET), new OptionKey(0, 32));
+ map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_TTL, StandardProtocolFamily.INET), new OptionKey(0, 33));
+ map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_LOOP, StandardProtocolFamily.INET), new OptionKey(0, 34));
+ map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_IF, StandardProtocolFamily.INET6), new OptionKey(41, 17));
+ map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_TTL, StandardProtocolFamily.INET6), new OptionKey(41, 18));
+ map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_LOOP, StandardProtocolFamily.INET6), new OptionKey(41, 19));
map.put(new RegistryKey(ExtendedSocketOption.SO_OOBINLINE, Net.UNSPEC), new OptionKey(1, 10));
return map;
}
diff -r 53d922289489 -r 7ca2cb0df928 patches/boot/ecj-autoboxing.patch
--- a/patches/boot/ecj-autoboxing.patch Mon Jun 06 15:30:31 2011 +0200
+++ b/patches/boot/ecj-autoboxing.patch Fri Jun 24 19:07:40 2011 +0100
@@ -261,3 +261,27 @@
static private final String CLASS_PREFIX; // "java.lang.invoke.ToGeneric$"
static {
+diff -r d28f54a421b1 src/share/classes/sun/invoke/util/ValueConversions.java
+--- openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Mon Jun 13 15:58:42 2011 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Thu Jun 23 17:29:41 2011 +0100
+@@ -209,9 +209,9 @@
+ if (x instanceof Number) {
+ res = (Number) x;
+ } else if (x instanceof Boolean) {
+- res = ((boolean)x ? 1 : 0);
++ res = ((Boolean)x ? 1 : 0);
+ } else if (x instanceof Character) {
+- res = (int)(char)x;
++ res = (int)(Character)x;
+ } else {
+ // this will fail with the required ClassCastException:
+ res = (Number) x;
+@@ -371,7 +371,7 @@
+
+ static int unboxRawInteger(Object x) {
+ if (x instanceof Integer)
+- return (int) x;
++ return (Integer) x;
+ else
+ return (int) unboxLong(x, false);
+ }
diff -r 53d922289489 -r 7ca2cb0df928 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Mon Jun 06 15:30:31 2011 +0200
+++ b/patches/boot/ecj-diamond.patch Fri Jun 24 19:07:40 2011 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-28 17:28:50.894745825 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-06-14 02:06:39.313002689 +0100
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -72,8 +72,8 @@
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-28 17:10:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-28 17:28:50.902745957 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-06-14 01:54:53.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-06-14 02:06:39.329002971 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -136,8 +136,8 @@
return true;
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-04-28 17:10:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-04-28 17:28:50.902745957 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-06-14 01:54:52.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-06-14 02:06:39.329002971 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -149,7 +149,7 @@
new InnerClass(readClassRef(),
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-04-28 17:28:50.902745957 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-06-14 02:06:39.329002971 +0100
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -187,7 +187,7 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-04-28 17:28:50.902745957 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-06-14 02:06:39.329002971 +0100
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -199,7 +199,7 @@
if (x1 == null) codeMap.put(x0, x1 = x0);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-04-28 17:28:50.902745957 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-06-14 02:06:39.329002971 +0100
@@ -919,7 +919,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -228,8 +228,8 @@
Entry e = work.previous();
work.remove(); // pop stack
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-04-28 17:10:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-06-14 01:54:53.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-06-14 02:06:39.329002971 +0100
@@ -59,7 +59,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -257,7 +257,7 @@
try {
for (;;) {
String state = parseCommandOptions(av, optionMap, avProps);
-@@ -515,7 +515,7 @@
+@@ -530,7 +530,7 @@
String resultString = null;
// Convert options string into optLines dictionary.
@@ -268,7 +268,7 @@
String[] words = optline.split("\\p{Space}+");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-04-28 17:28:50.906746023 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-06-14 02:06:39.329002971 +0100
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -279,8 +279,8 @@
for (int i = 0 ; i < capacity ; i++) {
flist.add(null);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-04-28 17:10:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-06-14 01:54:52.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-06-14 02:06:39.333003042 +0100
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -436,8 +436,8 @@
// Add to the end of ths list:
if (!fileSet.contains(cls.file))
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-04-28 17:10:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-06-14 01:54:53.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-06-14 02:06:39.333003042 +0100
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -551,8 +551,8 @@
ClassEntry thisClass = curClass.thisClass;
ClassEntry superClass = curClass.superClass;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-04-28 17:10:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-06-14 01:54:53.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-06-14 02:06:39.333003042 +0100
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -609,7 +609,7 @@
if (!cls.hasInnerClasses()) continue;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2011-04-28 17:28:50.906746023 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2011-06-14 02:06:39.333003042 +0100
@@ -183,8 +183,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -641,7 +641,7 @@
InFile inFile = new InFile(jf, je);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2011-04-14 01:29:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2011-04-28 17:28:50.906746023 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2011-06-14 02:06:39.333003042 +0100
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -652,8 +652,8 @@
maxForDebug += fillp;
int min = Integer.MIN_VALUE; // farthest from the center
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-04-28 17:10:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-06-14 01:54:53.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-06-14 02:06:39.333003042 +0100
@@ -48,8 +48,8 @@
*/
@@ -685,7 +685,7 @@
return res;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2011-04-14 01:29:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2011-04-28 17:28:50.906746023 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2011-06-14 02:06:39.333003042 +0100
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -706,8 +706,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-04-28 17:10:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-06-14 01:54:53.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-06-14 02:06:39.333003042 +0100
@@ -233,7 +233,7 @@
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
@@ -718,8 +718,8 @@
String name = file.nameString;
JarEntry je = new JarEntry(Utils.getJarEntryName(name));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-04-28 17:10:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-06-14 01:54:53.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-06-14 02:06:39.333003042 +0100
@@ -132,7 +132,7 @@
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
@@ -731,7 +731,7 @@
static TLGlobals getTLGlobals() {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2011-04-14 01:29:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2011-04-28 17:28:50.906746023 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2011-06-14 02:06:39.333003042 +0100
@@ -135,7 +135,7 @@
throw new ConfigurationException("DNS pseudo-URL required");
}
@@ -742,8 +742,8 @@
for (int i = 0; i < urls.length; i++) {
String server = urls[i].getHost();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2011-04-14 01:29:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2011-06-11 00:38:08.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2011-06-14 02:06:39.333003042 +0100
@@ -99,10 +99,10 @@
throws UnsupportedCallbackException
{
@@ -758,8 +758,8 @@
ConfirmationInfo confirmation = new ConfirmationInfo();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2011-04-14 01:29:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2011-06-11 00:38:08.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2011-06-14 02:06:39.333003042 +0100
@@ -152,7 +152,7 @@
// new configuration
@@ -788,8 +788,8 @@
String value;
while (peek(";") == false) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2011-04-14 01:29:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2011-06-11 00:38:08.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2011-06-14 02:06:39.333003042 +0100
@@ -184,7 +184,7 @@
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
@@ -800,8 +800,8 @@
// initial state
private Subject subject;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2011-04-14 01:29:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2011-06-11 00:38:08.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2011-06-14 02:06:39.333003042 +0100
@@ -658,7 +658,7 @@
throw new FailedLoginException(
"Unable to find X.509 certificate chain in keystore");
@@ -812,8 +812,8 @@
certList.add(fromKeyStore[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2011-04-14 01:29:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2011-04-28 17:28:50.906746023 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2011-06-11 00:38:08.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2011-06-14 02:06:39.333003042 +0100
@@ -76,7 +76,7 @@
private SolarisNumericUserPrincipal UIDPrincipal;
private SolarisNumericGroupPrincipal GIDPrincipal;
@@ -824,8 +824,8 @@
/**
* Initialize this <code>LoginModule</code>.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2011-04-14 01:29:59.000000000 +0100
More information about the distro-pkg-dev
mailing list