From 791cc2ba47eed9ebf5844270fab49055be4afd99 Mon Sep 17 00:00:00 2001
From: Christian Faulhammer <fauli@gentoo.org>
Date: Tue, 3 Apr 2007 07:40:57 +0000
Subject: [PATCH] x86 stable, security bug 173122 Package-Manager:
 portage-2.1.2.2

---
 www-servers/tomcat/ChangeLog               |  6 ++++-
 www-servers/tomcat/Manifest                | 26 +++++++++++++++-------
 www-servers/tomcat/tomcat-5.5.23-r1.ebuild |  4 ++--
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 0da8cad6112d..dfd1e17e21c5 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.130 2007/04/02 16:24:29 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.131 2007/04/03 07:40:57 opfer Exp $
+
+  03 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
+  tomcat-5.5.23-r1.ebuild:
+  x86 stable, security bug 173122
 
 *tomcat-5.5.23-r1 (02 Apr 2007)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0497f3d82e83..df84e66e0c94 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.5.20/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e
 MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5.20/catalinabuild-xml.patch 1149
 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5.20/catalinabuild-xml.patch 1149
@@ -93,18 +96,18 @@ EBUILD tomcat-5.5.20-r8.ebuild 10244 RMD160 d99fee7973616b0b7f165ccdb1d2126a7fee
 MD5 b35390dd66d703bef0d76905378f3f8c tomcat-5.5.20-r8.ebuild 10244
 RMD160 d99fee7973616b0b7f165ccdb1d2126a7fee031c tomcat-5.5.20-r8.ebuild 10244
 SHA256 215bb2f0f8ef97b47f2003c5c79862b54243a0decb52d965a51af45590f93ec9 tomcat-5.5.20-r8.ebuild 10244
-EBUILD tomcat-5.5.23-r1.ebuild 10586 RMD160 68b348b5cd512de49a277c39e0ade0c8f877161c SHA1 d7a08e474d8f12d35c5eae11450eb3bc19cc89b2 SHA256 d4618860e9fd2da7c501d021fa1c68c6d4d945c9d2aeaf4dfc27dcf2e0eda625
-MD5 218569e768631547f9c812c9a0ebb7f6 tomcat-5.5.23-r1.ebuild 10586
-RMD160 68b348b5cd512de49a277c39e0ade0c8f877161c tomcat-5.5.23-r1.ebuild 10586
-SHA256 d4618860e9fd2da7c501d021fa1c68c6d4d945c9d2aeaf4dfc27dcf2e0eda625 tomcat-5.5.23-r1.ebuild 10586
+EBUILD tomcat-5.5.23-r1.ebuild 10585 RMD160 0dc6190f13c0c89a27318585d226cee81d73ea91 SHA1 0ba6b9426ffd763bfd5c5f8b24048276eda4e147 SHA256 1684f06b9e320de04a619e585db8d5c645f152a1621a965f2f829f2f12ff3978
+MD5 6630f8096fbd46a5388b857896be587f tomcat-5.5.23-r1.ebuild 10585
+RMD160 0dc6190f13c0c89a27318585d226cee81d73ea91 tomcat-5.5.23-r1.ebuild 10585
+SHA256 1684f06b9e320de04a619e585db8d5c645f152a1621a965f2f829f2f12ff3978 tomcat-5.5.23-r1.ebuild 10585
 EBUILD tomcat-6.0.10-r1.ebuild 5020 RMD160 47410070eee746c2e9d35934acad4f1d826a56d2 SHA1 3dc49b928e184a0f7a09f0169c61d6beb836840a SHA256 9adb6e238ea27e8febeaaf0279c721f287bc0118dea14d62cdf0c57caca4dfe2
 MD5 d10ccf2250d5978776b327eb2114abc0 tomcat-6.0.10-r1.ebuild 5020
 RMD160 47410070eee746c2e9d35934acad4f1d826a56d2 tomcat-6.0.10-r1.ebuild 5020
 SHA256 9adb6e238ea27e8febeaaf0279c721f287bc0118dea14d62cdf0c57caca4dfe2 tomcat-6.0.10-r1.ebuild 5020
-MISC ChangeLog 42154 RMD160 456ff023ee01fc3bd7ad131166caee537de8f070 SHA1 f6eefe0223a21621da61f089b9f53723d6483f84 SHA256 20d7f5b615b59c188d26c17142559200b53eee1d372219814216c6766d8be650
-MD5 d8e8d40805bd7e8c4d1316d6f2691fe5 ChangeLog 42154
-RMD160 456ff023ee01fc3bd7ad131166caee537de8f070 ChangeLog 42154
-SHA256 20d7f5b615b59c188d26c17142559200b53eee1d372219814216c6766d8be650 ChangeLog 42154
+MISC ChangeLog 42271 RMD160 756de18b1ef1359a278d78456408049622f7f254 SHA1 4fed035264cb553d700ba86118b0c751e288b8b4 SHA256 f9b7e5490681d08ed21aba58db714d65940f177d2e9cb881480fe4a73b8cf6b3
+MD5 d911f2be0c33cddc945925bd52d03fe2 ChangeLog 42271
+RMD160 756de18b1ef1359a278d78456408049622f7f254 ChangeLog 42271
+SHA256 f9b7e5490681d08ed21aba58db714d65940f177d2e9cb881480fe4a73b8cf6b3 ChangeLog 42271
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -118,3 +121,10 @@ SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/di
 MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r1 277
 RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r1 277
 SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r1 277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGEgUQNQqtfCuFneMRAuGSAJ0WSK3rV0JaVGS5DTmduyHjJyjMVgCgmMzT
+x2gO4vvYiGeFx3/2bSid39k=
+=Fsxe
+-----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-5.5.23-r1.ebuild b/www-servers/tomcat/tomcat-5.5.23-r1.ebuild
index 6d1f2222eaeb..505210a90a8e 100644
--- a/www-servers/tomcat/tomcat-5.5.23-r1.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.23-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-5.5.23-r1.ebuild,v 1.1 2007/04/02 16:24:29 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r1.ebuild,v 1.2 2007/04/03 07:40:57 opfer Exp $
 
 #WANT_ANT_TASKS="ant-trax"
 
@@ -12,7 +12,7 @@ MY_P="apache-${P}-src"
 SLOT="5.5"
 SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 -ppc -ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 -ppc -ppc64 x86 ~x86-fbsd"
 LICENSE="Apache-2.0"
 
 IUSE="admin java5 doc examples source test"
-- 
2.26.2