From owner-svn-ports-all@freebsd.org Sat Feb 13 09:36:36 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 399A6547201; Sat, 13 Feb 2021 09:36:36 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dd4xw188yz3mkg; Sat, 13 Feb 2021 09:36:36 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A19415001; Sat, 13 Feb 2021 09:36:36 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11D9aZZr026954; Sat, 13 Feb 2021 09:36:35 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11D9aZG2026949; Sat, 13 Feb 2021 09:36:35 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202102130936.11D9aZG2026949@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 13 Feb 2021 09:36:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565113 - in head/www: . tomcat10 tomcat10/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/www: . tomcat10 tomcat10/files X-SVN-Commit-Revision: 565113 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2021 09:36:36 -0000 Author: tcberner Date: Sat Feb 13 09:36:34 2021 New Revision: 565113 URL: https://svnweb.freebsd.org/changeset/ports/565113 Log: New port: www/tomcat10 The Apache Tomcat Project is proud to announce the release of version 10.0.2 of Apache Tomcat. This release is the first stable release in the 10.0.x series and is targeted at Jakarta EE 9. Changelog: https://tomcat.apache.org/tomcat-10.0-doc/changelog.html#Tomcat_10.0.2_(markt - Copied from www/tomcat-devel PR: 253404 Submitted by: VVD (maintainer) Added: head/www/tomcat10/ - copied from r565112, head/www/tomcat-devel/ head/www/tomcat10/files/tomcat10.in (contents, props changed) Deleted: head/www/tomcat10/files/tomcat_devel.in Modified: head/www/Makefile head/www/tomcat10/Makefile head/www/tomcat10/distinfo head/www/tomcat10/pkg-plist Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Sat Feb 13 09:23:09 2021 (r565112) +++ head/www/Makefile Sat Feb 13 09:36:34 2021 (r565113) @@ -2184,6 +2184,7 @@ SUBDIR += tokyopromenade SUBDIR += tomcat-devel SUBDIR += tomcat-native + SUBDIR += tomcat10 SUBDIR += tomcat7 SUBDIR += tomcat85 SUBDIR += tomcat9 Modified: head/www/tomcat10/Makefile ============================================================================== --- head/www/tomcat-devel/Makefile Sat Feb 13 09:23:09 2021 (r565112) +++ head/www/tomcat10/Makefile Sat Feb 13 09:36:34 2021 (r565113) @@ -1,11 +1,10 @@ -# Created by: Alex Dupre # $FreeBSD$ 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 Modified: head/www/tomcat10/distinfo ============================================================================== --- head/www/tomcat-devel/distinfo Sat Feb 13 09:23:09 2021 (r565112) +++ head/www/tomcat10/distinfo Sat Feb 13 09:36:34 2021 (r565113) @@ -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 Added: head/www/tomcat10/files/tomcat10.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/tomcat10/files/tomcat10.in Sat Feb 13 09:36:34 2021 (r565113) @@ -0,0 +1,145 @@ +!/bin/sh +# +# $FreeBSD$ +# + +# 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" Modified: head/www/tomcat10/pkg-plist ============================================================================== --- head/www/tomcat-devel/pkg-plist Sat Feb 13 09:23:09 2021 (r565112) +++ head/www/tomcat10/pkg-plist Sat Feb 13 09:36:34 2021 (r565113) @@ -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