/hg/release/icedtea6-1.11: 7 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Sep 6 20:26:01 PDT 2013
changeset ecd2b7356f84 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ecd2b7356f84
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Sep 04 12:25:58 2013 +0100
Update NEWS with missing backports and remove erroneous backport.
2013-09-02 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/6893617-cnctx_always_uses_default_orb.patch:
Remove patch which shouldn't have been backported to 1.11.
* Makefile.am:
(ICEDTEA_PATCHES): Remove 6893617.
* NEWS: Add missing backport entries.
changeset 46162ab5e258 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=46162ab5e258
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Sep 04 12:27:13 2013 +0100
Prepare for 1.11.13 release.
2013-09-04 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add release date of 1.11.13.
* configure.ac: Prepare for 1.11.13.
changeset 636eeb85c15e in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=636eeb85c15e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Sep 06 12:19:02 2013 +0100
RH995488: Java thinks that the default timezone is Busingen instead of Zurich
2013-09-05 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* patches/rh995488-rhel_tz_fix.patch:
Use /etc/sysconfig/clock on RHEL & clones
so that they don't search /usr/share/zoneinfo.
* NEWS: Mention patch.
changeset f4d047e0ad2d in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=f4d047e0ad2d
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Sep 06 12:20:11 2013 +0100
Bump release date.
2013-09-06 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Bump date.
changeset a02969e09391 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a02969e09391
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Sep 06 23:33:32 2013 +0100
Credit Omair for original version of RH995488.
2013-09-06 Andrew John Hughes <gnu.andrew at redhat.com>
* ChangeLog: Credit Omair for original
version of RH995488 patch.
changeset 0729d519b51f in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=0729d519b51f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Sep 06 23:33:38 2013 +0100
Added tag icedtea6-1.11.13 for changeset a02969e09391
changeset 5fb5a0032329 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=5fb5a0032329
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Sat Sep 07 04:25:38 2013 +0100
Start 1.11.14 release cycle.
2013-09-07 Andrew John Hughes <gnu.andrew at redhat.com>
* configure.ac: Set to 1.11.14pre.
* NEWS: Add 1.11.14 section.
diffstat:
.hgtags | 1 +
ChangeLog | 37 +
Makefile.am | 4 +-
NEWS | 10 +-
configure.ac | 2 +-
patches/openjdk/6893617-cnctx_always_uses_default_orb.patch | 234 ------------
patches/rh995488-rhel_tz_fix.patch | 77 +++
7 files changed, 127 insertions(+), 238 deletions(-)
diffs (437 lines):
diff -r 88ad9f715193 -r 5fb5a0032329 .hgtags
--- a/.hgtags Wed Sep 04 00:13:08 2013 +0100
+++ b/.hgtags Sat Sep 07 04:25:38 2013 +0100
@@ -35,3 +35,4 @@
f25e5db9397688f7268bb62aca5c63520b4bd08e icedtea6-1.11.10
d3fed928b8b9d76d6153789ac6daec5dd02aab4d icedtea6-1.11.11
eca41165787238e9d088af88d5a35e417cff21b7 icedtea6-1.11.12
+a02969e093910e938dddd09c03c52bcd1f53ed2d icedtea6-1.11.13
diff -r 88ad9f715193 -r 5fb5a0032329 ChangeLog
--- a/ChangeLog Wed Sep 04 00:13:08 2013 +0100
+++ b/ChangeLog Sat Sep 07 04:25:38 2013 +0100
@@ -1,3 +1,40 @@
+2013-09-07 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * configure.ac: Set to 1.11.14pre.
+ * NEWS: Add 1.11.14 section.
+
+2013-09-06 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * ChangeLog: Credit Omair for original
+ version of RH995488 patch.
+
+2013-09-06 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Bump date.
+
+2013-09-05 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * patches/rh995488-rhel_tz_fix.patch:
+ Use /etc/sysconfig/clock on RHEL & clones
+ so that they don't search /usr/share/zoneinfo.
+ Main part of patch originally by Omair Majid.
+ * NEWS: Mention patch.
+
+2013-09-04 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Add release date of 1.11.13.
+ * configure.ac: Prepare for 1.11.13.
+
+2013-09-04 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/6893617-cnctx_always_uses_default_orb.patch:
+ Remove patch which shouldn't have been backported to 1.11.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove 6893617.
+ * NEWS: Add missing backport entries.
+
2013-09-02 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r 88ad9f715193 -r 5fb5a0032329 Makefile.am
--- a/Makefile.am Wed Sep 04 00:13:08 2013 +0100
+++ b/Makefile.am Sat Sep 07 04:25:38 2013 +0100
@@ -667,7 +667,6 @@
patches/openjdk/7196533-timezone_bottleneck.patch \
patches/openjdk/6636370-appcontext_simplification.patch \
patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \
- patches/openjdk/6893617-cnctx_always_uses_default_orb.patch \
patches/imageiojpeg_sync.patch \
patches/openjdk/8005194-scale_memory_leak.patch \
patches/openjdk/6563752-ss12_support.patch \
@@ -679,7 +678,8 @@
patches/openjdk/6980281-majorver_for_solaris.patch \
patches/openjdk/7000225-bad_tabs.patch \
patches/openjdk/7038711-fix_no-clobber_usage.patch \
- patches/disable-cc-incompatible-sanity-checks.patch
+ patches/disable-cc-incompatible-sanity-checks.patch \
+ patches/rh995488-rhel_tz_fix.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 88ad9f715193 -r 5fb5a0032329 NEWS
--- a/NEWS Wed Sep 04 00:13:08 2013 +0100
+++ b/NEWS Sat Sep 07 04:25:38 2013 +0100
@@ -11,12 +11,16 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.11.13 (2013-XX-XX):
+New in release 1.11.14 (2013-10-XX):
+
+New in release 1.11.13 (2013-09-06):
* Backports
- S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY
- S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
- S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll
+ - S6636331: ConcurrentModificationException in AppContext code
+ - S6636370: minor corrections and simplification of code in AppContext
- S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
- S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6
- S6793818: JpegImageReader is too greedy creating color profiles
@@ -33,10 +37,14 @@
- S7018912: [parfait] potential buffer overruns in imageio jpeg
- S7022999: Can't build with FORCE_TIERED=0
- S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
+ - S7196533: TimeZone.getDefault() slow due to synchronization bottleneck
- S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
+ - S8014469: (tz) Support tzdata2013c
+ - S8020054: (tz) Support tzdata2013d
- S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
* Bug fixes
- PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel.
+ - RH995488: Java thinks that the default timezone is Busingen instead of Zurich
New in release 1.11.12 (2013-07-10):
diff -r 88ad9f715193 -r 5fb5a0032329 configure.ac
--- a/configure.ac Wed Sep 04 00:13:08 2013 +0100
+++ b/configure.ac Sat Sep 07 04:25:38 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.11.13pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.11.14pre],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r 88ad9f715193 -r 5fb5a0032329 patches/openjdk/6893617-cnctx_always_uses_default_orb.patch
--- a/patches/openjdk/6893617-cnctx_always_uses_default_orb.patch Wed Sep 04 00:13:08 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,234 +0,0 @@
-# HG changeset patch
-# User coffeys
-# Date 1340827826 -3600
-# Wed Jun 27 21:10:26 2012 +0100
-# Node ID 83f8283e47917f97b838257db5711e37be9b715e
-# Parent 352fad83e8447dec768064f60dc85934db32ef27
-6893617: JDK 6 CNCtx always uses the default ORB
-Reviewed-by: lancea
-
-diff --git a/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java b/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java
---- openjdk/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java
-+++ openjdk/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -59,8 +59,22 @@
-
- private final static boolean debug = false;
-
-+ /*
-+ * Implement one shared ORB among all CNCtx. However, there is a public constructor
-+ * accepting an ORB, so we need the option of using a given ORB.
-+ */
-+ private static ORB _defaultOrb;
- ORB _orb; // used by ExceptionMapper and RMI/IIOP factory
- public NamingContext _nc; // public for accessing underlying NamingContext
-+
-+ private synchronized static ORB getDefaultOrb() {
-+ if (_defaultOrb == null) {
-+ _defaultOrb = CorbaUtils.getOrb(null, -1,
-+ new Hashtable<String, java.lang.Object>());
-+ }
-+ return _defaultOrb;
-+ }
-+
- private NameComponent[] _name = null;
-
- Hashtable _env; // used by ExceptionMapper
-@@ -113,8 +127,9 @@
- // rest is the INS name
- // Return the parsed form to prevent subsequent lookup
- // from parsing the string as a composite name
-- // The caller should be aware that a toString() of the name
-- // will yield its INS syntax, rather than a composite syntax
-+ // The caller should be aware that a toString() of the name,
-+ // which came from the environment will yield its INS syntax,
-+ // rather than a composite syntax
- return new ResolveResult(ctx, parser.parse(rest));
- }
-
-@@ -134,10 +149,10 @@
- if (orb == null || nctx == null)
- throw new ConfigurationException(
- "Must supply ORB or NamingContext");
-- _orb = orb;
-- orbTracker = tracker;
-- if (orbTracker != null) {
-- orbTracker.incRefCount();
-+ if (orb != null) {
-+ _orb = orb;
-+ } else {
-+ _orb = getDefaultOrb();
- }
- _nc = nctx;
- _env = env;
-@@ -211,10 +226,13 @@
- org.omg.CORBA.ORB inOrb = null;
- String ncIor = null;
-
-- if (env != null) {
-+ if (inOrb == null && env != null) {
- inOrb = (org.omg.CORBA.ORB) env.get("java.naming.corba.orb");
- }
-
-+ if (inOrb == null)
-+ inOrb = getDefaultOrb(); // will create a default ORB if none exists
-+
- // Extract PROVIDER_URL from environment
- String provUrl = null;
- if (env != null) {
-@@ -225,13 +243,6 @@
- // Initialize the root naming context by using the IOR supplied
- // in the PROVIDER_URL
- ncIor = getStringifiedIor(provUrl);
--
-- if (inOrb == null) {
--
-- // no ORB instance specified; create one using env and defaults
-- inOrb = CorbaUtils.getOrb(null, -1, env);
-- orbTracker = new OrbReuseTracker(inOrb);
-- }
- setOrbAndRootContext(inOrb, ncIor);
- } else if (provUrl != null) {
- // Initialize the root naming context by using the URL supplied
-@@ -257,14 +268,8 @@
- }
- } else {
- // No PROVIDER_URL supplied; initialize using defaults
-- if (inOrb == null) {
--
-- // No ORB instance specified; create one using env and defaults
-- inOrb = CorbaUtils.getOrb(null, -1, env);
-- orbTracker = new OrbReuseTracker(inOrb);
-- if (debug) {
-- System.err.println("Getting default ORB: " + inOrb + env);
-- }
-+ if (debug) {
-+ System.err.println("Getting default ORB: " + inOrb + env);
- }
- setOrbAndRootContext(inOrb, (String)null);
- }
-@@ -285,6 +290,10 @@
- */
- private String initUsingIiopUrl(ORB defOrb, String url, Hashtable env)
- throws NamingException {
-+
-+ if (defOrb == null)
-+ defOrb = getDefaultOrb();
-+
- try {
- IiopUrl parsedUrl = new IiopUrl(url);
-
-@@ -296,19 +305,17 @@
- addr = (IiopUrl.Address)addrs.elementAt(i);
-
- try {
-- if (defOrb != null) {
-- try {
-- String tmpUrl = "corbaloc:iiop:" + addr.host
-- + ":" + addr.port + "/NameService";
-- if (debug) {
-- System.err.println("Using url: " + tmpUrl);
-- }
-- org.omg.CORBA.Object rootCtx =
-- defOrb.string_to_object(tmpUrl);
-- setOrbAndRootContext(defOrb, rootCtx);
-- return parsedUrl.getStringName();
-- } catch (Exception e) {} // keep going
-- }
-+ try {
-+ String tmpUrl = "corbaloc:iiop:" + addr.host
-+ + ":" + addr.port + "/NameService";
-+ if (debug) {
-+ System.err.println("Using url: " + tmpUrl);
-+ }
-+ org.omg.CORBA.Object rootCtx =
-+ defOrb.string_to_object(tmpUrl);
-+ setOrbAndRootContext(defOrb, rootCtx);
-+ return parsedUrl.getStringName();
-+ } catch (Exception e) {} // keep going
-
- // Get ORB
- if (debug) {
-@@ -316,12 +323,8 @@
- + " and port " + addr.port);
- }
-
-- // Get ORB
-- ORB orb = CorbaUtils.getOrb(addr.host, addr.port, env);
-- orbTracker = new OrbReuseTracker(orb);
--
- // Assign to fields
-- setOrbAndRootContext(orb, (String)null);
-+ setOrbAndRootContext(defOrb, (String)null);
- return parsedUrl.getStringName();
-
- } catch (NamingException ne) {
-@@ -343,18 +346,16 @@
- */
- private String initUsingCorbanameUrl(ORB orb, String url, Hashtable env)
- throws NamingException {
-+
-+ if (orb == null)
-+ orb = getDefaultOrb();
-+
- try {
- CorbanameUrl parsedUrl = new CorbanameUrl(url);
-
- String corbaloc = parsedUrl.getLocation();
- String cosName = parsedUrl.getStringName();
-
-- if (orb == null) {
--
-- // No ORB instance specified; create one using env and defaults
-- orb = CorbaUtils.getOrb(null, -1, env);
-- orbTracker = new OrbReuseTracker(orb);
-- }
- setOrbAndRootContext(orb, corbaloc);
-
- return parsedUrl.getStringName();
-@@ -1115,9 +1116,6 @@
- }
-
- synchronized public void incEnumCount() {
-- if (orbTracker == null) {
-- return;
-- }
- enumCount++;
- if (debug) {
- System.out.println("incEnumCount, new count:" + enumCount);
-@@ -1126,9 +1124,6 @@
-
- synchronized public void decEnumCount()
- throws NamingException {
-- if (orbTracker == null) {
-- return;
-- }
- enumCount--;
- if (debug) {
- System.out.println("decEnumCount, new count:" + enumCount +
-@@ -1140,14 +1135,15 @@
- }
-
- synchronized public void close() throws NamingException {
-- if (orbTracker == null) {
-- return;
-- }
-+
- if (enumCount > 0) {
- isCloseCalled = true;
- return;
- }
-- orbTracker.decRefCount();
-+
-+ // Never destroy an orb in CNCtx.
-+ // The orb we have is either the shared/default orb, or one passed in to a constructor
-+ // from elsewhere, so that orb is somebody else's reponsibility.
- }
-
- protected void finalize() {
diff -r 88ad9f715193 -r 5fb5a0032329 patches/rh995488-rhel_tz_fix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/rh995488-rhel_tz_fix.patch Sat Sep 07 04:25:38 2013 +0100
@@ -0,0 +1,77 @@
+diff --git a/src/solaris/native/java/util/TimeZone_md.c b/src/solaris/native/java/util/TimeZone_md.c
+--- openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c
++++ openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c
+@@ -52,6 +52,8 @@
+ #ifdef __linux__
+
+ static const char *ETC_TIMEZONE_FILE = "/etc/timezone";
++static const char *REDHAT_RELEASE_FILE = "/etc/redhat-release";
++static const char *SYSCONFIG_CLOCK_FILE = "/etc/sysconfig/clock";
+ static const char *ZONEINFO_DIR = "/usr/share/zoneinfo";
+ static const char *DEFAULT_ZONEINFO_FILE = "/etc/localtime";
+
+@@ -225,6 +227,64 @@
+ }
+
+ /*
++ * Next, try the ZONE entry in /etc/sysconfig/clock.
++ */
++ if ((fp = fopen(REDHAT_RELEASE_FILE, "r")) != NULL) {
++ char id[7];
++
++ /* Avoid this file on Fedora as may be buggy; RH489586 */
++ if (fgets(id, sizeof (id), fp) != NULL &&
++ strncmp(id, "Fedora", 6) != 0) {
++ (void) fclose(fp);
++ if ((fp = fopen(SYSCONFIG_CLOCK_FILE, "r")) != NULL) {
++ char line[256];
++
++ while (fgets(line, sizeof(line), fp) != NULL) {
++ char *p = line;
++ char *s;
++
++ SKIP_SPACE(p);
++ if (*p != 'Z') {
++ continue;
++ }
++ if (strncmp(p, "ZONE=\"", 6) == 0) {
++ p += 6;
++ } else {
++ /*
++ * In case we need to parse it token by token.
++ */
++ if (strncmp(p, "ZONE", 4) != 0) {
++ continue;
++ }
++ p += 4;
++ SKIP_SPACE(p);
++ if (*p++ != '=') {
++ break;
++ }
++ SKIP_SPACE(p);
++ if (*p++ != '"') {
++ break;
++ }
++ }
++ for (s = p; *s && *s != '"'; s++)
++ ;
++ if (*s != '"') {
++ /* this ZONE entry is broken. */
++ break;
++ }
++ *s = '\0';
++ tz = strdup(p);
++ break;
++ }
++ (void) fclose(fp);
++ if (tz != NULL) {
++ return tz;
++ }
++ }
++ }
++ }
++
++ /*
+ * Next, try /etc/localtime to find the zone ID.
+ */
+ if (lstat(DEFAULT_ZONEINFO_FILE, &statbuf) == -1) {
More information about the distro-pkg-dev
mailing list