/hg/release/icedtea7-2.3: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 17 11:09:36 PDT 2013
changeset 10333436ab3e in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=10333436ab3e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Apr 17 14:31:42 2013 +0100
PR1363: Fedora 19 / rawhide FTBFS SIGILL
PR1401: Fix Zero build on 2.3.8
2013-04-08 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Obtain revert-7017193 patch
from HotSpot-dependent directory.
* hotspot.map: Update zero to bring in removal
of debuginfo files & ARM fix.
* patches/hotspot/zero/7089790-bsd_port.patch:
Regenerated.
* patches/hotspot/zero/revert-7017193.patch:
Taken from 2.1.
* patches/revert-7017193.patch: Moved to ...
* patches/hotspot/original/revert-7017193.patch:
... here.
* NEWS: Updated.
changeset 4624e54bf5ef in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=4624e54bf5ef
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Apr 17 19:09:24 2013 +0100
Add 2013/04/16 security fixes.
2013-04-17 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 21 (no idea why
Oracle just skipped 19).
(OPENJDK_VERSION): Bump to b02.
(JAXP_CHANGESET): Update to IcedTea7 2.3.9 forest tag,
bringing in security fixes.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Bring in Martin Buchholz ant patch.
(JAXP_SHA256SUM): Same as JAXP_CHANGESET.
(JAXWS_SHA256SUM): Likewise for JAXWS_CHANGESET.
(JDK_SHA256SUM): Likewise for JDK_CHANGESET.
(LANGTOOLS_SHA256SUM): Likewise for LANGTOOLS_CHANGESET.
* patches/boot/ecj-diamond.patch:
Regenerate due to security patches.
* hotspot.map:
Update to IcedTea7 2.3.9 forest tag,
bringing in security fixes.
* NEWS: Updated to cover new security & bug fixes.
diffstat:
ChangeLog | 40 +
Makefile.am | 20 +-
NEWS | 43 +
hotspot.map | 4 +-
patches/boot/ecj-diamond.patch | 908 +++++++++++++-------------
patches/hotspot/default/revert-7017193.patch | 138 ++++
patches/hotspot/zero/7089790-bsd_port.patch | 904 +++++++++++++-------------
patches/hotspot/zero/revert-7017193.patch | 136 ++++
patches/revert-7017193.patch | 138 ----
9 files changed, 1275 insertions(+), 1056 deletions(-)
diffs (truncated from 6056 to 500 lines):
diff -r 87982c9fedc5 -r 4624e54bf5ef ChangeLog
--- a/ChangeLog Tue Mar 12 21:34:03 2013 +0000
+++ b/ChangeLog Wed Apr 17 19:09:24 2013 +0100
@@ -1,3 +1,43 @@
+2013-04-17 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 21 (no idea why
+ Oracle just skipped 19).
+ (OPENJDK_VERSION): Bump to b02.
+ (JAXP_CHANGESET): Update to IcedTea7 2.3.9 forest tag,
+ bringing in security fixes.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Bring in Martin Buchholz ant patch.
+ (JAXP_SHA256SUM): Same as JAXP_CHANGESET.
+ (JAXWS_SHA256SUM): Likewise for JAXWS_CHANGESET.
+ (JDK_SHA256SUM): Likewise for JDK_CHANGESET.
+ (LANGTOOLS_SHA256SUM): Likewise for LANGTOOLS_CHANGESET.
+ * patches/boot/ecj-diamond.patch:
+ Regenerate due to security patches.
+ * hotspot.map:
+ Update to IcedTea7 2.3.9 forest tag,
+ bringing in security fixes.
+ * NEWS: Updated to cover new security & bug fixes.
+
+2013-04-08 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1363: Fedora 19 / rawhide FTBFS SIGILL
+ PR1401: Fix Zero build on 2.3.8
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Obtain revert-7017193 patch
+ from HotSpot-dependent directory.
+ * hotspot.map: Update zero to bring in removal
+ of debuginfo files & ARM fix.
+ * patches/hotspot/zero/7089790-bsd_port.patch:
+ Regenerated.
+ * patches/hotspot/zero/revert-7017193.patch:
+ Taken from 2.1.
+ * patches/revert-7017193.patch: Moved to ...
+ * patches/hotspot/original/revert-7017193.patch:
+ ... here.
+ * NEWS: Updated.
+
2013-03-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/8006179-lookup_using_findvirtual.patch,
diff -r 87982c9fedc5 -r 4624e54bf5ef Makefile.am
--- a/Makefile.am Tue Mar 12 21:34:03 2013 +0000
+++ b/Makefile.am Wed Apr 17 19:09:24 2013 +0100
@@ -1,21 +1,21 @@
# Dependencies
OPENJDK_VERSION = b02
-JDK_UPDATE_VERSION = 17
+JDK_UPDATE_VERSION = 21
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
CORBA_CHANGESET = 47a6bf94ce11
-JAXP_CHANGESET = a2c49387365b
-JAXWS_CHANGESET = 8eb0bc947ad4
-JDK_CHANGESET = 850b9e5f2c64
-LANGTOOLS_CHANGESET = 23907f495db8
+JAXP_CHANGESET = d2142901bcb7
+JAXWS_CHANGESET = b1877762d45c
+JDK_CHANGESET = 8e91101e36f0
+LANGTOOLS_CHANGESET = fd956199cb82
OPENJDK_CHANGESET = 12b96a57263c
CORBA_SHA256SUM = 7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934
-JAXP_SHA256SUM = 835a175fa72efd097218cb0f052e1874392afde738f940ebd59ca498483e5cb8
-JAXWS_SHA256SUM = a68a47d136d9b205bc9cac3728e33dce979ca9799740f65b39769b8e0af5b07e
-JDK_SHA256SUM = 613ca91c4244198bad568352e24c1a82abd1018140f9b59c825d33c437ded3b9
-LANGTOOLS_SHA256SUM = 8bbf80e096352b4e26407b94c405ea7d529f002057d7a1e0e1d108a5d8feb51c
+JAXP_SHA256SUM = 8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6
+JAXWS_SHA256SUM = b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc
+JDK_SHA256SUM = 349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e
+LANGTOOLS_SHA256SUM = 2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12
OPENJDK_SHA256SUM = 651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc
CACAO_VERSION = a567bcb7f589
@@ -241,7 +241,7 @@
# Patch list
ICEDTEA_PATCHES = \
- patches/revert-7017193.patch
+ patches/hotspot/$(HSBUILD)/revert-7017193.patch
# Conditional patches
diff -r 87982c9fedc5 -r 4624e54bf5ef NEWS
--- a/NEWS Tue Mar 12 21:34:03 2013 +0000
+++ b/NEWS Wed Apr 17 19:09:24 2013 +0100
@@ -12,6 +12,49 @@
New in release 2.3.9 (2013-04-XX):
+* Security fixes
+ - S6657673, CVE-2013-1518: Issues with JAXP
+ - S7200507: Refactor Introspector internals
+ - S8000724, CVE-2013-2417: Improve networking serialization
+ - S8001031, CVE-2013-2419: Better font processing
+ - S8001040, CVE-2013-1537: Rework RMI model
+ - S8001322: Refactor deserialization
+ - S8001329, CVE-2013-1557: Augment RMI logging
+ - S8003335: Better handling of Finalizer thread
+ - S8003445: Adjust JAX-WS to focus on API
+ - S8003543, CVE-2013-2415: Improve processing of MTOM attachments
+ - S8004261: Improve input validation
+ - S8004336, CVE-2013-2431: Better handling of method handle intrinsic frames
+ - S8004986, CVE-2013-2383: Better handling of glyph table
+ - S8004987, CVE-2013-2384: Improve font layout
+ - S8004994, CVE-2013-1569: Improve checking of glyph table
+ - S8005432: Update access to JAX-WS
+ - S8005943: (process) Improved Runtime.exec
+ - S8006309: More reliable control panel operation
+ - S8006435, CVE-2013-2424: Improvements in JMX
+ - S8006790: Improve checking for windows
+ - S8006795: Improve font warning messages
+ - S8007406: Improve accessibility of AccessBridge
+ - S8007617, CVE-2013-2420: Better validation of images
+ - S8007667, CVE-2013-2430: Better image reading
+ - S8007918, CVE-2013-2429: Better image writing
+ - S8008140: Better method handle resolution
+ - S8009049, CVE-2013-2436: Better method handle binding
+ - S8009063, CVE-2013-2426: Improve reliability of ConcurrentHashMap
+ - S8009305, CVE-2013-0401: Improve AWT data transfer
+ - S8009677, CVE-2013-2423: Better setting of setters
+ - S8009699, CVE-2013-2421: Methodhandle lookup
+ - S8009814, CVE-2013-1488: Better driver management
+ - S8009857, CVE-2013-2422: Problem with plugin
+* Backports
+ - S7130662, RH928500: GTK file dialog crashes with a NPE
+* Bug fixes
+ - PR1363: Fedora 19 / rawhide FTBFS SIGILL
+ - PR1401: Fix Zero build on 2.3.8
+ - Fix offset problem in ICU LETableReference.
+ - Change -Werror fix to preserve OpenJDK default.
+ - PR1303: Correct #ifdef to #if
+
New in release 2.3.8 (2013-03-11):
* Security fixes
diff -r 87982c9fedc5 -r 4624e54bf5ef hotspot.map
--- a/hotspot.map Tue Mar 12 21:34:03 2013 +0000
+++ b/hotspot.map Wed Apr 17 19:09:24 2013 +0100
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 23888f3dec52 6d77e26134d47e62621a35b259c70d8e98070724af9a718ec2b85cf84b954614
-zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot d8b22e079abe 28883ebefcfff1ba8b356a7fabf8e449c25fe7fffe1d563f1f58f887100063f0
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot ad5a321edea2 c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac
+zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 4e4dd75d54e7 46b4bb240e3ebea1e151c57aa9afb0cb4706f4fc467b651a6c5090101352853d
diff -r 87982c9fedc5 -r 4624e54bf5ef patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Tue Mar 12 21:34:03 2013 +0000
+++ b/patches/boot/ecj-diamond.patch Wed Apr 17 19:09:24 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 2013-02-11 21:40:54.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-02-12 00:10:02.178178345 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-03-08 16:05:05.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-04-17 14:53:25.283551366 +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 2013-02-11 21:40:54.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-02-12 00:10:02.178178345 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-03-08 16:05:05.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-04-17 14:53:25.291551495 +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 2013-02-11 21:40:54.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-02-12 00:10:02.178178345 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-03-08 16:05:05.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-04-17 14:53:25.291551495 +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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-02-12 00:10:02.178178345 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-04-17 14:53:25.291551495 +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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-02-12 00:10:02.178178345 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-04-17 14:53:25.291551495 +0100
@@ -239,9 +239,9 @@
}
}
@@ -76,8 +76,8 @@
/**
* Constructs the type resolver for the given actual type.
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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-02-12 00:10:02.178178345 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-04-17 14:53:25.291551495 +0100
@@ -103,9 +103,9 @@
return this.def.compareTo(that.def);
}
@@ -149,8 +149,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 2013-02-12 00:09:29.341652316 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-12 00:10:02.178178345 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-04-17 14:52:22.422547047 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-04-17 14:53:25.291551495 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != 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 2013-02-12 00:09:29.129648920 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-12 00:10:02.178178345 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-17 14:52:22.294545002 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-04-17 14:53:25.291551495 +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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-02-12 00:10:02.182178409 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-04-17 14:53:25.295551558 +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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-02-12 00:10:02.182178409 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-04-17 14:53:25.295551558 +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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-02-12 00:10:02.182178409 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-04-17 14:53:25.295551558 +0100
@@ -915,7 +915,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -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 2013-02-12 00:09:29.341652316 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-12 00:10:02.182178409 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-17 14:52:22.422547047 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-04-17 14:53:25.295551558 +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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-02-12 00:10:02.186178473 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-04-17 14:53:25.295551558 +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/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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-02-12 00:10:02.186178473 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-04-17 14:53:25.295551558 +0100
@@ -126,11 +126,11 @@
public void setBytes(byte[] newBytes) {
if (bytes == newBytes) return;
@@ -388,8 +388,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 2013-02-12 00:09:29.129648920 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-12 00:10:02.186178473 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-17 14:52:22.294545002 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-04-17 14:53:25.295551558 +0100
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -554,8 +554,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 2013-02-12 00:09:29.341652316 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-12 00:10:02.186178473 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-04-17 14:52:22.422547047 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-04-17 14:53:25.295551558 +0100
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -669,8 +669,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 2013-02-12 00:09:29.345652380 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-12 00:10:02.186178473 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-04-17 14:52:22.422547047 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-04-17 14:53:25.299551622 +0100
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -726,8 +726,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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-02-12 00:10:02.186178473 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-04-17 14:53:25.299551622 +0100
@@ -181,8 +181,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -758,8 +758,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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-02-12 00:10:02.186178473 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-04-17 14:53:25.299551622 +0100
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -770,8 +770,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 2013-02-12 00:09:29.345652380 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-12 00:10:02.186178473 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-04-17 14:52:22.426547111 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-04-17 14:53:25.299551622 +0100
@@ -47,8 +47,8 @@
*/
@@ -793,8 +793,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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-02-12 00:10:02.186178473 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-04-17 14:53:25.299551622 +0100
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -815,8 +815,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 2013-02-12 00:09:29.345652380 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-12 00:10:02.190178537 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-04-17 14:52:22.426547111 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-04-17 14:53:25.299551622 +0100
@@ -232,7 +232,7 @@
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
@@ -827,8 +827,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 2013-02-12 00:09:29.345652380 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-12 00:10:02.190178537 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-04-17 14:52:22.426547111 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-04-17 14:53:25.299551622 +0100
@@ -132,7 +132,7 @@
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
@@ -839,8 +839,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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-02-12 00:10:02.190178537 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-04-17 14:53:25.303551686 +0100
@@ -1284,7 +1284,7 @@
*/
public Collection<?> toCollection() throws SQLException {
@@ -860,8 +860,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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-02-12 00:10:02.190178537 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2013-04-17 14:53:25.303551686 +0100
@@ -222,7 +222,7 @@
// either of the setter methods have been set.
if(boolColId){
@@ -872,8 +872,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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-02-12 00:10:02.194178601 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2013-04-17 14:53:25.303551686 +0100
@@ -99,10 +99,10 @@
throws UnsupportedCallbackException
{
@@ -888,8 +888,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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-02-12 00:10:02.194178601 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2013-04-17 14:53:25.307551750 +0100
@@ -152,7 +152,7 @@
// new configuration
@@ -918,8 +918,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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-02-12 00:10:02.194178601 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2013-04-17 14:53:25.307551750 +0100
@@ -184,7 +184,7 @@
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
@@ -930,8 +930,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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-02-12 00:10:02.194178601 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2013-04-17 14:53:25.307551750 +0100
@@ -658,7 +658,7 @@
throw new FailedLoginException(
"Unable to find X.509 certificate chain in keystore");
@@ -942,8 +942,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 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-02-12 00:10:02.194178601 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2013-04-17 14:53:25.307551750 +0100
@@ -76,7 +76,7 @@
private SolarisNumericUserPrincipal UIDPrincipal;
private SolarisNumericGroupPrincipal GIDPrincipal;
@@ -954,8 +954,8 @@
/**
* Initialize this <code>LoginModule</code>.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-02-12 00:10:02.194178601 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-04-15 23:41:13.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2013-04-17 14:53:25.307551750 +0100
@@ -70,7 +70,7 @@
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
@@ -966,8 +966,8 @@
/**
* Initialize this <code>LoginModule</code>.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-02-11 21:40:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2013-02-12 00:10:02.198178665 +0000
More information about the distro-pkg-dev
mailing list