diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2020-01-16 22:00:22 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2020-01-16 22:00:22 +0000 |
| commit | a5fb52f085a00bc0fa9ce949cde900baeecd143d (patch) | |
| tree | 54b1dbe171576e0a3cdc6639d130ea7c7d1bad00 /java/openjdk8 | |
| parent | devel/R-cran-vcd: update to version 1.4-5 (diff) | |
Update to 8u242
Security: https://openjdk.java.net/groups/vulnerability/advisories/2020-01-14
Notes
Notes:
svn path=/head/; revision=523263
Diffstat (limited to 'java/openjdk8')
| -rw-r--r-- | java/openjdk8/Makefile | 5 | ||||
| -rw-r--r-- | java/openjdk8/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd | 33 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdNativeDispatcher.java | 14 |
4 files changed, 5 insertions, 53 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 83effc192d70..7156b78c4c45 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -2,7 +2,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -52,8 +51,8 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 232 -JDK_BUILD_NUMBER= 09 +JDK_UPDATE_VERSION= 242 +JDK_BUILD_NUMBER= 07 BSD_JDK_VERSION= 1 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo index fc1bb9174aa6..1092695531d5 100644 --- a/java/openjdk8/distinfo +++ b/java/openjdk8/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1571191646 +TIMESTAMP = 1579209434 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c SIZE (jtreg4.1-b08.tar.gz) = 6834252 -SHA256 (battleblow-openjdk-jdk8u-8.232.09.1-jdk8u232-b09.1_GH0.tar.gz) = f6796bfb8a0a30fd045b608e8a2e6a8b8ae02748fbb6a647dd3669914040f319 -SIZE (battleblow-openjdk-jdk8u-8.232.09.1-jdk8u232-b09.1_GH0.tar.gz) = 85766372 +SHA256 (battleblow-openjdk-jdk8u-8.242.07.1-jdk8u242-b07.1_GH0.tar.gz) = 7fe8824a2bc9a61377e3284ca9bd1b4bad1eb8b1e87a095c17d473a26ea7a046 +SIZE (battleblow-openjdk-jdk8u-8.242.07.1-jdk8u242-b07.1_GH0.tar.gz) = 85837823 diff --git a/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd b/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd deleted file mode 100644 index c53a57d2f94a..000000000000 --- a/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd +++ /dev/null @@ -1,33 +0,0 @@ ---- jdk/make/mapfiles/libnio/mapfile-bsd.orig 2019-10-17 21:15:55 UTC -+++ jdk/make/mapfiles/libnio/mapfile-bsd -@@ -41,6 +41,7 @@ SUNWprivate_1.1 { - Java_sun_nio_ch_FileChannelImpl_map0; - Java_sun_nio_ch_FileChannelImpl_transferTo0; - Java_sun_nio_ch_FileChannelImpl_unmap0; -+ Java_sun_nio_ch_FileDispatcherImpl_allocate0; - Java_sun_nio_ch_FileDispatcherImpl_close0; - Java_sun_nio_ch_FileDispatcherImpl_closeIntFD; - Java_sun_nio_ch_FileDispatcherImpl_seek0; -@@ -135,6 +136,7 @@ SUNWprivate_1.1 { - Java_sun_nio_fs_BsdNativeDispatcher_endfsstat; - Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry; - Java_sun_nio_fs_BsdNativeDispatcher_getfsstat; -+ Java_sun_nio_fs_BsdNativeDispatcher_getmntonname0; - Java_sun_nio_fs_BsdNativeDispatcher_initIDs; - Java_sun_nio_fs_GnomeFileTypeDetector_initializeGio; - Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs; -@@ -143,6 +145,14 @@ SUNWprivate_1.1 { - Java_sun_nio_fs_MagicFileTypeDetector_initialize0; - Java_sun_nio_fs_MagicFileTypeDetector_probe0; - Java_sun_nio_fs_UnixCopyFile_transfer; -+ Java_sun_nio_fs_LinuxWatchService_eventSize; -+ Java_sun_nio_fs_LinuxWatchService_eventOffsets; -+ Java_sun_nio_fs_LinuxWatchService_inotifyInit; -+ Java_sun_nio_fs_LinuxWatchService_inotifyAddWatch; -+ Java_sun_nio_fs_LinuxWatchService_inotifyRmWatch; -+ Java_sun_nio_fs_LinuxWatchService_configureBlocking; -+ Java_sun_nio_fs_LinuxWatchService_socketpair; -+ Java_sun_nio_fs_LinuxWatchService_poll; - Java_sun_nio_fs_UnixNativeDispatcher_access0; - Java_sun_nio_fs_UnixNativeDispatcher_chmod0; - Java_sun_nio_fs_UnixNativeDispatcher_chown0; diff --git a/java/openjdk8/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdNativeDispatcher.java b/java/openjdk8/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdNativeDispatcher.java deleted file mode 100644 index d8de6d6d6d1d..000000000000 --- a/java/openjdk8/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdNativeDispatcher.java +++ /dev/null @@ -1,14 +0,0 @@ ---- jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java.orig 2019-10-17 19:49:41 UTC -+++ jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java -@@ -69,6 +69,11 @@ class BsdNativeDispatcher extends UnixNativeDispatcher - private static native void initIDs(); - - static { -+ AccessController.doPrivileged(new PrivilegedAction<Void>() { -+ public Void run() { -+ System.loadLibrary("nio"); -+ return null; -+ }}); - initIDs(); - } - } |