/hg/release/icedtea7-2.3: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Feb 11 18:57:02 PST 2013
changeset d7b14b793a5c in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=d7b14b793a5c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Feb 05 09:31:13 2013 +0000
List latest security fixes in NEWS.
2013-02-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Updated with latest security fixes.
changeset 19a65ee9399c in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=19a65ee9399c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Feb 05 09:40:10 2013 +0000
PR1295: jamvm parallel unpack failures
2013-02-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: List PR1295.
* Makefile.am:
(extract-jamvm): Depend on download-jamvm.
changeset f328153e6c45 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=f328153e6c45
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Feb 12 02:54:56 2013 +0000
Sync with IcedTea7 2.3 forest HEAD and move to 2.3.6pre.
2013-02-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to 13.
(OPENJDK_VERSION): Bump to b20.
(CORBA_CHANGESET): Update to IcedTea7 2.3 forest head,
bringing in regression fixes and u10 changes.
(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_BOOTSTRAP_CLASSES): Remove ClassValue,
no longer needed thanks to 8002068.
* NEWS: List backports from u10.
* configure.ac: Bump to 2.3.6pre
as 2.3.5 was a forest-only release due
to the regressions.
* hotspot.map: Sync default with 2.3 HEAD as other
changes above.
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-trywithresources.patch:
Add additional cases required by u10 changes.
* patches/boot/ecj-multicatch.patch:
Drop CORBA case which was reverted in 8002068.
diffstat:
ChangeLog | 42 +
Makefile.am | 32 +-
NEWS | 95 +++
configure.ac | 2 +-
hotspot.map | 2 +-
patches/boot/ecj-diamond.patch | 972 ++++++++++++++++---------------
patches/boot/ecj-multicatch.patch | 16 -
patches/boot/ecj-trywithresources.patch | 26 +
8 files changed, 696 insertions(+), 491 deletions(-)
diffs (truncated from 2838 to 500 lines):
diff -r 04e3b3ccc887 -r f328153e6c45 ChangeLog
--- a/ChangeLog Mon Feb 04 16:34:28 2013 +0000
+++ b/ChangeLog Tue Feb 12 02:54:56 2013 +0000
@@ -1,3 +1,45 @@
+2013-02-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 13.
+ (OPENJDK_VERSION): Bump to b20.
+ (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head,
+ bringing in regression fixes and u10 changes.
+ (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_BOOTSTRAP_CLASSES): Remove ClassValue,
+ no longer needed thanks to 8002068.
+ * NEWS: List backports from u10.
+ * configure.ac: Bump to 2.3.6pre
+ as 2.3.5 was a forest-only release due
+ to the regressions.
+ * hotspot.map: Sync default with 2.3 HEAD as other
+ changes above.
+ * patches/boot/ecj-diamond.patch,
+ * patches/boot/ecj-trywithresources.patch:
+ Add additional cases required by u10 changes.
+ * patches/boot/ecj-multicatch.patch:
+ Drop CORBA case which was reverted in 8002068.
+
+2013-02-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: List PR1295.
+ * Makefile.am:
+ (extract-jamvm): Depend on download-jamvm.
+
+2013-02-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Updated with latest security fixes.
+
2013-02-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am,
diff -r 04e3b3ccc887 -r f328153e6c45 Makefile.am
--- a/Makefile.am Mon Feb 04 16:34:28 2013 +0000
+++ b/Makefile.am Tue Feb 12 02:54:56 2013 +0000
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b30
-JDK_UPDATE_VERSION = 09
+OPENJDK_VERSION = b20
+JDK_UPDATE_VERSION = 13
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 5116fe321210
-JAXP_CHANGESET = 91fcc41a0b4b
-JAXWS_CHANGESET = 8064f322e58d
-JDK_CHANGESET = a16bf9aa6275
-LANGTOOLS_CHANGESET = afdfcc0ca555
-OPENJDK_CHANGESET = 02128561d696
+CORBA_CHANGESET = 97a8b625f6e9
+JAXP_CHANGESET = d7feafb8427b
+JAXWS_CHANGESET = b900024eb4ba
+JDK_CHANGESET = 6bb01322bb5a
+LANGTOOLS_CHANGESET = e0739a8783d1
+OPENJDK_CHANGESET = dd8d1a8f222f
-CORBA_SHA256SUM = 7ea949e32cff3b901aafb69939731469c88ded2036c7a2ae72b757f3f9517435
-JAXP_SHA256SUM = c92299f6f9b812f2b57f78c699a04f297bc261f51a76b8ff694dea168504805c
-JAXWS_SHA256SUM = aed5c1ae9f80d4af02d183c71d46f223e05420f15cd379a98d413e09ad679bd1
-JDK_SHA256SUM = 87531928e9f4bc3c413df1bd09ff990d23ec03872e8df8aa4248389369b540f4
-LANGTOOLS_SHA256SUM = 30473c84f50ffb9db23887d0231fea6c81384d567506a37e392692eafa479c88
-OPENJDK_SHA256SUM = 2da96c984e35a13d64c92ad6670244d506b113a67289adeeaee77b43edb5f267
+CORBA_SHA256SUM = 511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d
+JAXP_SHA256SUM = 81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941
+JAXWS_SHA256SUM = 276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2
+JDK_SHA256SUM = a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2
+LANGTOOLS_SHA256SUM = 85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb
+OPENJDK_SHA256SUM = a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
@@ -99,7 +99,7 @@
SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
# Sources used from OpenJDK.
-ICEDTEA_BOOTSTRAP_CLASSES = $(SHARE)/java/lang/ClassValue.java
+ICEDTEA_BOOTSTRAP_CLASSES =
#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
if LACKS_JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT
@@ -1289,7 +1289,7 @@
clean-extract-cacao: clean-cacao
rm -f stamps/extract-cacao.stamp
-stamps/extract-jamvm.stamp:
+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
if BUILD_JAMVM
set -e ; \
if ! test -d jamvm ; \
diff -r 04e3b3ccc887 -r f328153e6c45 NEWS
--- a/NEWS Mon Feb 04 16:34:28 2013 +0000
+++ b/NEWS Tue Feb 12 02:54:56 2013 +0000
@@ -12,8 +12,103 @@
New in release 2.3.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
+ - S7057320: test/java/util/concurrent/Executors/AutoShutdown.java failing intermittently
+ - S7083664: TEST_BUG: test hard code of using c:/temp but this dir might not exist
+ - S7107613: scalability blocker in javax.crypto.CryptoPermissions
+ - S7107616: scalability blocker in javax.crypto.JceSecurityManager
+ - S7146424: Wildcard expansion for single entry classpath
+ - S7160609: [macosx] JDK crash in libjvm.dylib ( C [GeForceGLDriver+0x675a] gldAttachDrawable+0x941)
+ - S7160951: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar
+ - S7162488: VM not printing unknown -XX options
+ - S7169395: Exception throws due to the changes in JDK 7 object tranversal and break backward compatibility
+ - S7175616: Port fix for TimeZone from JDK 8 to JDK 7
+ - S7176485: (bf) Allow temporary buffer cache to grow to IOV_MAX
+ - S7179908: Fork hs23.3 hsx from hs22.2 for jdk7u7 and reinitialize build number
+ - S7184326: TEST_BUG: java/awt/Frame/7024749/bug7024749.java has a typo
+ - S7185245: Licensee source bundle tries to compile JFR
+ - S7185471: Avoid key expansion when AES cipher is re-init w/ the same key
+ - S7186371: [macosx] Main menu shortcuts not displayed (7u6 regression)
+ - S7187834: [macosx] Usage of private API in macosx 2d implementation causes Apple Store rejection
+ - S7188114: (launcher) need an alternate command line parser for Windows
+ - S7189136: Fork hs23.5 hsx from hs23.4 for jdk7u9 and reinitialize build number
+ - S7189350: Fix failed for CR 7162144
+ - S7190550: REGRESSION: Some closed/com/oracle/jfr/api tests fail to compile becuse of fix 7185245
+ - S7193219: JComboBox serialization fails in JDK 1.7
+ - S7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
+ - S7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
+ - S7195301: XML Signature DOM implementation should not use instanceof to determine type of Node
+ - S7195931: UnsatisfiedLinkError on PKCS11.C_GetOperationState while using NSS from jre7u6+
+ - S7197071: Makefiles for various security providers aren't including the default manifest.
+ - S7197652: Impossible to run any signed JNLP applications or applets, OCSP off by default
+ - S7198146: Another new regression test does not compile on windows-amd64
+ - S7198570: (tz) Support tzdata2012f
+ - S7198640: new hotspot build - hs23.6-b04
+ - S7199488: [TEST] runtime/7158800/InternTest.java failed due to false-positive on PID match.
+ - S7199645: Increment build # of hs23.5 to b02
+ - S7199669: Update tags in .hgtags file for CPU release rename
+ - S7200720: crash in net.dll during NTLM authentication
+ - S7200742: (se) Selector.select does not block when starting Coherence (sol11u1)
+ - S7200762: [macosx] Stuck in sun.java2d.opengl.CGLGraphicsConfig.getMaxTextureSize(Native Method)
+ - S8000285: Deadlock between PostEventQueue.noEvents, EventQueue.isDispatchThread and SwingUtilities.invokeLater
+ - S8000286: [macosx] Views keep scrolling back to the drag position after DnD
+ - S8000297: REGRESSION: closed/java/awt/EventQueue/PostEventOrderingTest.java fails
+ - S8000307: Jre7cert: focusgained does not get called for all focus req when do alt + tab
+ - S8000822: Fork hs23.7 hsx from hs23.6 for jdk7u11 and reinitialize build number
+ - S8001124: jdk7u ProblemList.txt updates (10/2012)
+ - S8001242: Improve RMI HTTP conformance
+ - S8001808: Create a test for 8000327
+ - S8001876: Create regtest for 8000283
+ - S8002068: Build broken: corba code changes unable to use new JDK 7 classes
+ - S8002091: tools/launcher/ToolsOpts.java test started to fail since 7u11 b01 on Windows
+ - S8002114: fix failed for JDK-7160951: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar
+ - S8002225: (tz) Support tzdata2012i
+ - S8003402: (dc) test/java/nio/channels/DatagramChannel/SendToUnresovled.java failing after 7u11 cleanup issues
+ - S8003403: Test ShortRSAKeyWithinTLS and ClientJSSEServerJSSE failing after 7u11 cleanup
+ - S8003948: NTLM/Negotiate authentication problem
+ - S8004175: Restricted packages added in java.security are missing in java.security-{macosx, solaris, windows}
+ - S8004302: javax/xml/soap/Test7013971.java fails since jdk6u39b01
+ - S8004341: Two JCK tests fails with 7u11 b06
+ - S8005615: Java Logger fails to load tomcat logger implementation (JULI)
* Bug fixes
- Fix build using Zero's HotSpot so all patches apply again.
+ - PR1295: jamvm parallel unpack failure
New in release 2.3.4 (2013-01-15):
diff -r 04e3b3ccc887 -r f328153e6c45 configure.ac
--- a/configure.ac Mon Feb 04 16:34:28 2013 +0000
+++ b/configure.ac Tue Feb 12 02:54:56 2013 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.3.5pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.3.6pre], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r 04e3b3ccc887 -r f328153e6c45 hotspot.map
--- a/hotspot.map Mon Feb 04 16:34:28 2013 +0000
+++ b/hotspot.map Tue Feb 12 02:54:56 2013 +0000
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot ad27d7c42279 cc6c3e631f7b745f7a4bd8ff0a6fd75ccde06e7aa58e0d20d2254a1c98937538
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot bc0de5a0ece2 4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068
zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot a456d0771ba0 09a64fca0beff0759ef1b461d63ed6a00e43032972781bb3a55e49d8b93f67d0
diff -r 04e3b3ccc887 -r f328153e6c45 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Mon Feb 04 16:34:28 2013 +0000
+++ b/patches/boot/ecj-diamond.patch Tue Feb 12 02:54:56 2013 +0000
@@ -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-20 19:13:29.537633988 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-02-02 15:57:52.018737343 +0000
+--- 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
@@ -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-02 13:42:15.037347115 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-02-02 15:57:52.082738368 +0000
+--- 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
@@ -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-20 19:13:29.621635717 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-02-02 15:57:52.082738368 +0000
+--- 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
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -44,8 +44,8 @@
for (WorkerThread wt : copy) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2012-10-11 14:16:40.677525442 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-02-02 15:57:52.174739840 +0000
+--- 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
@@ -62,9 +62,10 @@
*/
public final class DocumentHandler extends DefaultHandler {
@@ -61,8 +61,8 @@
private Reference<ClassLoader> loader;
private ExceptionListener listener;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2012-07-20 19:23:35.521421032 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-02-02 15:57:52.082738368 +0000
+--- 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
@@ -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 2012-07-20 19:23:35.685424083 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-02-02 15:57:52.082738368 +0000
+--- 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
@@ -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-02 15:37:06.051471139 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-02-02 15:57:52.082738368 +0000
+--- 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
@@ -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-02 15:37:05.975469923 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-02-02 15:57:52.082738368 +0000
+--- 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
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -231,8 +231,8 @@
InnerClass ic =
new InnerClass(readClassRef(),
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-07-20 19:23:35.689424155 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-02-02 15:57:52.082738368 +0000
+--- 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
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -269,8 +269,8 @@
if (popset.add(values[i])) popvals.add(values[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-07-20 19:23:35.689424155 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-02-02 15:57:52.082738368 +0000
+--- 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
@@ -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-02 13:23:34.763400328 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-02-02 15:57:52.082738368 +0000
+--- 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
@@ -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-02 15:37:06.051471139 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -350,8 +350,8 @@
for (String optline : options.split("\n")) {
String[] words = optline.split("\\p{Space}+");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-07-20 19:23:35.693424229 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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 2012-07-20 19:23:35.693424229 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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-02 15:37:05.975469923 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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-02 15:37:06.051471139 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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-02 15:37:06.051471139 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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-02 13:14:33.330732979 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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 2012-07-20 19:23:35.697424304 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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-02 15:37:06.055471202 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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 2012-07-20 19:23:35.697424304 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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-02 15:37:06.055471202 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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-02 15:37:06.055471202 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2013-02-02 15:57:52.086738431 +0000
+--- 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
@@ -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 2012-07-20 19:23:36.029430487 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-02-02 15:57:52.090738496 +0000
+--- 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
@@ -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
More information about the distro-pkg-dev
mailing list