stable x86, security bug 303719

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 06c44a3b28b9d878c265cfae6832bfe42d1cd285..e79ada4bbcffba6477302be882f7974c302be304 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.226 2010/03/26 15:41:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.227 2010/03/29 13:58:42 fauli Exp $
+
+  29 Mar 2010; Christian Faulhammer <fauli@gentoo.org> tomcat-6.0.26.ebuild:
+  stable x86, security bug 303719
 
   26 Mar 2010; Brent Baude <ranger@gentoo.org> tomcat-6.0.26.ebuild:
   Marking tomcat-6.0.26 ppc for bug 303719

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index e90e551e7d3464d348bcbb25cc2230fe8fa6fc40..c41609876f115bd3e496ebd6dc66c989988ccb00 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.5/26-main_tomcat_catalina_jasper_build_xml.patch 16573 RMD160 53f1deaa88a39459a584cf14c761cb411d68f2e6 SHA1 69b3ca39f9dbabe12c56865d47866c06dcb7c2e3 SHA256 99a2c1bb164d97407525305512a85e6139531d81a47aa2c25f5c2cfe50aee1f6
 AUX 5.5/5.5.27-dynamic-JSSE13Factory.patch 1853 RMD160 31d20202a3be06c156b0c13f0afb3b394b8ecf02 SHA1 d7e7640dd4f7b7b92b21ac51d1b508fe56691a81 SHA256 f7db0e692088ec25a4731a521c1da4a0075e747f68690235fde3ca93c6f2e19d
 AUX 5.5/catalina.policy 10897 RMD160 d6accc56803b132d0e82e163cc583464c38248ef SHA1 585f80e24cad7e5927f8c2c6ad03f668eb904cc1 SHA256 8188db94772eb00d44b28cb9b40e9ccf30803acf576c0af1be5844ebd35d763c
@@ -16,6 +19,13 @@ DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3
 EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01
 EBUILD tomcat-6.0.20-r1.ebuild 6899 RMD160 14a5a13cdb09935cc9ba353f5cf7eb761f655a1f SHA1 5fd5dbc255a61b5f19a0c4eae71e719a478010da SHA256 33046ec344113795237a5bdccf233e6cf4f8af0c887ff516ec74a58e5fb5d113
 EBUILD tomcat-6.0.20.ebuild 6790 RMD160 19b0a9b7ce9b0764ccf2e3f0355a11744bb6434b SHA1 8a2b1bd20a099b97bfb50d7658ed5db99a0482b8 SHA256 b8868770240026c71773b8e3d63469ee6a71fe621e1d0751e867f5c513d4b5f2
-EBUILD tomcat-6.0.26.ebuild 6892 RMD160 08c68ab8db9b1ad4d19f2df7c45adeab879bde0b SHA1 9f115838873cf20f77459a9667c9bab05f459d3c SHA256 0291e5cfae5eb9047de599ded1039aa5e016da92fccadc4045300e4af735a25f
-MISC ChangeLog 58656 RMD160 07db2a5acf4ecdff807738510d00857c8ff859df SHA1 90b9ce352118ee446e241cfc62333b36dad594c3 SHA256 084fbdab819123469522d99c61dec0406a7a0448810d599f9e64b8b4b0f79950
+EBUILD tomcat-6.0.26.ebuild 6890 RMD160 e73aa0f77debd3e387b712a6ae9d4b68b8d63c41 SHA1 54be27704b7c0bcb8e3a2eab99cd005e0118d877 SHA256 8a982afde60e558b15b686951dde359db5d86f45e1ea03d81d2212fea8ef2dbb
+MISC ChangeLog 58767 RMD160 a7a237c01ba09901ce304f2c78b6bd49c7a86317 SHA1 351c2964841ce2f44bea5d8a0b10d4226a7b0d82 SHA256 7ea34d4312eaf4cc88ef7b0a8523d273525341f5debc87c82c5150e178129e47
 MISC metadata.xml 658 RMD160 db94c7bc6ba622acfe88f970aa7d2e6fa1718a2a SHA1 aa25178fefb68df9dee7d8fc0d925a2fbbb655dd SHA256 5ddc2743ca9e3ec0bef7983248a9c8eda9238425288efb3acdecc8a828714bd8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuwshgACgkQNQqtfCuFneNuFwCdHKSjd/kLcnCRlr7mi95q7p6k
+/ygAn2BiNhR43cal9ZBwwi8+w69mFjMj
+=a9lw
+-----END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-6.0.26.ebuild b/www-servers/tomcat/tomcat-6.0.26.ebuild
index 5dda5ea7df6e6b974ed1767e7e48b6cc0c1f693d..887891a1539c6f5698f2fbf9f84d33dbdbd40cbb 100644 (file)
--- a/www-servers/tomcat/tomcat-6.0.26.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.3 2010/03/26 15:41:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.4 2010/03/29 13:58:42 fauli Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"
@@ -14,7 +14,7 @@ MY_P="apache-${P}-src"
 SLOT="6"
 SRC_URI="mirror://apache/${PN}/${PN}-6/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=""