Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Oct 2019 22:39:06 +0000 (UTC)
From:      Greg Lewis <glewis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r514690 - in head/java/openjdk8: . files
Message-ID:  <201910172239.x9HMd6n3006689@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glewis
Date: Thu Oct 17 22:39:05 2019
New Revision: 514690
URL: https://svnweb.freebsd.org/changeset/ports/514690

Log:
  Fix file interaction
  
  * Load libnio in BsdNativeDispatcher, as per other OSes
  * Export getmntonname0 from libnio
  
  PR:		241317
  Submitted by:	cmt@

Added:
  head/java/openjdk8/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdNativeDispatcher.java   (contents, props changed)
Modified:
  head/java/openjdk8/Makefile
  head/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd

Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile	Thu Oct 17 21:50:08 2019	(r514689)
+++ head/java/openjdk8/Makefile	Thu Oct 17 22:39:05 2019	(r514690)
@@ -2,6 +2,7 @@
 
 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}

Modified: head/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd
==============================================================================
--- head/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd	Thu Oct 17 21:50:08 2019	(r514689)
+++ head/java/openjdk8/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd	Thu Oct 17 22:39:05 2019	(r514690)
@@ -1,14 +1,22 @@
---- jdk/make/mapfiles/libnio/mapfile-bsd
+--- jdk/make/mapfiles/libnio/mapfile-bsd.orig	2019-10-17 21:15:55 UTC
 +++ jdk/make/mapfiles/libnio/mapfile-bsd
-@@ -42,6 +42,7 @@ SUNWprivate_1.1 {
- 		Java_sun_nio_ch_FileChannelImpl_position0;
+@@ -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_force0;
-@@ -143,6 +144,14 @@ SUNWprivate_1.1 {
+ 		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;

Added: head/java/openjdk8/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdNativeDispatcher.java
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk8/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdNativeDispatcher.java	Thu Oct 17 22:39:05 2019	(r514690)
@@ -0,0 +1,14 @@
+--- 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();
+     }
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910172239.x9HMd6n3006689>