Attachment 206768 Details for Bug 239892 – Java 9+ support in tomcat9 and update to 9.0.24

[patch] Java 9+ support in tomcat9 and update to 9.0.24

tomcat9.diff (text/plain), 2.12 KB, created by Vladimir Druzenko on 2019-08-21 22:23:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2019-08-21 22:23:42 UTC

Size: 2.12 KB

patch

obsolete

>diff -ur www/tomcat9.orig/Makefile www/tomcat9/Makefile
>--- www/tomcat9.orig/Makefile
>+++ www/tomcat9/Makefile
>@@ -2,7 +2,8 @@
> # $FreeBSD: head/www/tomcat9/Makefile 506770 2019-07-16 17:29:46Z swills $
> 
> PORTNAME=	tomcat
>-PORTVERSION=	9.0.22
>+PORTVERSION=	9.0.24
>+PORTREVISION=	0
> CATEGORIES=	www java
> MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
> PKGNAMESUFFIX=	9
>diff -ur www/tomcat9.orig/distinfo www/tomcat9/distinfo
>--- www/tomcat9.orig/distinfo
>+++ www/tomcat9/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1563135834
>-SHA256 (apache-tomcat-9.0.22.tar.gz) = 86b30768f7674409dfe1091e0917637bfa3b1b699851112bef99b65673039168
>-SIZE (apache-tomcat-9.0.22.tar.gz) = 10929702
>+TIMESTAMP = 1566425345
>+SHA256 (apache-tomcat-9.0.24.tar.gz) = 22064138e25f7ab899802804775259a156c06770535b8ce93856beba13dfcf6d
>+SIZE (apache-tomcat-9.0.24.tar.gz) = 10914435
>diff -ur www/tomcat9.orig/files/tomcat9.in www/tomcat9/files/tomcat9.in
>--- www/tomcat9.orig/files/tomcat9.in
>+++ www/tomcat9/files/tomcat9.in
>@@ -44,7 +44,7 @@
> #
> # tomcat9_logging_config (str):
> #   Set to "${catalina.base}/conf/logging.properties" by default.
>-#   Set the JUL config file 
>+#   Set the JUL config file
> #
> # tomcat9_java_home (str):
> #   Set to "%%JAVA_HOME%%" by default.
>@@ -111,6 +111,17 @@
> 
> extra_commands="reload"
> 
>+_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
>+
>+case "${_tomcat_java_version}" in
>+	9* | 1[0-9]* )
>+		_tomcat_endorsed_dirs_option=
>+		;;
>+	*)
>+		_tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed'"
>+		;;
>+esac
>+
> command="%%LOCALBASE%%/bin/jsvc"
> command_args="-java-home '${_tomcat_java_home}' \
> 	-server \
>@@ -124,7 +135,7 @@
> 	-Djava.util.logging.manager=${_tomcat_logging_manager} \
> 	-Djava.util.logging.config.file='${_tomcat_logging_config}' \
> 	${_tomcat_java_opts} \
>-	-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed' \
>+	${_tomcat_endorsed_dirs_option} \
> 	-Dcatalina.home='${_tomcat_catalina_home}' \
> 	-Dcatalina.base='${_tomcat_catalina_base}' \
> 	-Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \

Flags:

vvd: maintainer-approval+

Actions: View | Diff

Attachments on bug 239892: 206601 | 206651 | 206652 | 206767 | 206768