Compare commits
No commits in common. "imports/c9/java-1.8.0-openjdk-1.8.0.352.b08-2.el9_0" and "c8" have entirely different histories.
imports/c9
...
c8
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u352-b08-4curve.tar.xz
|
SOURCES/shenandoah8u432-b06.tar.xz
|
||||||
SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
11e3bf44f3c54d25e2018fc7df16c231daf041c5 SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u352-b08-4curve.tar.xz
|
af2d3b85c48ecc8c22188ac687e6160658ef6aca SOURCES/shenandoah8u432-b06.tar.xz
|
||||||
7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
||||||
|
|||||||
1280
SOURCES/NEWS
1280
SOURCES/NEWS
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,34 @@
|
|||||||
Package of LTS OpenJDK 8
|
OpenJDK 8 is a Long-Term Support (LTS) release of the Java platform.
|
||||||
OpenJDK have release cadence of 6 months. but 3/4 of them are Short Term Supported for 6 months only. This package is designed to harbore them. Currently it is build on openJDK 10. LTSs (next is 11) will go as separate packages.
|
|
||||||
|
|
||||||
JDK8 is last LTS release of Java platform. It is bringing many cool improvements - http://openjdk.java.net/projects/jdk/8/ and is landing to your RHEL. Where it will be maintained for several years. You will always be allowed to install Used LTSs in build root, and alongside via alternatives.
|
For a list of major changes in OpenJDK 8 (java-1.8.0-openjdk), see the
|
||||||
|
upstream release page: https://openjdk.org/projects/jdk8/features
|
||||||
|
|
||||||
See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
|
# Rebuilding the OpenJDK package
|
||||||
See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf
|
|
||||||
|
|
||||||
|
The OpenJDK packages are now created from a single build which is then
|
||||||
|
packaged for different major versions of Red Hat Enterprise Linux
|
||||||
|
(RHEL). This allows the OpenJDK team to focus their efforts on the
|
||||||
|
development and testing of this single build, rather than having
|
||||||
|
multiple builds which only differ by the platform they were built on.
|
||||||
|
|
||||||
|
This does make rebuilding the package slightly more complicated than a
|
||||||
|
normal package. Modifications should be made to the
|
||||||
|
`java-1.8.0-openjdk-portable.specfile` file, which can be found with
|
||||||
|
this README file in the source RPM or installed in the documentation
|
||||||
|
tree by the `java-1.8.0-openjdk-headless` RPM.
|
||||||
|
|
||||||
|
Once the modified `java-1.8.0-openjdk-portable` RPMs are built, they
|
||||||
|
should be installed and will produce a number of tarballs in the
|
||||||
|
`/usr/lib/jvm` directory. The `java-1.8.0-openjdk` RPMs can then be
|
||||||
|
built, which will use these tarballs to create the usual RPMs found in
|
||||||
|
RHEL. The `java-1.8.0-openjdk-portable` RPMs can be uninstalled once
|
||||||
|
the desired final RPMs are produced.
|
||||||
|
|
||||||
|
Note that the `java-1.8.0-openjdk.spec` file has a hard requirement on
|
||||||
|
the exact version of java-1.8.0-openjdk-portable to use, so this will
|
||||||
|
need to be modified if the version or rpmrelease values are changed in
|
||||||
|
`java-1.8.0-openjdk-portable.specfile`.
|
||||||
|
|
||||||
|
To reduce the number of RPMs involved, the `fastdebug` and `slowdebug`
|
||||||
|
builds may be disabled using `--without fastdebug` and `--without
|
||||||
|
slowdebug`.
|
||||||
|
|||||||
@ -30,7 +30,7 @@ import java.util.TimeZone;
|
|||||||
|
|
||||||
public class TestTranslations {
|
public class TestTranslations {
|
||||||
|
|
||||||
private static Map<Locale,String[]> KYIV;
|
private static Map<Locale,String[]> KYIV, CIUDAD_JUAREZ;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
Map<Locale,String[]> map = new HashMap<Locale,String[]>();
|
Map<Locale,String[]> map = new HashMap<Locale,String[]>();
|
||||||
@ -44,6 +44,18 @@ public class TestTranslations {
|
|||||||
"Osteurop\u00e4ische Sommerzeit", "OESZ", "OESZ",
|
"Osteurop\u00e4ische Sommerzeit", "OESZ", "OESZ",
|
||||||
"Osteurop\u00e4ische Zeit", "OEZ", "OEZ"});
|
"Osteurop\u00e4ische Zeit", "OEZ", "OEZ"});
|
||||||
KYIV = Collections.unmodifiableMap(map);
|
KYIV = Collections.unmodifiableMap(map);
|
||||||
|
|
||||||
|
map = new HashMap<Locale,String[]>();
|
||||||
|
map.put(Locale.US, new String[] { "Mountain Standard Time", "MST", "MST",
|
||||||
|
"Mountain Daylight Time", "MDT", "MDT",
|
||||||
|
"Mountain Time", "MT", "MT"});
|
||||||
|
map.put(Locale.FRANCE, new String[] { "Heure normale des Rocheuses", "UTC\u221207:00", "MST",
|
||||||
|
"Heure avanc\u00e9e des Rocheuses", "UTC\u221206:00", "MDT",
|
||||||
|
"Rocheuses", "UTC\u221207:00", "MT"});
|
||||||
|
map.put(Locale.GERMANY, new String[] { "Rocky Mountains Normalzeit", "GMT-07:00", "MST",
|
||||||
|
"Rocky Mountains Sommerzeit", "GMT-06:00", "MDT",
|
||||||
|
"Zeitzone Mountain", "GMT-07:00", "MT"});
|
||||||
|
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -53,7 +65,6 @@ public class TestTranslations {
|
|||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
String localeProvider = args[0];
|
|
||||||
System.out.println("Checking sanity of full zone string set...");
|
System.out.println("Checking sanity of full zone string set...");
|
||||||
boolean invalid = Arrays.stream(Locale.getAvailableLocales())
|
boolean invalid = Arrays.stream(Locale.getAvailableLocales())
|
||||||
.peek(l -> System.out.println("Locale: " + l))
|
.peek(l -> System.out.println("Locale: " + l))
|
||||||
@ -68,9 +79,18 @@ public class TestTranslations {
|
|||||||
System.exit(2);
|
System.exit(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Locale l : KYIV.keySet()) {
|
String localeProvider = args[0];
|
||||||
String[] expected = KYIV.get(l);
|
testZone(localeProvider, KYIV,
|
||||||
for (String id : new String[] { "Europe/Kiev", "Europe/Kyiv", "Europe/Uzhgorod", "Europe/Zaporozhye" }) {
|
new String[] { "Europe/Kiev", "Europe/Kyiv", "Europe/Uzhgorod", "Europe/Zaporozhye" });
|
||||||
|
testZone(localeProvider, CIUDAD_JUAREZ,
|
||||||
|
new String[] { "America/Cambridge_Bay", "America/Ciudad_Juarez" });
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testZone(String localeProvider, Map<Locale,String[]> exp, String[] ids) {
|
||||||
|
for (Locale l : exp.keySet()) {
|
||||||
|
String[] expected = exp.get(l);
|
||||||
|
System.out.printf("Expected values for %s are %s\n", l, Arrays.toString(expected));
|
||||||
|
for (String id : ids) {
|
||||||
String expectedShortStd = null;
|
String expectedShortStd = null;
|
||||||
String expectedShortDST = null;
|
String expectedShortDST = null;
|
||||||
String expectedShortGen = null;
|
String expectedShortGen = null;
|
||||||
|
|||||||
2582
SOURCES/java-1.8.0-openjdk-portable.specfile
Normal file
2582
SOURCES/java-1.8.0-openjdk-portable.specfile
Normal file
File diff suppressed because it is too large
Load Diff
286
SOURCES/jdk8186464-rh1433262-zip64_failure.patch
Normal file
286
SOURCES/jdk8186464-rh1433262-zip64_failure.patch
Normal file
@ -0,0 +1,286 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User sherman
|
||||||
|
# Date 1505950914 25200
|
||||||
|
# Wed Sep 20 16:41:54 2017 -0700
|
||||||
|
# Node ID 723486922bfe4c17e3f5c067ce5e97229842fbcd
|
||||||
|
# Parent c8ac05bbe47771b3dafa2e7fc9a95d86d68d7c07
|
||||||
|
8186464: ZipFile cannot read some InfoZip ZIP64 zip files
|
||||||
|
Reviewed-by: martin
|
||||||
|
|
||||||
|
diff --git openjdk.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java openjdk/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
|
||||||
|
index 26e2a5bf9e9..2630c118817 100644
|
||||||
|
--- openjdk.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
|
||||||
|
+++ openjdk/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
|
||||||
|
@@ -92,6 +92,7 @@ public class ZipFileSystem extends FileSystem {
|
||||||
|
private final boolean createNew; // create a new zip if not exists
|
||||||
|
private static final boolean isWindows =
|
||||||
|
System.getProperty("os.name").startsWith("Windows");
|
||||||
|
+ private final boolean forceEnd64;
|
||||||
|
|
||||||
|
// a threshold, in bytes, to decide whether to create a temp file
|
||||||
|
// for outputstream of a zip entry
|
||||||
|
@@ -112,12 +113,13 @@ public class ZipFileSystem extends FileSystem {
|
||||||
|
if (this.defaultDir.charAt(0) != '/')
|
||||||
|
throw new IllegalArgumentException("default dir should be absolute");
|
||||||
|
|
||||||
|
+ this.forceEnd64 = "true".equals(env.get("forceZIP64End"));
|
||||||
|
this.provider = provider;
|
||||||
|
this.zfpath = zfpath;
|
||||||
|
if (Files.notExists(zfpath)) {
|
||||||
|
if (createNew) {
|
||||||
|
try (OutputStream os = Files.newOutputStream(zfpath, CREATE_NEW, WRITE)) {
|
||||||
|
- new END().write(os, 0);
|
||||||
|
+ new END().write(os, 0, forceEnd64);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new FileSystemNotFoundException(zfpath.toString());
|
||||||
|
@@ -1014,28 +1016,36 @@ public class ZipFileSystem extends FileSystem {
|
||||||
|
end.cenoff = ENDOFF(buf);
|
||||||
|
end.comlen = ENDCOM(buf);
|
||||||
|
end.endpos = pos + i;
|
||||||
|
- if (end.cenlen == ZIP64_MINVAL ||
|
||||||
|
- end.cenoff == ZIP64_MINVAL ||
|
||||||
|
- end.centot == ZIP64_MINVAL32)
|
||||||
|
- {
|
||||||
|
- // need to find the zip64 end;
|
||||||
|
- byte[] loc64 = new byte[ZIP64_LOCHDR];
|
||||||
|
- if (readFullyAt(loc64, 0, loc64.length, end.endpos - ZIP64_LOCHDR)
|
||||||
|
- != loc64.length) {
|
||||||
|
- return end;
|
||||||
|
- }
|
||||||
|
- long end64pos = ZIP64_LOCOFF(loc64);
|
||||||
|
- byte[] end64buf = new byte[ZIP64_ENDHDR];
|
||||||
|
- if (readFullyAt(end64buf, 0, end64buf.length, end64pos)
|
||||||
|
- != end64buf.length) {
|
||||||
|
- return end;
|
||||||
|
- }
|
||||||
|
- // end64 found, re-calcualte everything.
|
||||||
|
- end.cenlen = ZIP64_ENDSIZ(end64buf);
|
||||||
|
- end.cenoff = ZIP64_ENDOFF(end64buf);
|
||||||
|
- end.centot = (int)ZIP64_ENDTOT(end64buf); // assume total < 2g
|
||||||
|
- end.endpos = end64pos;
|
||||||
|
+ // try if there is zip64 end;
|
||||||
|
+ byte[] loc64 = new byte[ZIP64_LOCHDR];
|
||||||
|
+ if (end.endpos < ZIP64_LOCHDR ||
|
||||||
|
+ readFullyAt(loc64, 0, loc64.length, end.endpos - ZIP64_LOCHDR)
|
||||||
|
+ != loc64.length ||
|
||||||
|
+ !locator64SigAt(loc64, 0)) {
|
||||||
|
+ return end;
|
||||||
|
+ }
|
||||||
|
+ long end64pos = ZIP64_LOCOFF(loc64);
|
||||||
|
+ byte[] end64buf = new byte[ZIP64_ENDHDR];
|
||||||
|
+ if (readFullyAt(end64buf, 0, end64buf.length, end64pos)
|
||||||
|
+ != end64buf.length ||
|
||||||
|
+ !end64SigAt(end64buf, 0)) {
|
||||||
|
+ return end;
|
||||||
|
+ }
|
||||||
|
+ // end64 found,
|
||||||
|
+ long cenlen64 = ZIP64_ENDSIZ(end64buf);
|
||||||
|
+ long cenoff64 = ZIP64_ENDOFF(end64buf);
|
||||||
|
+ long centot64 = ZIP64_ENDTOT(end64buf);
|
||||||
|
+ // double-check
|
||||||
|
+ if (cenlen64 != end.cenlen && end.cenlen != ZIP64_MINVAL ||
|
||||||
|
+ cenoff64 != end.cenoff && end.cenoff != ZIP64_MINVAL ||
|
||||||
|
+ centot64 != end.centot && end.centot != ZIP64_MINVAL32) {
|
||||||
|
+ return end;
|
||||||
|
}
|
||||||
|
+ // to use the end64 values
|
||||||
|
+ end.cenlen = cenlen64;
|
||||||
|
+ end.cenoff = cenoff64;
|
||||||
|
+ end.centot = (int)centot64; // assume total < 2g
|
||||||
|
+ end.endpos = end64pos;
|
||||||
|
return end;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1201,7 +1211,7 @@ public class ZipFileSystem extends FileSystem {
|
||||||
|
|
||||||
|
// sync the zip file system, if there is any udpate
|
||||||
|
private void sync() throws IOException {
|
||||||
|
- //System.out.printf("->sync(%s) starting....!%n", toString());
|
||||||
|
+ // System.out.printf("->sync(%s) starting....!%n", toString());
|
||||||
|
// check ex-closer
|
||||||
|
if (!exChClosers.isEmpty()) {
|
||||||
|
for (ExChannelCloser ecc : exChClosers) {
|
||||||
|
@@ -1292,7 +1302,7 @@ public class ZipFileSystem extends FileSystem {
|
||||||
|
}
|
||||||
|
end.centot = elist.size();
|
||||||
|
end.cenlen = written - end.cenoff;
|
||||||
|
- end.write(os, written);
|
||||||
|
+ end.write(os, written, forceEnd64);
|
||||||
|
}
|
||||||
|
if (!streams.isEmpty()) {
|
||||||
|
//
|
||||||
|
@@ -1849,8 +1859,8 @@ public class ZipFileSystem extends FileSystem {
|
||||||
|
long endpos;
|
||||||
|
int disktot;
|
||||||
|
|
||||||
|
- void write(OutputStream os, long offset) throws IOException {
|
||||||
|
- boolean hasZip64 = false;
|
||||||
|
+ void write(OutputStream os, long offset, boolean forceEnd64) throws IOException {
|
||||||
|
+ boolean hasZip64 = forceEnd64; // false;
|
||||||
|
long xlen = cenlen;
|
||||||
|
long xoff = cenoff;
|
||||||
|
if (xlen >= ZIP64_MINVAL) {
|
||||||
|
@@ -1875,8 +1885,8 @@ public class ZipFileSystem extends FileSystem {
|
||||||
|
writeShort(os, 45); // version needed to extract
|
||||||
|
writeInt(os, 0); // number of this disk
|
||||||
|
writeInt(os, 0); // central directory start disk
|
||||||
|
- writeLong(os, centot); // number of directory entires on disk
|
||||||
|
- writeLong(os, centot); // number of directory entires
|
||||||
|
+ writeLong(os, centot); // number of directory entries on disk
|
||||||
|
+ writeLong(os, centot); // number of directory entries
|
||||||
|
writeLong(os, cenlen); // length of central directory
|
||||||
|
writeLong(os, cenoff); // offset of central directory
|
||||||
|
|
||||||
|
diff --git openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c
|
||||||
|
index 5fd6fea049d..858e5814e92 100644
|
||||||
|
--- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c
|
||||||
|
+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c
|
||||||
|
@@ -385,6 +385,9 @@ findEND64(jzfile *zip, void *end64buf, jlong endpos)
|
||||||
|
{
|
||||||
|
char loc64[ZIP64_LOCHDR];
|
||||||
|
jlong end64pos;
|
||||||
|
+ if (endpos < ZIP64_LOCHDR) {
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
if (readFullyAt(zip->zfd, loc64, ZIP64_LOCHDR, endpos - ZIP64_LOCHDR) == -1) {
|
||||||
|
return -1; // end64 locator not found
|
||||||
|
}
|
||||||
|
@@ -567,6 +570,7 @@ readCEN(jzfile *zip, jint knownTotal)
|
||||||
|
{
|
||||||
|
/* Following are unsigned 32-bit */
|
||||||
|
jlong endpos, end64pos, cenpos, cenlen, cenoff;
|
||||||
|
+ jlong cenlen64, cenoff64, centot64;
|
||||||
|
/* Following are unsigned 16-bit */
|
||||||
|
jint total, tablelen, i, j;
|
||||||
|
unsigned char *cenbuf = NULL;
|
||||||
|
@@ -594,13 +598,20 @@ readCEN(jzfile *zip, jint knownTotal)
|
||||||
|
cenlen = ENDSIZ(endbuf);
|
||||||
|
cenoff = ENDOFF(endbuf);
|
||||||
|
total = ENDTOT(endbuf);
|
||||||
|
- if (cenlen == ZIP64_MAGICVAL || cenoff == ZIP64_MAGICVAL ||
|
||||||
|
- total == ZIP64_MAGICCOUNT) {
|
||||||
|
- unsigned char end64buf[ZIP64_ENDHDR];
|
||||||
|
- if ((end64pos = findEND64(zip, end64buf, endpos)) != -1) {
|
||||||
|
- cenlen = ZIP64_ENDSIZ(end64buf);
|
||||||
|
- cenoff = ZIP64_ENDOFF(end64buf);
|
||||||
|
- total = (jint)ZIP64_ENDTOT(end64buf);
|
||||||
|
+ unsigned char end64buf[ZIP64_ENDHDR];
|
||||||
|
+ if ((end64pos = findEND64(zip, end64buf, endpos)) != -1) {
|
||||||
|
+ // end64 candidate found,
|
||||||
|
+ cenlen64 = ZIP64_ENDSIZ(end64buf);
|
||||||
|
+ cenoff64 = ZIP64_ENDOFF(end64buf);
|
||||||
|
+ centot64 = ZIP64_ENDTOT(end64buf);
|
||||||
|
+ // double-check
|
||||||
|
+ if ((cenlen64 == cenlen || cenlen == ZIP64_MAGICVAL) &&
|
||||||
|
+ (cenoff64 == cenoff || cenoff == ZIP64_MAGICVAL) &&
|
||||||
|
+ (centot64 == total || total == ZIP64_MAGICCOUNT)) {
|
||||||
|
+ // to use the end64 values
|
||||||
|
+ cenlen = cenlen64;
|
||||||
|
+ cenoff = cenoff64;
|
||||||
|
+ total = (jint)centot64;
|
||||||
|
endpos = end64pos;
|
||||||
|
endhdrlen = ZIP64_ENDHDR;
|
||||||
|
}
|
||||||
|
diff --git openjdk.orig/jdk/test/java/util/zip/ZipFile/ReadZip.java openjdk/jdk/test/java/util/zip/ZipFile/ReadZip.java
|
||||||
|
index ffe8a8ed712..9b380003893 100644
|
||||||
|
--- openjdk.orig/jdk/test/java/util/zip/ZipFile/ReadZip.java
|
||||||
|
+++ openjdk/jdk/test/java/util/zip/ZipFile/ReadZip.java
|
||||||
|
@@ -22,7 +22,7 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* @test
|
||||||
|
- * @bug 4241361 4842702 4985614 6646605 5032358 6923692 6233323 8144977 8184993
|
||||||
|
+ * @bug 4241361 4842702 4985614 6646605 5032358 6923692 6233323 8144977 8184993 8186464
|
||||||
|
* @summary Make sure we can read a zip file.
|
||||||
|
@key randomness
|
||||||
|
* @run main/othervm ReadZip
|
||||||
|
@@ -31,12 +31,24 @@
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.io.*;
|
||||||
|
+import java.net.URI;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
+import java.nio.file.FileSystem;
|
||||||
|
+import java.nio.file.FileSystems;
|
||||||
|
+import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.nio.file.StandardCopyOption;
|
||||||
|
import java.nio.file.StandardOpenOption;
|
||||||
|
+import java.util.Collections;
|
||||||
|
+import java.util.HashMap;
|
||||||
|
+import java.util.List;
|
||||||
|
+import java.util.Map;
|
||||||
|
import java.util.zip.*;
|
||||||
|
|
||||||
|
+import sun.misc.IOUtils;
|
||||||
|
+
|
||||||
|
+import static java.nio.charset.StandardCharsets.US_ASCII;
|
||||||
|
+
|
||||||
|
public class ReadZip {
|
||||||
|
private static void unreached (Object o)
|
||||||
|
throws Exception
|
||||||
|
@@ -144,8 +156,6 @@ public class ReadZip {
|
||||||
|
newZip.delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
-
|
||||||
|
// Throw a FNF exception when read a non-existing zip file
|
||||||
|
try { unreached (new ZipFile(
|
||||||
|
new File(System.getProperty("test.src", "."),
|
||||||
|
@@ -153,5 +163,54 @@ public class ReadZip {
|
||||||
|
+ String.valueOf(new java.util.Random().nextInt())
|
||||||
|
+ ".zip")));
|
||||||
|
} catch (FileNotFoundException fnfe) {}
|
||||||
|
+
|
||||||
|
+ // read a zip file with ZIP64 end
|
||||||
|
+ Path path = Paths.get(System.getProperty("test.dir", ""), "end64.zip");
|
||||||
|
+ try {
|
||||||
|
+ URI uri = URI.create("jar:" + path.toUri());
|
||||||
|
+ Map<String, Object> env = new HashMap<>();
|
||||||
|
+ env.put("create", "true");
|
||||||
|
+ env.put("forceZIP64End", "true");
|
||||||
|
+ try (FileSystem fs = FileSystems.newFileSystem(uri, env)) {
|
||||||
|
+ Files.write(fs.getPath("hello"), "hello".getBytes());
|
||||||
|
+ }
|
||||||
|
+ try (ZipFile zf = new ZipFile(path.toFile())) {
|
||||||
|
+ if (!"hello".equals(new String(IOUtils.readAllBytes(zf.getInputStream(new ZipEntry("hello"))),
|
||||||
|
+ US_ASCII)))
|
||||||
|
+ throw new RuntimeException("zipfile: read entry failed");
|
||||||
|
+ } catch (IOException x) {
|
||||||
|
+ throw new RuntimeException("zipfile: zip64 end failed");
|
||||||
|
+ }
|
||||||
|
+ try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) {
|
||||||
|
+ if (!"hello".equals(new String(Files.readAllBytes(fs.getPath("hello")))))
|
||||||
|
+ throw new RuntimeException("zipfs: read entry failed");
|
||||||
|
+ } catch (IOException x) {
|
||||||
|
+ throw new RuntimeException("zipfile: zip64 end failed");
|
||||||
|
+ }
|
||||||
|
+ } finally {
|
||||||
|
+ Files.deleteIfExists(path);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // read a zip file created via "echo hello | zip dst.zip -", which uses
|
||||||
|
+ // ZIP64 end record
|
||||||
|
+ if (Files.notExists(Paths.get("/usr/bin/zip")))
|
||||||
|
+ return;
|
||||||
|
+ try {
|
||||||
|
+ Process zip = new ProcessBuilder("zip", path.toString().toString(), "-").start();
|
||||||
|
+ OutputStream os = zip.getOutputStream();
|
||||||
|
+ os.write("hello".getBytes(US_ASCII));
|
||||||
|
+ os.close();
|
||||||
|
+ zip.waitFor();
|
||||||
|
+ if (zip.exitValue() == 0 && Files.exists(path)) {
|
||||||
|
+ try (ZipFile zf = new ZipFile(path.toFile())) {
|
||||||
|
+ if (!"hello".equals(new String(IOUtils.readAllBytes(zf.getInputStream(new ZipEntry("-"))))))
|
||||||
|
+ throw new RuntimeException("zipfile: read entry failed");
|
||||||
|
+ } catch (IOException x) {
|
||||||
|
+ throw new RuntimeException("zipfile: zip64 end failed");
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ } finally {
|
||||||
|
+ Files.deleteIfExists(path);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,125 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# User mbalao
|
|
||||||
# Date 1529971845 -28800
|
|
||||||
# Tue Jun 26 08:10:45 2018 +0800
|
|
||||||
# Node ID e9c20b7250cd98d16a67f2a30b34284c2caa01dc
|
|
||||||
# Parent 9f1aa2e38d90dd60522237d7414af6bdcf03c4ff
|
|
||||||
8195607, PR3776: sun/security/pkcs11/Secmod/TestNssDbSqlite.java failed with "NSS initialization failed" on NSS 3.34.1
|
|
||||||
Reviewed-by: valeriep, weijun
|
|
||||||
|
|
||||||
diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/Secmod.java openjdk/jdk/src/share/classes/sun/security/pkcs11/Secmod.java
|
|
||||||
--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/Secmod.java
|
|
||||||
+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/Secmod.java
|
|
||||||
@@ -197,7 +197,7 @@
|
|
||||||
|
|
||||||
if (configDir != null) {
|
|
||||||
String configDirPath = null;
|
|
||||||
- String sqlPrefix = "sql:/";
|
|
||||||
+ String sqlPrefix = "sql:";
|
|
||||||
if (!configDir.startsWith(sqlPrefix)) {
|
|
||||||
configDirPath = configDir;
|
|
||||||
} else {
|
|
||||||
diff --git openjdk.orig/jdk/src/share/native/sun/security/pkcs11/j2secmod.c openjdk/jdk/src/share/native/sun/security/pkcs11/j2secmod.c
|
|
||||||
--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/j2secmod.c
|
|
||||||
+++ openjdk/jdk/src/share/native/sun/security/pkcs11/j2secmod.c
|
|
||||||
@@ -69,9 +69,14 @@
|
|
||||||
int res = 0;
|
|
||||||
FPTR_Initialize initialize =
|
|
||||||
(FPTR_Initialize)findFunction(env, jHandle, "NSS_Initialize");
|
|
||||||
+ #ifdef SECMOD_DEBUG
|
|
||||||
+ FPTR_GetError getError =
|
|
||||||
+ (FPTR_GetError)findFunction(env, jHandle, "PORT_GetError");
|
|
||||||
+ #endif // SECMOD_DEBUG
|
|
||||||
unsigned int flags = 0x00;
|
|
||||||
const char *configDir = NULL;
|
|
||||||
const char *functionName = NULL;
|
|
||||||
+ const char *configFile = NULL;
|
|
||||||
|
|
||||||
/* If we cannot initialize, exit now */
|
|
||||||
if (initialize == NULL) {
|
|
||||||
@@ -97,13 +102,18 @@
|
|
||||||
flags = 0x20; // NSS_INIT_OPTIMIZESPACE flag
|
|
||||||
}
|
|
||||||
|
|
||||||
+ configFile = "secmod.db";
|
|
||||||
+ if (configDir != NULL && strncmp("sql:", configDir, 4U) == 0) {
|
|
||||||
+ configFile = "pkcs11.txt";
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* If the NSS_Init function is requested then call NSS_Initialize to
|
|
||||||
* open the Cert, Key and Security Module databases, read only.
|
|
||||||
*/
|
|
||||||
if (strcmp("NSS_Init", functionName) == 0) {
|
|
||||||
flags = flags | 0x01; // NSS_INIT_READONLY flag
|
|
||||||
- res = initialize(configDir, "", "", "secmod.db", flags);
|
|
||||||
+ res = initialize(configDir, "", "", configFile, flags);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If the NSS_InitReadWrite function is requested then call
|
|
||||||
@@ -111,7 +121,7 @@
|
|
||||||
* read/write.
|
|
||||||
*/
|
|
||||||
} else if (strcmp("NSS_InitReadWrite", functionName) == 0) {
|
|
||||||
- res = initialize(configDir, "", "", "secmod.db", flags);
|
|
||||||
+ res = initialize(configDir, "", "", configFile, flags);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If the NSS_NoDB_Init function is requested then call
|
|
||||||
@@ -137,6 +147,13 @@
|
|
||||||
(*env)->ReleaseStringUTFChars(env, jConfigDir, configDir);
|
|
||||||
}
|
|
||||||
dprintf1("-res: %d\n", res);
|
|
||||||
+ #ifdef SECMOD_DEBUG
|
|
||||||
+ if (res == -1) {
|
|
||||||
+ if (getError != NULL) {
|
|
||||||
+ dprintf1("-NSS error: %d\n", getError());
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ #endif // SECMOD_DEBUG
|
|
||||||
|
|
||||||
return (res == 0) ? JNI_TRUE : JNI_FALSE;
|
|
||||||
}
|
|
||||||
diff --git openjdk.orig/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
|
|
||||||
--- openjdk.orig/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
|
|
||||||
+++ openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
|
|
||||||
@@ -34,6 +34,10 @@
|
|
||||||
const char *certPrefix, const char *keyPrefix,
|
|
||||||
const char *secmodName, unsigned int flags);
|
|
||||||
|
|
||||||
+#ifdef SECMOD_DEBUG
|
|
||||||
+typedef int (*FPTR_GetError)(void);
|
|
||||||
+#endif //SECMOD_DEBUG
|
|
||||||
+
|
|
||||||
// in secmod.h
|
|
||||||
//extern SECMODModule *SECMOD_LoadModule(char *moduleSpec,SECMODModule *parent,
|
|
||||||
// PRBool recurse);
|
|
||||||
diff --git openjdk.orig/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt openjdk/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt
|
|
||||||
new file mode 100644
|
|
||||||
--- /dev/null
|
|
||||||
+++ openjdk/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt
|
|
||||||
@@ -0,0 +1,4 @@
|
|
||||||
+library=
|
|
||||||
+name=NSS Internal PKCS #11 Module
|
|
||||||
+parameters=configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription=''
|
|
||||||
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
|
|
||||||
diff --git openjdk.orig/jdk/test/sun/security/pkcs11/SecmodTest.java openjdk/jdk/test/sun/security/pkcs11/SecmodTest.java
|
|
||||||
--- openjdk.orig/jdk/test/sun/security/pkcs11/SecmodTest.java
|
|
||||||
+++ openjdk/jdk/test/sun/security/pkcs11/SecmodTest.java
|
|
||||||
@@ -55,7 +55,7 @@
|
|
||||||
|
|
||||||
DBDIR = System.getProperty("test.classes", ".") + SEP + "tmpdb";
|
|
||||||
if (useSqlite) {
|
|
||||||
- System.setProperty("pkcs11test.nss.db", "sql:/" + DBDIR);
|
|
||||||
+ System.setProperty("pkcs11test.nss.db", "sql:" + DBDIR);
|
|
||||||
} else {
|
|
||||||
System.setProperty("pkcs11test.nss.db", DBDIR);
|
|
||||||
}
|
|
||||||
@@ -67,6 +67,7 @@
|
|
||||||
if (useSqlite) {
|
|
||||||
copyFile("key4.db", BASE, DBDIR);
|
|
||||||
copyFile("cert9.db", BASE, DBDIR);
|
|
||||||
+ copyFile("pkcs11.txt", BASE, DBDIR);
|
|
||||||
} else {
|
|
||||||
copyFile("secmod.db", BASE, DBDIR);
|
|
||||||
copyFile("key3.db", BASE, DBDIR);
|
|
||||||
@ -7,10 +7,11 @@
|
|||||||
PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations
|
PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations
|
||||||
Summary: Enable -mstackrealign on x86 Linux as well as x86 Mac OS X
|
Summary: Enable -mstackrealign on x86 Linux as well as x86 Mac OS X
|
||||||
|
|
||||||
diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
|
diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4
|
||||||
--- openjdk.orig///common/autoconf/flags.m4
|
index 113bf367e2..bed030e8d1 100644
|
||||||
+++ openjdk///common/autoconf/flags.m4
|
--- a/common/autoconf/flags.m4
|
||||||
@@ -402,6 +402,21 @@
|
+++ b/common/autoconf/flags.m4
|
||||||
|
@@ -451,6 +451,21 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
|
||||||
AC_SUBST($2CXXSTD_CXXFLAG)
|
AC_SUBST($2CXXSTD_CXXFLAG)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -32,23 +33,32 @@ diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/fla
|
|||||||
if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
|
if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
|
||||||
AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
|
AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
|
||||||
fi
|
fi
|
||||||
diff --git openjdk.orig///common/autoconf/hotspot-spec.gmk.in openjdk///common/autoconf/hotspot-spec.gmk.in
|
diff --git a/common/autoconf/hotspot-spec.gmk.in b/common/autoconf/hotspot-spec.gmk.in
|
||||||
--- openjdk.orig///common/autoconf/hotspot-spec.gmk.in
|
index 3f86751d2b..f8a271383f 100644
|
||||||
+++ openjdk///common/autoconf/hotspot-spec.gmk.in
|
--- a/common/autoconf/hotspot-spec.gmk.in
|
||||||
@@ -112,7 +112,8 @@
|
+++ b/common/autoconf/hotspot-spec.gmk.in
|
||||||
RC:=@HOTSPOT_RC@
|
@@ -114,13 +114,14 @@ RC:=@HOTSPOT_RC@
|
||||||
|
# Retain EXTRA_{CFLAGS,CXXFLAGS,LDFLAGS,ASFLAGS} for the target flags to
|
||||||
EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
|
# maintain compatibility with the existing Makefiles
|
||||||
|
EXTRA_CFLAGS=@LEGACY_TARGET_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
|
||||||
- $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
|
- $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
|
||||||
+ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) \
|
+ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) \
|
||||||
+ $(REALIGN_CFLAG)
|
+ $(REALIGN_CFLAG)
|
||||||
EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
|
EXTRA_CXXFLAGS=@LEGACY_TARGET_CXXFLAGS@
|
||||||
EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
|
EXTRA_LDFLAGS=@LEGACY_TARGET_LDFLAGS@
|
||||||
EXTRA_ASFLAGS=@LEGACY_EXTRA_ASFLAGS@
|
EXTRA_ASFLAGS=@LEGACY_TARGET_ASFLAGS@
|
||||||
diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
|
# Define an equivalent set for the host flags (i.e. without sysroot options)
|
||||||
--- openjdk.orig///common/autoconf/spec.gmk.in
|
HOST_CFLAGS=@LEGACY_HOST_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
|
||||||
+++ openjdk///common/autoconf/spec.gmk.in
|
- $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
|
||||||
@@ -366,6 +366,7 @@
|
+ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
|
||||||
|
HOST_CXXFLAGS=@LEGACY_HOST_CXXFLAGS@
|
||||||
|
HOST_LDFLAGS=@LEGACY_HOST_LDFLAGS@
|
||||||
|
HOST_ASFLAGS=@LEGACY_HOST_ASFLAGS@
|
||||||
|
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
|
||||||
|
index 9573bb2cbd..fe7efc130c 100644
|
||||||
|
--- a/common/autoconf/spec.gmk.in
|
||||||
|
+++ b/common/autoconf/spec.gmk.in
|
||||||
|
@@ -366,6 +366,7 @@ CXXFLAGS_JDKEXE:=@CXXFLAGS_JDKEXE@
|
||||||
|
|
||||||
NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
|
NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
|
||||||
NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
|
NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
diff --git openjdk.orig/hotspot/src/os/linux/vm/perfMemory_linux.cpp openjdk/hotspot/src/os/linux/vm/perfMemory_linux.cpp
|
|
||||||
--- openjdk.orig/hotspot/src/os/linux/vm/perfMemory_linux.cpp
|
|
||||||
+++ openjdk/hotspot/src/os/linux/vm/perfMemory_linux.cpp
|
|
||||||
@@ -878,7 +878,7 @@
|
|
||||||
|
|
||||||
// open the file
|
|
||||||
int result;
|
|
||||||
- RESTARTABLE(::open(filename, oflags), result);
|
|
||||||
+ RESTARTABLE(::open(filename, oflags, 0), result);
|
|
||||||
if (result == OS_ERR) {
|
|
||||||
if (errno == ENOENT) {
|
|
||||||
THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
diff --git openjdk.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java openjdk/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
|
|
||||||
index cf4becb7db..4ab2ac0a31 100644
|
|
||||||
--- openjdk.orig/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
|
|
||||||
+++ openjdk/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
|
|
||||||
@@ -189,6 +189,10 @@ final public class LdapCtxFactory implements ObjectFactory, InitialContextFactor
|
|
||||||
ctx = getLdapCtxFromUrl(
|
|
||||||
r.getDomainName(), url, new LdapURL(u), env);
|
|
||||||
return ctx;
|
|
||||||
+ } catch (AuthenticationException e) {
|
|
||||||
+ // do not retry on a different endpoint to avoid blocking
|
|
||||||
+ // the user if authentication credentials are wrong.
|
|
||||||
+ throw e;
|
|
||||||
} catch (NamingException e) {
|
|
||||||
// try the next element
|
|
||||||
lastException = e;
|
|
||||||
@@ -241,6 +245,10 @@ final public class LdapCtxFactory implements ObjectFactory, InitialContextFactor
|
|
||||||
for (String u : urls) {
|
|
||||||
try {
|
|
||||||
return getUsingURL(u, env);
|
|
||||||
+ } catch (AuthenticationException e) {
|
|
||||||
+ // do not retry on a different URL to avoid blocking
|
|
||||||
+ // the user if authentication credentials are wrong.
|
|
||||||
+ throw e;
|
|
||||||
} catch (NamingException e) {
|
|
||||||
ex = e;
|
|
||||||
}
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
|
|
||||||
# Date 1620365804 -3600
|
|
||||||
# Fri May 07 06:36:44 2021 +0100
|
|
||||||
# Node ID 39b62f35eca823b4c9a98bc1dc0cb9acb87360f8
|
|
||||||
# Parent 723b59ed1afe878c5cd35f080399c8ceec4f776b
|
|
||||||
PR3836: Extra compiler flags not passed to adlc build
|
|
||||||
|
|
||||||
diff --git openjdk.orig/hotspot/make/aix/makefiles/adlc.make openjdk/hotspot/make/aix/makefiles/adlc.make
|
|
||||||
--- openjdk.orig/hotspot/make/aix/makefiles/adlc.make
|
|
||||||
+++ openjdk/hotspot/make/aix/makefiles/adlc.make
|
|
||||||
@@ -69,6 +69,11 @@
|
|
||||||
CFLAGS_WARN = -w
|
|
||||||
CFLAGS += $(CFLAGS_WARN)
|
|
||||||
|
|
||||||
+# Extra flags from gnumake's invocation or environment
|
|
||||||
+CFLAGS += $(EXTRA_CFLAGS)
|
|
||||||
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
||||||
+ASFLAGS += $(EXTRA_ASFLAGS)
|
|
||||||
+
|
|
||||||
OBJECTNAMES = \
|
|
||||||
adlparse.o \
|
|
||||||
archDesc.o \
|
|
||||||
diff --git openjdk.orig/hotspot/make/bsd/makefiles/adlc.make openjdk/hotspot/make/bsd/makefiles/adlc.make
|
|
||||||
--- openjdk.orig/hotspot/make/bsd/makefiles/adlc.make
|
|
||||||
+++ openjdk/hotspot/make/bsd/makefiles/adlc.make
|
|
||||||
@@ -71,6 +71,11 @@
|
|
||||||
endif
|
|
||||||
CFLAGS += $(CFLAGS_WARN)
|
|
||||||
|
|
||||||
+# Extra flags from gnumake's invocation or environment
|
|
||||||
+CFLAGS += $(EXTRA_CFLAGS)
|
|
||||||
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
||||||
+ASFLAGS += $(EXTRA_ASFLAGS)
|
|
||||||
+
|
|
||||||
OBJECTNAMES = \
|
|
||||||
adlparse.o \
|
|
||||||
archDesc.o \
|
|
||||||
diff --git openjdk.orig/hotspot/make/linux/makefiles/adlc.make openjdk/hotspot/make/linux/makefiles/adlc.make
|
|
||||||
--- openjdk.orig/hotspot/make/linux/makefiles/adlc.make
|
|
||||||
+++ openjdk/hotspot/make/linux/makefiles/adlc.make
|
|
||||||
@@ -69,6 +69,11 @@
|
|
||||||
CFLAGS_WARN = $(WARNINGS_ARE_ERRORS)
|
|
||||||
CFLAGS += $(CFLAGS_WARN)
|
|
||||||
|
|
||||||
+# Extra flags from gnumake's invocation or environment
|
|
||||||
+CFLAGS += $(EXTRA_CFLAGS)
|
|
||||||
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
||||||
+ASFLAGS += $(EXTRA_ASFLAGS)
|
|
||||||
+
|
|
||||||
OBJECTNAMES = \
|
|
||||||
adlparse.o \
|
|
||||||
archDesc.o \
|
|
||||||
diff --git openjdk.orig/hotspot/make/solaris/makefiles/adlc.make openjdk/hotspot/make/solaris/makefiles/adlc.make
|
|
||||||
--- openjdk.orig/hotspot/make/solaris/makefiles/adlc.make
|
|
||||||
+++ openjdk/hotspot/make/solaris/makefiles/adlc.make
|
|
||||||
@@ -85,6 +85,10 @@
|
|
||||||
endif
|
|
||||||
CFLAGS += $(CFLAGS_WARN)
|
|
||||||
|
|
||||||
+# Extra flags from gnumake's invocation or environment
|
|
||||||
+CFLAGS += $(EXTRA_CFLAGS)
|
|
||||||
+ASFLAGS += $(EXTRA_ASFLAGS)
|
|
||||||
+
|
|
||||||
ifeq ("${Platform_compiler}", "sparcWorks")
|
|
||||||
# Enable the following CFLAGS addition if you need to compare the
|
|
||||||
# built ELF objects.
|
|
||||||
@ -1,506 +0,0 @@
|
|||||||
commit 8589b1229cffb9a0ab00baf62ce2d4376d31b055
|
|
||||||
Author: Andrew John Hughes <andrew@openjdk.org>
|
|
||||||
Date: Fri Oct 14 22:55:39 2022 +0100
|
|
||||||
|
|
||||||
Backport f67b4de8a07b8158be1dfb5b09cdb4cc5b7ac93b
|
|
||||||
|
|
||||||
diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION
|
|
||||||
index decb8716b22..889d0e6dad7 100644
|
|
||||||
--- a/jdk/make/data/tzdata/VERSION
|
|
||||||
+++ b/jdk/make/data/tzdata/VERSION
|
|
||||||
@@ -21,4 +21,4 @@
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
-tzdata2022c
|
|
||||||
+tzdata2022d
|
|
||||||
diff --git a/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia
|
|
||||||
index 6cb6d2c57cf..1dc7d34f88e 100644
|
|
||||||
--- a/jdk/make/data/tzdata/asia
|
|
||||||
+++ b/jdk/make/data/tzdata/asia
|
|
||||||
@@ -3398,10 +3398,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
||||||
# The winter time in 2015 started on October 23 at 01:00.
|
|
||||||
# https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
|
|
||||||
# http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
|
|
||||||
-#
|
|
||||||
-# From Paul Eggert (2019-04-10):
|
|
||||||
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday
|
|
||||||
-# preceding March's last Sunday (i.e., Sat>=24).
|
|
||||||
|
|
||||||
# From P Chan (2021-10-18):
|
|
||||||
# http://wafa.ps/Pages/Details/34701
|
|
||||||
@@ -3418,6 +3414,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
||||||
# From Heba Hamad (2022-03-10):
|
|
||||||
# summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.
|
|
||||||
|
|
||||||
+# From Heba Hamad (2022-08-30):
|
|
||||||
+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by
|
|
||||||
+# 60 minutes backwards. Also the state of Palestine adopted the summer
|
|
||||||
+# and winter time for the years: 2023,2024,2025,2026 ...
|
|
||||||
+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
|
|
||||||
+# (2022-08-31): ... the Saturday before the last Sunday in March and October
|
|
||||||
+# at 2:00 AM ,for the years from 2023 to 2026.
|
|
||||||
+# (2022-09-05): https://mtit.pna.ps/Site/New/1453
|
|
||||||
+#
|
|
||||||
+# From Paul Eggert (2022-08-31):
|
|
||||||
+# For now, assume that this rule will also be used after 2026.
|
|
||||||
+
|
|
||||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
||||||
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
|
|
||||||
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
|
|
||||||
@@ -3448,14 +3456,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 -
|
|
||||||
Rule Palestine 2014 only - Oct 24 0:00 0 -
|
|
||||||
Rule Palestine 2015 only - Mar 28 0:00 1:00 S
|
|
||||||
Rule Palestine 2015 only - Oct 23 1:00 0 -
|
|
||||||
-Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S
|
|
||||||
-Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 -
|
|
||||||
+Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S
|
|
||||||
+Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 -
|
|
||||||
Rule Palestine 2019 only - Mar 29 0:00 1:00 S
|
|
||||||
-Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -
|
|
||||||
-Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S
|
|
||||||
+Rule Palestine 2019 only - Oct Sat<=30 0:00 0 -
|
|
||||||
+Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S
|
|
||||||
Rule Palestine 2020 only - Oct 24 1:00 0 -
|
|
||||||
-Rule Palestine 2021 max - Oct Fri>=23 1:00 0 -
|
|
||||||
-Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S
|
|
||||||
+Rule Palestine 2021 only - Oct 29 1:00 0 -
|
|
||||||
+Rule Palestine 2022 only - Mar 27 0:00 1:00 S
|
|
||||||
+Rule Palestine 2022 max - Oct Sat<=30 2:00 0 -
|
|
||||||
+Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S
|
|
||||||
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
|
|
||||||
diff --git a/jdk/make/data/tzdata/backward b/jdk/make/data/tzdata/backward
|
|
||||||
index d4a29e8cf29..7765d99aedf 100644
|
|
||||||
--- a/jdk/make/data/tzdata/backward
|
|
||||||
+++ b/jdk/make/data/tzdata/backward
|
|
||||||
@@ -113,6 +113,8 @@ Link Etc/UTC Etc/UCT
|
|
||||||
Link Europe/London Europe/Belfast
|
|
||||||
Link Europe/Kyiv Europe/Kiev
|
|
||||||
Link Europe/Chisinau Europe/Tiraspol
|
|
||||||
+Link Europe/Kyiv Europe/Uzhgorod
|
|
||||||
+Link Europe/Kyiv Europe/Zaporozhye
|
|
||||||
Link Europe/London GB
|
|
||||||
Link Europe/London GB-Eire
|
|
||||||
Link Etc/GMT GMT+0
|
|
||||||
diff --git a/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe
|
|
||||||
index f7eb7a387aa..9e0a538f86d 100644
|
|
||||||
--- a/jdk/make/data/tzdata/europe
|
|
||||||
+++ b/jdk/make/data/tzdata/europe
|
|
||||||
@@ -2638,10 +2638,14 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
|
|
||||||
# From Alexander Krivenyshev (2014-03-17):
|
|
||||||
# time change at 2:00 (2am) on March 30, 2014
|
|
||||||
# https://vz.ru/news/2014/3/17/677464.html
|
|
||||||
-# From Paul Eggert (2014-03-30):
|
|
||||||
-# Simferopol and Sevastopol reportedly changed their central town clocks
|
|
||||||
-# late the previous day, but this appears to have been ceremonial
|
|
||||||
-# and the discrepancies are small enough to not worry about.
|
|
||||||
+# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30):
|
|
||||||
+# The clocks at the railway station in Simferopol were put forward from 22:00
|
|
||||||
+# to 24:00 the previous day in a "symbolic ceremony"; however, per
|
|
||||||
+# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings
|
|
||||||
+# time switch at 2am" on Sunday.
|
|
||||||
+# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html
|
|
||||||
+# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329
|
|
||||||
+# https://www.bbc.com/news/av/world-europe-26806583
|
|
||||||
2:00 EU EE%sT 2014 Mar 30 2:00
|
|
||||||
4:00 - MSK 2014 Oct 26 2:00s
|
|
||||||
3:00 - MSK
|
|
||||||
@@ -3774,8 +3778,8 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
|
||||||
# US colleague David Cochrane) are still trying to get more
|
|
||||||
# information upon these local deviations from Kiev rules.
|
|
||||||
#
|
|
||||||
-# From Paul Eggert (2022-02-08):
|
|
||||||
-# For now, assume that Ukraine's other three zones followed the same rules,
|
|
||||||
+# From Paul Eggert (2022-08-27):
|
|
||||||
+# For now, assume that Ukraine's zones all followed the same rules,
|
|
||||||
# except that Crimea switched to Moscow time in 1994 as described elsewhere.
|
|
||||||
|
|
||||||
# From Igor Karpov, who works for the Ukrainian Ministry of Justice,
|
|
||||||
@@ -3845,21 +3849,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
|
||||||
# * Ukrainian Government's Resolution of 20.03.1992, No. 139.
|
|
||||||
# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
|
|
||||||
|
|
||||||
-# From Paul Eggert (2022-04-12):
|
|
||||||
-# As is usual in tzdb, Ukrainian zones use the most common English spellings.
|
|
||||||
-# In particular, tzdb's name Europe/Kyiv uses the most common spelling in
|
|
||||||
-# English for Ukraine's capital. Although tzdb's former name was Europe/Kiev,
|
|
||||||
-# "Kyiv" is now more common due to widespread reporting of the current conflict.
|
|
||||||
-# Conversely, tzdb continues to use the names Europe/Uzhgorod and
|
|
||||||
-# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is
|
|
||||||
-# certainly wrong as a transliteration of the Czech "Praha".
|
|
||||||
-# English-language spelling of Ukrainian names is in flux, and
|
|
||||||
-# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more
|
|
||||||
-# common in English; in the meantime, do not change these
|
|
||||||
-# English spellings as that means less disruption for our users.
|
|
||||||
-
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-# This represents most of Ukraine. See above for the spelling of "Kyiv".
|
|
||||||
Zone Europe/Kyiv 2:02:04 - LMT 1880
|
|
||||||
2:02:04 - KMT 1924 May 2 # Kyiv Mean Time
|
|
||||||
2:00 - EET 1930 Jun 21
|
|
||||||
@@ -3869,34 +3859,6 @@ Zone Europe/Kyiv 2:02:04 - LMT 1880
|
|
||||||
2:00 1:00 EEST 1991 Sep 29 3:00
|
|
||||||
2:00 C-Eur EE%sT 1996 May 13
|
|
||||||
2:00 EU EE%sT
|
|
||||||
-# Transcarpathia used CET 1990/1991.
|
|
||||||
-# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
|
|
||||||
-# "Uzhgorod" is more common in English.
|
|
||||||
-Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
|
|
||||||
- 1:00 - CET 1940
|
|
||||||
- 1:00 C-Eur CE%sT 1944 Oct
|
|
||||||
- 1:00 1:00 CEST 1944 Oct 26
|
|
||||||
- 1:00 - CET 1945 Jun 29
|
|
||||||
- 3:00 Russia MSK/MSD 1990
|
|
||||||
- 3:00 - MSK 1990 Jul 1 2:00
|
|
||||||
- 1:00 - CET 1991 Mar 31 3:00
|
|
||||||
- 2:00 - EET 1992 Mar 20
|
|
||||||
- 2:00 C-Eur EE%sT 1996 May 13
|
|
||||||
- 2:00 EU EE%sT
|
|
||||||
-# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
|
|
||||||
-# "Zaporizhzhia" is the transliteration of the Ukrainian name, but
|
|
||||||
-# "Zaporozh'ye" is more common in English. Use the common English
|
|
||||||
-# spelling, except omit the apostrophe as it is not allowed in
|
|
||||||
-# portable Posix file names.
|
|
||||||
-Zone Europe/Zaporozhye 2:20:40 - LMT 1880
|
|
||||||
- 2:20 - +0220 1924 May 2
|
|
||||||
- 2:00 - EET 1930 Jun 21
|
|
||||||
- 3:00 - MSK 1941 Aug 25
|
|
||||||
- 1:00 C-Eur CE%sT 1943 Oct 25
|
|
||||||
- 3:00 Russia MSK/MSD 1991 Mar 31 2:00
|
|
||||||
- 2:00 E-Eur EE%sT 1992 Mar 20
|
|
||||||
- 2:00 C-Eur EE%sT 1996 May 13
|
|
||||||
- 2:00 EU EE%sT
|
|
||||||
|
|
||||||
# Vatican City
|
|
||||||
# See Europe/Rome.
|
|
||||||
diff --git a/jdk/make/data/tzdata/southamerica b/jdk/make/data/tzdata/southamerica
|
|
||||||
index 13ec081c7e0..3c0e0e2061c 100644
|
|
||||||
--- a/jdk/make/data/tzdata/southamerica
|
|
||||||
+++ b/jdk/make/data/tzdata/southamerica
|
|
||||||
@@ -1332,8 +1332,14 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
|
|
||||||
# for America/Santiago will start on midnight of September 11th;
|
|
||||||
# and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas)
|
|
||||||
# will keep UTC -3 "indefinitely"... This is because on September 4th
|
|
||||||
-# we will have a voting whether to approve a new Constitution....
|
|
||||||
-# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/
|
|
||||||
+# we will have a voting whether to approve a new Constitution.
|
|
||||||
+#
|
|
||||||
+# From Eduardo Romero Urra (2022-08-17):
|
|
||||||
+# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf
|
|
||||||
+#
|
|
||||||
+# From Paul Eggert (2022-08-17):
|
|
||||||
+# Although the presidential decree stops at fall 2026, assume that
|
|
||||||
+# similar DST rules will continue thereafter.
|
|
||||||
|
|
||||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
||||||
Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
|
|
||||||
diff --git a/jdk/make/data/tzdata/zone.tab b/jdk/make/data/tzdata/zone.tab
|
|
||||||
index 51b65fa273c..ee025196e50 100644
|
|
||||||
--- a/jdk/make/data/tzdata/zone.tab
|
|
||||||
+++ b/jdk/make/data/tzdata/zone.tab
|
|
||||||
@@ -424,8 +424,6 @@ TV -0831+17913 Pacific/Funafuti
|
|
||||||
TW +2503+12130 Asia/Taipei
|
|
||||||
TZ -0648+03917 Africa/Dar_es_Salaam
|
|
||||||
UA +5026+03031 Europe/Kyiv Ukraine (most areas)
|
|
||||||
-UA +4837+02218 Europe/Uzhgorod Transcarpathia
|
|
||||||
-UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk
|
|
||||||
UG +0019+03225 Africa/Kampala
|
|
||||||
UM +2813-17722 Pacific/Midway Midway Islands
|
|
||||||
UM +1917+16637 Pacific/Wake Wake Island
|
|
||||||
diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
|
|
||||||
index 43bddd5859a..4b84cda3067 100644
|
|
||||||
--- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
|
|
||||||
+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
|
|
||||||
@@ -573,12 +573,8 @@ public final class ZoneInfoFile {
|
|
||||||
// we can then pass in the dom = -1, dow > 0 into ZoneInfo
|
|
||||||
//
|
|
||||||
// hacking, assume the >=24 is the result of ZRB optimization for
|
|
||||||
- // "last", it works for now. From tzdata2020d this hacking
|
|
||||||
- // will not work for Asia/Gaza and Asia/Hebron which follow
|
|
||||||
- // Palestine DST rules.
|
|
||||||
- if (dom < 0 || dom >= 24 &&
|
|
||||||
- !(zoneId.equals("Asia/Gaza") ||
|
|
||||||
- zoneId.equals("Asia/Hebron"))) {
|
|
||||||
+ // "last", it works for now.
|
|
||||||
+ if (dom < 0 || dom >= 24) {
|
|
||||||
params[1] = -1;
|
|
||||||
params[2] = toCalendarDOW[dow];
|
|
||||||
} else {
|
|
||||||
@@ -600,7 +596,6 @@ public final class ZoneInfoFile {
|
|
||||||
params[7] = 0;
|
|
||||||
} else {
|
|
||||||
// hacking: see comment above
|
|
||||||
- // No need of hacking for Asia/Gaza and Asia/Hebron from tz2021e
|
|
||||||
if (dom < 0 || dom >= 24) {
|
|
||||||
params[6] = -1;
|
|
||||||
params[7] = toCalendarDOW[dow];
|
|
||||||
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
|
|
||||||
index c32bee39fba..71470168456 100644
|
|
||||||
--- a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
|
|
||||||
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
|
|
||||||
@@ -1 +1 @@
|
|
||||||
-tzdata2022c
|
|
||||||
+tzdata2022d
|
|
||||||
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt b/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt
|
|
||||||
index a5e6428a3f5..e3ce742f887 100644
|
|
||||||
--- a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt
|
|
||||||
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt
|
|
||||||
@@ -183,6 +183,8 @@ Link Etc/UTC Etc/UCT
|
|
||||||
Link Europe/London Europe/Belfast
|
|
||||||
Link Europe/Kyiv Europe/Kiev
|
|
||||||
Link Europe/Chisinau Europe/Tiraspol
|
|
||||||
+Link Europe/Kyiv Europe/Uzhgorod
|
|
||||||
+Link Europe/Kyiv Europe/Zaporozhye
|
|
||||||
Link Europe/London GB
|
|
||||||
Link Europe/London GB-Eire
|
|
||||||
Link Etc/GMT GMT+0
|
|
||||||
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
||||||
index fc148537f1f..b3823958ae4 100644
|
|
||||||
--- a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
||||||
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
||||||
@@ -163,11 +163,9 @@ Europe/Simferopol MSK
|
|
||||||
Europe/Sofia EET EEST
|
|
||||||
Europe/Tallinn EET EEST
|
|
||||||
Europe/Tirane CET CEST
|
|
||||||
-Europe/Uzhgorod EET EEST
|
|
||||||
Europe/Vienna CET CEST
|
|
||||||
Europe/Vilnius EET EEST
|
|
||||||
Europe/Warsaw CET CEST
|
|
||||||
-Europe/Zaporozhye EET EEST
|
|
||||||
Europe/Zurich CET CEST
|
|
||||||
HST HST
|
|
||||||
MET MET MEST
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
|
|
||||||
index 3aad69f8118..c682531d4bd 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
|
|
||||||
@@ -173,10 +173,19 @@ public class TestZoneInfo310 {
|
|
||||||
* Temporary ignoring the failing TimeZones which are having zone
|
|
||||||
* rules defined till year 2037 and/or above and have negative DST
|
|
||||||
* save time in IANA tzdata. This bug is tracked via JDK-8223388.
|
|
||||||
+ *
|
|
||||||
+ * Tehran/Iran rule has rules beyond 2037, in which javazic assumes
|
|
||||||
+ * to be the last year. Thus javazic's rule is based on year 2037
|
|
||||||
+ * (Mar 20th/Sep 20th are the cutover dates), while the real rule
|
|
||||||
+ * has year 2087 where Mar 21st/Sep 21st are the cutover dates.
|
|
||||||
*/
|
|
||||||
- if (zid.equals("Africa/Casablanca") || zid.equals("Africa/El_Aaiun")
|
|
||||||
- || zid.equals("Asia/Tehran") || zid.equals("Iran")) {
|
|
||||||
- continue;
|
|
||||||
+ if (zid.equals("Africa/Casablanca") || // uses "Morocco" rule
|
|
||||||
+ zid.equals("Africa/El_Aaiun") || // uses "Morocco" rule
|
|
||||||
+ zid.equals("Asia/Tehran") || // last rule mismatch
|
|
||||||
+ zid.equals("Asia/Gaza") || // uses "Palestine" rule
|
|
||||||
+ zid.equals("Asia/Hebron") || // uses "Palestine" rule
|
|
||||||
+ zid.equals("Iran")) { // last rule mismatch
|
|
||||||
+ continue;
|
|
||||||
}
|
|
||||||
if (! zi.equalsTo(ziOLD)) {
|
|
||||||
System.out.println(zi.diffsTo(ziOLD));
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
|
|
||||||
index decb8716b22..889d0e6dad7 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
|
|
||||||
@@ -21,4 +21,4 @@
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
-tzdata2022c
|
|
||||||
+tzdata2022d
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia
|
|
||||||
index 6cb6d2c57cf..1dc7d34f88e 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia
|
|
||||||
@@ -3398,10 +3398,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
||||||
# The winter time in 2015 started on October 23 at 01:00.
|
|
||||||
# https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
|
|
||||||
# http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
|
|
||||||
-#
|
|
||||||
-# From Paul Eggert (2019-04-10):
|
|
||||||
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday
|
|
||||||
-# preceding March's last Sunday (i.e., Sat>=24).
|
|
||||||
|
|
||||||
# From P Chan (2021-10-18):
|
|
||||||
# http://wafa.ps/Pages/Details/34701
|
|
||||||
@@ -3418,6 +3414,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
||||||
# From Heba Hamad (2022-03-10):
|
|
||||||
# summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.
|
|
||||||
|
|
||||||
+# From Heba Hamad (2022-08-30):
|
|
||||||
+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by
|
|
||||||
+# 60 minutes backwards. Also the state of Palestine adopted the summer
|
|
||||||
+# and winter time for the years: 2023,2024,2025,2026 ...
|
|
||||||
+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
|
|
||||||
+# (2022-08-31): ... the Saturday before the last Sunday in March and October
|
|
||||||
+# at 2:00 AM ,for the years from 2023 to 2026.
|
|
||||||
+# (2022-09-05): https://mtit.pna.ps/Site/New/1453
|
|
||||||
+#
|
|
||||||
+# From Paul Eggert (2022-08-31):
|
|
||||||
+# For now, assume that this rule will also be used after 2026.
|
|
||||||
+
|
|
||||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
||||||
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
|
|
||||||
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
|
|
||||||
@@ -3448,14 +3456,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 -
|
|
||||||
Rule Palestine 2014 only - Oct 24 0:00 0 -
|
|
||||||
Rule Palestine 2015 only - Mar 28 0:00 1:00 S
|
|
||||||
Rule Palestine 2015 only - Oct 23 1:00 0 -
|
|
||||||
-Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S
|
|
||||||
-Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 -
|
|
||||||
+Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S
|
|
||||||
+Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 -
|
|
||||||
Rule Palestine 2019 only - Mar 29 0:00 1:00 S
|
|
||||||
-Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -
|
|
||||||
-Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S
|
|
||||||
+Rule Palestine 2019 only - Oct Sat<=30 0:00 0 -
|
|
||||||
+Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S
|
|
||||||
Rule Palestine 2020 only - Oct 24 1:00 0 -
|
|
||||||
-Rule Palestine 2021 max - Oct Fri>=23 1:00 0 -
|
|
||||||
-Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S
|
|
||||||
+Rule Palestine 2021 only - Oct 29 1:00 0 -
|
|
||||||
+Rule Palestine 2022 only - Mar 27 0:00 1:00 S
|
|
||||||
+Rule Palestine 2022 max - Oct Sat<=30 2:00 0 -
|
|
||||||
+Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S
|
|
||||||
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/backward b/jdk/test/sun/util/calendar/zi/tzdata/backward
|
|
||||||
index d4a29e8cf29..7765d99aedf 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/tzdata/backward
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/tzdata/backward
|
|
||||||
@@ -113,6 +113,8 @@ Link Etc/UTC Etc/UCT
|
|
||||||
Link Europe/London Europe/Belfast
|
|
||||||
Link Europe/Kyiv Europe/Kiev
|
|
||||||
Link Europe/Chisinau Europe/Tiraspol
|
|
||||||
+Link Europe/Kyiv Europe/Uzhgorod
|
|
||||||
+Link Europe/Kyiv Europe/Zaporozhye
|
|
||||||
Link Europe/London GB
|
|
||||||
Link Europe/London GB-Eire
|
|
||||||
Link Etc/GMT GMT+0
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe
|
|
||||||
index f7eb7a387aa..9e0a538f86d 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe
|
|
||||||
@@ -2638,10 +2638,14 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
|
|
||||||
# From Alexander Krivenyshev (2014-03-17):
|
|
||||||
# time change at 2:00 (2am) on March 30, 2014
|
|
||||||
# https://vz.ru/news/2014/3/17/677464.html
|
|
||||||
-# From Paul Eggert (2014-03-30):
|
|
||||||
-# Simferopol and Sevastopol reportedly changed their central town clocks
|
|
||||||
-# late the previous day, but this appears to have been ceremonial
|
|
||||||
-# and the discrepancies are small enough to not worry about.
|
|
||||||
+# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30):
|
|
||||||
+# The clocks at the railway station in Simferopol were put forward from 22:00
|
|
||||||
+# to 24:00 the previous day in a "symbolic ceremony"; however, per
|
|
||||||
+# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings
|
|
||||||
+# time switch at 2am" on Sunday.
|
|
||||||
+# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html
|
|
||||||
+# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329
|
|
||||||
+# https://www.bbc.com/news/av/world-europe-26806583
|
|
||||||
2:00 EU EE%sT 2014 Mar 30 2:00
|
|
||||||
4:00 - MSK 2014 Oct 26 2:00s
|
|
||||||
3:00 - MSK
|
|
||||||
@@ -3774,8 +3778,8 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
|
||||||
# US colleague David Cochrane) are still trying to get more
|
|
||||||
# information upon these local deviations from Kiev rules.
|
|
||||||
#
|
|
||||||
-# From Paul Eggert (2022-02-08):
|
|
||||||
-# For now, assume that Ukraine's other three zones followed the same rules,
|
|
||||||
+# From Paul Eggert (2022-08-27):
|
|
||||||
+# For now, assume that Ukraine's zones all followed the same rules,
|
|
||||||
# except that Crimea switched to Moscow time in 1994 as described elsewhere.
|
|
||||||
|
|
||||||
# From Igor Karpov, who works for the Ukrainian Ministry of Justice,
|
|
||||||
@@ -3845,21 +3849,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
|
||||||
# * Ukrainian Government's Resolution of 20.03.1992, No. 139.
|
|
||||||
# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
|
|
||||||
|
|
||||||
-# From Paul Eggert (2022-04-12):
|
|
||||||
-# As is usual in tzdb, Ukrainian zones use the most common English spellings.
|
|
||||||
-# In particular, tzdb's name Europe/Kyiv uses the most common spelling in
|
|
||||||
-# English for Ukraine's capital. Although tzdb's former name was Europe/Kiev,
|
|
||||||
-# "Kyiv" is now more common due to widespread reporting of the current conflict.
|
|
||||||
-# Conversely, tzdb continues to use the names Europe/Uzhgorod and
|
|
||||||
-# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is
|
|
||||||
-# certainly wrong as a transliteration of the Czech "Praha".
|
|
||||||
-# English-language spelling of Ukrainian names is in flux, and
|
|
||||||
-# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more
|
|
||||||
-# common in English; in the meantime, do not change these
|
|
||||||
-# English spellings as that means less disruption for our users.
|
|
||||||
-
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-# This represents most of Ukraine. See above for the spelling of "Kyiv".
|
|
||||||
Zone Europe/Kyiv 2:02:04 - LMT 1880
|
|
||||||
2:02:04 - KMT 1924 May 2 # Kyiv Mean Time
|
|
||||||
2:00 - EET 1930 Jun 21
|
|
||||||
@@ -3869,34 +3859,6 @@ Zone Europe/Kyiv 2:02:04 - LMT 1880
|
|
||||||
2:00 1:00 EEST 1991 Sep 29 3:00
|
|
||||||
2:00 C-Eur EE%sT 1996 May 13
|
|
||||||
2:00 EU EE%sT
|
|
||||||
-# Transcarpathia used CET 1990/1991.
|
|
||||||
-# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
|
|
||||||
-# "Uzhgorod" is more common in English.
|
|
||||||
-Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
|
|
||||||
- 1:00 - CET 1940
|
|
||||||
- 1:00 C-Eur CE%sT 1944 Oct
|
|
||||||
- 1:00 1:00 CEST 1944 Oct 26
|
|
||||||
- 1:00 - CET 1945 Jun 29
|
|
||||||
- 3:00 Russia MSK/MSD 1990
|
|
||||||
- 3:00 - MSK 1990 Jul 1 2:00
|
|
||||||
- 1:00 - CET 1991 Mar 31 3:00
|
|
||||||
- 2:00 - EET 1992 Mar 20
|
|
||||||
- 2:00 C-Eur EE%sT 1996 May 13
|
|
||||||
- 2:00 EU EE%sT
|
|
||||||
-# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
|
|
||||||
-# "Zaporizhzhia" is the transliteration of the Ukrainian name, but
|
|
||||||
-# "Zaporozh'ye" is more common in English. Use the common English
|
|
||||||
-# spelling, except omit the apostrophe as it is not allowed in
|
|
||||||
-# portable Posix file names.
|
|
||||||
-Zone Europe/Zaporozhye 2:20:40 - LMT 1880
|
|
||||||
- 2:20 - +0220 1924 May 2
|
|
||||||
- 2:00 - EET 1930 Jun 21
|
|
||||||
- 3:00 - MSK 1941 Aug 25
|
|
||||||
- 1:00 C-Eur CE%sT 1943 Oct 25
|
|
||||||
- 3:00 Russia MSK/MSD 1991 Mar 31 2:00
|
|
||||||
- 2:00 E-Eur EE%sT 1992 Mar 20
|
|
||||||
- 2:00 C-Eur EE%sT 1996 May 13
|
|
||||||
- 2:00 EU EE%sT
|
|
||||||
|
|
||||||
# Vatican City
|
|
||||||
# See Europe/Rome.
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
|
|
||||||
index 13ec081c7e0..3c0e0e2061c 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
|
|
||||||
@@ -1332,8 +1332,14 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
|
|
||||||
# for America/Santiago will start on midnight of September 11th;
|
|
||||||
# and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas)
|
|
||||||
# will keep UTC -3 "indefinitely"... This is because on September 4th
|
|
||||||
-# we will have a voting whether to approve a new Constitution....
|
|
||||||
-# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/
|
|
||||||
+# we will have a voting whether to approve a new Constitution.
|
|
||||||
+#
|
|
||||||
+# From Eduardo Romero Urra (2022-08-17):
|
|
||||||
+# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf
|
|
||||||
+#
|
|
||||||
+# From Paul Eggert (2022-08-17):
|
|
||||||
+# Although the presidential decree stops at fall 2026, assume that
|
|
||||||
+# similar DST rules will continue thereafter.
|
|
||||||
|
|
||||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
||||||
Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
|
|
||||||
index 51b65fa273c..ee025196e50 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
|
|
||||||
@@ -424,8 +424,6 @@ TV -0831+17913 Pacific/Funafuti
|
|
||||||
TW +2503+12130 Asia/Taipei
|
|
||||||
TZ -0648+03917 Africa/Dar_es_Salaam
|
|
||||||
UA +5026+03031 Europe/Kyiv Ukraine (most areas)
|
|
||||||
-UA +4837+02218 Europe/Uzhgorod Transcarpathia
|
|
||||||
-UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk
|
|
||||||
UG +0019+03225 Africa/Kampala
|
|
||||||
UM +2813-17722 Pacific/Midway Midway Islands
|
|
||||||
UM +1917+16637 Pacific/Wake Wake Island
|
|
||||||
@ -1,813 +0,0 @@
|
|||||||
commit 44ea8322b2f62e3d8139a78923e3bf017e535989
|
|
||||||
Author: Andrew John Hughes <andrew@openjdk.org>
|
|
||||||
Date: Sun Oct 16 03:02:37 2022 +0100
|
|
||||||
|
|
||||||
Backport 21407dec0156301871a83328615e4d975c4287c4
|
|
||||||
|
|
||||||
diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION
|
|
||||||
index 889d0e6dad7..b8cb36e69f4 100644
|
|
||||||
--- a/jdk/make/data/tzdata/VERSION
|
|
||||||
+++ b/jdk/make/data/tzdata/VERSION
|
|
||||||
@@ -21,4 +21,4 @@
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
-tzdata2022d
|
|
||||||
+tzdata2022e
|
|
||||||
diff --git a/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia
|
|
||||||
index 1dc7d34f88e..f1771e42a71 100644
|
|
||||||
--- a/jdk/make/data/tzdata/asia
|
|
||||||
+++ b/jdk/make/data/tzdata/asia
|
|
||||||
@@ -2254,6 +2254,17 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
|
|
||||||
# From the Arabic version, it seems to say it would be at midnight
|
|
||||||
# (assume 24:00) on the last Thursday in February, starting from 2022.
|
|
||||||
|
|
||||||
+# From Issam Al-Zuwairi (2022-10-05):
|
|
||||||
+# The Council of Ministers in Jordan decided Wednesday 5th October 2022,
|
|
||||||
+# that daylight saving time (DST) will be throughout the year....
|
|
||||||
+#
|
|
||||||
+# From Brian Inglis (2022-10-06):
|
|
||||||
+# https://petra.gov.jo/Include/InnerPage.jsp?ID=45567&lang=en&name=en_news
|
|
||||||
+#
|
|
||||||
+# From Paul Eggert (2022-10-05):
|
|
||||||
+# Like Syria, model this as a transition from EEST +03 (DST) to plain +03
|
|
||||||
+# (non-DST) at the point where DST would otherwise have ended.
|
|
||||||
+
|
|
||||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
||||||
Rule Jordan 1973 only - Jun 6 0:00 1:00 S
|
|
||||||
Rule Jordan 1973 1975 - Oct 1 0:00 0 -
|
|
||||||
@@ -2285,11 +2296,12 @@ Rule Jordan 2005 only - Sep lastFri 0:00s 0 -
|
|
||||||
Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
|
|
||||||
Rule Jordan 2013 only - Dec 20 0:00 0 -
|
|
||||||
Rule Jordan 2014 2021 - Mar lastThu 24:00 1:00 S
|
|
||||||
-Rule Jordan 2014 max - Oct lastFri 0:00s 0 -
|
|
||||||
-Rule Jordan 2022 max - Feb lastThu 24:00 1:00 S
|
|
||||||
+Rule Jordan 2014 2022 - Oct lastFri 0:00s 0 -
|
|
||||||
+Rule Jordan 2022 only - Feb lastThu 24:00 1:00 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
Zone Asia/Amman 2:23:44 - LMT 1931
|
|
||||||
- 2:00 Jordan EE%sT
|
|
||||||
+ 2:00 Jordan EE%sT 2022 Oct 28 0:00s
|
|
||||||
+ 3:00 - +03
|
|
||||||
|
|
||||||
|
|
||||||
# Kazakhstan
|
|
||||||
@@ -3838,19 +3850,27 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 -
|
|
||||||
# Our brief summary:
|
|
||||||
# https://www.timeanddate.com/news/time/syria-dst-2012.html
|
|
||||||
|
|
||||||
-# From Arthur David Olson (2012-03-27):
|
|
||||||
-# Assume last Friday in March going forward XXX.
|
|
||||||
+# From Steffen Thorsen (2022-10-05):
|
|
||||||
+# Syria is adopting year-round DST, starting this autumn....
|
|
||||||
+# From https://www.enabbaladi.net/archives/607812
|
|
||||||
+# "This [the decision] came after the weekly government meeting today,
|
|
||||||
+# Tuesday 4 October ..."
|
|
||||||
+#
|
|
||||||
+# From Paul Eggert (2022-10-05):
|
|
||||||
+# Like Jordan, model this as a transition from EEST +03 (DST) to plain +03
|
|
||||||
+# (non-DST) at the point where DST would otherwise have ended.
|
|
||||||
|
|
||||||
Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S
|
|
||||||
Rule Syria 2008 only - Nov 1 0:00 0 -
|
|
||||||
Rule Syria 2009 only - Mar lastFri 0:00 1:00 S
|
|
||||||
Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S
|
|
||||||
-Rule Syria 2012 max - Mar lastFri 0:00 1:00 S
|
|
||||||
-Rule Syria 2009 max - Oct lastFri 0:00 0 -
|
|
||||||
+Rule Syria 2012 2022 - Mar lastFri 0:00 1:00 S
|
|
||||||
+Rule Syria 2009 2022 - Oct lastFri 0:00 0 -
|
|
||||||
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
|
|
||||||
- 2:00 Syria EE%sT
|
|
||||||
+ 2:00 Syria EE%sT 2022 Oct 28 0:00
|
|
||||||
+ 3:00 - +03
|
|
||||||
|
|
||||||
# Tajikistan
|
|
||||||
# From Shanks & Pottenger.
|
|
||||||
diff --git a/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe
|
|
||||||
index 9e0a538f86d..930cede4cf4 100644
|
|
||||||
--- a/jdk/make/data/tzdata/europe
|
|
||||||
+++ b/jdk/make/data/tzdata/europe
|
|
||||||
@@ -3417,7 +3417,7 @@ Zone Europe/Madrid -0:14:44 - LMT 1901 Jan 1 0:00u
|
|
||||||
0:00 Spain WE%sT 1940 Mar 16 23:00
|
|
||||||
1:00 Spain CE%sT 1979
|
|
||||||
1:00 EU CE%sT
|
|
||||||
-Zone Africa/Ceuta -0:21:16 - LMT 1900 Dec 31 23:38:44
|
|
||||||
+Zone Africa/Ceuta -0:21:16 - LMT 1901 Jan 1 0:00u
|
|
||||||
0:00 - WET 1918 May 6 23:00
|
|
||||||
0:00 1:00 WEST 1918 Oct 7 23:00
|
|
||||||
0:00 - WET 1924
|
|
||||||
diff --git a/jdk/make/data/tzdata/northamerica b/jdk/make/data/tzdata/northamerica
|
|
||||||
index 114cef14cce..ce4ee74582c 100644
|
|
||||||
--- a/jdk/make/data/tzdata/northamerica
|
|
||||||
+++ b/jdk/make/data/tzdata/northamerica
|
|
||||||
@@ -462,7 +462,7 @@ Rule Chicago 1922 1966 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Chicago 1922 1954 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Chicago 1955 1966 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24
|
|
||||||
+Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1920
|
|
||||||
-6:00 Chicago C%sT 1936 Mar 1 2:00
|
|
||||||
-5:00 - EST 1936 Nov 15 2:00
|
|
||||||
@@ -471,7 +471,7 @@ Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24
|
|
||||||
-6:00 Chicago C%sT 1967
|
|
||||||
-6:00 US C%sT
|
|
||||||
# Oliver County, ND switched from mountain to central time on 1992-10-25.
|
|
||||||
-Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48
|
|
||||||
+Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 19:00u
|
|
||||||
-7:00 US M%sT 1992 Oct 25 2:00
|
|
||||||
-6:00 US C%sT
|
|
||||||
# Morton County, ND, switched from mountain to central time on
|
|
||||||
@@ -481,7 +481,7 @@ Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48
|
|
||||||
# Jones, Mellette, and Todd Counties in South Dakota;
|
|
||||||
# but in practice these other counties were already observing central time.
|
|
||||||
# See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
|
|
||||||
-Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
|
|
||||||
+Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 19:00u
|
|
||||||
-7:00 US M%sT 2003 Oct 26 2:00
|
|
||||||
-6:00 US C%sT
|
|
||||||
|
|
||||||
@@ -498,7 +498,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
|
|
||||||
# largest city in Mercer County). Google Maps places Beulah's city hall
|
|
||||||
# at 47° 15' 51" N, 101° 46' 40" W, which yields an offset of 6h47'07".
|
|
||||||
|
|
||||||
-Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
|
|
||||||
+Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 19:00u
|
|
||||||
-7:00 US M%sT 2010 Nov 7 2:00
|
|
||||||
-6:00 US C%sT
|
|
||||||
|
|
||||||
@@ -530,7 +530,7 @@ Rule Denver 1921 only - May 22 2:00 0 S
|
|
||||||
Rule Denver 1965 1966 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Denver 1965 1966 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Denver -6:59:56 - LMT 1883 Nov 18 12:00:04
|
|
||||||
+Zone America/Denver -6:59:56 - LMT 1883 Nov 18 19:00u
|
|
||||||
-7:00 US M%sT 1920
|
|
||||||
-7:00 Denver M%sT 1942
|
|
||||||
-7:00 US M%sT 1946
|
|
||||||
@@ -583,7 +583,7 @@ Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
|
|
||||||
Rule CA 1950 1961 - Sep lastSun 2:00 0 S
|
|
||||||
Rule CA 1962 1966 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02
|
|
||||||
+Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u
|
|
||||||
-8:00 US P%sT 1946
|
|
||||||
-8:00 CA P%sT 1967
|
|
||||||
-8:00 US P%sT
|
|
||||||
@@ -845,7 +845,7 @@ Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00
|
|
||||||
# Go with the Arizona State Library instead.
|
|
||||||
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 11:31:42
|
|
||||||
+Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 19:00u
|
|
||||||
-7:00 US M%sT 1944 Jan 1 0:01
|
|
||||||
-7:00 - MST 1944 Apr 1 0:01
|
|
||||||
-7:00 US M%sT 1944 Oct 1 0:01
|
|
||||||
@@ -873,7 +873,7 @@ Link America/Phoenix America/Creston
|
|
||||||
# switched four weeks late in 1974.
|
|
||||||
#
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11
|
|
||||||
+Zone America/Boise -7:44:49 - LMT 1883 Nov 18 20:00u
|
|
||||||
-8:00 US P%sT 1923 May 13 2:00
|
|
||||||
-7:00 US M%sT 1974
|
|
||||||
-7:00 - MST 1974 Feb 3 2:00
|
|
||||||
@@ -945,7 +945,7 @@ Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
|
|
||||||
Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
|
|
||||||
+Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1920
|
|
||||||
-6:00 Indianapolis C%sT 1942
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
@@ -965,7 +965,7 @@ Rule Marengo 1951 only - Sep lastSun 2:00 0 S
|
|
||||||
Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Marengo 1954 1960 - Sep lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 12:14:37
|
|
||||||
+Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1951
|
|
||||||
-6:00 Marengo C%sT 1961 Apr 30 2:00
|
|
||||||
-5:00 - EST 1969
|
|
||||||
@@ -989,7 +989,7 @@ Rule Vincennes 1960 only - Oct lastSun 2:00 0 S
|
|
||||||
Rule Vincennes 1961 only - Sep lastSun 2:00 0 S
|
|
||||||
Rule Vincennes 1962 1963 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 12:09:53
|
|
||||||
+Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
-6:00 Vincennes C%sT 1964 Apr 26 2:00
|
|
||||||
-5:00 - EST 1969
|
|
||||||
@@ -1009,7 +1009,7 @@ Rule Perry 1955 1960 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Perry 1961 1963 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 12:12:57
|
|
||||||
+Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
-6:00 Perry C%sT 1964 Apr 26 2:00
|
|
||||||
-5:00 - EST 1967 Oct 29 2:00
|
|
||||||
@@ -1026,7 +1026,7 @@ Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Pike 1961 1964 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 12:10:53
|
|
||||||
+Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1955
|
|
||||||
-6:00 Pike C%sT 1965 Apr 25 2:00
|
|
||||||
-5:00 - EST 1966 Oct 30 2:00
|
|
||||||
@@ -1048,7 +1048,7 @@ Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
|
|
||||||
Rule Starke 1957 1958 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Starke 1959 1961 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 12:13:30
|
|
||||||
+Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1947
|
|
||||||
-6:00 Starke C%sT 1962 Apr 29 2:00
|
|
||||||
-5:00 - EST 1963 Oct 27 2:00
|
|
||||||
@@ -1064,7 +1064,7 @@ Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
|
|
||||||
Rule Pulaski 1957 1960 - Sep lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35
|
|
||||||
+Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
-6:00 Pulaski C%sT 1961 Apr 30 2:00
|
|
||||||
-5:00 - EST 1969
|
|
||||||
@@ -1075,7 +1075,7 @@ Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35
|
|
||||||
#
|
|
||||||
# Switzerland County, Indiana, did not observe DST from 1973 through 2005.
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44
|
|
||||||
+Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1954 Apr 25 2:00
|
|
||||||
-5:00 - EST 1969
|
|
||||||
-5:00 US E%sT 1973
|
|
||||||
@@ -1111,7 +1111,7 @@ Rule Louisville 1950 1961 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Louisville 1950 1955 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Louisville 1956 1961 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58
|
|
||||||
+Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1921
|
|
||||||
-6:00 Louisville C%sT 1942
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
@@ -1145,7 +1145,7 @@ Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58
|
|
||||||
# Federal Register 65, 160 (2000-08-17), pp 50154-50158.
|
|
||||||
# https://www.gpo.gov/fdsys/pkg/FR-2000-08-17/html/00-20854.htm
|
|
||||||
#
|
|
||||||
-Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 12:20:36
|
|
||||||
+Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
-6:00 - CST 1968
|
|
||||||
-6:00 US C%sT 2000 Oct 29 2:00
|
|
||||||
@@ -2640,6 +2640,8 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
|
|
||||||
# longitude they are located at.
|
|
||||||
|
|
||||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
||||||
+Rule Mexico 1931 only - May 1 23:00 1:00 D
|
|
||||||
+Rule Mexico 1931 only - Oct 1 0:00 0 S
|
|
||||||
Rule Mexico 1939 only - Feb 5 0:00 1:00 D
|
|
||||||
Rule Mexico 1939 only - Jun 25 0:00 0 S
|
|
||||||
Rule Mexico 1940 only - Dec 9 0:00 1:00 D
|
|
||||||
@@ -2656,13 +2658,13 @@ Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D
|
|
||||||
Rule Mexico 2002 max - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
# Quintana Roo; represented by Cancún
|
|
||||||
-Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56
|
|
||||||
+Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 6:00u
|
|
||||||
-6:00 - CST 1981 Dec 23
|
|
||||||
-5:00 Mexico E%sT 1998 Aug 2 2:00
|
|
||||||
-6:00 Mexico C%sT 2015 Feb 1 2:00
|
|
||||||
-5:00 - EST
|
|
||||||
# Campeche, Yucatán; represented by Mérida
|
|
||||||
-Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
|
|
||||||
+Zone America/Merida -5:58:28 - LMT 1922 Jan 1 6:00u
|
|
||||||
-6:00 - CST 1981 Dec 23
|
|
||||||
-5:00 - EST 1982 Dec 2
|
|
||||||
-6:00 Mexico C%sT
|
|
||||||
@@ -2676,23 +2678,21 @@ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
|
|
||||||
# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
|
|
||||||
# 2016-03-12
|
|
||||||
# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
|
|
||||||
-Zone America/Matamoros -6:40:00 - LMT 1921 Dec 31 23:20:00
|
|
||||||
+Zone America/Matamoros -6:30:00 - LMT 1922 Jan 1 6:00u
|
|
||||||
-6:00 - CST 1988
|
|
||||||
-6:00 US C%sT 1989
|
|
||||||
-6:00 Mexico C%sT 2010
|
|
||||||
-6:00 US C%sT
|
|
||||||
# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
|
|
||||||
-Zone America/Monterrey -6:41:16 - LMT 1921 Dec 31 23:18:44
|
|
||||||
+Zone America/Monterrey -6:41:16 - LMT 1922 Jan 1 6:00u
|
|
||||||
-6:00 - CST 1988
|
|
||||||
-6:00 US C%sT 1989
|
|
||||||
-6:00 Mexico C%sT
|
|
||||||
# Central Mexico
|
|
||||||
-Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
|
||||||
+Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 Mexico C%sT 2001 Sep 30 2:00
|
|
||||||
-6:00 - CST 2002 Feb 20
|
|
||||||
-6:00 Mexico C%sT
|
|
||||||
@@ -2700,35 +2700,29 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
|
||||||
# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
|
|
||||||
# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
|
|
||||||
# (See the 2016-03-12 El Universal source mentioned above.)
|
|
||||||
-Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
|
|
||||||
+Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 - CST 1996
|
|
||||||
-6:00 Mexico C%sT 1998
|
|
||||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
|
||||||
-7:00 Mexico M%sT 2010
|
|
||||||
-7:00 US M%sT
|
|
||||||
# Chihuahua (away from US border)
|
|
||||||
-Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40
|
|
||||||
+Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 - CST 1996
|
|
||||||
-6:00 Mexico C%sT 1998
|
|
||||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
|
||||||
-7:00 Mexico M%sT
|
|
||||||
# Sonora
|
|
||||||
-Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
|
||||||
+Zone America/Hermosillo -7:23:52 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 - CST 1942 Apr 24
|
|
||||||
-7:00 - MST 1949 Jan 14
|
|
||||||
-8:00 - PST 1970
|
|
||||||
@@ -2763,24 +2757,20 @@ Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
|
||||||
# Use "Bahia_Banderas" to keep the name to fourteen characters.
|
|
||||||
|
|
||||||
# Mazatlán
|
|
||||||
-Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20
|
|
||||||
+Zone America/Mazatlan -7:05:40 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 - CST 1942 Apr 24
|
|
||||||
-7:00 - MST 1949 Jan 14
|
|
||||||
-8:00 - PST 1970
|
|
||||||
-7:00 Mexico M%sT
|
|
||||||
|
|
||||||
# Bahía de Banderas
|
|
||||||
-Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00
|
|
||||||
+Zone America/Bahia_Banderas -7:01:00 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 - CST 1942 Apr 24
|
|
||||||
-7:00 - MST 1949 Jan 14
|
|
||||||
-8:00 - PST 1970
|
|
||||||
@@ -2788,7 +2778,7 @@ Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00
|
|
||||||
-6:00 Mexico C%sT
|
|
||||||
|
|
||||||
# Baja California
|
|
||||||
-Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56
|
|
||||||
+Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1924
|
|
||||||
-8:00 - PST 1927 Jun 10 23:00
|
|
||||||
-7:00 - MST 1930 Nov 15
|
|
||||||
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
|
|
||||||
index 71470168456..0cad939008f 100644
|
|
||||||
--- a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
|
|
||||||
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
|
|
||||||
@@ -1 +1 @@
|
|
||||||
-tzdata2022d
|
|
||||||
+tzdata2022e
|
|
||||||
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
||||||
index b3823958ae4..2f2786f1c69 100644
|
|
||||||
--- a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
||||||
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
||||||
@@ -97,9 +97,7 @@ America/Winnipeg CST CDT
|
|
||||||
America/Yakutat AKST AKDT
|
|
||||||
America/Yellowknife MST MDT
|
|
||||||
Antarctica/Macquarie AEST AEDT
|
|
||||||
-Asia/Amman EET EEST
|
|
||||||
Asia/Beirut EET EEST
|
|
||||||
-Asia/Damascus EET EEST
|
|
||||||
Asia/Famagusta EET EEST
|
|
||||||
Asia/Gaza EET EEST
|
|
||||||
Asia/Hebron EET EEST
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
|
|
||||||
index 889d0e6dad7..b8cb36e69f4 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
|
|
||||||
@@ -21,4 +21,4 @@
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
-tzdata2022d
|
|
||||||
+tzdata2022e
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia
|
|
||||||
index 1dc7d34f88e..f1771e42a71 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia
|
|
||||||
@@ -2254,6 +2254,17 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
|
|
||||||
# From the Arabic version, it seems to say it would be at midnight
|
|
||||||
# (assume 24:00) on the last Thursday in February, starting from 2022.
|
|
||||||
|
|
||||||
+# From Issam Al-Zuwairi (2022-10-05):
|
|
||||||
+# The Council of Ministers in Jordan decided Wednesday 5th October 2022,
|
|
||||||
+# that daylight saving time (DST) will be throughout the year....
|
|
||||||
+#
|
|
||||||
+# From Brian Inglis (2022-10-06):
|
|
||||||
+# https://petra.gov.jo/Include/InnerPage.jsp?ID=45567&lang=en&name=en_news
|
|
||||||
+#
|
|
||||||
+# From Paul Eggert (2022-10-05):
|
|
||||||
+# Like Syria, model this as a transition from EEST +03 (DST) to plain +03
|
|
||||||
+# (non-DST) at the point where DST would otherwise have ended.
|
|
||||||
+
|
|
||||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
||||||
Rule Jordan 1973 only - Jun 6 0:00 1:00 S
|
|
||||||
Rule Jordan 1973 1975 - Oct 1 0:00 0 -
|
|
||||||
@@ -2285,11 +2296,12 @@ Rule Jordan 2005 only - Sep lastFri 0:00s 0 -
|
|
||||||
Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
|
|
||||||
Rule Jordan 2013 only - Dec 20 0:00 0 -
|
|
||||||
Rule Jordan 2014 2021 - Mar lastThu 24:00 1:00 S
|
|
||||||
-Rule Jordan 2014 max - Oct lastFri 0:00s 0 -
|
|
||||||
-Rule Jordan 2022 max - Feb lastThu 24:00 1:00 S
|
|
||||||
+Rule Jordan 2014 2022 - Oct lastFri 0:00s 0 -
|
|
||||||
+Rule Jordan 2022 only - Feb lastThu 24:00 1:00 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
Zone Asia/Amman 2:23:44 - LMT 1931
|
|
||||||
- 2:00 Jordan EE%sT
|
|
||||||
+ 2:00 Jordan EE%sT 2022 Oct 28 0:00s
|
|
||||||
+ 3:00 - +03
|
|
||||||
|
|
||||||
|
|
||||||
# Kazakhstan
|
|
||||||
@@ -3838,19 +3850,27 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 -
|
|
||||||
# Our brief summary:
|
|
||||||
# https://www.timeanddate.com/news/time/syria-dst-2012.html
|
|
||||||
|
|
||||||
-# From Arthur David Olson (2012-03-27):
|
|
||||||
-# Assume last Friday in March going forward XXX.
|
|
||||||
+# From Steffen Thorsen (2022-10-05):
|
|
||||||
+# Syria is adopting year-round DST, starting this autumn....
|
|
||||||
+# From https://www.enabbaladi.net/archives/607812
|
|
||||||
+# "This [the decision] came after the weekly government meeting today,
|
|
||||||
+# Tuesday 4 October ..."
|
|
||||||
+#
|
|
||||||
+# From Paul Eggert (2022-10-05):
|
|
||||||
+# Like Jordan, model this as a transition from EEST +03 (DST) to plain +03
|
|
||||||
+# (non-DST) at the point where DST would otherwise have ended.
|
|
||||||
|
|
||||||
Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S
|
|
||||||
Rule Syria 2008 only - Nov 1 0:00 0 -
|
|
||||||
Rule Syria 2009 only - Mar lastFri 0:00 1:00 S
|
|
||||||
Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S
|
|
||||||
-Rule Syria 2012 max - Mar lastFri 0:00 1:00 S
|
|
||||||
-Rule Syria 2009 max - Oct lastFri 0:00 0 -
|
|
||||||
+Rule Syria 2012 2022 - Mar lastFri 0:00 1:00 S
|
|
||||||
+Rule Syria 2009 2022 - Oct lastFri 0:00 0 -
|
|
||||||
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
|
|
||||||
- 2:00 Syria EE%sT
|
|
||||||
+ 2:00 Syria EE%sT 2022 Oct 28 0:00
|
|
||||||
+ 3:00 - +03
|
|
||||||
|
|
||||||
# Tajikistan
|
|
||||||
# From Shanks & Pottenger.
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe
|
|
||||||
index 9e0a538f86d..930cede4cf4 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe
|
|
||||||
@@ -3417,7 +3417,7 @@ Zone Europe/Madrid -0:14:44 - LMT 1901 Jan 1 0:00u
|
|
||||||
0:00 Spain WE%sT 1940 Mar 16 23:00
|
|
||||||
1:00 Spain CE%sT 1979
|
|
||||||
1:00 EU CE%sT
|
|
||||||
-Zone Africa/Ceuta -0:21:16 - LMT 1900 Dec 31 23:38:44
|
|
||||||
+Zone Africa/Ceuta -0:21:16 - LMT 1901 Jan 1 0:00u
|
|
||||||
0:00 - WET 1918 May 6 23:00
|
|
||||||
0:00 1:00 WEST 1918 Oct 7 23:00
|
|
||||||
0:00 - WET 1924
|
|
||||||
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/northamerica b/jdk/test/sun/util/calendar/zi/tzdata/northamerica
|
|
||||||
index 114cef14cce..ce4ee74582c 100644
|
|
||||||
--- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica
|
|
||||||
+++ b/jdk/test/sun/util/calendar/zi/tzdata/northamerica
|
|
||||||
@@ -462,7 +462,7 @@ Rule Chicago 1922 1966 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Chicago 1922 1954 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Chicago 1955 1966 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24
|
|
||||||
+Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1920
|
|
||||||
-6:00 Chicago C%sT 1936 Mar 1 2:00
|
|
||||||
-5:00 - EST 1936 Nov 15 2:00
|
|
||||||
@@ -471,7 +471,7 @@ Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24
|
|
||||||
-6:00 Chicago C%sT 1967
|
|
||||||
-6:00 US C%sT
|
|
||||||
# Oliver County, ND switched from mountain to central time on 1992-10-25.
|
|
||||||
-Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48
|
|
||||||
+Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 19:00u
|
|
||||||
-7:00 US M%sT 1992 Oct 25 2:00
|
|
||||||
-6:00 US C%sT
|
|
||||||
# Morton County, ND, switched from mountain to central time on
|
|
||||||
@@ -481,7 +481,7 @@ Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48
|
|
||||||
# Jones, Mellette, and Todd Counties in South Dakota;
|
|
||||||
# but in practice these other counties were already observing central time.
|
|
||||||
# See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
|
|
||||||
-Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
|
|
||||||
+Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 19:00u
|
|
||||||
-7:00 US M%sT 2003 Oct 26 2:00
|
|
||||||
-6:00 US C%sT
|
|
||||||
|
|
||||||
@@ -498,7 +498,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
|
|
||||||
# largest city in Mercer County). Google Maps places Beulah's city hall
|
|
||||||
# at 47° 15' 51" N, 101° 46' 40" W, which yields an offset of 6h47'07".
|
|
||||||
|
|
||||||
-Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
|
|
||||||
+Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 19:00u
|
|
||||||
-7:00 US M%sT 2010 Nov 7 2:00
|
|
||||||
-6:00 US C%sT
|
|
||||||
|
|
||||||
@@ -530,7 +530,7 @@ Rule Denver 1921 only - May 22 2:00 0 S
|
|
||||||
Rule Denver 1965 1966 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Denver 1965 1966 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Denver -6:59:56 - LMT 1883 Nov 18 12:00:04
|
|
||||||
+Zone America/Denver -6:59:56 - LMT 1883 Nov 18 19:00u
|
|
||||||
-7:00 US M%sT 1920
|
|
||||||
-7:00 Denver M%sT 1942
|
|
||||||
-7:00 US M%sT 1946
|
|
||||||
@@ -583,7 +583,7 @@ Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
|
|
||||||
Rule CA 1950 1961 - Sep lastSun 2:00 0 S
|
|
||||||
Rule CA 1962 1966 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02
|
|
||||||
+Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u
|
|
||||||
-8:00 US P%sT 1946
|
|
||||||
-8:00 CA P%sT 1967
|
|
||||||
-8:00 US P%sT
|
|
||||||
@@ -845,7 +845,7 @@ Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00
|
|
||||||
# Go with the Arizona State Library instead.
|
|
||||||
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 11:31:42
|
|
||||||
+Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 19:00u
|
|
||||||
-7:00 US M%sT 1944 Jan 1 0:01
|
|
||||||
-7:00 - MST 1944 Apr 1 0:01
|
|
||||||
-7:00 US M%sT 1944 Oct 1 0:01
|
|
||||||
@@ -873,7 +873,7 @@ Link America/Phoenix America/Creston
|
|
||||||
# switched four weeks late in 1974.
|
|
||||||
#
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11
|
|
||||||
+Zone America/Boise -7:44:49 - LMT 1883 Nov 18 20:00u
|
|
||||||
-8:00 US P%sT 1923 May 13 2:00
|
|
||||||
-7:00 US M%sT 1974
|
|
||||||
-7:00 - MST 1974 Feb 3 2:00
|
|
||||||
@@ -945,7 +945,7 @@ Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
|
|
||||||
Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
|
|
||||||
+Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1920
|
|
||||||
-6:00 Indianapolis C%sT 1942
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
@@ -965,7 +965,7 @@ Rule Marengo 1951 only - Sep lastSun 2:00 0 S
|
|
||||||
Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Marengo 1954 1960 - Sep lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 12:14:37
|
|
||||||
+Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1951
|
|
||||||
-6:00 Marengo C%sT 1961 Apr 30 2:00
|
|
||||||
-5:00 - EST 1969
|
|
||||||
@@ -989,7 +989,7 @@ Rule Vincennes 1960 only - Oct lastSun 2:00 0 S
|
|
||||||
Rule Vincennes 1961 only - Sep lastSun 2:00 0 S
|
|
||||||
Rule Vincennes 1962 1963 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 12:09:53
|
|
||||||
+Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
-6:00 Vincennes C%sT 1964 Apr 26 2:00
|
|
||||||
-5:00 - EST 1969
|
|
||||||
@@ -1009,7 +1009,7 @@ Rule Perry 1955 1960 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Perry 1961 1963 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 12:12:57
|
|
||||||
+Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
-6:00 Perry C%sT 1964 Apr 26 2:00
|
|
||||||
-5:00 - EST 1967 Oct 29 2:00
|
|
||||||
@@ -1026,7 +1026,7 @@ Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Pike 1961 1964 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 12:10:53
|
|
||||||
+Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1955
|
|
||||||
-6:00 Pike C%sT 1965 Apr 25 2:00
|
|
||||||
-5:00 - EST 1966 Oct 30 2:00
|
|
||||||
@@ -1048,7 +1048,7 @@ Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
|
|
||||||
Rule Starke 1957 1958 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Starke 1959 1961 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 12:13:30
|
|
||||||
+Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1947
|
|
||||||
-6:00 Starke C%sT 1962 Apr 29 2:00
|
|
||||||
-5:00 - EST 1963 Oct 27 2:00
|
|
||||||
@@ -1064,7 +1064,7 @@ Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
|
|
||||||
Rule Pulaski 1957 1960 - Sep lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35
|
|
||||||
+Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
-6:00 Pulaski C%sT 1961 Apr 30 2:00
|
|
||||||
-5:00 - EST 1969
|
|
||||||
@@ -1075,7 +1075,7 @@ Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35
|
|
||||||
#
|
|
||||||
# Switzerland County, Indiana, did not observe DST from 1973 through 2005.
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44
|
|
||||||
+Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1954 Apr 25 2:00
|
|
||||||
-5:00 - EST 1969
|
|
||||||
-5:00 US E%sT 1973
|
|
||||||
@@ -1111,7 +1111,7 @@ Rule Louisville 1950 1961 - Apr lastSun 2:00 1:00 D
|
|
||||||
Rule Louisville 1950 1955 - Sep lastSun 2:00 0 S
|
|
||||||
Rule Louisville 1956 1961 - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
-Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58
|
|
||||||
+Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1921
|
|
||||||
-6:00 Louisville C%sT 1942
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
@@ -1145,7 +1145,7 @@ Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58
|
|
||||||
# Federal Register 65, 160 (2000-08-17), pp 50154-50158.
|
|
||||||
# https://www.gpo.gov/fdsys/pkg/FR-2000-08-17/html/00-20854.htm
|
|
||||||
#
|
|
||||||
-Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 12:20:36
|
|
||||||
+Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 18:00u
|
|
||||||
-6:00 US C%sT 1946
|
|
||||||
-6:00 - CST 1968
|
|
||||||
-6:00 US C%sT 2000 Oct 29 2:00
|
|
||||||
@@ -2640,6 +2640,8 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
|
|
||||||
# longitude they are located at.
|
|
||||||
|
|
||||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
||||||
+Rule Mexico 1931 only - May 1 23:00 1:00 D
|
|
||||||
+Rule Mexico 1931 only - Oct 1 0:00 0 S
|
|
||||||
Rule Mexico 1939 only - Feb 5 0:00 1:00 D
|
|
||||||
Rule Mexico 1939 only - Jun 25 0:00 0 S
|
|
||||||
Rule Mexico 1940 only - Dec 9 0:00 1:00 D
|
|
||||||
@@ -2656,13 +2658,13 @@ Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D
|
|
||||||
Rule Mexico 2002 max - Oct lastSun 2:00 0 S
|
|
||||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
||||||
# Quintana Roo; represented by Cancún
|
|
||||||
-Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56
|
|
||||||
+Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 6:00u
|
|
||||||
-6:00 - CST 1981 Dec 23
|
|
||||||
-5:00 Mexico E%sT 1998 Aug 2 2:00
|
|
||||||
-6:00 Mexico C%sT 2015 Feb 1 2:00
|
|
||||||
-5:00 - EST
|
|
||||||
# Campeche, Yucatán; represented by Mérida
|
|
||||||
-Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
|
|
||||||
+Zone America/Merida -5:58:28 - LMT 1922 Jan 1 6:00u
|
|
||||||
-6:00 - CST 1981 Dec 23
|
|
||||||
-5:00 - EST 1982 Dec 2
|
|
||||||
-6:00 Mexico C%sT
|
|
||||||
@@ -2676,23 +2678,21 @@ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
|
|
||||||
# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
|
|
||||||
# 2016-03-12
|
|
||||||
# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
|
|
||||||
-Zone America/Matamoros -6:40:00 - LMT 1921 Dec 31 23:20:00
|
|
||||||
+Zone America/Matamoros -6:30:00 - LMT 1922 Jan 1 6:00u
|
|
||||||
-6:00 - CST 1988
|
|
||||||
-6:00 US C%sT 1989
|
|
||||||
-6:00 Mexico C%sT 2010
|
|
||||||
-6:00 US C%sT
|
|
||||||
# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
|
|
||||||
-Zone America/Monterrey -6:41:16 - LMT 1921 Dec 31 23:18:44
|
|
||||||
+Zone America/Monterrey -6:41:16 - LMT 1922 Jan 1 6:00u
|
|
||||||
-6:00 - CST 1988
|
|
||||||
-6:00 US C%sT 1989
|
|
||||||
-6:00 Mexico C%sT
|
|
||||||
# Central Mexico
|
|
||||||
-Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
|
||||||
+Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 Mexico C%sT 2001 Sep 30 2:00
|
|
||||||
-6:00 - CST 2002 Feb 20
|
|
||||||
-6:00 Mexico C%sT
|
|
||||||
@@ -2700,35 +2700,29 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
|
||||||
# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
|
|
||||||
# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
|
|
||||||
# (See the 2016-03-12 El Universal source mentioned above.)
|
|
||||||
-Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
|
|
||||||
+Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 - CST 1996
|
|
||||||
-6:00 Mexico C%sT 1998
|
|
||||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
|
||||||
-7:00 Mexico M%sT 2010
|
|
||||||
-7:00 US M%sT
|
|
||||||
# Chihuahua (away from US border)
|
|
||||||
-Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40
|
|
||||||
+Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 - CST 1996
|
|
||||||
-6:00 Mexico C%sT 1998
|
|
||||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
|
||||||
-7:00 Mexico M%sT
|
|
||||||
# Sonora
|
|
||||||
-Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
|
||||||
+Zone America/Hermosillo -7:23:52 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 - CST 1942 Apr 24
|
|
||||||
-7:00 - MST 1949 Jan 14
|
|
||||||
-8:00 - PST 1970
|
|
||||||
@@ -2763,24 +2757,20 @@ Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
|
||||||
# Use "Bahia_Banderas" to keep the name to fourteen characters.
|
|
||||||
|
|
||||||
# Mazatlán
|
|
||||||
-Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20
|
|
||||||
+Zone America/Mazatlan -7:05:40 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 - CST 1942 Apr 24
|
|
||||||
-7:00 - MST 1949 Jan 14
|
|
||||||
-8:00 - PST 1970
|
|
||||||
-7:00 Mexico M%sT
|
|
||||||
|
|
||||||
# Bahía de Banderas
|
|
||||||
-Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00
|
|
||||||
+Zone America/Bahia_Banderas -7:01:00 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1927 Jun 10 23:00
|
|
||||||
-6:00 - CST 1930 Nov 15
|
|
||||||
- -7:00 - MST 1931 May 1 23:00
|
|
||||||
- -6:00 - CST 1931 Oct
|
|
||||||
- -7:00 - MST 1932 Apr 1
|
|
||||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
||||||
-6:00 - CST 1942 Apr 24
|
|
||||||
-7:00 - MST 1949 Jan 14
|
|
||||||
-8:00 - PST 1970
|
|
||||||
@@ -2788,7 +2778,7 @@ Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00
|
|
||||||
-6:00 Mexico C%sT
|
|
||||||
|
|
||||||
# Baja California
|
|
||||||
-Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56
|
|
||||||
+Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 7:00u
|
|
||||||
-7:00 - MST 1924
|
|
||||||
-8:00 - PST 1927 Jun 10 23:00
|
|
||||||
-7:00 - MST 1930 Nov 15
|
|
||||||
2596
SOURCES/jdk8328999-update_giflib_5.2.2.patch
Normal file
2596
SOURCES/jdk8328999-update_giflib_5.2.2.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -7,10 +7,11 @@
|
|||||||
8074839: Resolve disabled warnings for libunpack and the unpack200 binary
|
8074839: Resolve disabled warnings for libunpack and the unpack200 binary
|
||||||
Reviewed-by: dholmes, ksrini
|
Reviewed-by: dholmes, ksrini
|
||||||
|
|
||||||
diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h b/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
||||||
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
index bdaf95a2f6a..60c5b4f2a69 100644
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
||||||
@@ -63,7 +63,7 @@
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
||||||
|
@@ -63,7 +63,7 @@ struct bytes {
|
||||||
bytes res;
|
bytes res;
|
||||||
res.ptr = ptr + beg;
|
res.ptr = ptr + beg;
|
||||||
res.len = end - beg;
|
res.len = end - beg;
|
||||||
@ -19,10 +20,11 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openj
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
// building C strings inside byte buffers:
|
// building C strings inside byte buffers:
|
||||||
diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
||||||
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
index 5fbc7261fb3..4c002e779d8 100644
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
||||||
@@ -292,7 +292,7 @@
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
||||||
|
@@ -292,7 +292,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject
|
||||||
|
|
||||||
if (uPtr->aborting()) {
|
if (uPtr->aborting()) {
|
||||||
THROW_IOE(uPtr->get_abort_message());
|
THROW_IOE(uPtr->get_abort_message());
|
||||||
@ -31,16 +33,16 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openj
|
|||||||
}
|
}
|
||||||
|
|
||||||
// We have fetched all the files.
|
// We have fetched all the files.
|
||||||
@@ -310,7 +310,7 @@
|
@@ -312,7 +312,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
|
||||||
JNIEXPORT jlong JNICALL
|
// There's no need to create a new unpacker here if we don't already have one
|
||||||
Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
|
// just to immediatly free it afterwards.
|
||||||
unpacker* uPtr = get_unpacker(env, pObj, false);
|
unpacker* uPtr = get_unpacker(env, pObj, /* noCreate= */ true);
|
||||||
- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
|
- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
|
||||||
+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
|
+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
|
||||||
size_t consumed = uPtr->input_consumed();
|
size_t consumed = uPtr->input_consumed();
|
||||||
|
// free_unpacker() will set the unpacker field on 'pObj' to null
|
||||||
free_unpacker(env, pObj, uPtr);
|
free_unpacker(env, pObj, uPtr);
|
||||||
return consumed;
|
@@ -323,6 +323,7 @@ JNIEXPORT jboolean JNICALL
|
||||||
@@ -320,6 +320,7 @@
|
|
||||||
Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
|
Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
|
||||||
jstring pProp, jstring pValue) {
|
jstring pProp, jstring pValue) {
|
||||||
unpacker* uPtr = get_unpacker(env, pObj);
|
unpacker* uPtr = get_unpacker(env, pObj);
|
||||||
@ -48,10 +50,11 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openj
|
|||||||
const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
|
const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
|
||||||
CHECK_EXCEPTION_RETURN_VALUE(prop, false);
|
CHECK_EXCEPTION_RETURN_VALUE(prop, false);
|
||||||
const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
|
const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
|
||||||
diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
||||||
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
index 6fbc43a18ae..722c8baaff0 100644
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
||||||
@@ -142,31 +142,28 @@
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
||||||
|
@@ -142,31 +142,28 @@ static const char* nbasename(const char* progname) {
|
||||||
return progname;
|
return progname;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -101,10 +104,11 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp open
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
||||||
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
index a585535c513..8df3fade499 100644
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
||||||
@@ -222,9 +222,9 @@
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
||||||
|
@@ -225,9 +225,9 @@ struct entry {
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PRODUCT
|
#ifdef PRODUCT
|
||||||
@ -116,7 +120,7 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp op
|
|||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -715,13 +715,13 @@
|
@@ -719,13 +719,13 @@ void unpacker::read_file_header() {
|
||||||
// Now we can size the whole archive.
|
// Now we can size the whole archive.
|
||||||
// Read everything else into a mega-buffer.
|
// Read everything else into a mega-buffer.
|
||||||
rp = hdr.rp;
|
rp = hdr.rp;
|
||||||
@ -134,7 +138,7 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp op
|
|||||||
abort("EOF reading fixed input buffer");
|
abort("EOF reading fixed input buffer");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -735,7 +735,7 @@
|
@@ -739,7 +739,7 @@ void unpacker::read_file_header() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
|
input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
|
||||||
@ -143,7 +147,7 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp op
|
|||||||
CHECK;
|
CHECK;
|
||||||
assert(input.limit()[0] == 0);
|
assert(input.limit()[0] == 0);
|
||||||
// Move all the bytes we read initially into the real buffer.
|
// Move all the bytes we read initially into the real buffer.
|
||||||
@@ -958,13 +958,13 @@
|
@@ -962,13 +962,13 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
|
||||||
nentries = next_entry;
|
nentries = next_entry;
|
||||||
|
|
||||||
// place a limit on future CP growth:
|
// place a limit on future CP growth:
|
||||||
@ -159,18 +163,7 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp op
|
|||||||
|
|
||||||
// Note that this CP does not include "empty" entries
|
// Note that this CP does not include "empty" entries
|
||||||
// for longs and doubles. Those are introduced when
|
// for longs and doubles. Those are introduced when
|
||||||
@@ -982,8 +982,9 @@
|
@@ -3694,21 +3694,22 @@ void cpool::computeOutputIndexes() {
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize *all* our entries once
|
|
||||||
- for (int i = 0 ; i < maxentries ; i++)
|
|
||||||
+ for (uint i = 0 ; i < maxentries ; i++) {
|
|
||||||
entries[i].outputIndex = REQUESTED_NONE;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
initGroupIndexes();
|
|
||||||
// Initialize hashTab to a generous power-of-two size.
|
|
||||||
@@ -3677,21 +3678,22 @@
|
|
||||||
|
|
||||||
unpacker* debug_u;
|
unpacker* debug_u;
|
||||||
|
|
||||||
@ -197,7 +190,7 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp op
|
|||||||
case CONSTANT_Signature:
|
case CONSTANT_Signature:
|
||||||
if (value.b.ptr == null)
|
if (value.b.ptr == null)
|
||||||
return ref(0)->string();
|
return ref(0)->string();
|
||||||
@@ -3711,26 +3713,28 @@
|
@@ -3728,26 +3729,28 @@ char* entry::string() {
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (nrefs == 0) {
|
if (nrefs == 0) {
|
||||||
@ -235,10 +228,11 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp op
|
|||||||
}
|
}
|
||||||
|
|
||||||
void print_cp_entries(int beg, int end) {
|
void print_cp_entries(int beg, int end) {
|
||||||
diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
||||||
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
index 4ec595333c4..aad0c971ef2 100644
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
||||||
@@ -209,7 +209,7 @@
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
||||||
|
@@ -209,7 +209,7 @@ struct unpacker {
|
||||||
byte* rp; // read pointer (< rplimit <= input.limit())
|
byte* rp; // read pointer (< rplimit <= input.limit())
|
||||||
byte* rplimit; // how much of the input block has been read?
|
byte* rplimit; // how much of the input block has been read?
|
||||||
julong bytes_read;
|
julong bytes_read;
|
||||||
@ -247,10 +241,11 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h open
|
|||||||
|
|
||||||
// callback to read at least one byte, up to available input
|
// callback to read at least one byte, up to available input
|
||||||
typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
|
typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
|
||||||
diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
||||||
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
index da39a589545..1281d8b25c8 100644
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
||||||
@@ -81,7 +81,7 @@
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
||||||
|
@@ -81,7 +81,7 @@ void breakpoint() { } // hook for debugger
|
||||||
int assert_failed(const char* p) {
|
int assert_failed(const char* p) {
|
||||||
char message[1<<12];
|
char message[1<<12];
|
||||||
sprintf(message, "@assert failed: %s\n", p);
|
sprintf(message, "@assert failed: %s\n", p);
|
||||||
@ -259,10 +254,11 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp ope
|
|||||||
breakpoint();
|
breakpoint();
|
||||||
unpack_abort(message);
|
unpack_abort(message);
|
||||||
return 0;
|
return 0;
|
||||||
diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
||||||
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
index f58c94956c0..343da3e183b 100644
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
||||||
@@ -84,7 +84,7 @@
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
||||||
|
@@ -84,7 +84,7 @@ void jar::init(unpacker* u_) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write data to the ZIP output stream.
|
// Write data to the ZIP output stream.
|
||||||
@ -271,7 +267,7 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openj
|
|||||||
while (len > 0) {
|
while (len > 0) {
|
||||||
int rc = (int)fwrite(buff, 1, len, jarfp);
|
int rc = (int)fwrite(buff, 1, len, jarfp);
|
||||||
if (rc <= 0) {
|
if (rc <= 0) {
|
||||||
@@ -323,12 +323,12 @@
|
@@ -323,12 +323,12 @@ void jar::write_central_directory() {
|
||||||
// Total number of disks (int)
|
// Total number of disks (int)
|
||||||
header64[36] = (ushort)SWAP_BYTES(1);
|
header64[36] = (ushort)SWAP_BYTES(1);
|
||||||
header64[37] = 0;
|
header64[37] = 0;
|
||||||
@ -286,10 +282,11 @@ diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openj
|
|||||||
|
|
||||||
PRINTCR((2, "writing zip comment\n"));
|
PRINTCR((2, "writing zip comment\n"));
|
||||||
// Write the comment.
|
// Write the comment.
|
||||||
diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h b/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
||||||
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
index 14ffc9d65bd..9877f6f68ca 100644
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
||||||
@@ -68,8 +68,8 @@
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
||||||
|
@@ -68,8 +68,8 @@ struct jar {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Private Methods
|
// Private Methods
|
||||||
|
|||||||
@ -1,63 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# User andrew
|
|
||||||
# Date 1459487045 -3600
|
|
||||||
# Fri Apr 01 06:04:05 2016 +0100
|
|
||||||
# Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b
|
|
||||||
# Parent 6b81fd2227d14226f2121f2d51b464536925686e
|
|
||||||
PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
|
|
||||||
PR3575: System cacerts database handling should not affect jssecacerts
|
|
||||||
|
|
||||||
diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
|
|
||||||
--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
|
|
||||||
+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
|
|
||||||
@@ -72,7 +72,7 @@
|
|
||||||
* The preference of the default trusted KeyStore is:
|
|
||||||
* javax.net.ssl.trustStore
|
|
||||||
* jssecacerts
|
|
||||||
- * cacerts
|
|
||||||
+ * cacerts (system and local)
|
|
||||||
*/
|
|
||||||
private static final class TrustStoreDescriptor {
|
|
||||||
private static final String fileSep = File.separator;
|
|
||||||
@@ -83,6 +83,10 @@
|
|
||||||
defaultStorePath + fileSep + "cacerts";
|
|
||||||
private static final String jsseDefaultStore =
|
|
||||||
defaultStorePath + fileSep + "jssecacerts";
|
|
||||||
+ /* Check system cacerts DB: /etc/pki/java/cacerts */
|
|
||||||
+ private static final String systemStore =
|
|
||||||
+ fileSep + "etc" + fileSep + "pki" +
|
|
||||||
+ fileSep + "java" + fileSep + "cacerts";
|
|
||||||
|
|
||||||
// the trust store name
|
|
||||||
private final String storeName;
|
|
||||||
@@ -146,7 +150,8 @@
|
|
||||||
long temporaryTime = 0L;
|
|
||||||
if (!"NONE".equals(storePropName)) {
|
|
||||||
String[] fileNames =
|
|
||||||
- new String[] {storePropName, defaultStore};
|
|
||||||
+ new String[] {storePropName,
|
|
||||||
+ systemStore, defaultStore};
|
|
||||||
for (String fileName : fileNames) {
|
|
||||||
File f = new File(fileName);
|
|
||||||
if (f.isFile() && f.canRead()) {
|
|
||||||
diff --git openjdk.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
|
|
||||||
--- openjdk.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
|
|
||||||
+++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
|
|
||||||
@@ -108,9 +108,14 @@
|
|
||||||
throws Exception
|
|
||||||
{
|
|
||||||
String sep = File.separator;
|
|
||||||
- File file = new File(System.getProperty("java.home") + sep
|
|
||||||
- + "lib" + sep + "security" + sep
|
|
||||||
- + "cacerts");
|
|
||||||
+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
|
|
||||||
+ File file = new File(sep + "etc" + sep + "pki" + sep
|
|
||||||
+ + "java" + sep + "cacerts");
|
|
||||||
+ if (!file.exists()) {
|
|
||||||
+ file = new File(System.getProperty("java.home") + sep
|
|
||||||
+ + "lib" + sep + "security" + sep
|
|
||||||
+ + "cacerts");
|
|
||||||
+ }
|
|
||||||
if (!file.exists()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
@ -0,0 +1,193 @@
|
|||||||
|
diff --git a/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java b/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
|
||||||
|
index e7b4763db53..0005e56f528 100644
|
||||||
|
--- a/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
|
||||||
|
+++ b/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
|
||||||
|
@@ -31,6 +31,7 @@ import java.security.*;
|
||||||
|
import java.security.cert.*;
|
||||||
|
import java.util.*;
|
||||||
|
import sun.security.action.*;
|
||||||
|
+import sun.security.tools.KeyStoreUtil;
|
||||||
|
import sun.security.validator.TrustStoreUtil;
|
||||||
|
|
||||||
|
/**
|
||||||
|
@@ -68,7 +69,7 @@ final class TrustStoreManager {
|
||||||
|
* The preference of the default trusted KeyStore is:
|
||||||
|
* javax.net.ssl.trustStore
|
||||||
|
* jssecacerts
|
||||||
|
- * cacerts
|
||||||
|
+ * cacerts (system and local)
|
||||||
|
*/
|
||||||
|
private static final class TrustStoreDescriptor {
|
||||||
|
private static final String fileSep = File.separator;
|
||||||
|
@@ -76,7 +77,8 @@ final class TrustStoreManager {
|
||||||
|
GetPropertyAction.privilegedGetProperty("java.home") +
|
||||||
|
fileSep + "lib" + fileSep + "security";
|
||||||
|
private static final String defaultStore =
|
||||||
|
- defaultStorePath + fileSep + "cacerts";
|
||||||
|
+ AccessController.doPrivileged((PrivilegedAction<String>) () ->
|
||||||
|
+ KeyStoreUtil.getCacertsKeyStorePath());
|
||||||
|
private static final String jsseDefaultStore =
|
||||||
|
defaultStorePath + fileSep + "jssecacerts";
|
||||||
|
|
||||||
|
@@ -139,6 +141,10 @@ final class TrustStoreManager {
|
||||||
|
String storePropPassword = System.getProperty(
|
||||||
|
"javax.net.ssl.trustStorePassword", "");
|
||||||
|
|
||||||
|
+ if (SSLLogger.isOn && SSLLogger.isOn("trustmanager")) {
|
||||||
|
+ SSLLogger.fine("Default store: " + defaultStore);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
String temporaryName = "";
|
||||||
|
File temporaryFile = null;
|
||||||
|
long temporaryTime = 0L;
|
||||||
|
@@ -160,7 +166,7 @@ final class TrustStoreManager {
|
||||||
|
SSLLogger.isOn("trustmanager")) {
|
||||||
|
SSLLogger.fine(
|
||||||
|
"Inaccessible trust store: " +
|
||||||
|
- storePropName);
|
||||||
|
+ fileName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
diff --git a/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java b/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
|
||||||
|
index fcc77786da1..3a4388964cc 100644
|
||||||
|
--- a/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
|
||||||
|
+++ b/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
|
||||||
|
@@ -41,6 +41,8 @@ import java.text.Collator;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.ResourceBundle;
|
||||||
|
|
||||||
|
+import sun.security.util.SecurityProperties;
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* <p> This class provides several utilities to <code>KeyStore</code>.
|
||||||
|
*
|
||||||
|
@@ -54,6 +56,8 @@ public class KeyStoreUtil {
|
||||||
|
|
||||||
|
private static final String JKS = "jks";
|
||||||
|
|
||||||
|
+ private static final String SYSTEM_CA_CERTS_PROP = "security.systemCACerts";
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* Returns true if the certificate is self-signed, false otherwise.
|
||||||
|
*/
|
||||||
|
@@ -96,16 +100,30 @@ public class KeyStoreUtil {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /**
|
||||||
|
+ * Returns the path to the cacerts DB
|
||||||
|
+ */
|
||||||
|
+ public static String getCacertsKeyStorePath()
|
||||||
|
+ {
|
||||||
|
+ // Check system DB first, preferring system property over security one
|
||||||
|
+ String systemDB = SecurityProperties
|
||||||
|
+ .privilegedGetOverridable(SYSTEM_CA_CERTS_PROP);
|
||||||
|
+ if (systemDB != null && !"".equals(systemDB) &&
|
||||||
|
+ (new File(systemDB)).isFile()) {
|
||||||
|
+ return systemDB;
|
||||||
|
+ }
|
||||||
|
+ String sep = File.separator;
|
||||||
|
+ return System.getProperty("java.home") + sep
|
||||||
|
+ + "lib" + sep + "security" + sep + "cacerts";
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* Returns the keystore with the configured CA certificates.
|
||||||
|
*/
|
||||||
|
public static KeyStore getCacertsKeyStore()
|
||||||
|
throws Exception
|
||||||
|
{
|
||||||
|
- String sep = File.separator;
|
||||||
|
- File file = new File(System.getProperty("java.home") + sep
|
||||||
|
- + "lib" + sep + "security" + sep
|
||||||
|
- + "cacerts");
|
||||||
|
+ File file = new File(getCacertsKeyStorePath());
|
||||||
|
if (!file.exists()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
diff --git a/jdk/src/share/lib/security/java.security-aix b/jdk/src/share/lib/security/java.security-aix
|
||||||
|
index 681a24b905d..ecb8bc43a6c 100644
|
||||||
|
--- a/jdk/src/share/lib/security/java.security-aix
|
||||||
|
+++ b/jdk/src/share/lib/security/java.security-aix
|
||||||
|
@@ -294,6 +294,12 @@ security.overridePropertiesFile=true
|
||||||
|
#
|
||||||
|
security.useSystemPropertiesFile=false
|
||||||
|
|
||||||
|
+#
|
||||||
|
+# Specifies the system certificate store
|
||||||
|
+# This property may be disabled using an empty value
|
||||||
|
+#
|
||||||
|
+security.systemCACerts=${java.home}/lib/security/cacerts
|
||||||
|
+
|
||||||
|
#
|
||||||
|
# Determines the default key and trust manager factory algorithms for
|
||||||
|
# the javax.net.ssl package.
|
||||||
|
diff --git a/jdk/src/share/lib/security/java.security-linux b/jdk/src/share/lib/security/java.security-linux
|
||||||
|
index 789c19a8cba..2546fdec9b2 100644
|
||||||
|
--- a/jdk/src/share/lib/security/java.security-linux
|
||||||
|
+++ b/jdk/src/share/lib/security/java.security-linux
|
||||||
|
@@ -307,6 +307,12 @@ security.overridePropertiesFile=true
|
||||||
|
#
|
||||||
|
security.useSystemPropertiesFile=false
|
||||||
|
|
||||||
|
+#
|
||||||
|
+# Specifies the system certificate store
|
||||||
|
+# This property may be disabled using an empty value
|
||||||
|
+#
|
||||||
|
+security.systemCACerts=${java.home}/lib/security/cacerts
|
||||||
|
+
|
||||||
|
#
|
||||||
|
# Determines the default key and trust manager factory algorithms for
|
||||||
|
# the javax.net.ssl package.
|
||||||
|
diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
|
||||||
|
index d4da666af3b..1a20027c02b 100644
|
||||||
|
--- a/jdk/src/share/lib/security/java.security-macosx
|
||||||
|
+++ b/jdk/src/share/lib/security/java.security-macosx
|
||||||
|
@@ -297,6 +297,12 @@ security.overridePropertiesFile=true
|
||||||
|
#
|
||||||
|
security.useSystemPropertiesFile=false
|
||||||
|
|
||||||
|
+#
|
||||||
|
+# Specifies the system certificate store
|
||||||
|
+# This property may be disabled using an empty value
|
||||||
|
+#
|
||||||
|
+security.systemCACerts=${java.home}/lib/security/cacerts
|
||||||
|
+
|
||||||
|
#
|
||||||
|
# Determines the default key and trust manager factory algorithms for
|
||||||
|
# the javax.net.ssl package.
|
||||||
|
diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
|
||||||
|
index 300132384a1..6299e0a3c7b 100644
|
||||||
|
--- a/jdk/src/share/lib/security/java.security-solaris
|
||||||
|
+++ b/jdk/src/share/lib/security/java.security-solaris
|
||||||
|
@@ -295,6 +295,12 @@ security.overridePropertiesFile=true
|
||||||
|
#
|
||||||
|
security.useSystemPropertiesFile=false
|
||||||
|
|
||||||
|
+#
|
||||||
|
+# Specifies the system certificate store
|
||||||
|
+# This property may be disabled using an empty value
|
||||||
|
+#
|
||||||
|
+security.systemCACerts=${java.home}/lib/security/cacerts
|
||||||
|
+
|
||||||
|
#
|
||||||
|
# Determines the default key and trust manager factory algorithms for
|
||||||
|
# the javax.net.ssl package.
|
||||||
|
diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows
|
||||||
|
index 64db5a5cd1e..823994f3466 100644
|
||||||
|
--- a/jdk/src/share/lib/security/java.security-windows
|
||||||
|
+++ b/jdk/src/share/lib/security/java.security-windows
|
||||||
|
@@ -297,6 +297,12 @@ security.overridePropertiesFile=true
|
||||||
|
#
|
||||||
|
security.useSystemPropertiesFile=false
|
||||||
|
|
||||||
|
+#
|
||||||
|
+# Specifies the system certificate store
|
||||||
|
+# This property may be disabled using an empty value
|
||||||
|
+#
|
||||||
|
+security.systemCACerts=${java.home}/lib/security/cacerts
|
||||||
|
+
|
||||||
|
#
|
||||||
|
# Determines the default key and trust manager factory algorithms for
|
||||||
|
# the javax.net.ssl package.
|
||||||
@ -17,7 +17,7 @@ fi
|
|||||||
d=`mktemp -d`
|
d=`mktemp -d`
|
||||||
NW=$d/$f
|
NW=$d/$f
|
||||||
pushd $d
|
pushd $d
|
||||||
jar xf $ORIG
|
unzip $ORIG
|
||||||
cat $M
|
cat $M
|
||||||
# sed -i "s/Created-By.*/Created-By: 1.7.0/g" $M
|
# sed -i "s/Created-By.*/Created-By: 1.7.0/g" $M
|
||||||
sed -i "s/Created-By.*/Created-By: $2/g" $M
|
sed -i "s/Created-By.*/Created-By: $2/g" $M
|
||||||
@ -1,66 +0,0 @@
|
|||||||
diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
|
|
||||||
--- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
|
|
||||||
+++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
/*
|
|
||||||
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
|
|
||||||
+ * Copyright (c) 2014 Red Hat Inc.
|
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
||||||
*
|
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
|
||||||
@@ -61,13 +62,13 @@
|
|
||||||
|
|
||||||
private static void checkKeySize(int keysize)
|
|
||||||
throws InvalidParameterException {
|
|
||||||
- boolean supported = ((keysize == 2048) || (keysize == 3072) ||
|
|
||||||
+ boolean supported = ((keysize == 2048) || (keysize == 3072) || (keysize == 4096) ||
|
|
||||||
((keysize >= 512) && (keysize <= 1024) && ((keysize & 0x3F) == 0)));
|
|
||||||
|
|
||||||
if (!supported) {
|
|
||||||
throw new InvalidParameterException(
|
|
||||||
"DH key size must be multiple of 64 and range " +
|
|
||||||
- "from 512 to 1024 (inclusive), or 2048, 3072. " +
|
|
||||||
+ "from 512 to 1024 (inclusive), or 2048, 3072, 4096. " +
|
|
||||||
"The specific key size " + keysize + " is not supported");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
|
|
||||||
--- openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
|
|
||||||
+++ openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
/*
|
|
||||||
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
|
|
||||||
+ * Copyright (c) 2014 Red Hat Inc.
|
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
||||||
*
|
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
|
||||||
@@ -58,7 +59,7 @@
|
|
||||||
*/
|
|
||||||
private enum Sizes {
|
|
||||||
two56(256), three84(384), five12(512), seven68(768), ten24(1024),
|
|
||||||
- twenty48(2048);
|
|
||||||
+ twenty48(2048), forty96(4096);
|
|
||||||
|
|
||||||
private final int intSize;
|
|
||||||
private final BigInteger bigIntValue;
|
|
||||||
@@ -130,6 +131,19 @@
|
|
||||||
kp = kpg.generateKeyPair();
|
|
||||||
checkKeyPair(kp, Sizes.twenty48, Sizes.five12);
|
|
||||||
|
|
||||||
+ kpg.initialize(Sizes.forty96.getIntSize());
|
|
||||||
+ kp = kpg.generateKeyPair();
|
|
||||||
+ checkKeyPair(kp, Sizes.forty96, Sizes.twenty48);
|
|
||||||
+
|
|
||||||
+ publicKey = (DHPublicKey)kp.getPublic();
|
|
||||||
+ p = publicKey.getParams().getP();
|
|
||||||
+ g = publicKey.getParams().getG();
|
|
||||||
+
|
|
||||||
+ // test w/ all values specified
|
|
||||||
+ kpg.initialize(new DHParameterSpec(p, g, Sizes.ten24.getIntSize()));
|
|
||||||
+ kp = kpg.generateKeyPair();
|
|
||||||
+ checkKeyPair(kp, Sizes.forty96, Sizes.ten24);
|
|
||||||
+
|
|
||||||
System.out.println("OK");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
|
||||||
|
--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
|
||||||
|
+++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
|
||||||
|
@@ -883,7 +883,11 @@
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
- loadAssistiveTechnologies();
|
||||||
|
+ try {
|
||||||
|
+ loadAssistiveTechnologies();
|
||||||
|
+ } catch ( AWTError error) {
|
||||||
|
+ // ignore silently
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
return toolkit;
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
--- openjdk/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java 2013-03-01 10:48:12.038189968 +0100
|
||||||
|
+++ openjdk/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java 2013-03-01 10:48:11.913188505 +0100
|
||||||
|
@@ -48,8 +48,8 @@
|
||||||
|
|
||||||
|
private final static String PROP_NAME = "sun.security.smartcardio.library";
|
||||||
|
|
||||||
|
- private final static String LIB1 = "/usr/$LIBISA/libpcsclite.so";
|
||||||
|
- private final static String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
|
||||||
|
+ private final static String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
|
||||||
|
+ private final static String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
|
||||||
|
private final static String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
|
||||||
|
|
||||||
|
PlatformPCSC() {
|
||||||
@ -16,7 +16,7 @@ diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenan
|
|||||||
Atomic::add(val, &_sum);
|
Atomic::add(val, &_sum);
|
||||||
|
|
||||||
- int mag = log2_intptr(val) + 1;
|
- int mag = log2_intptr(val) + 1;
|
||||||
+ int mag = log2_intptr((uintptr_t)val) + 1;
|
+ int mag = log2_long(val) + 1;
|
||||||
|
|
||||||
// Defensively saturate for product bits:
|
// Defensively saturate for product bits:
|
||||||
if (mag < 0) {
|
if (mag < 0) {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user