diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2010-07-25 17:31:33 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2010-07-25 17:31:33 +0000 |
| commit | accde0089a89d78d7f36d13cb28b4fdba39744ed (patch) | |
| tree | 93dc4024f18cc8c46207e8537829d2ce1a9df4cc /www-servers | |
| parent | fix permission for /proc/av7110_ir , bug #328719 (diff) | |
| download | historical-accde0089a89d78d7f36d13cb28b4fdba39744ed.tar.gz historical-accde0089a89d78d7f36d13cb28b4fdba39744ed.tar.bz2 historical-accde0089a89d78d7f36d13cb28b4fdba39744ed.zip | |
Block tomcat-native older than 1.1.20. Fixes bug #316545.
Package-Manager: portage-2.2_rc67/cvs/Linux i686
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 5 | ||||
| -rw-r--r-- | www-servers/tomcat/Manifest | 12 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-6.0.28.ebuild | 6 |
3 files changed, 14 insertions, 9 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index d1895e243d45..c1123fa8a88c 100644 --- 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.231 2010/07/10 18:53:47 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.232 2010/07/25 17:31:33 betelgeuse Exp $ + + 25 Jul 2010; Petteri Räty <betelgeuse@gentoo.org> tomcat-6.0.28.ebuild: + Block tomcat-native older than 1.1.20. Fixes bug #316545. *tomcat-6.0.28 (10 Jul 2010) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index d8803e3e0371..5b57017a6b23 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -20,13 +20,13 @@ DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f146 EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01 EBUILD tomcat-6.0.26-r1.ebuild 6870 RMD160 159eb416c53876cc18d72937f901edcd2e6e8c92 SHA1 618e876b15ee3f55c6e79d474f41a603cf2f9ec8 SHA256 c9bc6777a9d5a0112c1a0e2c77b5e8f8316bfff2043af7fc3e5880102428c400 EBUILD tomcat-6.0.26.ebuild 6861 RMD160 38045bfd3921e366823b00061ee327fb17d21bbf SHA1 272759bcbf4744ec404e6c941c2aeac3852c58e8 SHA256 1d8198ae22485ffb11a87690f969f272c6446c3a83b4137bc14b7f1f8a62cba2 -EBUILD tomcat-6.0.28.ebuild 6871 RMD160 4fc6d287533b7b3cfef6cc92f0ae957a757df406 SHA1 e16a7c9fb8e279200234af46b35033ee781038de SHA256 23f103747f823ad68584ea6384307e31fb77c2e2e260505cb6ed70aa9d52ff2a -MISC ChangeLog 59746 RMD160 11e7e3d9523cdc44b0e6ca1b32db0295813ec88f SHA1 5f516c1ec6552f26d32cef2ab7366436bce638f0 SHA256 14eb41ef837a2ab43e0b003924d19d808177ac8b60bdc6f4f15544a051177770 +EBUILD tomcat-6.0.28.ebuild 6906 RMD160 8c8796c768eebdf7e875724be616ef2a8c9118f3 SHA1 cacc13108cb6e91de6877947d14415e9e5e78e48 SHA256 026f1710b56bca990a43512b00d187821981a0064510564000647a3101d393c6 +MISC ChangeLog 59882 RMD160 9cca68d4bbb7cd783f828dae8c32af7579a6698e SHA1 a6436a11427f852cd4092a5472e2e6e6984e6433 SHA256 96ad778620ed17167e242135ae45198b6accc207e16c0b4969763c19d6a3db4f MISC metadata.xml 658 RMD160 db94c7bc6ba622acfe88f970aa7d2e6fa1718a2a SHA1 aa25178fefb68df9dee7d8fc0d925a2fbbb655dd SHA256 5ddc2743ca9e3ec0bef7983248a9c8eda9238425288efb3acdecc8a828714bd8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkw4wiAACgkQcxLzpIGCsLS6OACglEha04l0GGasqkY8kWIIVF+s -yAYAn2UFAk9us7IK+pYXz3xZok/k8Pf+ -=KadX +iEYEARECAAYFAkxMdUoACgkQcxLzpIGCsLQhNQCfdDWcWd/bupvx2r2uYkKHi9EA +Ap0AoJXUvTeKRoZJ7KzcjjDyatZBh1El +=KlUo -----END PGP SIGNATURE----- diff --git a/www-servers/tomcat/tomcat-6.0.28.ebuild b/www-servers/tomcat/tomcat-6.0.28.ebuild index f83582951a5d..d3a8b4f99ec2 100644 --- a/www-servers/tomcat/tomcat-6.0.28.ebuild +++ b/www-servers/tomcat/tomcat-6.0.28.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.28.ebuild,v 1.1 2010/07/10 18:53:47 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.28.ebuild,v 1.2 2010/07/25 17:31:33 betelgeuse Exp $ EAPI=2 JAVA_PKG_IUSE="doc examples source test" @@ -27,7 +27,9 @@ COMMON_DEPEND="dev-java/eclipse-ecj:3.3 ~dev-java/tomcat-servlet-api-${PV} examples? ( dev-java/jakarta-jstl )" -RDEPEND=">=virtual/jre-1.5 +RDEPEND=" + !<dev-java/tomcat-native-1.1.20 + >=virtual/jre-1.5 >=dev-java/commons-daemon-1.0.1 dev-java/ant-core ${COMMON_DEPEND}" |