/hg/icedtea7: Update to u20 b17.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Apr 4 14:53:11 PDT 2013
changeset 397dd0f8e62a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=397dd0f8e62a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Apr 04 22:52:56 2013 +0100
Update to u20 b17.
2013-04-04 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/zero_libffi.patch:
Removed; upstreamed to IcedTea.
* Makefile.am:
(OPENJDK_VERSION): Bump to b17.
(JDK_UPDATE_VERSION): Bump to 20.
(CORBA_CHANGESET): Update to IcedTea7 forest head.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Set empty again.
* hotspot.map: Update to IcedTea7 forest head.
* patches/boot/ecj-diamond.patch:
Regenerate, add new cases in JarFileFactory.java,
java.util.logging.Level, java.util.logging.LogManager
and JdpPacketReader.
* patches/boot/ecj-multicatch.patch:
Regenerate, add new case in java.lang.reflect.Proxy.
* patches/boot/ecj-stringswitch.patch,
* patches/boot/ecj-trywithresources.patch:
Regenerated.
* patches/boot/xsltproc.patch:
Undo removal of XSLT setting as not needed (command
line overrides anyway). Patch new trace.make as
well.
* patches/systemtap_gc.patch: Regenerated.
diffstat:
ChangeLog | 36 +
Makefile.am | 30 +-
hotspot.map | 3 +-
patches/boot/ecj-diamond.patch | 2150 +++++++++++++++---------------
patches/boot/ecj-multicatch.patch | 404 ++---
patches/boot/ecj-stringswitch.patch | 55 +-
patches/boot/ecj-trywithresources.patch | 563 +++----
patches/boot/xsltproc.patch | 21 +-
patches/systemtap_gc.patch | 106 +-
patches/zero_libffi.patch | 37 -
10 files changed, 1719 insertions(+), 1686 deletions(-)
diffs (truncated from 5982 to 500 lines):
diff -r 9b9b5df83038 -r 397dd0f8e62a ChangeLog
--- a/ChangeLog Thu Mar 28 00:18:00 2013 +0000
+++ b/ChangeLog Thu Apr 04 22:52:56 2013 +0100
@@ -1,3 +1,39 @@
+2013-04-04 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/zero_libffi.patch:
+ Removed; upstreamed to IcedTea.
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to b17.
+ (JDK_UPDATE_VERSION): Bump to 20.
+ (CORBA_CHANGESET): Update to IcedTea7 forest head.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Set empty again.
+ * hotspot.map: Update to IcedTea7 forest head.
+ * patches/boot/ecj-diamond.patch:
+ Regenerate, add new cases in JarFileFactory.java,
+ java.util.logging.Level, java.util.logging.LogManager
+ and JdpPacketReader.
+ * patches/boot/ecj-multicatch.patch:
+ Regenerate, add new case in java.lang.reflect.Proxy.
+ * patches/boot/ecj-stringswitch.patch,
+ * patches/boot/ecj-trywithresources.patch:
+ Regenerated.
+ * patches/boot/xsltproc.patch:
+ Undo removal of XSLT setting as not needed (command
+ line overrides anyway). Patch new trace.make as
+ well.
+ * patches/systemtap_gc.patch: Regenerated.
+
2013-03-27 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r 9b9b5df83038 -r 397dd0f8e62a Makefile.am
--- a/Makefile.am Thu Mar 28 00:18:00 2013 +0000
+++ b/Makefile.am Thu Apr 04 22:52:56 2013 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b09
-JDK_UPDATE_VERSION = 12
+OPENJDK_VERSION = b17
+JDK_UPDATE_VERSION = 20
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 679412ed11d5
-JAXP_CHANGESET = cba4d3377850
-JAXWS_CHANGESET = a7541d353428
-JDK_CHANGESET = 67b0266bbd5d
-LANGTOOLS_CHANGESET = 31539542e9e5
-OPENJDK_CHANGESET = 2d1ddf672d61
+CORBA_CHANGESET = 04ad0a30f564
+JAXP_CHANGESET = e17ab897041e
+JAXWS_CHANGESET = 7169780eff51
+JDK_CHANGESET = bc455fc9948f
+LANGTOOLS_CHANGESET = 5f4ad2269018
+OPENJDK_CHANGESET = 8714dddd443a
-CORBA_SHA256SUM = 20b9840fa09f8e89a141cbe0b08794588f8534ba760cf08cee34feaea3018bc4
-JAXP_SHA256SUM = d04ae1702118dd42e5f7c3796dab0214a44f27b8381464536877cded732f6b77
-JAXWS_SHA256SUM = ada222989022c456d6ebd417891fb4b575d47da1134bd0ca631fb5deea7cbed8
-JDK_SHA256SUM = 8f7b1ce3fea28901366530e152c479117cbb3c37a5a7f069a52531f7b7d01c4f
-LANGTOOLS_SHA256SUM = 7cc3816acebfeac0211161cc39472b38f87587f4d41fa3e153109e27df4c02c8
-OPENJDK_SHA256SUM = 43aef86d067f66f2cd3b6895cc166e056b05603ee585ba50b5a82d41e7924a16
+CORBA_SHA256SUM = 625fd145c5e7bbd92f28321d2584d116279cb0bf07f417d0f463f57c78b90526
+JAXP_SHA256SUM = 698244f0a12cc7fa6c2994db7b0771ff7c4e00d6457aabb9c326778d0a078650
+JAXWS_SHA256SUM = cff9fb3f14aad77b6415418556805cbb23779d2b5fc6b7ebfd7bea5100b139fe
+JDK_SHA256SUM = 54c3fff10484ce96b23599228ca99be89f4c433441da7489648c42fd8f03c0c8
+LANGTOOLS_SHA256SUM = 925f8166907dda64491dcaff51460ee83090d060f76abb4ff0efa7b9e1612a17
+OPENJDK_SHA256SUM = 7b500b6306981d0182a12e90b37182741df9931b34107a13686a77951ff7b0b3
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
@@ -232,7 +232,7 @@
# Patch list
-ICEDTEA_PATCHES = patches/zero_libffi.patch
+ICEDTEA_PATCHES =
# Conditional patches
diff -r 9b9b5df83038 -r 397dd0f8e62a hotspot.map
--- a/hotspot.map Thu Mar 28 00:18:00 2013 +0000
+++ b/hotspot.map Thu Apr 04 22:52:56 2013 +0100
@@ -1,1 +1,2 @@
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 7e12b7098f20 dc85dde54f736507e83f718a587020b89d5e6c532a33a18cabd17dedef5db80b
+# version url changeset sha256sum
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot b9bbe418db87 af823ea6283514495a42c291ed1d7d79c2ee86f8917e5f6f2782218a193546d9
diff -r 9b9b5df83038 -r 397dd0f8e62a patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Thu Mar 28 00:18:00 2013 +0000
+++ b/patches/boot/ecj-diamond.patch Thu Apr 04 22:52:56 2013 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-11-30 12:17:00.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-11-30 15:09:47.167537938 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-04-03 14:17:36.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-04-04 18:13:31.220314739 +0100
@@ -58,7 +58,7 @@
private CorbaConnection conn;
@@ -11,8 +11,8 @@
public static synchronized void cleanCache( ORB orb ) {
synchronized (iorMapLock) {
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-11-30 12:17:00.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-11-30 15:09:47.183538189 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-04-03 14:17:36.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-04-04 18:13:31.232314934 +0100
@@ -1316,7 +1316,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set<ObjectAdapterFactory> oaset;
@@ -23,8 +23,8 @@
for (ObjectAdapterFactory oaf : oaset)
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-11-30 12:17:00.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-11-30 15:09:47.183538189 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-04-03 14:17:36.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-04-04 18:13:31.236314998 +0100
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -44,8 +44,8 @@
for (WorkerThread wt : copy) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2012-11-30 15:19:29.516788251 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2012-11-30 15:20:13.301492126 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-04-04 18:13:31.240315064 +0100
@@ -62,9 +62,10 @@
*/
public final class DocumentHandler extends DefaultHandler {
@@ -61,8 +61,8 @@
private Reference<ClassLoader> loader;
private ExceptionListener listener;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-11-30 15:09:47.183538189 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-04-04 18:13:31.244315128 +0100
@@ -46,7 +46,7 @@
*/
public final class TypeResolver {
@@ -82,8 +82,8 @@
CACHE.put(actual, map);
}
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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-11-30 15:09:47.183538189 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-04-04 18:13:31.252315258 +0100
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -155,8 +155,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 2012-11-30 15:06:26.904399058 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-11-30 15:09:47.183538189 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-04-04 18:12:33.935383238 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-04-04 18:13:31.272315583 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -166,7 +166,7 @@
for (int i = 0; i < basicCodings.length; i++) {
Coding c = basicCodings[i];
if (c == null) continue;
-@@ -1068,8 +1068,8 @@
+@@ -1067,8 +1067,8 @@
// Bootstrap support for CPRefBands. These are needed to record
// intended CP indexes, before the CP has been created.
@@ -177,7 +177,7 @@
int encodeRef(Entry e, Index ix) {
-@@ -1704,7 +1704,7 @@
+@@ -1705,7 +1705,7 @@
protected int attrClassFileVersionMask;
// Mapping from Attribute.Layout to Band[] (layout element bands).
@@ -186,7 +186,7 @@
// Well-known attributes:
protected final Attribute.Layout attrCodeEmpty;
-@@ -1713,11 +1713,11 @@
+@@ -1714,11 +1714,11 @@
protected final Attribute.Layout attrConstantValue;
// Mapping from Attribute.Layout to Integer (inverse of attrDefs)
@@ -200,7 +200,7 @@
{
for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) {
assert(attrIndexLimit[i] == 0);
-@@ -1912,7 +1912,7 @@
+@@ -1913,7 +1913,7 @@
protected List getPredefinedAttrs(int ctype) {
assert(attrIndexLimit[ctype] != 0);
@@ -209,7 +209,7 @@
// Remove nulls and non-predefs.
for (int ai = 0; ai < attrIndexLimit[ctype]; ai++) {
if (testBit(attrDefSeen[ctype], 1L<<ai)) continue;
-@@ -2536,7 +2536,7 @@
+@@ -2537,7 +2537,7 @@
// DEBUG ONLY: Record something about the band order.
boolean notePrevForAssert(Band b, Band p) {
if (prevForAssertMap == null)
@@ -219,8 +219,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 2012-11-30 15:06:23.496345660 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-04 18:12:33.863382065 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-04 18:13:31.276315648 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -231,8 +231,8 @@
InnerClass ic =
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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-04-04 18:13:31.280315713 +0100
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -269,8 +269,8 @@
if (popset.add(values[i])) popvals.add(values[i]);
}
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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-04-04 18:13:31.284315778 +0100
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -281,8 +281,8 @@
Coding x1 = codeMap.get(x0);
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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-04-04 18:13:31.292315907 +0100
@@ -919,7 +919,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -301,7 +301,7 @@
}
part.add(cpMap[i]);
}
-@@ -1137,7 +1137,7 @@
+@@ -1139,7 +1139,7 @@
void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs) {
cpRefs.remove(null);
for (ListIterator<Entry> work =
@@ -311,8 +311,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 2012-11-30 15:06:26.904399058 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-04 18:12:33.935383238 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-04 18:13:31.292315907 +0100
@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -350,8 +350,8 @@
for (String optline : options.split("\n")) {
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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-04-04 18:13:31.296315973 +0100
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -362,8 +362,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 2012-11-30 15:06:23.688348668 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-04 18:12:33.863382065 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-04 18:13:31.304316103 +0100
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -519,8 +519,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 2012-11-30 15:06:26.908399120 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-04-04 18:12:33.935383238 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-04-04 18:13:31.308316167 +0100
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -634,8 +634,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 2012-11-30 15:06:26.908399120 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-04-04 18:12:33.935383238 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-04-04 18:13:31.312316233 +0100
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -691,8 +691,8 @@
for (Class cls : pkg.classes) {
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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-04-04 18:13:31.316316297 +0100
@@ -183,8 +183,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -723,8 +723,8 @@
for (JarEntry je : Collections.list(jf.entries())) {
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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-11-30 15:09:47.187538251 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-04-04 18:13:31.316316297 +0100
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -735,8 +735,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 2012-11-30 15:06:26.908399120 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-11-30 15:09:47.191538314 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-04-04 18:12:33.935383238 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-04-04 18:13:31.320316362 +0100
@@ -48,8 +48,8 @@
*/
@@ -767,8 +767,8 @@
while (res.remove(null));
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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-11-30 15:09:47.191538314 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-04-04 18:13:31.324316427 +0100
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -789,8 +789,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 2012-11-30 15:06:26.908399120 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-11-30 15:09:47.191538314 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-04-04 18:12:33.935383238 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-04-04 18:13:31.328316492 +0100
@@ -233,7 +233,7 @@
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
@@ -801,8 +801,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 2012-11-30 15:06:26.908399120 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-11-30 15:09:47.191538314 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-04-04 18:12:33.935383238 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-04-04 18:13:31.328316492 +0100
@@ -132,7 +132,7 @@
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
@@ -812,9 +812,33 @@
// convenience methods to access the TL globals
static TLGlobals getTLGlobals() {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2013-04-04 18:13:31.752323374 +0100
+@@ -231,7 +231,7 @@
+ * Create an empty ExecOptionPermissionCollection.
+ */
+ public ExecOptionPermissionCollection() {
+- permissions = new Hashtable<>(11);
++ permissions = new Hashtable<String, Permission>(11);
+ all_allowed = false;
+ }
+
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2013-04-04 18:13:31.752323374 +0100
+@@ -235,7 +235,7 @@
+ * Create an empty ExecPermissionCollection.
+ */
+ public ExecPermissionCollection() {
+- permissions = new Vector<>();
++ permissions = new Vector<Permission>();
+ }
+
+ /**
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-11-30 15:09:47.191538314 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-04-04 18:13:31.332316557 +0100
@@ -1284,7 +1284,7 @@
*/
public Collection<?> toCollection() throws SQLException {
@@ -834,8 +858,8 @@
// create a copy
CachedRowSetImpl crsTemp;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-11-30 15:09:47.191538314 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-04-04 18:13:31.336316622 +0100
@@ -222,7 +222,7 @@
// either of the setter methods have been set.
if(boolColId){
@@ -846,8 +870,8 @@
if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) {
iMatchKey = cRowset.findColumn(strMatchKey);
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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-11-30 15:09:47.191538314 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-04-04 18:13:31.340316687 +0100
@@ -99,10 +99,10 @@
throws UnsupportedCallbackException
{
@@ -862,8 +886,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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-11-30 15:09:47.195538377 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-04-04 18:13:31.344316752 +0100
@@ -152,7 +152,7 @@
// new configuration
@@ -892,8 +916,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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-11-30 15:09:47.195538377 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-04-04 18:13:31.344316752 +0100
@@ -184,7 +184,7 @@
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
@@ -904,8 +928,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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2012-11-30 15:09:47.195538377 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-04-04 18:13:31.348316816 +0100
@@ -658,7 +658,7 @@
throw new FailedLoginException(
"Unable to find X.509 certificate chain in keystore");
@@ -916,8 +940,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 2012-11-30 12:17:08.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2012-11-30 15:09:47.195538377 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-04-03 14:18:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-04-04 18:13:31.352316882 +0100
@@ -76,7 +76,7 @@
private SolarisNumericUserPrincipal UIDPrincipal;
private SolarisNumericGroupPrincipal GIDPrincipal;
@@ -928,8 +952,8 @@
/**
More information about the distro-pkg-dev
mailing list