From 84136eb49ded615d7408d656ca9791542a0280a0 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Mon, 26 Oct 2020 22:24:32 +0300 Subject: Configure: using comma instead of space for passing -rpath value. This variant will be more interoperable across various systems and it's already used in Ruby module. Otherwise, configure tests fail on NetBSD with: gcc: Missing argument for -Wl,-rpath --- auto/modules/java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'auto/modules/java') diff --git a/auto/modules/java b/auto/modules/java index be8f443c..90b28b06 100644 --- a/auto/modules/java +++ b/auto/modules/java @@ -178,7 +178,7 @@ fi NXT_JAVA_LIB_SERVER_PATH="${NXT_JAVA_LIB_PATH}/server" -NXT_JAVA_LDFLAGS="-L${NXT_JAVA_LIB_SERVER_PATH} -Wl,-rpath ${NXT_JAVA_LIB_SERVER_PATH} -ljvm" +NXT_JAVA_LDFLAGS="-L${NXT_JAVA_LIB_SERVER_PATH} -Wl,-rpath,${NXT_JAVA_LIB_SERVER_PATH} -ljvm" nxt_found=no -- cgit From 0390cb3a61051dd93e206d50591aff5759cf42fc Mon Sep 17 00:00:00 2001 From: Tiago Natel de Moura Date: Thu, 29 Oct 2020 20:30:53 +0000 Subject: Isolation: mounting of procfs by default when using "rootfs". --- auto/modules/java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'auto/modules/java') diff --git a/auto/modules/java b/auto/modules/java index 90b28b06..6996485c 100644 --- a/auto/modules/java +++ b/auto/modules/java @@ -326,11 +326,10 @@ cat << END > $NXT_BUILD_DIR/$NXT_JAVA_MOUNTS_HEADER static const nxt_fs_mount_t nxt_java_mounts[] = { - {(u_char *) "proc", (u_char *) "/proc", (u_char *) "proc", 0, NULL, 1}, {(u_char *) "$NXT_JAVA_LIBC_DIR", (u_char *) "$NXT_JAVA_LIBC_DIR", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1}, + NXT_FS_BIND, (u_char *) "bind", 0, NULL, 1, 1}, {(u_char *) "$NXT_JAVA_HOME", (u_char *) "$NXT_JAVA_HOME", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1}, + NXT_FS_BIND, (u_char *) "bind", 0, NULL, 1, 1}, }; -- cgit From 4ba9e1d0058bc1710a0078af6e9a1f7e4bee986a Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Mon, 2 Nov 2020 21:05:04 +0300 Subject: Java: upgrading 3rd-party components. --- auto/modules/java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'auto/modules/java') diff --git a/auto/modules/java b/auto/modules/java index 6996485c..a1f27131 100644 --- a/auto/modules/java +++ b/auto/modules/java @@ -238,7 +238,7 @@ cat << END > $NXT_JAVA_JARS static const char *nxt_java_system_jars[] = { END -NXT_TOMCAT_VERSION=9.0.13 +NXT_TOMCAT_VERSION=9.0.39 NXT_JAR_VERSION=$NXT_TOMCAT_VERSION @@ -271,7 +271,7 @@ NXT_JAR_NAME=tomcat-util . auto/modules/java_get_jar NXT_JAR_NAME=ecj -NXT_JAR_VERSION=3.13.102 +NXT_JAR_VERSION=3.23.0 NXT_JAR_NAMESPACE=org/eclipse/jdt/ . auto/modules/java_get_jar @@ -284,7 +284,7 @@ static const char *nxt_java_unit_jars[] = { "$NXT_UNIT_JAR", END -NXT_JAR_VERSION=9.4.12.v20180830 +NXT_JAR_VERSION=9.4.33.v20201020 NXT_JAR_NAMESPACE=org/eclipse/jetty/ NXT_JAR_NAME=jetty-util @@ -297,7 +297,7 @@ NXT_JAR_NAME=jetty-http . auto/modules/java_get_jar NXT_JAR_NAME=classgraph -NXT_JAR_VERSION=4.4.11 +NXT_JAR_VERSION=4.8.90 NXT_JAR_NAMESPACE=io/github/classgraph/ . auto/modules/java_get_jar -- cgit From 4ca9ba34081c44f5d421b171ffaf874fb341d73f Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Tue, 10 Nov 2020 22:27:08 +0300 Subject: Java: fixing isolation mounts for Alpine musl. Thanks to @wujjpp. This closes #490 PR on GitHub. --- auto/modules/java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'auto/modules/java') diff --git a/auto/modules/java b/auto/modules/java index a1f27131..60415c35 100644 --- a/auto/modules/java +++ b/auto/modules/java @@ -313,7 +313,7 @@ NXT_JAVA_LIBJVM="$NXT_JAVA_LIB_SERVER_PATH/libjvm.so" if [ "$NXT_SYSTEM" = "Darwin" ]; then NXT_JAVA_LIBC_DIR="/usr/lib" else -NXT_JAVA_LIBC_DIR=`ldd "$NXT_JAVA_LIBJVM" | grep libc.so | cut -d' ' -f3` +NXT_JAVA_LIBC_DIR=`ldd "$NXT_JAVA_LIBJVM" | grep -F libc. | cut -d' ' -f3` NXT_JAVA_LIBC_DIR=`dirname $NXT_JAVA_LIBC_DIR` fi -- cgit