/hg/release/icedtea7-forest-2.4/jdk: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 3372405e49a9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3372405e49a9
author: andrew
date: Fri Sep 06 12:44:40 2013 +0100

	RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors


changeset e2cdb919c0ee in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e2cdb919c0ee
author: andrew
date: Fri Sep 06 12:45:39 2013 +0100

	RH995488: Java thinks that the default timezone is Busingen instead of Zurich


changeset 394e5408306c in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=394e5408306c
author: andrew
date: Fri Sep 06 12:45:50 2013 +0100

	Added tag icedtea-2.4.2 for changeset e2cdb919c0ee


diffstat:

 .hgtags                                           |   1 +
 src/share/native/sun/awt/image/jpeg/imageioJPEG.c |   5 +-
 src/solaris/native/java/util/TimeZone_md.c        |  60 +++++++++++++++++++++++
 3 files changed, 64 insertions(+), 2 deletions(-)

diffs (114 lines):

diff -r b2611b1a750c -r 394e5408306c .hgtags
--- a/.hgtags	Wed Sep 04 18:20:38 2013 +0100
+++ b/.hgtags	Fri Sep 06 12:45:50 2013 +0100
@@ -352,3 +352,4 @@
 b479996d5c924128c3490165b592bf66a3034932 jdk7u40-b42
 fb25cdef17e9610db5cb89fc35c0c4abef5ad781 jdk7u40-b43
 ed444a09a5fd32237deaef6e43804e20ba4f6352 jdk7u40-b60
+e2cdb919c0eed11b1603711bcb066a9bac79709d icedtea-2.4.2
diff -r b2611b1a750c -r 394e5408306c src/share/native/sun/awt/image/jpeg/imageioJPEG.c
--- a/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Wed Sep 04 18:20:38 2013 +0100
+++ b/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Fri Sep 06 12:45:50 2013 +0100
@@ -1454,6 +1454,8 @@
                                                     "[S");
 }
 
+#define JPEG_APP1  (JPEG_APP0 + 1)  /* EXIF APP1 marker code  */
+
 JNIEXPORT jlong JNICALL
 Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initJPEGImageReader
     (JNIEnv *env,
@@ -1507,6 +1509,7 @@
 
     // Set up to keep any APP2 markers, as these might contain ICC profile
     // data
+    jpegsavemarkers(cinfo, JPEG_APP1, 0xFFFF);
     jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF);
 
     /*
@@ -1569,8 +1572,6 @@
     imageio_init_source((j_decompress_ptr) cinfo);
 }
 
-#define JPEG_APP1  (JPEG_APP0 + 1)  /* EXIF APP1 marker code  */
-
 /*
  * For EXIF images, the APP1 will appear immediately after the SOI,
  * so it's safe to only look at the first marker in the list.
diff -r b2611b1a750c -r 394e5408306c src/solaris/native/java/util/TimeZone_md.c
--- a/src/solaris/native/java/util/TimeZone_md.c	Wed Sep 04 18:20:38 2013 +0100
+++ b/src/solaris/native/java/util/TimeZone_md.c	Fri Sep 06 12:45:50 2013 +0100
@@ -53,6 +53,8 @@
 
 
 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";
 #else
@@ -255,6 +257,64 @@
 #endif /* __linux__ */
 
     /*
+     * 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) {