Compare commits
No commits in common. "c8" and "c8s" have entirely different histories.
|
@ -1,2 +1,20 @@
|
||||||
SOURCES/shenandoah8u412-b08.tar.xz
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.docs.el.aarch64.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.docs.el.ppc64le.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.docs.el.s390x.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.docs.el.x86_64.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.fastdebug.jdk.el.aarch64.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.fastdebug.jdk.el.ppc64le.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.fastdebug.jdk.el.x86_64.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.misc.el.aarch64.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.misc.el.ppc64le.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.misc.el.s390x.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.misc.el.x86_64.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.slowdebug.jdk.el.aarch64.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.slowdebug.jdk.el.ppc64le.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.slowdebug.jdk.el.x86_64.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.unstripped.jdk.el.aarch64.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.unstripped.jdk.el.ppc64le.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.unstripped.jdk.el.s390x.tar.xz
|
||||||
|
SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.unstripped.jdk.el.x86_64.tar.xz
|
||||||
|
SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u362-b09-4curve.tar.xz
|
||||||
SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
||||||
|
|
|
@ -1,2 +1,20 @@
|
||||||
9cb6b4c557e9a433fe4c16b3996f998335cec8a5 SOURCES/shenandoah8u412-b08.tar.xz
|
5040c94ac7c5179ea177bfc9ef75328eb4241df0 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.docs.el.aarch64.tar.xz
|
||||||
|
446076472f347a57c4fa011005179bebc1cde458 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.docs.el.ppc64le.tar.xz
|
||||||
|
60da42b3472f51ce19b77e0dcca1bc0d3d361ba5 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.docs.el.s390x.tar.xz
|
||||||
|
98265591c2ff120ac6aa962a480a0f2c81b83b3b SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.docs.el.x86_64.tar.xz
|
||||||
|
eb971e577fa2a015d196cf0b0cd153d3b1b43eb8 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.fastdebug.jdk.el.aarch64.tar.xz
|
||||||
|
b30396042c2b814aa9d1e5d7dca000bb38fb9b24 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.fastdebug.jdk.el.ppc64le.tar.xz
|
||||||
|
9de8f60988c05f5d268fd6cfb12e31302d9f6043 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.fastdebug.jdk.el.x86_64.tar.xz
|
||||||
|
d37e85a6b41ea87f803e864612a5e0b00e75c300 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.misc.el.aarch64.tar.xz
|
||||||
|
446720bd908c3a94c10857344f3a1df065000f72 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.misc.el.ppc64le.tar.xz
|
||||||
|
6422c248e0f9cab88f38c41e4736ad55993888e3 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.misc.el.s390x.tar.xz
|
||||||
|
6a657b7794fdb110a255464b5c96ca4ce3c1e717 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.misc.el.x86_64.tar.xz
|
||||||
|
84caa2fb432ad3b86fc680417c4dd2f31b13a075 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.slowdebug.jdk.el.aarch64.tar.xz
|
||||||
|
980548c52d9b251f9f4fc5a4aef619f975e51130 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.slowdebug.jdk.el.ppc64le.tar.xz
|
||||||
|
34774ec568094a519ef14d48e1c0457e156c5d60 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.slowdebug.jdk.el.x86_64.tar.xz
|
||||||
|
b71a0a3de6ac340fac5934a6d3105791f697d460 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.unstripped.jdk.el.aarch64.tar.xz
|
||||||
|
affb52225ed805edbad7149ceb5db7a1cdeba237 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.unstripped.jdk.el.ppc64le.tar.xz
|
||||||
|
1a58a1681a661ad0bcac525ce43e3216b060f093 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.unstripped.jdk.el.s390x.tar.xz
|
||||||
|
97b42aae506ddfd6b67501940764f4d2018842d5 SOURCES/java-1.8.0-openjdk-portable-1.8.0.362.b08-4.portable.unstripped.jdk.el.x86_64.tar.xz
|
||||||
|
10817d699dd7c85b03cfbd8eb820e00b19ddcae7 SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u362-b09-4curve.tar.xz
|
||||||
7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,34 +1,8 @@
|
||||||
OpenJDK 8 is a Long-Term Support (LTS) release of the Java platform.
|
Package of LTS OpenJDK 8
|
||||||
|
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.
|
||||||
|
|
||||||
For a list of major changes in OpenJDK 8 (java-1.8.0-openjdk), see the
|
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.
|
||||||
upstream release page: https://openjdk.org/projects/jdk8/features
|
|
||||||
|
|
||||||
# Rebuilding the OpenJDK package
|
See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
|
||||||
|
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`.
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,286 +0,0 @@
|
||||||
# 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);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
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;
|
||||||
|
}
|
|
@ -7,11 +7,10 @@
|
||||||
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.orig/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 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
|
||||||
index bdaf95a2f6a..60c5b4f2a69 100644
|
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
||||||
--- openjdk.orig/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
|
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
||||||
@@ -63,7 +63,7 @@ struct bytes {
|
@@ -63,7 +63,7 @@
|
||||||
bytes res;
|
bytes res;
|
||||||
res.ptr = ptr + beg;
|
res.ptr = ptr + beg;
|
||||||
res.len = end - beg;
|
res.len = end - beg;
|
||||||
|
@ -20,11 +19,10 @@ index bdaf95a2f6a..60c5b4f2a69 100644
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
// building C strings inside byte buffers:
|
// building C strings inside byte buffers:
|
||||||
diff --git openjdk.orig/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 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
|
||||||
index 5fbc7261fb3..4c002e779d8 100644
|
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
||||||
--- openjdk.orig/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
|
+++ openjdk/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
|
@@ -292,7 +292,7 @@
|
||||||
|
|
||||||
if (uPtr->aborting()) {
|
if (uPtr->aborting()) {
|
||||||
THROW_IOE(uPtr->get_abort_message());
|
THROW_IOE(uPtr->get_abort_message());
|
||||||
|
@ -33,16 +31,16 @@ index 5fbc7261fb3..4c002e779d8 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
// We have fetched all the files.
|
// We have fetched all the files.
|
||||||
@@ -312,7 +312,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
|
@@ -310,7 +310,7 @@
|
||||||
// There's no need to create a new unpacker here if we don't already have one
|
JNIEXPORT jlong JNICALL
|
||||||
// just to immediatly free it afterwards.
|
Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
|
||||||
unpacker* uPtr = get_unpacker(env, pObj, /* noCreate= */ true);
|
unpacker* uPtr = get_unpacker(env, pObj, false);
|
||||||
- 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);
|
||||||
@@ -323,6 +323,7 @@ JNIEXPORT jboolean JNICALL
|
return consumed;
|
||||||
|
@@ -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);
|
||||||
|
@ -50,11 +48,10 @@ index 5fbc7261fb3..4c002e779d8 100644
|
||||||
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.orig/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 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
|
||||||
index 6fbc43a18ae..722c8baaff0 100644
|
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
||||||
--- openjdk.orig/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
|
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
||||||
@@ -142,31 +142,28 @@ static const char* nbasename(const char* progname) {
|
@@ -142,31 +142,28 @@
|
||||||
return progname;
|
return progname;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,11 +101,10 @@ index 6fbc43a18ae..722c8baaff0 100644
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git openjdk.orig/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 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
|
||||||
index 56f391b1e87..f0a25f8cd20 100644
|
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
||||||
--- openjdk.orig/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
|
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
||||||
@@ -225,9 +225,9 @@ struct entry {
|
@@ -222,9 +222,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PRODUCT
|
#ifdef PRODUCT
|
||||||
|
@ -120,7 +116,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -718,13 +718,13 @@ void unpacker::read_file_header() {
|
@@ -715,13 +715,13 @@
|
||||||
// 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;
|
||||||
|
@ -138,7 +134,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
||||||
abort("EOF reading fixed input buffer");
|
abort("EOF reading fixed input buffer");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -738,7 +738,7 @@ void unpacker::read_file_header() {
|
@@ -735,7 +735,7 @@
|
||||||
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)),
|
||||||
|
@ -147,7 +143,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
||||||
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.
|
||||||
@@ -961,13 +961,13 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
|
@@ -958,13 +958,13 @@
|
||||||
nentries = next_entry;
|
nentries = next_entry;
|
||||||
|
|
||||||
// place a limit on future CP growth:
|
// place a limit on future CP growth:
|
||||||
|
@ -163,7 +159,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
||||||
|
|
||||||
// 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
|
||||||
@@ -985,8 +985,9 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
|
@@ -982,8 +982,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize *all* our entries once
|
// Initialize *all* our entries once
|
||||||
|
@ -174,7 +170,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
||||||
|
|
||||||
initGroupIndexes();
|
initGroupIndexes();
|
||||||
// Initialize hashTab to a generous power-of-two size.
|
// Initialize hashTab to a generous power-of-two size.
|
||||||
@@ -3681,21 +3682,22 @@ void cpool::computeOutputIndexes() {
|
@@ -3677,21 +3678,22 @@
|
||||||
|
|
||||||
unpacker* debug_u;
|
unpacker* debug_u;
|
||||||
|
|
||||||
|
@ -201,7 +197,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
||||||
case CONSTANT_Signature:
|
case CONSTANT_Signature:
|
||||||
if (value.b.ptr == null)
|
if (value.b.ptr == null)
|
||||||
return ref(0)->string();
|
return ref(0)->string();
|
||||||
@@ -3715,26 +3717,28 @@ char* entry::string() {
|
@@ -3711,26 +3713,28 @@
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (nrefs == 0) {
|
if (nrefs == 0) {
|
||||||
|
@ -239,11 +235,10 @@ index 56f391b1e87..f0a25f8cd20 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
void print_cp_entries(int beg, int end) {
|
void print_cp_entries(int beg, int end) {
|
||||||
diff --git openjdk.orig/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 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
|
||||||
index cec7a88b24e..ed5f3336a59 100644
|
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
||||||
--- openjdk.orig/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
|
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
||||||
@@ -209,7 +209,7 @@ struct unpacker {
|
@@ -209,7 +209,7 @@
|
||||||
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;
|
||||||
|
@ -252,11 +247,10 @@ index cec7a88b24e..ed5f3336a59 100644
|
||||||
|
|
||||||
// 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.orig/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 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
|
||||||
index e5197e1a3f1..40a10055ea5 100644
|
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
||||||
--- openjdk.orig/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
|
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
||||||
@@ -81,7 +81,7 @@ void breakpoint() { } // hook for debugger
|
@@ -81,7 +81,7 @@
|
||||||
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);
|
||||||
|
@ -265,11 +259,10 @@ index e5197e1a3f1..40a10055ea5 100644
|
||||||
breakpoint();
|
breakpoint();
|
||||||
unpack_abort(message);
|
unpack_abort(message);
|
||||||
return 0;
|
return 0;
|
||||||
diff --git openjdk.orig/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 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
|
||||||
index f58c94956c0..343da3e183b 100644
|
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
||||||
--- openjdk.orig/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
|
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
||||||
@@ -84,7 +84,7 @@ void jar::init(unpacker* u_) {
|
@@ -84,7 +84,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write data to the ZIP output stream.
|
// Write data to the ZIP output stream.
|
||||||
|
@ -278,7 +271,7 @@ index f58c94956c0..343da3e183b 100644
|
||||||
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 @@ void jar::write_central_directory() {
|
@@ -323,12 +323,12 @@
|
||||||
// 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;
|
||||||
|
@ -293,11 +286,10 @@ index f58c94956c0..343da3e183b 100644
|
||||||
|
|
||||||
PRINTCR((2, "writing zip comment\n"));
|
PRINTCR((2, "writing zip comment\n"));
|
||||||
// Write the comment.
|
// Write the comment.
|
||||||
diff --git openjdk.orig/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 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
|
||||||
index 14ffc9d65bd..9877f6f68ca 100644
|
--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
||||||
--- openjdk.orig/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
|
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
||||||
@@ -68,8 +68,8 @@ struct jar {
|
@@ -68,8 +68,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// Private Methods
|
// Private Methods
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
diff --git openjdk.orig/jdk/src/share/lib/security/java.security-linux openjdk/jdk/src/share/lib/security/java.security-linux
|
||||||
|
--- openjdk.orig/jdk/src/share/lib/security/java.security-linux
|
||||||
|
+++ openjdk/jdk/src/share/lib/security/java.security-linux
|
||||||
|
@@ -226,7 +226,9 @@
|
||||||
|
com.sun.activation.registries.,\
|
||||||
|
jdk.jfr.events.,\
|
||||||
|
jdk.jfr.internal.,\
|
||||||
|
- jdk.management.jfr.internal.
|
||||||
|
+ jdk.management.jfr.internal.,\
|
||||||
|
+ org.GNOME.Accessibility.,\
|
||||||
|
+ org.GNOME.Bonobo.
|
||||||
|
|
||||||
|
#
|
||||||
|
# List of comma-separated packages that start with or equal this string
|
||||||
|
@@ -279,7 +281,9 @@
|
||||||
|
com.sun.activation.registries.,\
|
||||||
|
jdk.jfr.events.,\
|
||||||
|
jdk.jfr.internal.,\
|
||||||
|
- jdk.management.jfr.internal.
|
||||||
|
+ jdk.management.jfr.internal.,\
|
||||||
|
+ org.GNOME.Accessibility.,\
|
||||||
|
+ org.GNOME.Bonobo.
|
||||||
|
|
||||||
|
#
|
||||||
|
# Determines whether this properties file can be appended to
|
|
@ -1,13 +0,0 @@
|
||||||
--- 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() {
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue