Attachment 104666 Details for Bug 144878 – file.diff

[patch] file.diff

file.diff (text/plain), 1.29 KB, created by Jason on 2010-03-19 19:00:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason

Created: 2010-03-19 19:00:08 UTC

Size: 1.29 KB

patch

obsolete

>--- tomcat55/Makefile.orig	2010-03-19 11:32:45.000000000 -0700
>+++ tomcat55/Makefile	2010-03-19 11:41:38.000000000 -0700
>@@ -29,6 +29,7 @@
> APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
> TOMCAT_USER?=	www
> TOMCAT_GROUP?=	www
>+TOMCAT_UID?=	80
> HTTP_PORT?=	8180
> SHUTDOWN_PORT?=	8005
> AJP_1_3_PORT?=	8009
>@@ -58,7 +59,8 @@
> 		STDOUT_LOG=${STDOUT_LOG} \
> 		TOMCAT_HOME=${APP_HOME} \
> 		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
>-		USER=${TOMCAT_USER}
>+		USER=${TOMCAT_USER} \
>+		UID=${TOMCAT_UID}
> 
> .include <bsd.port.pre.mk>
> 
>@@ -74,7 +76,7 @@
> 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
> 	@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
> 	@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
>-	@${ECHO_MSG} "   Running as (user/group):  ${TOMCAT_USER}/${TOMCAT_GROUP}"
>+	@${ECHO_MSG} "   Running as (user/group/uid):  ${TOMCAT_USER}/${TOMCAT_GROUP}/${TOMCAT_UID}"
> 	@${ECHO_MSG} "   HTTP port:                ${HTTP_PORT}"
> 	@${ECHO_MSG} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
> 	@${ECHO_MSG} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
>--- tomcat55/files/pkg-install.in.orig	2010-03-19 11:32:09.000000000 -0700
>+++ tomcat55/files/pkg-install.in	2010-03-19 11:32:34.000000000 -0700
>@@ -12,7 +12,7 @@
> fi
> 
> # Set some constants
>-UID=80
>+UID=%%UID%%
> GID=${UID}
> USER=%%USER%%
> GROUP=%%GROUP%%

Actions: View | Diff

Attachments on bug 144878: 104666