Attachment 222328 Details for Bug 253404 – [NEW PORT]: www/tomcat10 10.0.2 (diff from www/tomcat-devel)

[patch] [NEW PORT]: www/tomcat10 10.0.2 (diff from www/tomcat-devel)

tomcat10.diff (text/plain), 11.10 KB, created by Vladimir Druzenko on 2021-02-10 11:09:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2021-02-10 11:09:00 UTC

Size: 11.10 KB

patch

obsolete

>diff -urN www/tomcat-devel.orig/Makefile www/tomcat10/Makefile
>--- www/tomcat-devel.orig/Makefile
>+++ www/tomcat10/Makefile
>@@ -2,10 +2,10 @@
> # $FreeBSD: head/www/tomcat-devel/Makefile 558153 2020-12-15 10:46:39Z makc $
> 
> PORTNAME=	tomcat
>-PORTVERSION=	10.0.0
>+PORTVERSION=	10.0.2
> CATEGORIES=	www java
> MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9]+)(.*)/\1/}/v${PORTVERSION}/bin
>-PKGNAMESUFFIX=	-devel
>+PKGNAMESUFFIX=	10
> DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	vvd@unislabs.com
>diff -urN www/tomcat-devel.orig/distinfo www/tomcat10/distinfo
>--- www/tomcat-devel.orig/distinfo	2020-12-15 13:46:39.000000000 +0300
>+++ www/tomcat10/distinfo	2021-02-06 14:47:32.480273000 +0300
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1607990762
>-SHA256 (apache-tomcat-10.0.0.tar.gz) = 5403a9723a0e00735b97941d67d3257bf87b031a6b8dabb15e8f54dcc65f6105
>-SIZE (apache-tomcat-10.0.0.tar.gz) = 11291698
>+TIMESTAMP = 1612612052
>+SHA256 (apache-tomcat-10.0.2.tar.gz) = f20791fa8354d1517052ef8c3a6a5705dd9a1ebdbdce0affee9e5a6bd7e55ee2
>+SIZE (apache-tomcat-10.0.2.tar.gz) = 11353990
>diff -urN www/tomcat-devel.orig/files/tomcat10.in www/tomcat10/files/tomcat10.in
>--- www/tomcat-devel.orig/files/tomcat10.in
>+++ www/tomcat10/files/tomcat10.in
>@@ -0,0 +1,145 @@
>+!/bin/sh
>+#
>+# $FreeBSD: head/www/tomcat10/files/tomcat10.in 531294 2020-04-10 07:03:16Z fluffy $
>+#
>+
>+# PROVIDE: tomcat10
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+
>+#
>+# Configuration settings for tomcat10 in /etc/rc.conf:
>+#
>+# tomcat10_enable (bool):
>+#   Set to "NO" by default.
>+#   Set it to "YES" to enable tomcat10
>+#
>+# tomcat10_catalina_home (str)
>+#   Set to "%%TOMCAT_HOME%%" by default.
>+#   Set the CATALINA_HOME variable for the Tomcat process
>+#
>+# tomcat10_catalina_base (str)
>+#   Set to "${catalina.home}" by default.
>+#   Set the CATALINA_BASE variable for the Tomcat process
>+#
>+# tomcat10_catalina_tmpdir (str)
>+#   Set to "${catalina.base}/temp" by default.
>+#   Set the CATALINA_TMPDIR variable for the Tomcat process
>+#
>+# tomcat10_stdout (str)
>+#   Set to "${catalina.base}/logs/catalina.out" by default.
>+#   Set the stdout redirection. It may also be '/dev/null', '&1' or '&2'
>+#
>+# tomcat10_stderr (str)
>+#   Set to "&1" by default.
>+#   Set the stderr redirection. It may also be '/dev/null', '&1' or '&2'
>+#
>+# tomcat10_pipe_cmd (str):
>+#   Set to "" by default.
>+#   Set a piped command to process stdout/stderr when passthru
>+#
>+# tomcat10_logging_manager (str):
>+#   Set to "org.apache.juli.ClassLoaderLogManager" by default.
>+#   Set the JUL log manager
>+#
>+# tomcat10_logging_config (str):
>+#   Set to "${catalina.base}/conf/logging.properties" by default.
>+#   Set the JUL config file
>+#
>+# tomcat10_java_home (str):
>+#   Set to "%%JAVA_HOME%%" by default.
>+#   Specify the Java VM to use.
>+#
>+# tomcat10_classpath (str):
>+#   Set to "" by default.
>+#   Addtional classes to add to the CLASSPATH. If set, must start with ':'
>+#
>+# tomcat10_java_opts (str):
>+#   Set to "" by default.
>+#   Java VM args to use.
>+#
>+# tomcat10_wait (int):
>+#   Set to "30" by default.
>+#   Set the wait time (in seconds) for Tomcat process startup
>+#
>+# tomcat10_umask (str):
>+#   Set to "0077" by default.
>+#   Sets the umask for Tomcat process.
>+#
>+# You may symlink this script with other names to run multiple
>+# instances of tomcat10 with different configurations.
>+#
>+
>+. /etc/rc.subr
>+
>+case $0 in
>+/etc/rc*)
>+	# during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
>+	# so get the name of the script from $_file
>+	name=$_file
>+	;;
>+*)
>+	name=$0
>+	;;
>+esac
>+
>+name=${name##*/}
>+rcvar=${name}_enable
>+
>+load_rc_config "${name}"
>+
>+eval "${rcvar}=\${${rcvar}:-'NO'}"
>+eval "_tomcat_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}"
>+eval "_tomcat_catalina_user=\${${name}_catalina_user:-'%%TOMCAT_USER%%'}"
>+eval "_tomcat_catalina_home=\${${name}_catalina_home:-'%%TOMCAT_HOME%%'}"
>+eval "_tomcat_catalina_base=\${${name}_catalina_base:-'${_tomcat_catalina_home}'}"
>+eval "_tomcat_catalina_tmpdir=\${${name}_catalina_tmpdir:-'${_tomcat_catalina_base}/temp'}"
>+eval "_tomcat_stdout=\${${name}_stdout:-'${_tomcat_catalina_base}/logs/catalina.out'}"
>+eval "_tomcat_stderr=\${${name}_stderr:-'&1'}"
>+eval "_tomcat_pipe_cmd=\${${name}_pipe_cmd:-''}"
>+eval "_tomcat_logging_manager=\${${name}_logging_manager:-'org.apache.juli.ClassLoaderLogManager'}"
>+eval "_tomcat_logging_config=\${${name}_logging_config:-'${_tomcat_catalina_base}/conf/logging.properties'}"
>+eval "_tomcat_classpath=\${${name}_classpath:-''}"
>+eval "_tomcat_java_opts=\${${name}_java_opts:-''}"
>+eval "_tomcat_wait=\${${name}_wait:-'30'}"
>+eval "_tomcat_umask=\${${name}_umask:-'0077'}"
>+
>+pidfile="/var/run/${name}.pid"
>+
>+required_files="${_tomcat_catalina_base}/conf/server.xml"
>+required_dirs="${_tomcat_catalina_tmpdir}"
>+
>+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 \
>+	-user ${_tomcat_catalina_user} \
>+	-umask ${_tomcat_umask} \
>+	-pidfile '${pidfile}' \
>+	-wait ${_tomcat_wait} \
>+	-outfile '${_tomcat_stdout}' \
>+	-errfile '${_tomcat_stderr}' \
>+	-classpath '${_tomcat_catalina_home}/bin/bootstrap.jar:%%LOCALBASE%%/share/java/classes/commons-daemon.jar:${_tomcat_catalina_home}/bin/tomcat-juli.jar${_tomcat_classpath}' \
>+	-Djava.util.logging.manager=${_tomcat_logging_manager} \
>+	-Djava.util.logging.config.file='${_tomcat_logging_config}' \
>+	${_tomcat_java_opts} \
>+	${_tomcat_endorsed_dirs_option} \
>+	-Dcatalina.home='${_tomcat_catalina_home}' \
>+	-Dcatalina.base='${_tomcat_catalina_base}' \
>+	-Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \
>+	org.apache.catalina.startup.Bootstrap \
>+	${_tomcat_pipe_cmd}"
>+
>+run_rc_command "$1"
>diff -urN www/tomcat-devel.orig/files/tomcat_devel.in www/tomcat10/files/tomcat_devel.in
>--- www/tomcat-devel.orig/files/tomcat_devel.in	
>+++ www/tomcat10/files/tomcat_devel.in
>@@ -1,145 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: head/www/tomcat-devel/files/tomcat_devel.in 531294 2020-04-10 07:03:16Z fluffy $
>-#
>-
>-# PROVIDE: tomcat_devel
>-# REQUIRE: LOGIN
>-# KEYWORD: shutdown
>-
>-#
>-# Configuration settings for tomcat_devel in /etc/rc.conf:
>-#
>-# tomcat_devel_enable (bool):
>-#   Set to "NO" by default.
>-#   Set it to "YES" to enable tomcat_devel
>-#
>-# tomcat_devel_catalina_home (str)
>-#   Set to "%%TOMCAT_HOME%%" by default.
>-#   Set the CATALINA_HOME variable for the Tomcat process
>-#
>-# tomcat_devel_catalina_base (str)
>-#   Set to "${catalina.home}" by default.
>-#   Set the CATALINA_BASE variable for the Tomcat process
>-#
>-# tomcat_devel_catalina_tmpdir (str)
>-#   Set to "${catalina.base}/temp" by default.
>-#   Set the CATALINA_TMPDIR variable for the Tomcat process
>-#
>-# tomcat_devel_stdout (str)
>-#   Set to "${catalina.base}/logs/catalina.out" by default.
>-#   Set the stdout redirection. It may also be '/dev/null', '&1' or '&2'
>-#
>-# tomcat_devel_stderr (str)
>-#   Set to "&1" by default.
>-#   Set the stderr redirection. It may also be '/dev/null', '&1' or '&2'
>-#
>-# tomcat_devel_pipe_cmd (str):
>-#   Set to "" by default.
>-#   Set a piped command to process stdout/stderr when passthru
>-#
>-# tomcat_devel_logging_manager (str):
>-#   Set to "org.apache.juli.ClassLoaderLogManager" by default.
>-#   Set the JUL log manager
>-#
>-# tomcat_devel_logging_config (str):
>-#   Set to "${catalina.base}/conf/logging.properties" by default.
>-#   Set the JUL config file
>-#
>-# tomcat_devel_java_home (str):
>-#   Set to "%%JAVA_HOME%%" by default.
>-#   Specify the Java VM to use.
>-#
>-# tomcat_devel_classpath (str):
>-#   Set to "" by default.
>-#   Addtional classes to add to the CLASSPATH. If set, must start with ':'
>-#
>-# tomcat_devel_java_opts (str):
>-#   Set to "" by default.
>-#   Java VM args to use.
>-#
>-# tomcat_devel_wait (int):
>-#   Set to "30" by default.
>-#   Set the wait time (in seconds) for Tomcat process startup
>-#
>-# tomcat_devel_umask (str):
>-#   Set to "0077" by default.
>-#   Sets the umask for Tomcat process.
>-#
>-# You may symlink this script with other names to run multiple
>-# instances of tomcat_devel with different configurations.
>-#
>-
>-. /etc/rc.subr
>-
>-case $0 in
>-/etc/rc*)
>-	# during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
>-	# so get the name of the script from $_file
>-	name=$_file
>-	;;
>-*)
>-	name=$0
>-	;;
>-esac
>-
>-name=${name##*/}
>-rcvar=${name}_enable
>-
>-load_rc_config "${name}"
>-
>-eval "${rcvar}=\${${rcvar}:-'NO'}"
>-eval "_tomcat_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}"
>-eval "_tomcat_catalina_user=\${${name}_catalina_user:-'%%TOMCAT_USER%%'}"
>-eval "_tomcat_catalina_home=\${${name}_catalina_home:-'%%TOMCAT_HOME%%'}"
>-eval "_tomcat_catalina_base=\${${name}_catalina_base:-'${_tomcat_catalina_home}'}"
>-eval "_tomcat_catalina_tmpdir=\${${name}_catalina_tmpdir:-'${_tomcat_catalina_base}/temp'}"
>-eval "_tomcat_stdout=\${${name}_stdout:-'${_tomcat_catalina_base}/logs/catalina.out'}"
>-eval "_tomcat_stderr=\${${name}_stderr:-'&1'}"
>-eval "_tomcat_pipe_cmd=\${${name}_pipe_cmd:-''}"
>-eval "_tomcat_logging_manager=\${${name}_logging_manager:-'org.apache.juli.ClassLoaderLogManager'}"
>-eval "_tomcat_logging_config=\${${name}_logging_config:-'${_tomcat_catalina_base}/conf/logging.properties'}"
>-eval "_tomcat_classpath=\${${name}_classpath:-''}"
>-eval "_tomcat_java_opts=\${${name}_java_opts:-''}"
>-eval "_tomcat_wait=\${${name}_wait:-'30'}"
>-eval "_tomcat_umask=\${${name}_umask:-'0077'}"
>-
>-pidfile="/var/run/${name}.pid"
>-
>-required_files="${_tomcat_catalina_base}/conf/server.xml"
>-required_dirs="${_tomcat_catalina_tmpdir}"
>-
>-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 \
>-	-user ${_tomcat_catalina_user} \
>-	-umask ${_tomcat_umask} \
>-	-pidfile '${pidfile}' \
>-	-wait ${_tomcat_wait} \
>-	-outfile '${_tomcat_stdout}' \
>-	-errfile '${_tomcat_stderr}' \
>-	-classpath '${_tomcat_catalina_home}/bin/bootstrap.jar:%%LOCALBASE%%/share/java/classes/commons-daemon.jar:${_tomcat_catalina_home}/bin/tomcat-juli.jar${_tomcat_classpath}' \
>-	-Djava.util.logging.manager=${_tomcat_logging_manager} \
>-	-Djava.util.logging.config.file='${_tomcat_logging_config}' \
>-	${_tomcat_java_opts} \
>-	${_tomcat_endorsed_dirs_option} \
>-	-Dcatalina.home='${_tomcat_catalina_home}' \
>-	-Dcatalina.base='${_tomcat_catalina_base}' \
>-	-Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \
>-	org.apache.catalina.startup.Bootstrap \
>-	${_tomcat_pipe_cmd}"
>-
>-run_rc_command "$1"
>diff -urN www/tomcat-devel.orig/pkg-plist www/tomcat10/pkg-plist
>--- www/tomcat-devel.orig/pkg-plist
>+++ www/tomcat10/pkg-plist
>@@ -26,7 +26,7 @@
> %%T%%/lib/catalina-storeconfig.jar
> %%T%%/lib/catalina-tribes.jar
> %%T%%/lib/catalina.jar
>-%%T%%/lib/ecj-4.17.jar
>+%%T%%/lib/ecj-4.18.jar
> %%T%%/lib/el-api.jar
> %%T%%/lib/jasper-el.jar
> %%T%%/lib/jasper.jar

Actions: View | Diff

Attachments on bug 253404: 222325 | 222326 | 222327 | 222328 | 222329