Attachment 219935 Details for Bug 251348 – Update to 7.0.107, add support of java 9+ in rc.d script, add support of umask

[patch] Update to 7.0.107, add support of java 9+ in rc.d script, add support of umask

tomcat7.diff (text/plain), 3.94 KB, created by Vladimir Druzenko on 2020-11-24 18:25:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2020-11-24 18:25:12 UTC

Size: 3.94 KB

patch

obsolete

>diff -ur www/tomcat7.orig/Makefile www/tomcat7/Makefile
>--- www/tomcat7.orig/Makefile
>+++ www/tomcat7/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/www/tomcat7/Makefile 549757 2020-09-23 17:22:13Z joneum $
> 
> 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-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:
>diff -ur www/tomcat7.orig/distinfo www/tomcat7/distinfo
>--- www/tomcat7.orig/distinfo
>+++ www/tomcat7/distinfo
>@@ -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
>diff -ur www/tomcat7.orig/files/tomcat7.in www/tomcat7/files/tomcat7.in
>--- www/tomcat7.orig/files/tomcat7.in
>+++ www/tomcat7/files/tomcat7.in
>@@ -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_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 @@
> 
> 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 @@
> 	-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}' \
>diff -ur www/tomcat7.orig/pkg-plist www/tomcat7/pkg-plist
>--- www/tomcat7.orig/pkg-plist	2020-09-23 20:22:13.000000000 +0300
>+++ www/tomcat7/pkg-plist	2020-11-24 20:57:36.668476000 +0300
>@@ -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

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 251348: 219935