From owner-svn-ports-head@freebsd.org Tue Dec 19 09:30:12 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C672E99D19; Tue, 19 Dec 2017 09:30:12 +0000 (UTC) (envelope-from lme@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 mx1.freebsd.org (Postfix) with ESMTPS id DADB26F242; Tue, 19 Dec 2017 09:30:11 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBJ9UBCW020604; Tue, 19 Dec 2017 09:30:11 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBJ9UATJ020600; Tue, 19 Dec 2017 09:30:10 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201712190930.vBJ9UATJ020600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Tue, 19 Dec 2017 09:30:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456713 - in head/www: tomcat-devel tomcat-devel/files tomcat85 tomcat85/files X-SVN-Group: ports-head X-SVN-Commit-Author: lme X-SVN-Commit-Paths: in head/www: tomcat-devel tomcat-devel/files tomcat85 tomcat85/files X-SVN-Commit-Revision: 456713 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2017 09:30:12 -0000 Author: lme Date: Tue Dec 19 09:30:10 2017 New Revision: 456713 URL: https://svnweb.freebsd.org/changeset/ports/456713 Log: www/tomcat{85,-devel} - Add support for jsvc umask - Bump PORTREVISION jsvc support `-umask` parameter since 1.0.8, it can be useful e.g. to set to 0027 to have group-readable Catalina log files. PR: 224266, 224321 Submitted by: Lapo Luchini Approved by: maintainer Modified: head/www/tomcat-devel/Makefile head/www/tomcat-devel/files/tomcat_devel.in head/www/tomcat85/Makefile head/www/tomcat85/files/tomcat85.in Modified: head/www/tomcat-devel/Makefile ============================================================================== --- head/www/tomcat-devel/Makefile Tue Dec 19 09:00:37 2017 (r456712) +++ head/www/tomcat-devel/Makefile Tue Dec 19 09:30:10 2017 (r456713) @@ -3,6 +3,7 @@ PORTNAME= tomcat PORTVERSION= 9.0.2 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= -devel Modified: head/www/tomcat-devel/files/tomcat_devel.in ============================================================================== --- head/www/tomcat-devel/files/tomcat_devel.in Tue Dec 19 09:00:37 2017 (r456712) +++ head/www/tomcat-devel/files/tomcat_devel.in Tue Dec 19 09:30:10 2017 (r456713) @@ -58,6 +58,10 @@ # 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. # @@ -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" @@ -106,6 +111,7 @@ 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}' \ Modified: head/www/tomcat85/Makefile ============================================================================== --- head/www/tomcat85/Makefile Tue Dec 19 09:00:37 2017 (r456712) +++ head/www/tomcat85/Makefile Tue Dec 19 09:30:10 2017 (r456713) @@ -3,6 +3,7 @@ PORTNAME= tomcat PORTVERSION= 8.5.24 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin PKGNAMESUFFIX= 85 Modified: head/www/tomcat85/files/tomcat85.in ============================================================================== --- head/www/tomcat85/files/tomcat85.in Tue Dec 19 09:00:37 2017 (r456712) +++ head/www/tomcat85/files/tomcat85.in Tue Dec 19 09:30:10 2017 (r456713) @@ -58,6 +58,10 @@ # Set to "30" by default. # Set the wait time (in seconds) for Tomcat process startup # +# tomcat85_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 tomcat85 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" @@ -106,6 +111,7 @@ 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}' \