kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Since the procname of tomcat processes may vary due to javavmwrapper,

Browse source 
subvert the 'check_pid_file' procname check by setting it from the output
of 'ps'.

Remove the previous attempt at handling this problem, which was to put
a wildcard in procname.  I'll wear my pointy hat for that bogus hack.

Reported by:	Fritz Heinrichmeyer <Fritz.Heinrichmeyer@FernUni-Hagen.de>
This commit is contained in:
Sam Lawrance 2006-02-07 13:41:00 +00:00
parent a20733af44
commit 314fa7a3d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=155418
14 changed files with 63 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/jakarta-tomcat4/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 4.0.6
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www java
MASTER_SITES= http://distfiles.coredump.cn/ \
ftp://local-distfiles.freebsd.org.cn/pub/china-ports/liukang/

9
www/jakarta-tomcat4/files/tomcat4.sh.in
View file

@ -105,7 +105,14 @@ java_command="%%LOCALBASE%%/bin/java \
log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
procname="*java"
# Subvert the check_pid_file procname check.
if [ -f $pidfile ]; then
read rc_pid junk < $pidfile
if [ ! -z "$rc_pid" ]; then
procname=`ps -o command= $rc_pid | cut -d ' ' -f 1`
fi
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
command="/usr/sbin/daemon"

2
www/jakarta-tomcat41/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 4.1.31
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR= tomcat-4/v${PORTVERSION}/bin

9
www/jakarta-tomcat41/files/tomcat41.sh.in
View file

@ -105,7 +105,14 @@ java_command="%%LOCALBASE%%/bin/java \
log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
procname="*java"
# Subvert the check_pid_file procname check.
if [ -f $pidfile ]; then
read rc_pid junk < $pidfile
if [ ! -z "$rc_pid" ]; then
procname=`ps -o command= $rc_pid | cut -d ' ' -f 1`
fi
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
command="/usr/sbin/daemon"

2
www/jakarta-tomcat5/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 5.0.30
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR= tomcat-5/v${PORTVERSION}/bin

9
www/jakarta-tomcat5/files/tomcat50.sh.in
View file

@ -105,7 +105,14 @@ java_command="%%LOCALBASE%%/bin/java \
log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
procname="*java"
# Subvert the check_pid_file procname check.
if [ -f $pidfile ]; then
read rc_pid junk < $pidfile
if [ ! -z "$rc_pid" ]; then
procname=`ps -o command= $rc_pid | cut -d ' ' -f 1`
fi
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
command="/usr/sbin/daemon"

2
www/tomcat41/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 4.1.31
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR= tomcat-4/v${PORTVERSION}/bin

9
www/tomcat41/files/tomcat41.sh.in
View file

@ -105,7 +105,14 @@ java_command="%%LOCALBASE%%/bin/java \
log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
procname="*java"
# Subvert the check_pid_file procname check.
if [ -f $pidfile ]; then
read rc_pid junk < $pidfile
if [ ! -z "$rc_pid" ]; then
procname=`ps -o command= $rc_pid | cut -d ' ' -f 1`
fi
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
command="/usr/sbin/daemon"

2
www/tomcat55/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= tomcat
PORTVERSION= 5.5.12
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR= tomcat-5/v${PORTVERSION}/bin

9
www/tomcat55/files/tomcat55.sh.in
View file

@ -105,7 +105,14 @@ java_command="%%LOCALBASE%%/bin/java \
log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
procname="*java"
# Subvert the check_pid_file procname check.
if [ -f $pidfile ]; then
read rc_pid junk < $pidfile
if [ ! -z "$rc_pid" ]; then
procname=`ps -o command= $rc_pid | cut -d ' ' -f 1`
fi
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
command="/usr/sbin/daemon"

2
www/tomcat6/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= tomcat
PORTVERSION= 5.5.12
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR= tomcat-5/v${PORTVERSION}/bin

9
www/tomcat6/files/tomcat55.sh.in
View file

@ -105,7 +105,14 @@ java_command="%%LOCALBASE%%/bin/java \
log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
procname="*java"
# Subvert the check_pid_file procname check.
if [ -f $pidfile ]; then
read rc_pid junk < $pidfile
if [ ! -z "$rc_pid" ]; then
procname=`ps -o command= $rc_pid | cut -d ' ' -f 1`
fi
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
command="/usr/sbin/daemon"

2
www/tomcat7/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= tomcat
PORTVERSION= 5.5.12
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR= tomcat-5/v${PORTVERSION}/bin

9
www/tomcat7/files/tomcat55.sh.in
View file

@ -105,7 +105,14 @@ java_command="%%LOCALBASE%%/bin/java \
log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
procname="*java"
# Subvert the check_pid_file procname check.
if [ -f $pidfile ]; then
read rc_pid junk < $pidfile
if [ ! -z "$rc_pid" ]; then
procname=`ps -o command= $rc_pid | cut -d ' ' -f 1`
fi
fi
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
command="/usr/sbin/daemon"