From owner-svn-ports-all@freebsd.org Wed Nov 25 13:23:37 2020 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 E09CA469E30; Wed, 25 Nov 2020 13:23:37 +0000 (UTC) (envelope-from ale@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ch1mn620Gz3HpH; Wed, 25 Nov 2020 13:23:37 +0000 (UTC) (envelope-from ale@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 C1D4812304; Wed, 25 Nov 2020 13:23:37 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0APDNbbq058877; Wed, 25 Nov 2020 13:23:37 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0APDNbM8058874; Wed, 25 Nov 2020 13:23:37 GMT (envelope-from ale@FreeBSD.org) Message-Id: <202011251323.0APDNbM8058874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Wed, 25 Nov 2020 13:23:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556291 - in head/www/tomcat7: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ale X-SVN-Commit-Paths: in head/www/tomcat7: . files X-SVN-Commit-Revision: 556291 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: Wed, 25 Nov 2020 13:23:37 -0000 Author: ale Date: Wed Nov 25 13:23:36 2020 New Revision: 556291 URL: https://svnweb.freebsd.org/changeset/ports/556291 Log: - Update to 7.0.107 release - Add support for java 9+ in rc.d script - Add support for setting a different umask (077 by default) PR: 251348 Submitted by: VVD Modified: head/www/tomcat7/Makefile head/www/tomcat7/distinfo head/www/tomcat7/files/tomcat7.in head/www/tomcat7/pkg-plist Modified: head/www/tomcat7/Makefile ============================================================================== --- head/www/tomcat7/Makefile Wed Nov 25 12:39:08 2020 (r556290) +++ head/www/tomcat7/Makefile Wed Nov 25 13:23:36 2020 (r556291) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 7.0.106 +PORTVERSION= 7.0.107 PORTREVISION= 0 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-7/v${PORTVERSION}/bin @@ -75,7 +75,7 @@ post-install: post-install-HOST_MANAGER-on: (cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\ - for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml; do \ + for f in host-manager/META-INF/context.xml host-manager/WEB-INF/manager.xml host-manager/WEB-INF/web.xml; do \ ${MV} $$f $$f.sample; done) post-install-HOST_MANAGER-off: Modified: head/www/tomcat7/distinfo ============================================================================== --- head/www/tomcat7/distinfo Wed Nov 25 12:39:08 2020 (r556290) +++ head/www/tomcat7/distinfo Wed Nov 25 13:23:36 2020 (r556291) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600805641 -SHA256 (apache-tomcat-7.0.106.tar.gz) = 533c246def2624de7f79ff6edfdf5695d56f7267ddc337385c2e4b502f963606 -SIZE (apache-tomcat-7.0.106.tar.gz) = 9642456 +TIMESTAMP = 1606240573 +SHA256 (apache-tomcat-7.0.107.tar.gz) = 871574157a0d421c2aed13afbf94e47d0dd32985d7c4baa205279178a90f96f5 +SIZE (apache-tomcat-7.0.107.tar.gz) = 9650976 Modified: head/www/tomcat7/files/tomcat7.in ============================================================================== --- head/www/tomcat7/files/tomcat7.in Wed Nov 25 12:39:08 2020 (r556290) +++ head/www/tomcat7/files/tomcat7.in Wed Nov 25 13:23:36 2020 (r556291) @@ -58,6 +58,10 @@ # Set to "30" by default. # Set the wait time (in seconds) for Tomcat process startup # +# tomcat7_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 tomcat7 with different configurations. # @@ -94,6 +98,7 @@ eval "_tomcat_logging_config=\${${name}_logging_config 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" @@ -102,10 +107,22 @@ 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_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}' \ @@ -114,7 +131,7 @@ command_args="-java-home '${_tomcat_java_home}' \ -Djava.util.logging.manager=${_tomcat_logging_manager} \ -Djava.util.logging.config.file='${_tomcat_logging_config}' \ ${_tomcat_java_opts} \ - -Djava.endorsed.dirs='%%TOMCAT_HOME%%/endorsed' \ + ${_tomcat_endorsed_dirs_option} \ -Dcatalina.home='${_tomcat_catalina_home}' \ -Dcatalina.base='${_tomcat_catalina_base}' \ -Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \ Modified: head/www/tomcat7/pkg-plist ============================================================================== --- head/www/tomcat7/pkg-plist Wed Nov 25 12:39:08 2020 (r556290) +++ head/www/tomcat7/pkg-plist Wed Nov 25 13:23:36 2020 (r556291) @@ -605,6 +605,7 @@ %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp +%%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/WEB-INF/manager.xml.sample %%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/WEB-INF/web.xml.sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/add.gif %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg @@ -616,7 +617,6 @@ %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/update.gif %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/void.gif %%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp -%%HOST_MANAGER%%%%T%%/webapps/host-manager/manager.xml %%MANAGER%%@sample %%T%%/webapps/manager/META-INF/context.xml.sample %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/401.jsp %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/403.jsp