/hg/icedtea7: Start development of u8/2.4 with b04, bringing in ...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Aug 29 06:48:13 PDT 2012
changeset 77fba95d574a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=77fba95d574a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Aug 29 14:48:01 2012 +0100
Start development of u8/2.4 with b04, bringing in latest fixes.
2012-08-29 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/7192804-jvisualvm.patch,
* patches/no_diz_files.patch,
* patches/werror-hotspot.patch,
* patches/werror-jdk.patch,
* patches/werror-langtools.patch:
Dropped; in IcedTea7 HEAD.
* Makefile.am:
(OPENJDK_VERSION): Bump to b04.
(JDK_UPDATE_VERSION): Bump to u8.
(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 to empty again.
* NEWS: Add 2.4 section.
* configure.ac: Set to 2.4pre.
* hotspot.map: Update default to head of IcedTea7
forest HotSpot.
* patches/boot/ecj-diamond.patch:
Update due to com.sun.beans.TypeResolver changes.
diffstat:
ChangeLog | 31 +
Makefile.am | 35 +-
NEWS | 2 +
configure.ac | 2 +-
hotspot.map | 2 +-
patches/7192804-jvisualvm.patch | 31 -
patches/boot/ecj-diamond.patch | 904 ++++++++++++++++++++-------------------
patches/no_diz_files.patch | 143 ------
patches/werror-hotspot.patch | 56 --
patches/werror-jdk.patch | 78 ---
patches/werror-langtools.patch | 28 -
11 files changed, 505 insertions(+), 807 deletions(-)
diffs (truncated from 2918 to 500 lines):
diff -r 727519ab8096 -r 77fba95d574a ChangeLog
--- a/ChangeLog Fri Aug 24 01:53:20 2012 +0100
+++ b/ChangeLog Wed Aug 29 14:48:01 2012 +0100
@@ -1,3 +1,34 @@
+2012-08-29 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/7192804-jvisualvm.patch,
+ * patches/no_diz_files.patch,
+ * patches/werror-hotspot.patch,
+ * patches/werror-jdk.patch,
+ * patches/werror-langtools.patch:
+ Dropped; in IcedTea7 HEAD.
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to b04.
+ (JDK_UPDATE_VERSION): Bump to u8.
+ (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 to empty again.
+ * NEWS: Add 2.4 section.
+ * configure.ac: Set to 2.4pre.
+ * hotspot.map: Update default to head of IcedTea7
+ forest HotSpot.
+ * patches/boot/ecj-diamond.patch:
+ Update due to com.sun.beans.TypeResolver changes.
+
2012-08-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1138: jvisualvm.1 should not be installed in OpenJDK builds
diff -r 727519ab8096 -r 77fba95d574a Makefile.am
--- a/Makefile.am Fri Aug 24 01:53:20 2012 +0100
+++ b/Makefile.am Wed Aug 29 14:48:01 2012 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b20
-JDK_UPDATE_VERSION = 06
+OPENJDK_VERSION = b04
+JDK_UPDATE_VERSION = 08
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 7541673f1f87
-JAXP_CHANGESET = fc3d8d956b08
-JAXWS_CHANGESET = fd4311742772
-JDK_CHANGESET = f46deb5db4f9
-LANGTOOLS_CHANGESET = ba340b8fe8cf
-OPENJDK_CHANGESET = 7e0976a9c562
+CORBA_CHANGESET = 0145833b7e10
+JAXP_CHANGESET = 6de64995ea6e
+JAXWS_CHANGESET = 1a01efb4cd05
+JDK_CHANGESET = 5a2688a73184
+LANGTOOLS_CHANGESET = 3ce5864ed9da
+OPENJDK_CHANGESET = d2607b1bfb20
-CORBA_SHA256SUM = 9c539b60fa8226175830d56fbaf671c1e64952dc6c05114fa98b890e738bd2e6
-JAXP_SHA256SUM = 6787b6967b7a12415a326810eac334018dfe1d283e529d4c2251ff4ffd19b967
-JAXWS_SHA256SUM = 43df2c99755a1f0c62c0a6607401e3174c246c723f53a8771f27dfcf36ab2683
-JDK_SHA256SUM = a181187f67642d007cd5ce2c656a95c5bbd3c41dcc0ed853e0534198186ccf70
-LANGTOOLS_SHA256SUM = 291ff0a54dc26c0a1e0c3f02adee776e66c801d761a89894c1c8f6d3fb4b42a4
-OPENJDK_SHA256SUM = 5f32a88ca7a5c495e55ebe0b8bacef96685476f1b028fb9517d6babe8cc67edc
+CORBA_SHA256SUM = fcf6f60b89b1dd3d98c9fffdb226dad3f6503ab0829c43807a30e94d22800795
+JAXP_SHA256SUM = 3e64af781e9f17aae31cf8e94483d6f8a03a4c587c76c69c4b8009fa5d6118a2
+JAXWS_SHA256SUM = d388525b19f5a0eefc70dc77bceb2e6697061a47372697769e5a5e2ee8ec35cc
+JDK_SHA256SUM = 84637b747bfc0e5bf1dd4c47322c2bbc3ac81483f361553fb9c29d1446fd070a
+LANGTOOLS_SHA256SUM = 6c68a410c723c09a902659a28ee953a760b5c9d89947fcacee545a008e9d8918
+OPENJDK_SHA256SUM = 237d4d7c35d66536604e54781d1c927c7e75809a24b918640b3d10d92fec4e2c
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
@@ -240,12 +240,7 @@
# Patch list
-ICEDTEA_PATCHES = \
- patches/werror-jdk.patch \
- patches/werror-langtools.patch \
- patches/werror-hotspot.patch \
- patches/no_diz_files.patch \
- patches/7192804-jvisualvm.patch
+ICEDTEA_PATCHES =
# Conditional patches
diff -r 727519ab8096 -r 77fba95d574a NEWS
--- a/NEWS Fri Aug 24 01:53:20 2012 +0100
+++ b/NEWS Wed Aug 29 14:48:01 2012 +0100
@@ -10,6 +10,8 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release 2.4 (2012-XX-XX):
+
New in release 2.3 (2012-XX-XX):
* Bug fixes
diff -r 727519ab8096 -r 77fba95d574a configure.ac
--- a/configure.ac Fri Aug 24 01:53:20 2012 +0100
+++ b/configure.ac Wed Aug 29 14:48:01 2012 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.3pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.4pre], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r 727519ab8096 -r 77fba95d574a hotspot.map
--- a/hotspot.map Fri Aug 24 01:53:20 2012 +0100
+++ b/hotspot.map Wed Aug 29 14:48:01 2012 +0100
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 37da454d89f8 9df26636ed3133d08a5a9c6fe248d8306265c57b50efd3ab9580655898bbe9a2
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 2aad7a18d716 b0328803af53973a5a465ded4a7d8cb4d3862be783604b54e79828cbff5ae548
zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot b41a43560dc8 25d13a4be1c343b620d2a85a47b8b654abaee3541968d205128ca69cf46fc17c
diff -r 727519ab8096 -r 77fba95d574a patches/7192804-jvisualvm.patch
--- a/patches/7192804-jvisualvm.patch Fri Aug 24 01:53:20 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1345732943 -3600
-# Node ID d06702bfc987d0679d0c047b0897fbe7a684a608
-# Parent 968de9a6cf662529fd0fac7b54d9f8614d338da0
-7192804: Build should not install jvisualvm man page for OpenJDK
-Summary: OpenJDK builds don't ship VisualVM so shouldn't ship its man page either.
-Reviewed-by: dholmes
-
-diff --git a/make/common/Release.gmk b/make/common/Release.gmk
---- openjdk/jdk/make/common/Release.gmk
-+++ openjdk/jdk/make/common/Release.gmk
-@@ -158,7 +158,6 @@
- jstack.1 \
- jstat.1 \
- jstatd.1 \
-- jvisualvm.1 \
- native2ascii.1 \
- rmic.1 \
- schemagen.1 \
-@@ -167,6 +166,10 @@
- wsimport.1 \
- xjc.1
-
-+ifndef OPENJDK
-+ JDK_MAN_PAGES += jvisualvm.1
-+endif
-+
- ifeq ($(PLATFORM), solaris)
- MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
- MAN1SUBDIR=sun/man/man1
diff -r 727519ab8096 -r 77fba95d574a patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Fri Aug 24 01:53:20 2012 +0100
+++ b/patches/boot/ecj-diamond.patch Wed Aug 29 14:48:01 2012 +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-07-26 10:38:37.590704662 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-07-26 10:38:52.562995294 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-08-29 13:24:52.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2012-08-29 13:51:21.597693973 +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-07-26 10:42:49.783575656 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-07-26 10:43:32.556396764 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-08-29 13:24:52.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-08-29 13:51:21.605694085 +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-07-26 10:42:30.031195989 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-07-26 10:43:50.748745570 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-08-29 13:24:52.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2012-08-29 13:51:21.605694085 +0100
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -44,23 +44,29 @@
for (WorkerThread wt : copy) {
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-07-26 10:32:17.027354391 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-07-26 10:31:04.514176534 +0100
-@@ -239,9 +239,9 @@
- }
- }
-
-- private static final WeakCache<Type, TypeResolver> CACHE = new WeakCache<>();
-+ private static final WeakCache<Type, TypeResolver> CACHE = new WeakCache<Type, TypeResolver>();
-
-- private final Map<TypeVariable<?>, Type> map = new HashMap<>();
-+ private final Map<TypeVariable<?>, Type> map = new HashMap<TypeVariable<?>, Type>();
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-08-29 13:52:15.526449232 +0100
+@@ -46,7 +46,7 @@
+ */
+ public final class TypeResolver {
+
+- private static final WeakCache<Type, Map<Type, Type>> CACHE = new WeakCache<>();
++ private static final WeakCache<Type, Map<Type, Type>> CACHE = new WeakCache<Type, Map<Type, Type>>();
/**
- * Constructs the type resolver for the given actual type.
+ * Replaces the given {@code type} in an inherited method
+@@ -181,7 +181,7 @@
+ synchronized (CACHE) {
+ map = CACHE.get(actual);
+ if (map == null) {
+- map = new HashMap<>();
++ map = new HashMap<Type, Type>();
+ prepare(map, actual);
+ 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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-07-26 10:21:48.605049307 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-08-29 13:51:21.605694085 +0100
@@ -103,9 +103,9 @@
return this.def.compareTo(that.def);
}
@@ -132,8 +138,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-07-26 10:21:09.192395302 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-07-26 10:21:48.625049638 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-08-29 13:50:51.345270734 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-08-29 13:51:21.609694141 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -202,8 +208,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-07-26 10:21:09.024392512 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-07-26 10:21:48.625049638 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-08-29 13:50:51.209268832 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-08-29 13:51:21.609694141 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -214,8 +220,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-07-26 10:21:48.625049638 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-08-29 13:51:21.609694141 +0100
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -252,8 +258,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-07-26 10:21:48.625049638 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-08-29 13:51:21.609694141 +0100
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -264,8 +270,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-07-26 10:21:48.625049638 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-08-29 13:51:21.609694141 +0100
@@ -915,7 +915,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -294,9 +300,9 @@
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-07-26 10:21:09.192395302 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-07-26 10:21:48.629049705 +0100
-@@ -60,7 +60,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-08-29 13:50:51.345270734 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-08-29 13:51:21.609694141 +0100
+@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
public static void main(String[] ava) throws IOException {
@@ -305,7 +311,7 @@
boolean doPack = true;
boolean doUnpack = false;
-@@ -83,7 +83,7 @@
+@@ -84,7 +84,7 @@
}
// Collect engine properties here:
@@ -314,7 +320,7 @@
engProps.put(verboseProp, System.getProperty(verboseProp));
String optionMap;
-@@ -97,7 +97,7 @@
+@@ -98,7 +98,7 @@
}
// Collect argument properties here:
@@ -323,7 +329,7 @@
try {
for (;;) {
String state = parseCommandOptions(av, optionMap, avProps);
-@@ -529,7 +529,7 @@
+@@ -533,7 +533,7 @@
String resultString = null;
// Convert options string into optLines dictionary.
@@ -333,8 +339,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-08-29 13:51:21.609694141 +0100
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -345,8 +351,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/Fixups.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-08-29 13:51:21.609694141 +0100
@@ -126,11 +126,11 @@
public void setBytes(byte[] newBytes) {
if (bytes == newBytes) return;
@@ -371,8 +377,8 @@
static final int LOC_SHIFT = 1;
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-07-26 10:21:09.024392512 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-08-29 13:50:51.209268832 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-08-29 13:51:21.609694141 +0100
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -537,8 +543,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-07-26 10:21:09.192395302 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-08-29 13:50:51.349270790 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-08-29 13:51:21.609694141 +0100
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -652,8 +658,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-07-26 10:21:09.196395369 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-08-29 13:50:51.349270790 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-08-29 13:51:21.609694141 +0100
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -709,8 +715,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-08-29 13:51:21.609694141 +0100
@@ -181,8 +181,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -741,8 +747,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-08-29 13:51:21.609694141 +0100
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -753,8 +759,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-07-26 10:21:09.196395369 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-08-29 13:50:51.349270790 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-08-29 13:51:21.613694197 +0100
@@ -47,8 +47,8 @@
*/
@@ -776,8 +782,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-08-29 13:51:21.613694197 +0100
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -798,8 +804,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-07-26 10:21:09.196395369 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-08-29 13:50:51.353270846 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-08-29 13:51:21.613694197 +0100
@@ -232,7 +232,7 @@
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
@@ -810,8 +816,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-07-26 10:21:09.196395369 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-07-26 10:21:48.629049705 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-08-29 13:50:51.353270846 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-08-29 13:51:21.613694197 +0100
@@ -132,7 +132,7 @@
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
@@ -822,8 +828,8 @@
// convenience methods to access the TL globals
static TLGlobals getTLGlobals() {
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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-07-26 10:21:48.633049772 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-08-29 13:51:21.613694197 +0100
@@ -1284,7 +1284,7 @@
*/
public Collection<?> toCollection() throws SQLException {
@@ -843,8 +849,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-07-26 10:21:48.633049772 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-08-29 13:51:21.613694197 +0100
@@ -222,7 +222,7 @@
// either of the setter methods have been set.
if(boolColId){
@@ -855,8 +861,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-07-26 10:21:48.645049971 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-08-29 13:51:21.613694197 +0100
@@ -99,10 +99,10 @@
throws UnsupportedCallbackException
{
@@ -871,8 +877,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-07-26 10:21:48.645049971 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-08-29 13:24:58.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-08-29 13:51:21.613694197 +0100
@@ -152,7 +152,7 @@
// new configuration
@@ -901,8 +907,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-07-25 18:24:09.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-07-26 10:21:48.645049971 +0100
More information about the distro-pkg-dev
mailing list