diff options
| author |   William Thomson <wltjr@gentoo.org> | 2007-05-20 21:42:12 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2007-05-20 21:42:12 +0000 |
| commit | 1e6807025997505d97c31dfc20400cda0acd2207 (patch) | |
| tree | ab8baedde66b48f2d4469aa96e08904dd24ed940 /www-servers | |
| parent | Stable for HPPA (bug #175465). (diff) | |
| download | gentoo-2-1e6807025997505d97c31dfc20400cda0acd2207.tar.gz gentoo-2-1e6807025997505d97c31dfc20400cda0acd2207.tar.bz2 gentoo-2-1e6807025997505d97c31dfc20400cda0acd2207.zip | |
Added code to init script to check VM version, fix for bug #179119
(Portage version: 2.1.2.7)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 9 | ||||
| -rwxr-xr-x | www-servers/tomcat/files/5.5/tomcat.init.2 | 9 | ||||
| -rw-r--r-- | www-servers/tomcat/files/digest-tomcat-5.5.23-r4 (renamed from www-servers/tomcat/files/digest-tomcat-5.5.23-r3) | 0 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.23-r4.ebuild (renamed from www-servers/tomcat/tomcat-5.5.23-r3.ebuild) | 2 |
4 files changed, 17 insertions, 3 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 6d53a1bc6804..04fefd8c6084 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,13 @@ # 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.141 2007/05/17 21:15:05 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.142 2007/05/20 21:42:12 wltjr Exp $ + +*tomcat-5.5.23-r4 (20 May 2007) + + 20 May 2007; William L. Thomson Jr. <wltjr@gentoo.org> + files/5.5/tomcat.init.2, -tomcat-5.5.23-r3.ebuild, + +tomcat-5.5.23-r4.ebuild: + Added code to init script to check VM version, fix for bug #179119 *tomcat-6.0.13-r1 (17 May 2007) *tomcat-5.5.23-r3 (17 May 2007) diff --git a/www-servers/tomcat/files/5.5/tomcat.init.2 b/www-servers/tomcat/files/5.5/tomcat.init.2 index 274138eeb9fe..33b55921d8f8 100755 --- a/www-servers/tomcat/files/5.5/tomcat.init.2 +++ b/www-servers/tomcat/files/5.5/tomcat.init.2 @@ -1,9 +1,16 @@ #!/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.3 2007/05/17 21:15:05 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init.2,v 1.4 2007/05/20 21:42:12 wltjr Exp $ init_env_vars() { + if [ "$(gjl -p tomcat-5.5 --get-vm)" ] ; then + error "Tomcat has been compiled with java5 USE flag set." + error "Tomcat now requires a VM >=1.5 to run." + error "Please check your VM version, and restart Tomcat." + eend 1 + fi + # Set some sane defaults if [ -z "${CATALINA_TMPDIR}" ] ; then CATALINA_TMPDIR="${CATALINA_BASE}"/temp diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.23-r3 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r4 index e0e59f68fbb2..e0e59f68fbb2 100644 --- a/www-servers/tomcat/files/digest-tomcat-5.5.23-r3 +++ b/www-servers/tomcat/files/digest-tomcat-5.5.23-r4 diff --git a/www-servers/tomcat/tomcat-5.5.23-r3.ebuild b/www-servers/tomcat/tomcat-5.5.23-r4.ebuild index e2a44b4adad7..9a7b0cce2279 100644 --- a/www-servers/tomcat/tomcat-5.5.23-r3.ebuild +++ b/www-servers/tomcat/tomcat-5.5.23-r4.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-r3.ebuild,v 1.1 2007/05/17 21:15:05 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r4.ebuild,v 1.1 2007/05/20 21:42:12 wltjr Exp $ #WANT_ANT_TASKS="ant-trax" |