/hg/release/icedtea7-2.2: Bring in latest security fixes and ass...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Feb 13 08:13:45 PST 2013
changeset 39a069b2d432 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=39a069b2d432
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Feb 13 16:13:30 2013 +0000
Bring in latest security fixes and associated backports.
2013-02-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am,
(HOTSPOT_CHANGESET): Update to IcedTea7 2.2 forest head;
the tag icedtea-2.2.5.
(CORBA_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* patches/boot/ecj-diamond.patch:
Regenerated and new cases added.
* patches/boot/ecj-multicatch.patch:
New case added.
* patches/boot/ecj-trywithresources.patch:
Regenerated.
* NEWS: Updated.
diffstat:
ChangeLog | 26 +
Makefile.am | 28 +-
NEWS | 42 +
patches/boot/ecj-diamond.patch | 1263 ++++++++++++++++--------------
patches/boot/ecj-multicatch.patch | 14 +
patches/boot/ecj-trywithresources.patch | 203 ++--
6 files changed, 842 insertions(+), 734 deletions(-)
diffs (truncated from 3493 to 500 lines):
diff -r bd981b9485ed -r 39a069b2d432 ChangeLog
--- a/ChangeLog Wed Jan 16 01:26:58 2013 +0000
+++ b/ChangeLog Wed Feb 13 16:13:30 2013 +0000
@@ -1,3 +1,29 @@
+2013-02-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am,
+ (HOTSPOT_CHANGESET): Update to IcedTea7 2.2 forest head;
+ the tag icedtea-2.2.5.
+ (CORBA_CHANGESET): Likewise.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated and new cases added.
+ * patches/boot/ecj-multicatch.patch:
+ New case added.
+ * patches/boot/ecj-trywithresources.patch:
+ Regenerated.
+ * NEWS: Updated.
+
2013-01-16 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Add 2.2.5 section.
diff -r bd981b9485ed -r 39a069b2d432 Makefile.am
--- a/Makefile.am Wed Jan 16 01:26:58 2013 +0000
+++ b/Makefile.am Wed Feb 13 16:13:30 2013 +0000
@@ -4,21 +4,21 @@
JDK_UPDATE_VERSION = 05
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = f90e1b6ccfb6
-HOTSPOT_CHANGESET = 60d6e32e00a6
-JAXP_CHANGESET = 028a292be666
-JAXWS_CHANGESET = c620184ea425
-JDK_CHANGESET = 8fccb53fef83
-LANGTOOLS_CHANGESET = 206668cf21e5
-OPENJDK_CHANGESET = 431257be5014
+HOTSPOT_CHANGESET = d2e4bf94d38d
+CORBA_CHANGESET = 5a9a1b4aecd3
+JAXP_CHANGESET = 7d285e628870
+JAXWS_CHANGESET = acf0bd2643a5
+JDK_CHANGESET = 59849a48553a
+LANGTOOLS_CHANGESET = de74a816c73a
+OPENJDK_CHANGESET = ac5792f240c0
-CORBA_SHA256SUM = 1480c0ae07c31a5a0c70791a5ac8576ebd4a606fbf7e97d901ffce98a121c5ba
-HOTSPOT_SHA256SUM = 8c22bcae21996ad394a00c8607f716f5b9156f0f8005f2558adda58cbcd48275
-JAXP_SHA256SUM = 578b309af7bca3290e1df62c3950701196b791579ecd97f93da3b8fee17fc689
-JAXWS_SHA256SUM = 33c1f30d67ef2bc290f53f852f5d02ea6815f7ef875140306fabfec15e57a816
-JDK_SHA256SUM = a3e05956d2979ac5a5ea1331857a9b04b9f31a1283dda2ec746435cd4fd551b9
-LANGTOOLS_SHA256SUM = d5a8460788cc1cb6af9bfd9d70c01811a60c2a27e31ce5331d4bf444bc1f5a17
-OPENJDK_SHA256SUM = 6fe4d91049da673a843ff2b41ec9e9601c9ff45ba37526d414b8f0a700fa33d5
+HOTSPOT_SHA256SUM = 0023b69aa7e7b6c821b0d49bc28c56cf4cc5651f7e8816cb9b841f306ad14a7e
+CORBA_SHA256SUM = d093c8317798b47462022c0944da1146677c58f687e599475103ce65292ac0bc
+JAXP_SHA256SUM = 89456507df28350f22f3809744b5997164a2e7576d63e9a7472dab37700c8e19
+JAXWS_SHA256SUM = 24044a7f4bdc2368026aaefc7b25f2fc5c6a2b4145a8af7dc9393252dee5e238
+JDK_SHA256SUM = b0a1193a299a0d03cb040cdb538fcefb43bc72e9f61e5b209441931f58c1f351
+LANGTOOLS_SHA256SUM = b96dff5fe7a5a7fa90a73aacd9d67e70ee3598e7ea904e09a841d2e56fb86d9e
+OPENJDK_SHA256SUM = 47c661b2bda7167184d91bf7d7010f4ccf94a6b75298961da40c0eefe40fef53
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff -r bd981b9485ed -r 39a069b2d432 NEWS
--- a/NEWS Wed Jan 16 01:26:58 2013 +0000
+++ b/NEWS Wed Feb 13 16:13:30 2013 +0000
@@ -12,6 +12,48 @@
New in release 2.2.5 (2013-XX-XX):
+* Security fixes
+ - S6563318, CVE-2013-0424: RMI data sanitization
+ - S6664509, CVE-2013-0425: Add logging context
+ - S6664528, CVE-2013-0426: Find log level matching its name or value given at construction time
+ - S6776941: CVE-2013-0427: Improve thread pool shutdown
+ - S7141694, CVE-2013-0429: Improving CORBA internals
+ - S7173145: Improve in-memory representation of splashscreens
+ - S7186945: Unpack200 improvement
+ - S7186946: Refine unpacker resource usage
+ - S7186948: Improve Swing data validation
+ - S7186952, CVE-2013-0432: Improve clipboard access
+ - S7186954: Improve connection performance
+ - S7186957: Improve Pack200 data validation
+ - S7192392, CVE-2013-0443: Better validation of client keys
+ - S7192393, CVE-2013-0440: Better Checking of order of TLS Messages
+ - S7192977, CVE-2013-0442: Issue in toolkit thread
+ - S7197546, CVE-2013-0428: (proxy) Reflect about creating reflective proxies
+ - S7200491: Tighten up JTable layout code
+ - S7200493, CVE-2013-0444: Improve cache handling
+ - S7200499: Better data validation for options
+ - S7200500: Launcher better input validation
+ - S7201064: Better dialogue checking
+ - S7201066, CVE-2013-0441: Change modifiers on unused fields
+ - S7201068, CVE-2013-0435: Better handling of UI elements
+ - S7201070: Serialization to conform to protocol
+ - S7201071, CVE-2013-0433: InetSocketAddress serialization issue
+ - S8000210: Improve JarFile code quality
+ - S8000537, CVE-2013-0450: Contextualize RequiredModelMBean class
+ - S8000539, CVE-2013-0431: Introspect JMX data handling
+ - S8000540, CVE-2013-1475: Improve IIOP type reuse management
+ - S8000631, CVE-2013-1476: Restrict access to class constructor
+ - S8001235, CVE-2013-0434: Improve JAXP HTTP handling
+ - S8001242: Improve RMI HTTP conformance
+ - S8001307: Modify ACC_SUPER behavior
+ - S8001972, CVE-2013-1478: Improve image processing
+ - S8002325, CVE-2013-1480: Improve management of images
+* Backports
+ - S7175616: Port fix for TimeZone from JDK 8 to JDK 7
+ - S8002068: Build broken: corba code changes unable to use new JDK 7 classes
+ - S8004341: Two JCK tests fails with 7u11 b06
+ - S8005615: Java Logger fails to load tomcat logger implementation (JULI)
+
New in release 2.2.4 (2013-01-15):
* Security fixes
diff -r bd981b9485ed -r 39a069b2d432 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Jan 16 01:26:58 2013 +0000
+++ b/patches/boot/ecj-diamond.patch Wed Feb 13 16:13:30 2013 +0000
@@ -1,6 +1,41 @@
+diff -Nru openjdk-boot.orig/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java openjdk-boot/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
+--- openjdk-boot.orig/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java 2013-02-13 14:58:21.597631649 +0000
++++ openjdk-boot/jdk/src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java 2013-02-13 14:58:36.141865381 +0000
+@@ -68,10 +68,10 @@
+ // JVM info properties
+ private File runtime = null;
+ private String mainClassName = null;
+- private ArrayList<File> classPath = new ArrayList<>();
+- private ArrayList<File> nativeLibraries = new ArrayList<>();
+- private ArrayList<String> options = new ArrayList<>();
+- private ArrayList<String> arguments = new ArrayList<>();
++ private ArrayList<File> classPath = new ArrayList<File>();
++ private ArrayList<File> nativeLibraries = new ArrayList<File>();
++ private ArrayList<String> options = new ArrayList<String>();
++ private ArrayList<String> arguments = new ArrayList<String>();
+
+ public static final String EXECUTABLE_NAME = "JavaAppLauncher";
+ public static final String DEFAULT_ICON_NAME = "GenericApp.icns";
+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 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-02-13 14:50:35.658144443 +0000
+@@ -62,9 +62,10 @@
+ */
+ public final class DocumentHandler extends DefaultHandler {
+ private final AccessControlContext acc = AccessController.getContext();
+- private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<>();
+- private final Map<String, Object> environment = new HashMap<>();
+- private final List<Object> objects = new ArrayList<>();
++ private final Map<String, Class<? extends ElementHandler>> handlers =
++ new HashMap<String, Class<? extends ElementHandler>>();
++ private final Map<String, Object> environment = new HashMap<String, Object>();
++ private final List<Object> objects = new ArrayList<Object>();
+
+ private Reference<ClassLoader> loader;
+ private ExceptionListener listener;
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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-05-23 18:44:10.516396787 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-02-13 14:50:35.550142708 +0000
@@ -103,9 +103,9 @@
return this.def.compareTo(that.def);
}
@@ -72,8 +107,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-05-23 18:42:49.223062740 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-05-23 18:44:10.552397378 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-13 14:50:01.085588951 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-13 14:50:35.554142772 +0000
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -83,7 +118,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.
@@ -94,7 +129,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).
@@ -103,7 +138,7 @@
// Well-known attributes:
protected final Attribute.Layout attrCodeEmpty;
-@@ -1713,16 +1713,16 @@
+@@ -1714,16 +1714,16 @@
protected final Attribute.Layout attrConstantValue;
// Mapping from Attribute.Layout to Integer (inverse of attrDefs)
@@ -123,7 +158,7 @@
attrIndexLimit[i], (Attribute.Layout)null)));
}
-@@ -1912,7 +1912,7 @@
+@@ -1913,7 +1913,7 @@
protected List<Attribute.Layout> getPredefinedAttrs(int ctype) {
assert(attrIndexLimit[ctype] != 0);
@@ -132,7 +167,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)
@@ -142,8 +177,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-05-23 18:42:49.079060377 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-05-23 18:44:10.552397378 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-13 14:50:00.953586831 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-13 14:50:35.554142772 +0000
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -154,8 +189,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-05-23 18:44:10.552397378 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-02-13 14:50:35.554142772 +0000
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -192,8 +227,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-05-23 18:44:10.552397378 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-02-13 14:50:35.554142772 +0000
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -204,8 +239,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-05-23 18:44:10.552397378 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-02-13 14:50:35.554142772 +0000
@@ -915,7 +915,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -224,7 +259,7 @@
}
part.add(cpMap[i]);
}
-@@ -1133,7 +1133,7 @@
+@@ -1135,7 +1135,7 @@
void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs) {
cpRefs.remove(null);
for (ListIterator<Entry> work =
@@ -234,9 +269,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-05-23 18:42:49.223062740 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-05-23 18:44:10.552397378 +0100
-@@ -59,7 +59,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-13 14:50:01.085588951 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-13 14:50:35.554142772 +0000
+@@ -60,7 +60,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
public static void main(String[] ava) throws IOException {
@@ -245,7 +280,7 @@
boolean doPack = true;
boolean doUnpack = false;
-@@ -82,7 +82,7 @@
+@@ -83,7 +83,7 @@
}
// Collect engine properties here:
@@ -254,7 +289,7 @@
engProps.put(verboseProp, System.getProperty(verboseProp));
String optionMap;
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@
}
// Collect argument properties here:
@@ -263,7 +298,7 @@
try {
for (;;) {
String state = parseCommandOptions(av, optionMap, avProps);
-@@ -530,7 +530,7 @@
+@@ -529,7 +529,7 @@
String resultString = null;
// Convert options string into optLines dictionary.
@@ -273,8 +308,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-05-23 18:44:10.552397378 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-02-13 14:50:35.554142772 +0000
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -285,8 +320,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-05-23 18:44:10.552397378 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-02-13 14:50:35.554142772 +0000
@@ -126,11 +126,11 @@
public void setBytes(byte[] newBytes) {
if (bytes == newBytes) return;
@@ -311,8 +346,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-05-23 18:42:49.079060377 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-05-23 18:44:10.552397378 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-13 14:50:00.953586831 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-13 14:50:35.554142772 +0000
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -477,8 +512,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-05-23 18:42:49.223062740 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-05-23 18:44:10.552397378 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-13 14:50:01.085588951 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-13 14:50:35.554142772 +0000
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -592,8 +627,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-05-23 18:42:49.223062740 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-05-23 18:44:10.552397378 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-13 14:50:01.085588951 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-13 14:50:35.562142900 +0000
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -649,8 +684,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-05-23 18:44:10.556397443 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-02-13 14:50:35.562142900 +0000
@@ -181,8 +181,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -681,8 +716,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-05-23 18:44:10.556397443 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-02-13 14:50:35.562142900 +0000
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -693,8 +728,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-05-23 18:42:49.223062740 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-05-23 18:44:10.556397443 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-13 14:50:01.085588951 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-13 14:50:35.562142900 +0000
@@ -47,8 +47,8 @@
*/
@@ -716,8 +751,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-05-23 18:44:10.556397443 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-02-13 14:50:35.562142900 +0000
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -738,8 +773,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-05-23 18:42:49.227062806 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2012-05-23 18:44:10.556397443 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-13 14:50:01.085588951 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-13 14:50:35.562142900 +0000
@@ -232,7 +232,7 @@
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
@@ -750,8 +785,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-05-23 18:42:49.227062806 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2012-05-23 18:44:10.556397443 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-13 14:50:01.085588951 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-13 14:50:35.562142900 +0000
@@ -132,7 +132,7 @@
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
@@ -762,8 +797,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2012-05-23 18:44:10.556397443 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-02-13 14:50:35.566142965 +0000
@@ -1284,7 +1284,7 @@
*/
public Collection<?> toCollection() throws SQLException {
@@ -783,8 +818,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2012-05-23 18:44:10.556397443 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-02-13 14:50:35.566142965 +0000
@@ -222,7 +222,7 @@
// either of the setter methods have been set.
if(boolColId){
@@ -795,8 +830,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2012-05-23 18:44:10.560397509 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-02-13 14:50:35.566142965 +0000
@@ -99,10 +99,10 @@
throws UnsupportedCallbackException
{
@@ -811,8 +846,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2012-05-23 18:44:10.560397509 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-02-13 14:50:35.566142965 +0000
@@ -152,7 +152,7 @@
// new configuration
@@ -841,8 +876,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-05-23 18:33:36.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2012-05-23 18:44:10.560397509 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-02-11 23:13:31.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-02-13 14:50:35.566142965 +0000
@@ -184,7 +184,7 @@
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
@@ -853,8 +888,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
More information about the distro-pkg-dev
mailing list