Additional fixes for bug #174498

Package-Manager: portage-2.1.2.7

4 files changed, 29 insertions, 25 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/Manifest b/www-servers/tomcat/Manifest
index 831c3a0631b1..8f83da54c239 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -34,10 +34,10 @@ AUX 5.5/tomcat.init 3376 RMD160 bde20b2d738174fda5792531037b36ed27db8280 SHA1 5f
 MD5 19e200c22e63a7ce3b20ca5f6ba35eb4 files/5.5/tomcat.init 3376
 RMD160 bde20b2d738174fda5792531037b36ed27db8280 files/5.5/tomcat.init 3376
 SHA256 421ca1e7e4ab413e30ea708b0cacad398d472b857425b0d7a2963a4a4ce99e62 files/5.5/tomcat.init 3376
-AUX 5.5/tomcat.init.2 3403 RMD160 64076d86ba1d62e5bf09d017994d48307b760037 SHA1 7b7bc211cc13d9b78f2ef9bc41ff11359a86ced6 SHA256 4863693e4ee4c5eac032e59181b34e45ca94c68f8695de2a8309eeb0be8c3a58
-MD5 cbe49face784d2997633f3c8a5fa7477 files/5.5/tomcat.init.2 3403
-RMD160 64076d86ba1d62e5bf09d017994d48307b760037 files/5.5/tomcat.init.2 3403
-SHA256 4863693e4ee4c5eac032e59181b34e45ca94c68f8695de2a8309eeb0be8c3a58 files/5.5/tomcat.init.2 3403
+AUX 5.5/tomcat.init.2 3398 RMD160 0838025a8769419812fed44b61a86e27bf132dd9 SHA1 fd07978711a7a2ccf3aba0a6c13a2b12e01adb6a SHA256 f0648672f511cbef26dc924ceadc4ef068fa93d03bfcd647d76810b7700ac658
+MD5 ea282cc0c9693e916afa1966673f0717 files/5.5/tomcat.init.2 3398
+RMD160 0838025a8769419812fed44b61a86e27bf132dd9 files/5.5/tomcat.init.2 3398
+SHA256 f0648672f511cbef26dc924ceadc4ef068fa93d03bfcd647d76810b7700ac658 files/5.5/tomcat.init.2 3398
 AUX 5.5/tomcat_build_xml.patch 13828 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 SHA1 3a8ae3d686046f1938c71bd790d6f9ecf4339556 SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9
 MD5 47210f9a3e6b7c1809b34cfdab7fdb9b files/5.5/tomcat_build_xml.patch 13828
 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 files/5.5/tomcat_build_xml.patch 13828
@@ -54,10 +54,10 @@ AUX 6/tomcat.conf 2742 RMD160 c96fda0f18942b8bffa583f08a82cea1b70430d4 SHA1 4c36
 MD5 fde3c467493c7a29b54eedce3d57ff94 files/6/tomcat.conf 2742
 RMD160 c96fda0f18942b8bffa583f08a82cea1b70430d4 files/6/tomcat.conf 2742
 SHA256 bf8a205c477605ea88a7fa1a8d9535edc0a1e1cc4d4b92e0be09e950075474a6 files/6/tomcat.conf 2742
-AUX 6/tomcat.init 3371 RMD160 9da620b4b2398d1ab5319157daa4a48944e3ca2d SHA1 08957911a0d5ea259978f665830e5deaa1662cac SHA256 04db1a2d8f542a19f3e5ea36ef579e6baaed3e3b14e4dcd61da79ae2099ecb9e
-MD5 c8787eb6ff01c8f58412f5f2129e61c2 files/6/tomcat.init 3371
-RMD160 9da620b4b2398d1ab5319157daa4a48944e3ca2d files/6/tomcat.init 3371
-SHA256 04db1a2d8f542a19f3e5ea36ef579e6baaed3e3b14e4dcd61da79ae2099ecb9e files/6/tomcat.init 3371
+AUX 6/tomcat.init 3366 RMD160 d0b9365fd46b165ecd55ebc5518c9b63ca294fd3 SHA1 fcbcbbabe9f0ba8a95968b6e85a7326324ea0ae4 SHA256 ed61a204a312b56641e52e9e6c910c6b350e1e40b31b2e197ed300816e7b2738
+MD5 5ca14d034cc9c2eac4944a247d1958b0 files/6/tomcat.init 3366
+RMD160 d0b9365fd46b165ecd55ebc5518c9b63ca294fd3 files/6/tomcat.init 3366
+SHA256 ed61a204a312b56641e52e9e6c910c6b350e1e40b31b2e197ed300816e7b2738 files/6/tomcat.init 3366
 DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd
 DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199
 EBUILD tomcat-5.5.23-r1.ebuild 10630 RMD160 a164f36224fb766d6f10092d84b953dc5930b5a0 SHA1 d731665a2123e5d73952c48dce272e94334bbd4e SHA256 97454d3a2e93b87c86d52b29b075842e6e80d77b948e777fac7b9db4d8a7ca2b
@@ -72,10 +72,10 @@ EBUILD tomcat-6.0.10-r5.ebuild 5758 RMD160 65caa9eca6d20edcdd89939a7f677d4d3692e
 MD5 3c3315218509873a57dfb54ce05b1ca8 tomcat-6.0.10-r5.ebuild 5758
 RMD160 65caa9eca6d20edcdd89939a7f677d4d3692e2e3 tomcat-6.0.10-r5.ebuild 5758
 SHA256 ca1ba13ec634bb7d80e5bfb8fdbdeb0172b0dc1e7cd72b7c7f2dc69c91d42a5f tomcat-6.0.10-r5.ebuild 5758
-MISC ChangeLog 44573 RMD160 05261552884b35d629aacf742faa7d4091eba2c9 SHA1 d54491e741204b32f14bf12fe89d7f94458619e3 SHA256 ad2de33ec67fecb26dcf185dc6ebdbd3993103ed6a3404d737d907d928e99cc4
-MD5 42c44f33d5fe4b019c9358968864c2cf ChangeLog 44573
-RMD160 05261552884b35d629aacf742faa7d4091eba2c9 ChangeLog 44573
-SHA256 ad2de33ec67fecb26dcf185dc6ebdbd3993103ed6a3404d737d907d928e99cc4 ChangeLog 44573
+MISC ChangeLog 44714 RMD160 920dca908d83c45b812de525f6971f021d2732f5 SHA1 a43cda5ab760d59fbaf85ce553ceb032cdafe10e SHA256 65740a0773d060ea28e15cd42362a2f5e2f8774e4fd1ac1d50fb36c2e9b7b547
+MD5 056840b0955df7f180647a330654ead7 ChangeLog 44714
+RMD160 920dca908d83c45b812de525f6971f021d2732f5 ChangeLog 44714
+SHA256 65740a0773d060ea28e15cd42362a2f5e2f8774e4fd1ac1d50fb36c2e9b7b547 ChangeLog 44714
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
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