diff options
| author |   William Thomson <wltjr@gentoo.org> | 2007-05-15 04:50:31 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2007-05-15 04:50:31 +0000 |
| commit | 37428fb2905ea8c136c2e3e080dec390dbc2925c (patch) | |
| tree | 3548b33cfec1ccead3be66f67f78244a0503fdba /www-servers | |
| parent | old (diff) | |
| download | gentoo-2-37428fb2905ea8c136c2e3e080dec390dbc2925c.tar.gz gentoo-2-37428fb2905ea8c136c2e3e080dec390dbc2925c.tar.bz2 gentoo-2-37428fb2905ea8c136c2e3e080dec390dbc2925c.zip | |
Additional fixes for bug #174498
(Portage version: 2.1.2.7)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
| -rwxr-xr-x | www-servers/tomcat/files/5.5/tomcat.init.2 | 12 | ||||
| -rwxr-xr-x | www-servers/tomcat/files/6/tomcat.init | 12 |
3 files changed, 17 insertions, 13 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 17eadf0a2bd0..3eda4ecff615 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.138 2007/05/15 04:37:21 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.139 2007/05/15 04:50:31 wltjr Exp $ + + 15 May 2007; William L. Thomson Jr. <wltjr@gentoo.org> + files/5.5/tomcat.init.2, files/6/tomcat.init: + Additional fixes for bug #174498 *tomcat-6.0.10-r5 (09 May 2007) *tomcat-5.5.23-r2 (09 May 2007) diff --git a/www-servers/tomcat/files/5.5/tomcat.init.2 b/www-servers/tomcat/files/5.5/tomcat.init.2 index ea883b8aa090..f7ef4e2087f7 100755 --- a/www-servers/tomcat/files/5.5/tomcat.init.2 +++ b/www-servers/tomcat/files/5.5/tomcat.init.2 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.1 2007/05/15 04:37:21 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.2 2007/05/15 04:50:31 wltjr Exp $ init_env_vars() { # Set some sane defaults @@ -60,19 +60,19 @@ start() { ebegin "Starting Tomcat" init_env_vars # Figure out what arguments to pass start_helper based on TOMCAT_START - if [ "${TOMCAT_START}" == "debug" ] ; then + if [ "${TOMCAT_START}" = "debug" ] ; then start_helper ${JAVA_HOME}/bin/jdb \ -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share - elif [ "${TOMCAT_START}" == "-security debug" ] ; then + elif [ "${TOMCAT_START}" = "-security debug" ] ; then start_helper ${JAVA_HOME}/bin/jdb \ -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \ -Djava.security.manager \ -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy - elif [ "${TOMCAT_START}" == "jpda start" ] ; then + elif [ "${TOMCAT_START}" = "jpda start" ] ; then start_helper ${JAVA_HOME}/bin/java ${JPDA_OPTS} - elif [ "${TOMCAT_START}" == "start" ] ; then + elif [ "${TOMCAT_START}" = "start" ] ; then start_helper ${JAVA_HOME}/bin/java - elif [ "${TOMCAT_START}" == "-security start" ] ; then + elif [ "${TOMCAT_START}" = "-security start" ] ; then start_helper ${JAVA_HOME}/bin/java \ -Djava.security.manager \ -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy diff --git a/www-servers/tomcat/files/6/tomcat.init b/www-servers/tomcat/files/6/tomcat.init index 9b7ae58a0c81..b8a77144442f 100755 --- a/www-servers/tomcat/files/6/tomcat.init +++ b/www-servers/tomcat/files/6/tomcat.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.6 2007/05/15 04:37:21 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.7 2007/05/15 04:50:31 wltjr Exp $ init_env_vars() { # Populate JAVA_HOME @@ -61,19 +61,19 @@ start() { ebegin "Starting Tomcat" init_env_vars # Figure out what arguments to pass start_helper based on TOMCAT_START - if [ "${TOMCAT_START}" == "debug" ] ; then + if [ "${TOMCAT_START}" = "debug" ] ; then start_helper ${JAVA_HOME}/bin/jdb \ -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share - elif [ "${TOMCAT_START}" == "-security debug" ] ; then + elif [ "${TOMCAT_START}" = "-security debug" ] ; then start_helper ${JAVA_HOME}/bin/jdb \ -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \ -Djava.security.manager \ -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy - elif [ "${TOMCAT_START}" == "jpda start" ] ; then + elif [ "${TOMCAT_START}" = "jpda start" ] ; then start_helper ${JAVA_HOME}/bin/java ${JPDA_OPTS} - elif [ "${TOMCAT_START}" == "start" ] ; then + elif [ "${TOMCAT_START}" = "start" ] ; then start_helper ${JAVA_HOME}/bin/java - elif [ "${TOMCAT_START}" == "-security start" ] ; then + elif [ "${TOMCAT_START}" = "-security start" ] ; then start_helper ${JAVA_HOME}/bin/java \ -Djava.security.manager \ -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy |