Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/www-servers
diff options
context:
space:
mode:
authorJean-Noël Rivasseau <elvanor@gentoo.org>2011-04-08 11:25:06 +0000
committerJean-Noël Rivasseau <elvanor@gentoo.org>2011-04-08 11:25:06 +0000
commit3bf69c121d9c71485a2626f2b97455d33551a0fe (patch)
treea772bb699a3e4a4f38d2a869d6b567e981db62db /www-servers
parentFix DEPEND value. (diff)
downloadhistorical-3bf69c121d9c71485a2626f2b97455d33551a0fe.tar.gz
historical-3bf69c121d9c71485a2626f2b97455d33551a0fe.tar.bz2
historical-3bf69c121d9c71485a2626f2b97455d33551a0fe.zip
Fixed init scripts again.
Package-Manager: portage-2.1.9.42/cvs/Linux i686
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog7
-rw-r--r--www-servers/tomcat/Manifest6
-rw-r--r--www-servers/tomcat/files/6/tomcat.init.28
-rw-r--r--www-servers/tomcat/files/6/tomcat.init.38
4 files changed, 17 insertions, 12 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 9c5feb3ed934..b6a091e63de6 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.251 2011/04/07 14:13:49 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.252 2011/04/08 11:25:06 elvanor Exp $
+
+ 08 Apr 2011; <elvanor@gentoo.org> files/6/tomcat.init.2,
+ files/6/tomcat.init.3:
+ Fixed again init scripts so that catalina.out is not empty if running
+ without OpenRC.
*tomcat-7.0.12 (07 Apr 2011)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 983343706925..95b9c09e70fa 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -11,8 +11,8 @@ AUX 6/catalina.policy 6956 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 SHA1
AUX 6/examples-cal.patch 565 RMD160 85294480f354eb19340bdc7357690ae55ef5a89f SHA1 e9550e02500f2d9da6f4f7b3c7ca79c1934318ea SHA256 caf76c88d3b67d29a7aadca1485accd01270d986e7bc77281a9b30f0b1582b55
AUX 6/tomcat.conf 2895 RMD160 36ece62ddff5257c04f47d75b9c77bd4dc198652 SHA1 8fef42463b7bf186e2f1d1aeb083bdb370603265 SHA256 b04b085618be755ad9e1796fcbcbb8c2e192eefda3b240f1c06b0d9cc88f2ff0
AUX 6/tomcat.init 3529 RMD160 45aabac31804faff713ca3648f4a675e5ea7ea89 SHA1 f2b499fda69d83aecda72742f88ed8bf64f5cfb3 SHA256 744daa31e36e548f76f2997c3e3430b961163bfe0d2ba2ef6d81f5c2ddb0470c
-AUX 6/tomcat.init.2 4032 RMD160 cba893b5085f914ba656634705b0d0326c6a356b SHA1 453b8ca705e97a3497cf279785961aebc54fdca9 SHA256 adf7dd0f1d473cf95f83b53639644263039676771baadf1e5838e679b23cda26
-AUX 6/tomcat.init.3 4048 RMD160 9cd5840d7a5c98737b4720a1f22c41271265e585 SHA1 5079a0622c226e79016ecfe498e333039a8e6633 SHA256 087c73d4552df27a9d13d8bb8fb5ffcdb404e57c6b793948332c95c00879ab07
+AUX 6/tomcat.init.2 4034 RMD160 28a47d7e62ac5437eb2c9164f4595bd67b86f676 SHA1 c55f843f15db90e3e0af6069dfefc91daa4e0015 SHA256 55abf160871648ebeca531865b5918846cf298dadc9cdc5cc7ee060a8db487ad
+AUX 6/tomcat.init.3 4050 RMD160 d7fe0c83c7e5aeb30f2946c259c9f2bb3fe98aa8 SHA1 1519b957d5c467d604e5422f7876a08d79874ca5 SHA256 726fbfd0961df4a6fb70df17f72144a3f19c1080bd6f1f6abdadd849d5dd343c
AUX 7/7.0.12-build-xml.patch 4612 RMD160 9cec14c22e777eab0ea99e3d096a4e70647c6ec2 SHA1 b64989924cca3e121752e93100ac795a52e1d456 SHA256 5fcdfe19d7815deebb860d542cc0779012dec8727b37da4861e19dba80e771fc
AUX 7/build-xml.patch 5561 RMD160 672659e5273a9d6ef450fd29cc171fae56c99c9a SHA1 08714c12a72b1db8490460b10f74d32fc951dacb SHA256 f85ec37d37cc2bceca7877da3271570701a352e087e101e6b3146bdd16f31490
AUX 7/examples-cal.patch 565 RMD160 85294480f354eb19340bdc7357690ae55ef5a89f SHA1 e9550e02500f2d9da6f4f7b3c7ca79c1934318ea SHA256 caf76c88d3b67d29a7aadca1485accd01270d986e7bc77281a9b30f0b1582b55
@@ -33,5 +33,5 @@ EBUILD tomcat-6.0.29-r1.ebuild 6948 RMD160 d340dad22a80e36a03bdc0614fee97ce9e296
EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
EBUILD tomcat-6.0.32-r2.ebuild 6968 RMD160 756ffd21d60906c47031e0bc202d3fc77b21c868 SHA1 a9339169846af791be4a92c5cda053324eaa923a SHA256 ad9c4ce33cb4d998b3447a106f8a9df76dde19ef28b6dd94163362d0aaff3343
EBUILD tomcat-7.0.12.ebuild 7085 RMD160 650ff42e0c6505ec2d57d4095b0d7e4cac8c0a84 SHA1 3a41daa161322e880b783348e3347e0a2390f4b6 SHA256 b184d3fae2dce09b773d24388af284496c7525b7b633a81c3b5a202b65d92b23
-MISC ChangeLog 63653 RMD160 8c02ba4b9d4cd7cc4bc2326557762061aee5fc4e SHA1 595e65f20d9688f5d9f31d624aa7c931bf9588a2 SHA256 c0eb683f93cbb2e1e06dc53ad285259a230b5382b9f5decc694b1eb58ce16f6c
+MISC ChangeLog 63827 RMD160 1920d81ec35300c2fdea3ad3803df0547922a33e SHA1 8b20d873aa71e28b68baa026794d91bc9767a917 SHA256 3f5239fad1bceddc64e7a111892f4f667ab1abf90812eec45da9686efc72dd75
MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22
diff --git a/www-servers/tomcat/files/6/tomcat.init.2 b/www-servers/tomcat/files/6/tomcat.init.2
index 10738925e96f..9e08e07014ef 100644
--- a/www-servers/tomcat/files/6/tomcat.init.2
+++ b/www-servers/tomcat/files/6/tomcat.init.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 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.2,v 1.2 2011/04/05 17:36:16 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.2,v 1.3 2011/04/08 11:25:06 elvanor Exp $
opts="${opts} forcestop"
@@ -47,20 +47,20 @@ init_env_vars() {
ssd() {
local exec=${1}
shift
- local args="--start --quiet --background \
+ local args="--start --quiet \
--chdir "${CATALINA_TMPDIR}" \
--chuid ${CATALINA_USER}:${CATALINA_GROUP} \
--make-pidfile --pidfile /var/run/tomcat-6.pid"
# bug #243348
if [ -e /etc/init.d/sysfs ] ; then
- args="${args} \
+ args="${args} --background \
--stdout ${CATALINA_BASE}/logs/catalina.out \
--stderr ${CATALINA_BASE}/logs/catalina.out"
start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
else
start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \
- "${CATALINA_BASE}/logs/catalina.out" 2>&1
+ "${CATALINA_BASE}/logs/catalina.out" 2>&1 &
fi
return $?
}
diff --git a/www-servers/tomcat/files/6/tomcat.init.3 b/www-servers/tomcat/files/6/tomcat.init.3
index 17c92aa51c3e..dd5c2667bf01 100644
--- a/www-servers/tomcat/files/6/tomcat.init.3
+++ b/www-servers/tomcat/files/6/tomcat.init.3
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 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.3,v 1.2 2011/04/05 17:36:16 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3,v 1.3 2011/04/08 11:25:06 elvanor Exp $
opts="${opts} forcestop"
@@ -47,20 +47,20 @@ init_env_vars() {
ssd() {
local exec=${1}
shift
- local args="--start --quiet --background \
+ local args="--start --quiet \
--chdir "${CATALINA_TMPDIR}" \
--chuid ${CATALINA_USER}:${CATALINA_GROUP} \
--make-pidfile --pidfile /var/run/tomcat-6.pid"
# bug #243348
if [ -e /etc/init.d/sysfs ] ; then
- args="${args} \
+ args="${args} --background \
--stdout ${CATALINA_BASE}/logs/catalina.out \
--stderr ${CATALINA_BASE}/logs/catalina.out"
start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
else
start-stop-daemon ${args} --name ${exec} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> \
- "${CATALINA_BASE}/logs/catalina.out" 2>&1
+ "${CATALINA_BASE}/logs/catalina.out" 2>&1 &
fi
return $?
}