diff options
author | 2007-05-17 21:15:05 +0000 | |
---|---|---|
committer | 2007-05-17 21:15:05 +0000 | |
commit | 8ed952f5c5e9dbbf67f404a7cfe4cf98991aaea7 (patch) | |
tree | c9d3762631862e2ddcb7b2c124799f33a3eb5d1c /www-servers | |
parent | Add check for bundled class files along with jar files. (diff) | |
download | gentoo-2-8ed952f5c5e9dbbf67f404a7cfe4cf98991aaea7.tar.gz gentoo-2-8ed952f5c5e9dbbf67f404a7cfe4cf98991aaea7.tar.bz2 gentoo-2-8ed952f5c5e9dbbf67f404a7cfe4cf98991aaea7.zip |
Fixed init scripts to capture stdout/stderr. Work around for s-s-d lack of --stdout/--stderr. Bug #162379
(Portage version: 2.1.2.7)
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/tomcat/ChangeLog | 11 | ||||
-rwxr-xr-x | www-servers/tomcat/files/5.5/tomcat.init.2 | 6 | ||||
-rwxr-xr-x | www-servers/tomcat/files/6/tomcat.init | 6 | ||||
-rw-r--r-- | www-servers/tomcat/files/digest-tomcat-5.5.23-r3 (renamed from www-servers/tomcat/files/digest-tomcat-5.5.23-r2) | 0 | ||||
-rw-r--r-- | www-servers/tomcat/files/digest-tomcat-6.0.13-r1 (renamed from www-servers/tomcat/files/digest-tomcat-6.0.13) | 0 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-5.5.23-r3.ebuild (renamed from www-servers/tomcat/tomcat-5.5.23-r2.ebuild) | 2 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-6.0.13-r1.ebuild (renamed from www-servers/tomcat/tomcat-6.0.13.ebuild) | 2 |
7 files changed, 18 insertions, 9 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 3bfc08e77b89..6d53a1bc6804 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,15 @@ # 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.140 2007/05/15 17:04:37 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.141 2007/05/17 21:15:05 wltjr Exp $ + +*tomcat-6.0.13-r1 (17 May 2007) +*tomcat-5.5.23-r3 (17 May 2007) + + 17 May 2007; William L. Thomson Jr. <wltjr@gentoo.org> + files/5.5/tomcat.init.2, files/6/tomcat.init, -tomcat-5.5.23-r2.ebuild, + +tomcat-5.5.23-r3.ebuild, -tomcat-6.0.13.ebuild, +tomcat-6.0.13-r1.ebuild: + Fixed init scripts to capture stdout/stderr. Work around for s-s-d lack of + --stdout/--stderr. *tomcat-6.0.13 (15 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 f7ef4e2087f7..274138eeb9fe 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.2 2007/05/15 04:50:31 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.3 2007/05/17 21:15:05 wltjr Exp $ init_env_vars() { # Set some sane defaults @@ -43,12 +43,12 @@ init_env_vars() { start_helper() { local executor=${1} shift - local arguments="--start --quiet --background \ + local arguments="--start --quiet \ --chdir "${CATALINA_TMPDIR}" \ --chuid ${CATALINA_USER}:${CATALINA_GROUP} \ --make-pidfile --pidfile /var/run/tomcat-5.5.pid" start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" \ - ${CATALINA_ARGS} ${TOMCAT_START} >> "${CATALINA_BASE}"/logs/catalina.out 2>&1 + ${CATALINA_ARGS} ${TOMCAT_START} >> "${CATALINA_BASE}"/logs/catalina.out 2>&1 & return $? } diff --git a/www-servers/tomcat/files/6/tomcat.init b/www-servers/tomcat/files/6/tomcat.init index b8a77144442f..24fbea7901c5 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.7 2007/05/15 04:50:31 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init,v 1.8 2007/05/17 21:15:05 wltjr Exp $ init_env_vars() { # Populate JAVA_HOME @@ -44,12 +44,12 @@ init_env_vars() { start_helper() { local executor=${1} shift - local arguments="--start --quiet --background \ + local arguments="--start --quiet \ --chdir "${CATALINA_TMPDIR}" \ --chuid ${CATALINA_USER}:${CATALINA_GROUP} \ --make-pidfile --pidfile /var/run/tomcat-6.pid" start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" \ - ${CATALINA_ARGS} ${TOMCAT_START} >> "${CATALINA_BASE}"/logs/catalina.out 2>&1 + ${CATALINA_ARGS} ${TOMCAT_START} >> "${CATALINA_BASE}"/logs/catalina.out 2>&1 & return $? } diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.23-r2 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r3 index e0e59f68fbb2..e0e59f68fbb2 100644 --- a/www-servers/tomcat/files/digest-tomcat-5.5.23-r2 +++ b/www-servers/tomcat/files/digest-tomcat-5.5.23-r3 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.13 b/www-servers/tomcat/files/digest-tomcat-6.0.13-r1 index d9bfd1fdd00f..d9bfd1fdd00f 100644 --- a/www-servers/tomcat/files/digest-tomcat-6.0.13 +++ b/www-servers/tomcat/files/digest-tomcat-6.0.13-r1 diff --git a/www-servers/tomcat/tomcat-5.5.23-r2.ebuild b/www-servers/tomcat/tomcat-5.5.23-r3.ebuild index c26176961751..e2a44b4adad7 100644 --- a/www-servers/tomcat/tomcat-5.5.23-r2.ebuild +++ b/www-servers/tomcat/tomcat-5.5.23-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r2.ebuild,v 1.1 2007/05/15 04:37:21 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r3.ebuild,v 1.1 2007/05/17 21:15:05 wltjr Exp $ #WANT_ANT_TASKS="ant-trax" diff --git a/www-servers/tomcat/tomcat-6.0.13.ebuild b/www-servers/tomcat/tomcat-6.0.13-r1.ebuild index bd4f983416a3..8ac2de83bfb3 100644 --- a/www-servers/tomcat/tomcat-6.0.13.ebuild +++ b/www-servers/tomcat/tomcat-6.0.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.13.ebuild,v 1.1 2007/05/15 17:04:37 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.13-r1.ebuild,v 1.1 2007/05/17 21:15:05 wltjr Exp $ WANT_ANT_TASKS="ant-trax" |