/hg/icedtea6: Removed two unnecessary timezone patches
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Fri Feb 26 08:37:13 PST 2010
changeset 5216ec734960 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5216ec734960
author: ptisnovs
date: Fri Feb 26 17:25:59 2010 +0100
Removed two unnecessary timezone patches
diffstat:
3 files changed, 4 insertions(+), 220 deletions(-)
ChangeLog | 4
patches/icedtea-timezone-default-permission.patch | 23 --
patches/icedtea-timezone.patch | 197 ---------------------
diffs (239 lines):
diff -r 6731ec7aa417 -r 5216ec734960 ChangeLog
--- a/ChangeLog Fri Feb 26 15:53:18 2010 +0100
+++ b/ChangeLog Fri Feb 26 17:25:59 2010 +0100
@@ -1,3 +1,7 @@ 2010-02-26 Xerxes RÃ¥nby <xerxes at zafen
+2010-02-26 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * removed two unnecessary timezone patches
+
2010-02-26 Xerxes RÃ¥nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
diff -r 6731ec7aa417 -r 5216ec734960 patches/icedtea-timezone-default-permission.patch
--- a/patches/icedtea-timezone-default-permission.patch Fri Feb 26 15:53:18 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- openjdk7/jdk/src/share/classes/java/util/TimeZone.java 2009-08-04 18:54:13.026104895 +0200
-+++ openjdk/jdk/src/share/classes/java/util/TimeZone.java 2009-08-04 18:53:09.035985858 +0200
-@@ -602,11 +602,7 @@
- }
- });
-
-- if (hasPermission()) {
-- defaultTimeZone = tz;
-- } else {
-- defaultZoneTL.set(tz);
-- }
-+ defaultTimeZone = tz;
- return tz;
- }
-
-@@ -637,6 +633,7 @@
- if (hasPermission()) {
- synchronized (TimeZone.class) {
- defaultTimeZone = zone;
-+ defaultZoneTL.set(null);
- }
- } else {
- defaultZoneTL.set(zone);
diff -r 6731ec7aa417 -r 5216ec734960 patches/icedtea-timezone.patch
--- a/patches/icedtea-timezone.patch Fri Feb 26 15:53:18 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
---- openjdk/jdk/src/solaris/native/java/util/TimeZone_md_old.c 2008-11-25 04:06:19.000000000 -0500
-+++ openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c 2009-03-24 12:08:35.000000000 -0400
-@@ -201,115 +201,105 @@
- size_t size;
-
- /*
-- * First, try the ZONE entry in /etc/sysconfig/clock. However, the
-- * ZONE entry is not set up after initial Red Hat Linux
-- * installation. In case that /etc/localtime is set up without
-- * using timeconfig, there might be inconsistency between
-- * /etc/localtime and the ZONE entry. The inconsistency between
-- * timeconfig and linuxconf is reported as a bug in the Red Hat
-- * web page as of May 1, 2000.
-+ * First, try /etc/localtime to find the zone ID.
- */
-- if ((fp = fopen(sysconfig_clock_file, "r")) != NULL) {
-- char line[256];
--
-- while (fgets(line, sizeof(line), fp) != NULL) {
-- char *p = line;
-- char *s;
-+ if (lstat(defailt_zoneinfo_file, &statbuf) == -1) {
-+
-+ /* If /etc/localtime doesn't exist, try /etc/sysconfig/clock */
-+ 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) {
-+ SKIP_SPACE(p);
-+ if (*p != 'Z') {
- continue;
- }
-- p += 4;
-- SKIP_SPACE(p);
-- if (*p++ != '=') {
-- break;
-+ 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;
-+ }
- }
-- SKIP_SPACE(p);
-- if (*p++ != '"') {
-+ for (s = p; *s && *s != '"'; s++)
-+ ;
-+ if (*s != '"') {
-+ /* this ZONE entry is broken. */
- break;
- }
-- }
-- for (s = p; *s && *s != '"'; s++)
-- ;
-- if (*s != '"') {
-- /* this ZONE entry is broken. */
-+ *s = '\0';
-+ tz = strdup(p);
- break;
- }
-- *s = '\0';
-- tz = strdup(p);
-- break;
-- }
-- (void) fclose(fp);
-- if (tz != NULL) {
-+ (void) fclose(fp);
- return tz;
- }
-- }
-+ } else {
-
-- /*
-- * Next, try /etc/localtime to find the zone ID.
-- */
-- if (lstat(defailt_zoneinfo_file, &statbuf) == -1) {
-- return NULL;
-- }
-+ /*
-+ * If it's a symlink, get the link name and its zone ID part. (The
-+ * older versions of timeconfig created a symlink as described in
-+ * the Red Hat man page. It was changed in 1999 to create a copy
-+ * of a zoneinfo file. It's no longer possible to get the zone ID
-+ * from /etc/localtime.)
-+ */
-+ if (S_ISLNK(statbuf.st_mode)) {
-+ char linkbuf[PATH_MAX+1];
-+ int len;
-+
-+ if ((len = readlink(defailt_zoneinfo_file, linkbuf, sizeof(linkbuf)-1)) == -1) {
-+ jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n",
-+ defailt_zoneinfo_file);
-+ return NULL;
-+ }
-+ linkbuf[len] = '\0';
-+ tz = getZoneName(linkbuf);
-+ if (tz != NULL) {
-+ tz = strdup(tz);
-+ }
-+ return tz;
-+ }
-
-- /*
-- * If it's a symlink, get the link name and its zone ID part. (The
-- * older versions of timeconfig created a symlink as described in
-- * the Red Hat man page. It was changed in 1999 to create a copy
-- * of a zoneinfo file. It's no longer possible to get the zone ID
-- * from /etc/localtime.)
-- */
-- if (S_ISLNK(statbuf.st_mode)) {
-- char linkbuf[PATH_MAX+1];
-- int len;
--
-- if ((len = readlink(defailt_zoneinfo_file, linkbuf, sizeof(linkbuf)-1)) == -1) {
-- jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n",
-- defailt_zoneinfo_file);
-+ /*
-+ * If it's a regular file, we need to find out the same zoneinfo file
-+ * that has been copied as /etc/localtime.
-+ */
-+ size = (size_t) statbuf.st_size;
-+ buf = (char *) malloc(size);
-+ if (buf == NULL) {
- return NULL;
- }
-- linkbuf[len] = '\0';
-- tz = getZoneName(linkbuf);
-- if (tz != NULL) {
-- tz = strdup(tz);
-+ if ((fd = open(defailt_zoneinfo_file, O_RDONLY)) == -1) {
-+ free((void *) buf);
-+ return NULL;
- }
-- return tz;
-- }
-
-- /*
-- * If it's a regular file, we need to find out the same zoneinfo file
-- * that has been copied as /etc/localtime.
-- */
-- size = (size_t) statbuf.st_size;
-- buf = (char *) malloc(size);
-- if (buf == NULL) {
-- return NULL;
-- }
-- if ((fd = open(defailt_zoneinfo_file, O_RDONLY)) == -1) {
-- free((void *) buf);
-- return NULL;
-- }
--
-- if (read(fd, buf, size) != (ssize_t) size) {
-+ if (read(fd, buf, size) != (ssize_t) size) {
-+ (void) close(fd);
-+ free((void *) buf);
-+ return NULL;
-+ }
- (void) close(fd);
-+
-+ tz = findZoneinfoFile(buf, size, zoneinfo_dir);
- free((void *) buf);
-- return NULL;
-+ return tz;
- }
-- (void) close(fd);
--
-- tz = findZoneinfoFile(buf, size, zoneinfo_dir);
-- free((void *) buf);
-- return tz;
- }
- #else
- #ifdef __solaris__
More information about the distro-pkg-dev
mailing list