# ChangeLog for www-servers/tomcat
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.120 2007/02/13 19:24:57 wltjr Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.121 2007/02/13 22:39:09 wltjr Exp $
-*tomcat-6.0.10_pre (13 Feb 2007)
+*tomcat-5.5.22_pre (13 Feb 2007)
13 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- +tomcat-6.0.10_pre.ebuild:
- Bumped package to latest development release
-
- 09 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.5.20-r10.ebuild, tomcat-6.0.9_beta.ebuild:
- Updated split ant deps
-
-*tomcat-6.0.9_beta (08 Feb 2007)
-
- 08 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- -tomcat-6.0.7_beta-r6.ebuild, -tomcat-6.0.8_alpha-r3.ebuild,
- -tomcat-6.0.9_alpha.ebuild, +tomcat-6.0.9_beta.ebuild:
- Bump to latest beta, removed older versions
-
- 04 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.0.28-r14.ebuild, tomcat-5.5.20-r8.ebuild,
- tomcat-5.5.20-r10.ebuild, tomcat-6.0.7_beta-r6.ebuild,
- tomcat-6.0.8_alpha-r3.ebuild, tomcat-6.0.9_alpha.ebuild:
- Updated package description
-
- 03 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- -files/5.0.27/gentoo.diff, -files/5.0.27/tomcat.conf,
- -files/5.0.27/jikes.diff, -files/5.0.27/tomcat.env,
- -files/5.0.27/tomcat.init, -tomcat-5.0.27-r6.ebuild,
- -tomcat-5.5.20-r7.ebuild:
- Removed old versions of package
-
- 03 Feb 2007; Steve Dibb <beandog@gentoo.org> tomcat-5.5.20-r8.ebuild:
- amd64 stable, bug 163982
-
-*tomcat-6.0.9_alpha (02 Feb 2007)
-
- 02 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- +tomcat-6.0.9_alpha.ebuild:
- -m Bumped package to latest alpha
-
- 31 Jan 2007; Vlastimil Babka <caster@gentoo.org>
- tomcat-6.0.7_beta-r6.ebuild, tomcat-6.0.8_alpha-r3.ebuild:
- Fix tomcat-servlet-api deps for bug #164557.
-
- 30 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
- tomcat-5.5.20-r8.ebuild:
- stable x86; bug #163982
-
-*tomcat-6.0.8_alpha-r3 (28 Jan 2007)
-*tomcat-6.0.7_beta-r6 (28 Jan 2007)
-
- 28 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- files/6/build-xml.patch, -tomcat-6.0.7_beta-r5.ebuild,
- +tomcat-6.0.7_beta-r6.ebuild, -tomcat-6.0.8_alpha-r2.ebuild,
- +tomcat-6.0.8_alpha-r3.ebuild:
- Fixed issue with examples not being compiled and/or complete. Thanks to
- nostromo who provided some help there. Updated patch for examples
- compilation and to make docs compilation depend on doc USE flag. A few other
- syntax and policy corrections
-
-*tomcat-6.0.8_alpha-r2 (28 Jan 2007)
-*tomcat-6.0.7_beta-r5 (28 Jan 2007)
-*tomcat-5.5.20-r10 (28 Jan 2007)
-
- 28 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- files/5.5.20/tomcat.init, files/6/tomcat.init, -tomcat-5.5.20-r9.ebuild,
- +tomcat-5.5.20-r10.ebuild, -tomcat-6.0.7_beta-r4.ebuild,
- +tomcat-6.0.7_beta-r5.ebuild, -tomcat-6.0.8_alpha-r1.ebuild,
- +tomcat-6.0.8_alpha-r2.ebuild:
- Updated init script to capture std out per bug# 162379
-
-*tomcat-5.5.20-r9 (27 Jan 2007)
-
- 27 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- +files/5.5.20/jsr154_examples_build-xml.patch,
- +files/5.5.20/tomcat_build-xml.patch,
- +files/5.5.20/jsr152_examples_build-xml.patch, +tomcat-5.5.20-r9.ebuild,
- tomcat-6.0.7_beta-r4.ebuild, tomcat-6.0.8_alpha-r1.ebuild:
- Finally stopped building jsp/servlet-api.jars despite not using them after
- being built. Updated compilation of examples to use system
- jsp/servlet-api.jars. Switched from soon to be deprecated servletapi to
- tomcat-servlet-api. Dropped dep on ant in 6.0.x in order to use new split
- ant.
-
-*tomcat-6.0.8_alpha-r1 (26 Jan 2007)
-*tomcat-6.0.7_beta-r4 (26 Jan 2007)
-
- 26 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- files/6/build-xml.patch, -tomcat-6.0.7_beta-r3.ebuild,
- +tomcat-6.0.7_beta-r4.ebuild, -tomcat-6.0.8_alpha.ebuild,
- +tomcat-6.0.8_alpha-r1.ebuild:
- Updating 6.0.x to dep on tomcat-servlet-api. Modified patch to no longer
- build or install servletapi from tomcat package. Dropped force of ecj
- compiler for now, added commented out code to deal with oom/heap issues if
- they pop up again. Synced ebuilds and backported ~ppc keyword.
-
- 26 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-6.0.8_alpha.ebuild:
- Added ~ppc per user request
-
- 26 Jan 2007; Vlastimil Babka <caster@gentoo.org> tomcat-5.5.20-r7.ebuild,
- tomcat-5.5.20-r8.ebuild:
- Make compatible with split-ant - was breaking with admin flag because there
- was a different servletapi slot on ant's classpath without specifying only
- the needed tasks. Older ant versions are not affected by this change.
-
-*tomcat-6.0.8_alpha (20 Jan 2007)
-*tomcat-6.0.7_beta-r3 (20 Jan 2007)
-
- 20 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- -tomcat-6.0.7_beta-r2.ebuild, +tomcat-6.0.7_beta-r3.ebuild,
- +tomcat-6.0.8_alpha.ebuild:
- Bumped 6 to latest alpha, and dropped jni use flag. Due to it pulling in dep
- when USE flag is set, but dep still being installed when USE flag is unset.
-
-*tomcat-6.0.7_beta-r2 (10 Jan 2007)
-*tomcat-5.5.20-r8 (10 Jan 2007)
-
- 10 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- files/5.5.20/tomcat.init, files/6/tomcat.init, -tomcat-5.5.20-r6.ebuild,
- tomcat-5.5.20-r7.ebuild, +tomcat-5.5.20-r8.ebuild,
- -tomcat-6.0.7_beta-r1.ebuild, +tomcat-6.0.7_beta-r2.ebuild:
- Updated 5.5.20 and 6.0.7 init scripts, again :( previous version was borked.
- Trying to capture std out, which seems to be going no where atm.
-
-*tomcat-6.0.7_beta-r1 (10 Jan 2007)
-*tomcat-5.5.20-r7 (10 Jan 2007)
-
- 10 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- files/5.5.20/tomcat.init, files/6/tomcat.init, -tomcat-5.5.20-r5.ebuild,
- tomcat-5.5.20-r6.ebuild, +tomcat-5.5.20-r7.ebuild,
- -tomcat-6.0.7_beta.ebuild, +tomcat-6.0.7_beta-r1.ebuild:
- Updated 5.5.20 and 6.0.7 init scripts
-
-*tomcat-6.0.7_beta (10 Jan 2007)
-
- 10 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- -tomcat-6.0.7_alpha-r3.ebuild, +tomcat-6.0.7_beta.ebuild:
- Bumped 6.0.7 to beta from alpha
-
- 09 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
- tomcat-6.0.7_alpha-r3.ebuild:
- Add ~x86-fbsd keyword.
-
- 09 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.0.27-r6.ebuild, tomcat-5.0.28-r14.ebuild,
- tomcat-5.5.20-r5.ebuild, tomcat-5.5.20-r6.ebuild,
- tomcat-6.0.7_alpha-r3.ebuild:
- Updated einfo -> elog
-
-*tomcat-6.0.7_alpha-r3 (05 Jan 2007)
-
- 05 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- -tomcat-6.0.7_alpha-r2.ebuild, +tomcat-6.0.7_alpha-r3.ebuild:
- Change functionality of jni use flag from compiling/installing to dep on a
- package that does both, tomcat-native :)
-
-*tomcat-6.0.7_alpha-r2 (01 Jan 2007)
-
- 01 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
- -tomcat-6.0.7_alpha-r1.ebuild, +tomcat-6.0.7_alpha-r2.ebuild:
- Got the native stuff compilling and installed. Not sure about runtime. I
- can't load it. Basically jni USE flag works now :)
-
-*tomcat-6.0.7_alpha-r1 (31 Dec 2006)
-
- 31 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- -tomcat-6.0.7_alpha.ebuild, +tomcat-6.0.7_alpha-r1.ebuild:
- Address bin/*.sh stuff not having execute bit set. Possibly upstream
- bug/problem.
-
-*tomcat-5.5.20-r6 (30 Dec 2006)
-
- 30 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- -tomcat-5.5.20-r4.ebuild, tomcat-5.5.20-r5.ebuild,
- +tomcat-5.5.20-r6.ebuild:
- Modified 5.5.20 ebuilds to respect symlink and not copy the jars per bug
- #159169.
-
- 27 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.5.20-r5.ebuild, tomcat-6.0.7_alpha.ebuild:
- Updated virtuals for 1.6
-
- 27 Dec 2006; Timothy Redaelli <drizzt@gentoo.org> tomcat-5.5.20-r5.ebuild:
- Readded ~x86-fbsd keyword.
-
-*tomcat-6.0.7_alpha (27 Dec 2006)
-
- 27 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.5.20-r4.ebuild, tomcat-5.5.20-r5.ebuild, -tomcat-6.0.6.ebuild,
- +tomcat-6.0.7_alpha.ebuild:
- Bumped 6.0 to latest alpha. Fixed home page link on 5.5 ebuilds. Dropped
- ~x86-fbsd keyword from 5.5.20-r5 due to dev-java/commons-httpclient-2.0 not
- being keyworded for that arch.
-
- 26 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
- tomcat-5.5.20-r4.ebuild, tomcat-5.5.20-r5.ebuild:
- Changed dev-java/commons-httpclient dependency to only match one slot.
-
- 22 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
- tomcat-5.5.20-r5.ebuild:
- Depend on >=dev-java/java-config-2.0.31 and let it handle the java5 use flag
- properly.
-
- 22 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.5.20-r4.ebuild, tomcat-5.5.20-r5.ebuild:
- Added ~amd64 keyword to 5.5.20-r5. Dropped * from 1.5 virtuals
-
-*tomcat-6.0.6 (18 Dec 2006)
-
- 18 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- -tomcat-6.0.4.ebuild, +tomcat-6.0.6.ebuild:
- Bumped Tomcat 6.x to latest alpha
-
- 13 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.0.28-r14.ebuild, tomcat-5.5.20-r4.ebuild,
- tomcat-5.5.20-r5.ebuild:
- Removed unused TOMCAT_HOME variable from 5.0.28 and 5.5.x ebuilds. Also
- corrected a typo in 5.5.x, all per comments on bug #157956
-
-*tomcat-5.5.20-r5 (11 Dec 2006)
-*tomcat-5.5.20-r4 (11 Dec 2006)
-
- 11 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- -tomcat-5.5.20-r2.ebuild, -tomcat-5.5.20-r3.ebuild,
- +tomcat-5.5.20-r4.ebuild, +tomcat-5.5.20-r5.ebuild:
- Fixed issue with newer commons-fileupload depending on commons-io, and
- commons-io was not linked into Tomcat before breaking manager app war
- upload/deployment. Also fixed location where commons-fileupload is linked.
- But doing that pre-compile and might need to post install, since commons-io
- is being linked into server/lib as well as proper location.
-
- 09 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
- tomcat-5.5.20-r3.ebuild:
- Add ~x86-fbsd keyword.
-
-*tomcat-5.5.20-r3 (08 Dec 2006)
-
- 08 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
- +tomcat-5.5.20-r3.ebuild:
- Using new splitted mx4j-core to reduce the dependencies when the java5 use
- flag is off. Dropped amd64 keywords because mx4j-core is not keyworded yet.
-
-*tomcat-6.0.4 (08 Dec 2006)
-
- 08 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- -files/5.5.17/catalinabuild-xml.patch,
- -files/5.5.17/jsr152build-xml-examples.patch,
- -files/5.5.17/mainbuild-xml.patch, -files/5.5.17/tomcatbuild-xml.patch,
- -files/5.5.17/jasperbuild-xml.patch,
- -files/5.5.17/jsr154build-xml-examples.patch, -files/5.5.17/tomcat.conf,
- -files/5.5.17/tomcat.env, -files/5.5.17/tomcat.init,
- -files/5.5.17/tomcatbuild-xml-docs.patch,
- -files/5.5.17/tomcatbuild-xml-examples.patch,
- -files/6.0.2/build-xml.patch, -files/6.0.2/tomcat.conf,
- -files/6.0.2/tomcat.init, +files/6/build-xml.patch, +files/6/tomcat.conf,
- +files/6/tomcat.init, -tomcat-6.0.2.ebuild, +tomcat-6.0.4.ebuild:
- Rev bumped 6.0.x ebuild, consolidated files for the slot instead of per
- version. Removed obsolete 5.5.17 files.
-
- 07 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.5.20-r2.ebuild:
- Removed false dep on jaxen from 5.5.20.
-
- 06 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
- tomcat-5.5.20-r2.ebuild:
- It's java-pkg_filter-compiler not java-pkg_filter.
-
- 05 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.0.28-r14.ebuild, tomcat-5.5.20-r2.ebuild, tomcat-6.0.2.ebuild:
- Adding -ppc -pp64 to all 5.5 and 6.0 ebuilds due to missing sun.ssl.* stuff
- in IBM jdks. Added code to filter ecj on 5.5 ebuild. Cleaned up 6.0.2 ebuild
- a bit.
-
- 30 Nov 2006; Vlastimil Babka <caster@gentoo.org> tomcat-5.0.28-r14.ebuild:
- Update xerces dep for upcoming 2.6 slotmove.
-
- 28 Nov 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.0.27-r6.ebuild, -tomcat-5.5.17-r7.ebuild:
- Removed older ebuilds, dropped ~amd64 and x86 keywords from 5.0.27. Since
- that version is only being kept atm for ppc/ppc64. Despite it being binary,
- having bundled deps, and lots of bugs.
-
- 28 Nov 2006; Joshua Nichols <nichoj@gentoo.org> tomcat-5.5.20-r2.ebuild:
- Stabilized on amd64 (see bug #155622).
-
- 23 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
- tomcat-5.5.20-r2.ebuild:
- stable x86, bug #155622
-
-*tomcat-6.0.2 (20 Nov 2006)
-
- 20 Nov 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- +files/6.0.2/build-xml.patch, +files/6.0.2/tomcat.conf,
- +files/6.0.2/tomcat.init, +tomcat-6.0.2.ebuild:
- Initial ebuild for Tomcat 6.0.2 alpha, despite sources/ebuild not named as
- such. Compiles, runs and should be some what useable. Although will be
- package masked, since it's alpha sources. jni USE flag should not be used,
- still working on that part, help there appreciated
-
- 04 Nov 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- -tomcat-5.5.20.ebuild, -tomcat-5.5.20-r1.ebuild:
- Ebuild cleanup, removed older revisions
-
- 18 Oct 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.5.20-r2.ebuild:
- Fixed problem with ant calling targets that don't exist, like javadoc.
-
-*tomcat-5.5.20-r2 (18 Oct 2006)
-
- 18 Oct 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- -files/5.5.20/tomcat.env, files/5.5.20/tomcatbuild-xml.patch,
- -files/5.5.20/tomcatbuild-xml-docs.patch,
- -files/5.5.20/tomcatbuild-xml-examples.patch, +tomcat-5.5.20-r2.ebuild:
- Created new patch re-writing some existing and adding a few new, ant targets
- for admin/example webapps. Should resolve bug #150715
-
- 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> tomcat-5.0.28-r14.ebuild:
- Added call to java-pkg_pkg_setup, for bug #142708
-
- 05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
- tomcat-5.0.27-r6.ebuild:
- Dropping sparc keywords, see #96229
-
- 28 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> Manifest:
- Redigested, ew
-
-*tomcat-5.5.20 (28 Sep 2006)
-
- 28 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- +files/5.5.20/catalinabuild-xml.patch,
- +files/5.5.20/jasperbuild-xml.patch,
- +files/5.5.20/jsr152build-xml-examples.patch,
- +files/5.5.20/jsr154build-xml-examples.patch,
- +files/5.5.20/mainbuild-xml.patch, +files/5.5.20/tomcat.conf,
- +files/5.5.20/tomcat.env, +files/5.5.20/tomcat.init,
- +files/5.5.20/tomcatbuild-xml.patch,
- +files/5.5.20/tomcatbuild-xml-docs.patch,
- +files/5.5.20/tomcatbuild-xml-examples.patch, +tomcat-5.5.20.ebuild:
- New 0 day ebuild for Tomcat 5.5.20. Introduce admin use flag that will
- control the struts dep and if the admin webapp will be present.
-
- 27 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.5.17-r7.ebuild:
- Corrected invalid atom =dev-java/sun-jaf per bug # 149317. Also corrected
- the package xml-apis.jar comes from. Was changed to xml-commons-external-1.3
- but was mistakenly changed back when updating the ebuild for java5 use flag
- and 1.5 jdks
-
- 26 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.5.17-r7.ebuild:
- Changed sun-jaf-1 to sun-jaf since it's slotted 0 not 1
-
- 26 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- tomcat-5.5.17-r7.ebuild:
- Forgot to apply sun-javamail-bin -> sun-javamail and gnu-jaf -> sun-jaf
- changes with jars passed to ant
-
-*tomcat-5.5.17-r7 (26 Sep 2006)
-
- 26 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- files/5.5.17/tomcat.init, +tomcat-5.5.17-r7.ebuild:
- Fixed error recently created in Tomcat 5.5.17 init script with omission of
- /conf after ${CATALINA_BASE} for conf files. ooops! Also switched deps from
- sun-javamail-bin to sun-javamail, and from gnu-jaf to sun-jaf
-
- 23 Sep 2006; Bryan Østergaard <kloeri@gentoo.org>
- tomcat-5.0.27-r6.ebuild:
- Remove ~alpha keyword.
-
-*tomcat-5.0.28-r14 (20 Sep 2006)
-
- 20 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- files/5.0.28/tomcat.init, -tomcat-5.0.28-r12.ebuild,
- -tomcat-5.0.28-r13.ebuild, +tomcat-5.0.28-r14.ebuild:
- Synced recent modifications of 5.5.17 init script with 5.0.28. Removed older
- 5.0.28 ebuilds
-
-*tomcat-5.5.17-r6 (20 Sep 2006)
-
- 20 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- files/5.5.17/tomcat.init, -tomcat-5.5.17-r4.ebuild,
- -tomcat-5.5.17-r5.ebuild, +tomcat-5.5.17-r6.ebuild:
- Fixed init script to set ${CATALINA_TMPDIR} per bug #148387
-
-*tomcat-5.5.17-r5 (20 Sep 2006)
-
- 20 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
- files/5.5.17/tomcat.init, -tomcat-5.5.17-r3.ebuild,
- +tomcat-5.5.17-r5.ebuild:
- Fixed init script to respect ${CATALINA_BASE} per bug # 148331. Removed older ebuild
-
-*tomcat-5.5.17-r4 (09 Sep 2006)
-*tomcat-5.0.28-r13 (09 Sep 2006)
-
- 09 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> files/5.0.28/tomcat.conf,
- files/5.0.28/tomcat.init, +tomcat-5.0.28-r13.ebuild,
- -tomcat-5.5.17-r1.ebuild, -tomcat-5.5.17-r2.ebuild,
- +tomcat-5.5.17-r4.ebuild:
- Removed eant || die from ebuilds. Sync 5.0.28 ebuild with one in overlay
- that is more current. Removed older versions of 5.5.17 ebuild.
-
- 09 Sep 2006; Petteri Räty <betelgeuse@gentoo.org>
- tomcat-5.5.17-r3.ebuild:
- Fixed Tomcat to compile with JAVA_PKG_STRICT.
-
-*tomcat-5.5.17-r3 (05 Sep 2006)
-
- 05 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> +tomcat-5.5.17-r3.ebuild:
- Added back struts stuff that was lost when applying a 1.5 patch
-
- 04 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> tomcat-5.5.17-r2.ebuild:
- Take two on ebuild fix
-
- 04 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> ChangeLog:
- Manifest did not get committed
-
- 04 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> tomcat-5.5.17-r2.ebuild:
- Fixed problem with newest Tomcat ebuild. When java5 USE flag was in use it
- would mess up creation of directories. One of which contains many symlinks
- needed during compile. No revision buump, since it's fixing a broken
- revision bump previously committed.
-
- 04 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> metadata.xml:
- Updated metadata.xml to reflect new maintainer, me :)
-
-*tomcat-5.5.17-r1 (07 Jul 2006)
-
- 07 Jul 2006; Joshua Nichols <jnichols@gentoo.org>
- files/5.5.17/tomcat.init, -tomcat-5.5.17.ebuild, +tomcat-5.5.17-r1.ebuild:
- Removed commons-logging.jar from init.d script, which can cause problems
- with logging. Only commons-logging-api.jar is needed.
-
- 03 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
- +files/5.5.17/catalinabuild-xml.patch,
- +files/5.5.17/jasperbuild-xml.patch, +files/5.5.17/mainbuild-xml.patch,
- +files/5.5.17/tomcat.conf, +files/5.5.17/tomcat.env,
- +files/5.5.17/tomcat.init, +files/5.5.17/tomcatbuild-xml.patch:
- Version bump.
-
- 27 Apr 2006; Alec Warner <antarus@gentoo.org>
- files/digest-tomcat-5.0.27-r6, files/digest-tomcat-5.0.28-r12, Manifest:
- Fixing SHA256 digest, pass four
-
- 11 Mar 2006; Petteri Räty <betelgeuse@gentoo.org>
- tomcat-5.0.28-r12.ebuild:
- Moved enewgroup and enewuser calls to pkg_setup from src_install for bug
- #124680.
-
- 11 Mar 2006; Petteri Räty <betelgeuse@gentoo.org>
- tomcat-5.0.27-r6.ebuild, -tomcat-5.0.28-r9.ebuild,
- -tomcat-5.0.28-r10.ebuild, tomcat-5.0.28-r12.ebuild:
- Changed SRC_URI to reflect changes upstream. Fixes bug #124237. Thanks to
- Beech Horn <beech@metalshark.co.uk> for reporting. Also removed old
- revisions.
-
- 30 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
- tomcat-5.0.27-r6.ebuild, tomcat-5.0.28-r9.ebuild,
- tomcat-5.0.28-r10.ebuild, tomcat-5.0.28-r12.ebuild:
- The Tomcat homepage is now http://tomcat.apache.org/ .
-
-*tomcat-5.0.28-r12 (14 Dec 2005)
-
- 14 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
- -tomcat-5.0.28-r11.ebuild, +tomcat-5.0.28-r12.ebuild:
- Tomcat needs a newer xml-apis.jar from xml-commons-external to work instead
- of the older version found in xml-commons.
-
-*tomcat-5.0.28-r11 (06 Dec 2005)
-
- 06 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
- +files/5.0.28/setclasspath.patch, -tomcat-5.0.28-r8.ebuild,
- +tomcat-5.0.28-r11.ebuild:
- Fixed bug #112530 so users should now be able to set a custom CLASSPATH in
- /etc/conf.d/tomcat-5. Also changed tomcat to use xml-apis from xml-commons
- instead of xerces because the jar in xerces is a packed one.
-
-*tomcat-5.0.28-r10 (14 Nov 2005)
-
- 14 Nov 2005; Petteri Räty <betelgeuse@gentoo.org>
- files/5.0.28/tomcat.conf-r1, files/5.0.28/tomcat.init,
- +tomcat-5.0.28-r10.ebuild:
- New revision with support for changing the home directory of the tomcat user
- with emerge --config. Fixes bug #109079. Also the init script now creates a
- pidfile.
-
-*tomcat-5.0.28-r9 (17 Oct 2005)
-
- 17 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
- +tomcat-5.0.28-r9.ebuild:
- Fixed installation of default ${CATALINA_BASE}/shared/ reported in bug #106906.
-
-*tomcat-5.0.28-r8 (15 Oct 2005)
-
- 15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> tomcat-5.0.27-r6.ebuild,
- -tomcat-5.0.28-r4.ebuild, -tomcat-5.0.28-r6.ebuild,
- -tomcat-5.0.28-r7.ebuild, +tomcat-5.0.28-r8.ebuild:
- move dev-java/jmx dev-java/sun-jmx
-
-*tomcat-5.0.28-r7 (22 Sep 2005)
-
- 22 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
- files/5.0.28/tomcat.init, +tomcat-5.0.28-r7.ebuild:
- Added --background to stop too in the init script. Also fixed some
- permissions and cleaned directory creation code.
-
-*tomcat-5.0.28-r6 (20 Sep 2005)
-
- 20 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
- files/5.0.28/tomcat.init, tomcat-5.0.28-r4.ebuild,
- -tomcat-5.0.28-r5.ebuild, +tomcat-5.0.28-r6.ebuild:
- Struts is now slotted so fixed the dependencies. In the latest revision
- fixed bug #99704. Thanks to David Owen <fugue88@hotmail.com> for reporting.
- Also startup problems from bug #103925 should now be fixed.
-
-*tomcat-5.0.28-r5 (14 Sep 2005)
-
- 14 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>;
- +files/5.0.28/log4j.properties, files/5.0.28/tomcat.conf,
- +tomcat-5.0.28-r5.ebuild:
- Added a proper log4j properties file, changed the ebuild to install the
- log4j file. This is all related to bugs #103925 and #88002
-
- 26 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
- tomcat-5.0.28-r4.ebuild:
- Don't use root group as it doesn't exists on BSD-like userlands.
-
- 25 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.28-r4.ebuild:
- permission issue fixed, see #93778
-
- 20 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.28-r4.ebuild:
- fixed problems with first time installation, see #93322
-
- 17 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.28-r4.ebuild:
- further fixes & cleanups / improvements, thanks axxo :-)
-
-*tomcat-5.0.28-r4 (17 May 2005)
-
- 17 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
- -tomcat-5.0.28-r3.ebuild, +tomcat-5.0.28-r4.ebuild:
- revision bump, indicate the changes
-
- 17 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.28-r3.ebuild:
- permission changes
-
-*tomcat-5.0.27-r6 (15 May 2005)
-
- 15 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
- -tomcat-5.0.27-r5.ebuild, +tomcat-5.0.27-r6.ebuild,
- tomcat-5.0.28-r3.ebuild:
- fixed problem with userpriv, see #92663. default shutdown password now gets
- replaced with a random one, see #92281
-
-*tomcat-5.0.28-r3 (14 May 2005)
-
- 14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
- -tomcat-5.0.28-r2.ebuild, +tomcat-5.0.28-r3.ebuild:
- updated commons-beanutils dependency to reflect new slotting. see #71952
-
- 07 May 2005; Jason Wever <weeve@gentoo.org> tomcat-5.0.28-r2.ebuild:
- Added ~sparc keyword.
-
-*tomcat-5.0.27-r5 (13 Apr 2005)
-
- 13 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -tomcat-5.0.27-r4.ebuild,
- +tomcat-5.0.27-r5.ebuild:
- now the old ebuild also makes use of newenvd, fixes #79625
-
- 09 Apr 2005; Markus Rothe <corsair@gentoo.org> tomcat-5.0.28-r2.ebuild:
- This version doesn't build on ppc64 (added -ppc64 to KEYWORDS)
-
- 04 Apr 2005; Thomas Matthijs <axxo@gentoo.org> tomcat-5.0.28-r2.ebuild:
- change dep to reflect commons-httpclient slotting
-
- 28 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> files/5.0.28/tomcat.init,
- tomcat-5.0.28-r2.ebuild:
- introduced support for the examples useflag, also modified the init script to
- fix #86905
-
- 27 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.28-r2.ebuild:
- moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336
-
- 22 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -tomcat-5.0.28-r1.ebuild,
- tomcat-5.0.28-r2.ebuild, -tomcat-5.0.28.ebuild:
- removed a packed struts.jar. generall cleanup, removed old versions.
-
- 20 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/3.3.2/gentoo.diff,
- -files/3.3.2/tomcat.conf, -files/3.3.2/tomcat.init,
- -files/4.1.30/gentoo.diff, -files/4.1.30/jikes.diff,
- -files/4.1.30/tomcat.conf, -files/4.1.30/tomcat.init,
- -tomcat-3.3.2-r2.ebuild, -tomcat-4.1.30-r5.ebuild:
- cleanup, removed old vulnerable versions. see #85383
-
-*tomcat-5.0.28-r2 (19 Mar 2005)
-
- 19 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +tomcat-5.0.28-r2.ebuild:
- version bump to indicate the changes i recently did.
-
- 19 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.27-r4.ebuild,
- tomcat-5.0.28-r1.ebuild:
- now normal users can access all jars of tomcat-5.0.28-r1 via java-config -p.
- also fixed #83113, dos related files are not getting installed any longer.
-
-*tomcat-5.0.28-r1 (07 Mar 2005)
-
- 07 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +tomcat-5.0.28-r1.ebuild:
- revision bump to indicate the log4j addition to the classpath, all users with
- tomcat 5.0.28 should update to 5.0.28-r1
-
- 06 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
- files/5.0.28/scripts.patch:
- added log4j to classpath in catalina.sh, fixes #84206. thanks to Santiago Gala
- <sgala@apache.org> for the report and the fix.
-
- 13 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
- files/5.0.28/build.xml-02.patch, files/5.0.28/gentoo.diff,
- +files/5.0.28/scripts.patch, files/5.0.28/tomcat.conf,
- files/5.0.28/tomcat.env, files/5.0.28/tomcat.init, tomcat-5.0.28.ebuild:
- tomcat now builds from source and installs jar files using dojar, also removed
- a packed jars issue. fixes #18352
-
- 09 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/5.0.27/tomcat.env,
- +files/5.0.28/tomcat.env, tomcat-5.0.27-r4.ebuild, tomcat-5.0.28.ebuild:
- added env.d file for tomcat to export CATALINA_HOME. fixes #79625
-
- 08 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml:
- updated maintainer informations.
-
- 18 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org> tomcat-5.0.28.ebuild:
- Fixes #74858 thanks to Petteri Räty <petteri.raty@welho.com>
-
- 17 Nov 2004; Markus Rothe <corsair@gentoo.org> tomcat-5.0.27-r4.ebuild,
- tomcat-5.0.28.ebuild:
- marked ~ppc64; bug #55690
-
- 17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> files/5.0.28/jikes.diff:
- fix path in jikes patch, #67847
-
-*tomcat-5.0.28 (09 Oct 2004)
-
- 09 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
- +files/5.0.28/build.xml-01.patch, +files/5.0.28/build.xml-02.patch,
- +files/5.0.28/gentoo.diff, +files/5.0.28/jikes.diff,
- +files/5.0.28/tomcat.conf, +files/5.0.28/tomcat.init,
- +tomcat-5.0.28.ebuild:
- Version bump + now builds from source, Thanks too Mark Wolfe
- <mwolfe@netspace.net.au> for his work on this. #18352
-
- 08 Oct 2004; Thomas Matthijs <axxo@gentoo.org> files/3.3.2/tomcat.init,
- files/4.1.30/tomcat.init, files/5.0.27/tomcat.init:
- use net instead of need net in init.d script
-
- 08 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> tomcat-4.1.30-r5.ebuild:
- Marked ~amd64.
-
- 05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
- Fixed ChangeLog header.
-
- 03 Sep 2004; Thomas Matthijs <axxo@gentoo.org> tomcat-3.3.2-r2.ebuild,
- -tomcat-4.1.30-r4.ebuild, tomcat-4.1.30-r5.ebuild, -tomcat-5.0.27-r3.ebuild:
- remove broken + keyword x86
-
- 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
- tomcat-3.3.2-r2.ebuild, tomcat-4.1.30-r4.ebuild, tomcat-4.1.30-r5.ebuild,
- tomcat-5.0.27-r3.ebuild:
- Masked stable for ppc
-
- 01 Sep 2004; Thomas Matthijs <axxo@gentoo.org> tomcat-4.1.30-r5.ebuild,
- tomcat-5.0.27-r4.ebuild:
- keepdir work,temp so they are not removed when upgrading, bug 62468
-
-*tomcat-5.0.27-r4 (26 Aug 2004)
-
- 26 Aug 2004; Thomas Matthijs <axxo@gentoo.org> files/4.1.30/tomcat.init,
- files/5.0.27/tomcat.init, +tomcat-4.1.30-r5.ebuild,
- +tomcat-5.0.27-r4.ebuild:
- escape params in init script, bug 61822
-
-*tomcat-4.1.30-r4 (08 Aug 2004)
-
- 08 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml,
- +files/3.3.2/gentoo.diff, +files/3.3.2/tomcat.conf,
- +files/3.3.2/tomcat.init, +files/4.1.30/gentoo.diff,
- +files/4.1.30/jikes.diff, +files/4.1.30/tomcat.conf,
- +files/4.1.30/tomcat.init, +files/5.0.27/gentoo.diff,
- +files/5.0.27/jikes.diff, +files/5.0.27/tomcat.conf,
- +files/5.0.27/tomcat.init, +tomcat-3.3.2-r2.ebuild,
- +tomcat-4.1.30-r4.ebuild, +tomcat-5.0.27-r3.ebuild:
- Moved from net-www/tomcat to www-servers/tomcat.
-
-*tomcat-4.1.30-r4 (06 Aug 2004)
-
- 06 Aug 2004; Thomas Matthijs <axxo@gentoo.org> tomcat-3.3.2-r2.ebuild,
- tomcat-4.1.30-r4.ebuild, tomcat-5.0.27-r3.ebuild:
- fix doc chown
-
-*tomcat-5.0.27-r3 (06 Aug 2004)
-
- 06 Aug 2004; Thomas Matthijs <axxo@gentoo.org> tomcat-5.0.27-r3.ebuild:
- ~amd64
-
- 06 Aug 2004; Thomas Matthijs <axxo@gentoo.org> -files/3.3.2/21tomcat,
- -files/4.1.30/21tomcat, -files/5.0.27/21tomcat, -tomcat-3.3.2-r1.ebuild,
- -tomcat-3.3.2.ebuild, -tomcat-4.1.30-r2.ebuild, -tomcat-4.1.30-r3.ebuild,
- -tomcat-5.0.27-r1.ebuild, -tomcat-5.0.27-r2.ebuild:
- fix premissions (again sorry), should fix 59232 && 58616
-
-*tomcat-3.3.2-r1 (03 Aug 2004)
-
- 03 Aug 2004; Thomas Matthijs <axxo@gentoo.org> +tomcat-3.3.2-r1.ebuild,
- +tomcat-4.1.30-r3.ebuild, +tomcat-5.0.27-r2.ebuild:
- fix premissions
-
- 30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> -tomcat-4.1.30-r1.ebuild,
- -tomcat-4.1.30.ebuild, -tomcat-5.0.27.ebuild:
- cleanup
-
-*tomcat-4.1.30-r2 (30 Jul 2004)
-
- 30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> files/4.1.30/gentoo.diff,
- +tomcat-4.1.30-r2.ebuild:
- fix patch to source the correct file, 58835
-
-*tomcat-5.0.27-r1 (29 Jul 2004)
-
- 29 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +tomcat-4.1.30-r1.ebuild,
- +tomcat-5.0.27-r1.ebuild:
- revision bump to force updating, peaple that upgraded from 5.0.18 will
- otherwise have problems
-
- 29 Jul 2004; Thomas Matthijs <axxo@gentoo.org> files/4.1.30/gentoo.diff,
- +files/4.1.30/jikes.diff, files/4.1.30/tomcat.conf,
- files/5.0.27/gentoo.diff, +files/5.0.27/jikes.diff,
- files/5.0.27/tomcat.conf, tomcat-4.1.30.ebuild, tomcat-5.0.27.ebuild:
- added jikes use flag, enabling it will configure tomcat to use jikes
-
- 28 Jul 2004; Thomas Matthijs <axxo@gentoo.org> files/4.1.30/gentoo.diff,
- files/4.1.30/tomcat.conf, files/5.0.27/gentoo.diff,
- files/5.0.27/tomcat.conf, tomcat-4.1.30.ebuild, tomcat-5.0.27.ebuild:
- added commented config defaults to use jikes compile,added doc use flag,
- closes 58670
-
- 28 Jul 2004; Thomas Matthijs <axxo@gentoo.org> files/3.3.2/tomcat.init,
- files/4.1.30/tomcat.init, files/5.0.27/tomcat.init, tomcat-3.3.2.ebuild,
- tomcat-4.1.30.ebuild, tomcat-5.0.27.ebuild:
- changed init scripts, changed default shell/homedir for tomcat user, added
- warning about the new init scripts
-
-*tomcat-5.0.27 (27 Jul 2004)
-
- 27 Jul 2004; Thomas Matthijs <axxo@gentoo.org> metadata.xml,
- +files/3.3.2/21tomcat, +files/3.3.2/gentoo.diff, +files/3.3.2/tomcat.conf,
- +files/3.3.2/tomcat.init, -files/4.1.29/21tomcat, -files/4.1.29/gentoo.diff,
- -files/4.1.29/tomcat.conf, -files/4.1.29/tomcat.init,
- +files/4.1.30/21tomcat, +files/4.1.30/gentoo.diff,
- +files/4.1.30/tomcat.conf, +files/4.1.30/tomcat.init,
- -files/5.0.18/21tomcat, -files/5.0.18/gentoo.diff, -files/5.0.18/jikes.diff,
- -files/5.0.18/tomcat.conf, -files/5.0.18/tomcat.init,
- -files/5.0.25/21tomcat, -files/5.0.25/gentoo.diff,
- -files/5.0.25/tomcat.conf, -files/5.0.25/tomcat.init,
- +files/5.0.27/21tomcat, +files/5.0.27/gentoo.diff,
- +files/5.0.27/tomcat.conf, +files/5.0.27/tomcat.init, +tomcat-3.3.2.ebuild,
- -tomcat-4.1.29.ebuild, +tomcat-4.1.30.ebuild, -tomcat-5.0.18.ebuild,
- -tomcat-5.0.25.ebuild, +tomcat-5.0.27.ebuild:
- a whole bunch of new ebuilds, slot'ed, they should all work next to eatch
- other (don't forget to change the ports)
-
- 25 Jun 2004; Aron Griffis <agriffis@gentoo.org> tomcat-5.0.18.ebuild:
- QA - fix use invocation
-
- 08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> tomcat-5.0.18.ebuild:
- Stable on alpha.
-
-*tomcat-5.0.25 (19 May 2004)
-
- 19 May 2004; Chris Aniszczyk <zx@gentoo.org> +files/5.0.25/21tomcat,
- +files/5.0.25/gentoo.diff, +files/5.0.25/tomcat.conf,
- +files/5.0.25/tomcat.init, +tomcat-5.0.25.ebuild:
- New tomcat and new layout scheme.
- Thanks to Tim Chen for the initial ebuild.
-
- 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> tomcat-4.1.29.ebuild:
- Add inherit eutils
-
- 10 Apr 2004; Travis Tilley <lv@gentoo.org> tomcat-5.0.18.ebuild:
- added ~amd64 keyword
-
- 21 Mar 2004; Martin Holzer <mholzer@gentoo.org> tomcat-5.0.18.ebuild:
- adding categorie. see 45110 for details
-
- 24 Feb 2004; Chris Aniszczyk <zx@gentoo.org> tomcat-4.1.29.ebuild:
- Heh, variable order fix ;) Bug #42071
-
- 24 Feb 2004; Chris Aniszczyk <zx@gentoo.org> tomcat-5.0.18.ebuild,
- files/5.0.18/jikes.diff, files/5.0.18/tomcat.conf:
- Added jikes and doc support. Thanks to Luca Santarelli
- <hrk@users.sourceforge.net> for some patches. Bug #42175
-
-*tomcat-5.0.18 (15 Feb 2004)
-*tomcat-4.1.29 (15 Feb 2004)
-
- 15 Feb 2004; <zx@gentoo.org> tomcat-4.1.29.ebuild, tomcat-5.0.18.ebuild:
- Massive bugfixes + version bumps. Huge thanks to Chetan Sarva
- <gentoo-bugs@fw2.net> for the ebuilds + various fixes. This update adds 5.0.18
- and 4.1.29 tomcat versions. It also fixes the following bugs:
-
- Bug #38949
-
- Bug #38952
-
- Bug #21772
-
- Bug #38358
-
- Bug #21744
-
- Bug #22040
-
- Bug #19723
-
- Bug #39819
-
- Bug #26994
-
- Bug #32408
-
- Bug #35094
-
- 15 Dec 2003; <spider@gentoo.org> tomcat-4.1.24-r1.ebuild:
- QA: fixing chown user.group to user:group, bug #35127
-
- 16 Oct 2003; Sergey Kuleshov <svyatogor@gentoo.org> tomcat-4.1.24-r1.ebuild:
- Fixed permissions for /etc/conf.d/tomcat
-
-*tomcat-4.1.24-r1 (27 May 2003)
-
- 27 May 2003; Dylan Carlson <absinthe@gentoo.org> tomcat-4.1.24-r1.ebuild:
- /opt/tomcat/conf was vulnerable to local users who are snooping the
- tomcat-users.xml file for passwords. The new ebuild fixes this problem for new
- installations.
-
- If you have an existing installation of Tomcat you can do the following:
-
- 1. # /etc/init.d/tomcat stop
- 2. # chmod -R 750 /opt/tomcat/
- 3. # /etc/init.d/tomcat start
-
- Thanks to "D.Tuinstra" <tuinstra@inteo.com> for pointing out the
- vulnerability.
-
-*tomcat-4.1.24 (25 Mar 2003)
-
- 10 Apr 2003; Dylan Carlson <absinthe@gentoo.org> tomcat-4.1.24.ebuild:
- Minor fix to pkg_postinst() comments; fix to env.d/21tomcat install;
- added RDEPEND for sed.
-
- 06 Apr 2003; Dylan Carlson <absinthe@gentoo.org> tomcat-4.1.24.ebuild:
- x86 ppc sparc moved to stable.
-
- 28 Mar 2003; Dylan Carlson <absinthe@gentoo.org> files/4.1.24/tomcat.conf:
- Fixed sed path in conf.d/tomcat.
-
- 25 Mar 2003; Dylan Carlson <absinthe@gentoo.org> omcat-4.1.24.ebuild,
- files/4.1.24/21tomcat, tomcat-4.1.24.ebuild, files/4.1.24/21tomcat,
- files/4.1.24/gentoo.diff, files/4.1.24/tomcat.conf, files/4.1.24/tomcat.init:
- Version bump.
-
- Also a few changes thanks to user feedback from Anthony Murray:
- Fixes to init script, and changed conf.d/JAVA_HOME back to automatically
- set itself. Closes bug #17907.
-
-*tomcat-4.1.18-r1 (22 Mar 2003)
-
- 22 Mar 2003; Dylan Carlson <absinthe@gentoo.org> tomcat-4.1.18-r1.ebuild,
- files/4.1.18/gentoo.diff, files/4.1.18/tomcat.conf,
- files/4.1.18/tomcat.init:
- Significant changes. This ebuild now bears close resemblance to
- net-www/orion.
-
- 1. Tomcat now runs as user 'tomcat' by default.
- 2. All classes and JARs get installed into /usr/share/tomcat.
- 3. All logs go to /var/log/tomcat.
- 4. Init script was modified to use JAVA_HOME as set in /etc/conf.d/tomcat.
- This is because we don't want the init script making any assumptions as
- to what JVM the user wants to run for Tomcat.
- 5. JSSE and JPDA are supported as startup modes in /etc/conf.d/tomcat.
- ( If you have a Sun Java 1.4 SDK or later, you have JSSE and JPDA
- included. )
-
- Feedback on these changes would be appreciated, so we can get this
- ebuild moved to stable.
- http://bugs.gentoo.org/
- http://stable.gentoo.org/
-
-*tomcat-4.1.18 (16 Mar 2003)
-
- 16 Mar 2003; Dylan Carlson <absinthe@gentoo.org> tomcat-4.1.18.ebuild:
- New ebuild started from submission in bug # 11796. minor fixes; added
- servlet.jar as a shared library for packages that might require it at build
- time. Thanks to Mark Mealman <mmealman@tarsis.org> and gtonic <tom@wahuu.at>
- for their contributions.
-
- 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
-
-*tomcat-4.0.6 (15 Oct 2002)
-
- 15 Oct 2002; Maik Schreiber <blizzy@gentoo.org> : New version -
- security update. Closes bug #8931.
-
- 26 Sep 2002; Maik Schreiber <blizzy@gentoo.org> files/21tomcat:
- Added CONFIG_PROTECT=/opt/jakarta/tomcat/conf so that configuration
- files don't get lost when installing a new version.
-
-*tomcat-4.0.5 (25 Sep 2002)
-
- 25 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> :
- Security update. Ebuild provided by Adrian Almenar <aalmenar@conectium.com>.
-
-*tomcat-4.0.4 (23 Jun 2002)
-
- 14 Sep 2002; Owen Stampflee <owen@gentoo.org> :
- Added PPC to KEYWORDS.
-
- 14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> tomcat-4.0.4.ebuild :
- Added KEYWORDS.
-
- 23 Jun 2002; William McArthur <sandymac@gentoo.org> tomcat-4.0.4.ebuild files/digest-tomcat-4.0.4 :
-
- New upstream version. Added a .keep file to the logs dir to prevent the logs
- from being removed during an upgrade if there were no log files.
-
-*tomcat-4.0.3 (03 Jun 2002)
-
- 14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> tomcat-4.0.3.ebuild :
- Added KEYWORDS, SLOT.
-
- 03 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> tomcat-4.0.3.ebuild files/digest-tomcat-4.0.3 :
-
- New upstream version.
-
-*tomcat-4.0.1 (1 Feb 2002)
-
- 14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> tomcat-4.0.1.ebuild :
- Added KEYWORDS, SLOT.
-
- 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-
- Added initial ChangeLog which should be updated whenever the package is
- updated in any way. This changelog is targetted to users. This means that the
- comments should well explained and written in clean English. The details about
- writing correct changelogs are explained in the skel.ChangeLog file which you
- can find in the root directory of the portage repository.
-
-*tomcat-3.2.2.ebuild (14 Jul 2002)
-
- 01 Jul 2002; Karl Trygve Kalleberg <karltk@gentoo.org> tomcat-3.2.2.ebuild files/digest-tomcat-3.2.2 :
-
- This package has been masked for a while. Finally removed to get rid of
- dev-java/jaxp entirely.
-
- 14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> tomcat-3.2.2.ebuild :
- Added KEYWORDS, SLOT.
+ +files/5.5.22/catalinabuild-xml.patch,
+ +files/5.5.22/jasperbuild-xml.patch,
+ +files/5.5.22/jsr152_examples_build-xml.patch,
+ +files/5.5.22/jsr152build-xml-examples.patch,
+ +files/5.5.22/jsr154_examples_build-xml.patch,
+ +files/5.5.22/jsr154build-xml-examples.patch,
+ +files/5.5.22/mainbuild-xml.patch, +files/5.5.22/tomcat.conf,
+ +files/5.5.22/tomcat.init, +files/5.5.22/tomcatbuild-xml.patch,
+ +tomcat-5.5.22_pre.ebuild:
+ Bumped 5.5 to latest development release
--- /dev/null
+--- apache-tomcat-5.5.20-src/build/build.xml 2007-01-26 19:10:26.000000000 -0500
++++ build.xml 2007-01-26 19:31:49.000000000 -0500
+@@ -143,6 +143,7 @@
+
+ <!-- ====================== DEPLOY: Copy Static Files =================== -->
+ <target name="deploy-static" depends="init">
++ <!--
+ <copy file="${jsp-api.jar}" todir="${tomcat.build}/common/lib"/>
+ <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
+
+@@ -161,9 +162,9 @@
+ <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+ file="${tomcat-native.tar.gz}" />
+
+- <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+- <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
++ <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
+ <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
++ -->
+ </target>
+
+ <!-- ====================== Build all components =================== -->
+@@ -395,15 +396,14 @@
+ <target name="build-webapps-precompile"
+ depends="init" description="Precompile webapps" >
+
++ <antcall target="build-webapp-precompile-admin" />
++ <antcall target="build-webapp-precompile-examples" />
++
+ <!-- JSPC -->
+- <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
+ <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
+- <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
+
+- <mkdir dir="${admin.base}/WEB-INF/src/admin" />
+ <mkdir dir="${ROOT.base}/WEB-INF/src" />
+ <mkdir dir="${ROOT.base}/WEB-INF/classes" />
+- <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
+
+ <path id="jspc.classpath">
+ <pathelement location="${java.home}/../lib/tools.jar"/>
+@@ -437,23 +437,6 @@
+ addWebXmlMappings="true"
+ outputDir="${ROOT.base}/WEB-INF/src" />
+
+- <jasper2
+- compile="false"
+- validateXml="false"
+- uriroot="${jsp-examples.base}"
+- webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
+- addWebXmlMappings="true"
+- outputDir="${jsp-examples.base}/WEB-INF/src" />
+-
+- <jasper2
+- package="admin"
+- compile="false"
+- validateXml="false"
+- uriroot="${admin.base}"
+- webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
+- addWebXmlMappings="true"
+- outputDir="${admin.base}/WEB-INF/src/admin" />
+-
+ <javac destdir="${ROOT.base}/WEB-INF/classes"
+ optimize="off"
+ debug="${compile.debug}"
+@@ -475,61 +458,90 @@
+ <include name="**" />
+ </javac>
+
+- <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
+- <copy todir="${jsp-examples.base}/WEB-INF/classes">
+- <fileset dir="${jsp-examples.base}/WEB-INF/src">
+- <include name="**/*.class" />
+- </fileset>
+- </copy>
++ </target>
+
+- <javac destdir="${jsp-examples.base}/WEB-INF/classes"
++ <target name="build-webapp-precompile-admin" unless="admin.precompile.notrequired">
++ <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
++ <mkdir dir="${admin.base}/WEB-INF/src/admin" />
++ <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
++ <classpath refid="jspc.classpath"/>
++ </taskdef>
++ <jasper2
++ package="admin"
++ compile="false"
++ validateXml="false"
++ uriroot="${admin.base}"
++ webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
++ addWebXmlMappings="true"
++ outputDir="${admin.base}/WEB-INF/src/admin" />
++ <javac destdir="${admin.base}/WEB-INF/classes"
+ optimize="off"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ failonerror="false"
+- srcdir="${jsp-examples.base}/WEB-INF/src"
++ srcdir="${admin.base}/WEB-INF/src"
+ excludes="**/*.smap">
+ <classpath>
+ <pathelement location="${java.home}/../lib/tools.jar"/>
+ <fileset dir="${tomcat.build}/server/lib">
+ <include name="*.jar"/>
+ </fileset>
+- <fileset dir="${jsp-examples.base}/WEB-INF/lib">
++ <fileset dir="${admin.base}/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${tomcat.build}/common/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="${tomcat.build}/classes"/>
+- <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
+ </classpath>
+- <include name="**" />
+- <exclude name="tags/**" />
++ <include name="admin/**" />
+ </javac>
+-
+- <javac destdir="${admin.base}/WEB-INF/classes"
++ </target>
++
++ <target name="build-webapp-precompile-examples" unless="examples.precompile.notrequired">
++ <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
++ <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
++ <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
++ <classpath refid="jspc.classpath"/>
++ </taskdef>
++ <jasper2
++ compile="false"
++ validateXml="false"
++ uriroot="${jsp-examples.base}"
++ webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
++ addWebXmlMappings="true"
++ outputDir="${jsp-examples.base}/WEB-INF/src" />
++ <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
++ <copy todir="${jsp-examples.base}/WEB-INF/classes">
++ <fileset dir="${jsp-examples.base}/WEB-INF/src">
++ <include name="**/*.class" />
++ </fileset>
++ </copy>
++ <javac destdir="${jsp-examples.base}/WEB-INF/classes"
+ optimize="off"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ failonerror="false"
+- srcdir="${admin.base}/WEB-INF/src"
++ srcdir="${jsp-examples.base}/WEB-INF/src"
+ excludes="**/*.smap">
+ <classpath>
+ <pathelement location="${java.home}/../lib/tools.jar"/>
+ <fileset dir="${tomcat.build}/server/lib">
+ <include name="*.jar"/>
+ </fileset>
+- <fileset dir="${admin.base}/WEB-INF/lib">
++ <fileset dir="${jsp-examples.base}/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${tomcat.build}/common/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="${tomcat.build}/classes"/>
++ <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
+ </classpath>
+- <include name="admin/**" />
++ <include name="**" />
++ <exclude name="tags/**" />
+ </javac>
+ </target>
+
+@@ -653,28 +665,8 @@
+
+ <!-- <antcall target="build-commons-modeler" /> -->
+ <!-- <antcall target="build-commons-daemon" /> -->
+-
+- <antcall target="downloadgz">
+- <param name="sourcefile" value="${commons-collections-src.loc}"/>
+- <param name="destfile" value="${tomcat-dbcp.jar}" />
+- </antcall>
+- <antcall target="downloadgz">
+- <param name="sourcefile" value="${commons-pool-src.loc}"/>
+- <param name="destfile" value="${tomcat-dbcp.jar}" />
+- </antcall>
+- <antcall target="downloadgz">
+- <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
+- <param name="destfile" value="${tomcat-dbcp.jar}" />
+- </antcall>
+-
+- <antcall target="build-tomcat-dbcp" />
+-
+- <antcall target="downloadzip">
+- <param name="sourcefile" value="${jdt.loc}"/>
+- <param name="destfile" value="${jdt.jar}"/>
+- <param name="destdir" value="${base.path}"/>
+- </antcall>
+- <antcall target="build-jasper-compiler-jdt" />
++ <!-- <antcall target="build-tomcat-dbcp" /> -->
++ <!-- <antcall target="build-jasper-compiler-jdt" /> -->
+ </target>
+
+ <target name="build-tomcat-dbcp">
+@@ -754,19 +746,11 @@
+ </jar>
+ </target>
+
+- <target name="build-webapps" depends="init"
+- description="build webapps">
+-
+- <echo>========== Building: webapps </echo>
+-
+- <mkdir dir="${tomcat.build}/webapps" />
+- <mkdir dir="${tomcat.build}/server/webapps" />
++ <target name="build-examples" unless="examples.build.notrequired">
+
+ <!-- The build files are far too difficult to hack - just build it and copy -->
+- <ant dir="${api.home}/jsr154" target="dist">
+- </ant>
+- <ant dir="${api.home}/jsr152" target="dist">
+- </ant>
++ <ant dir="${api.home}/jsr154" target="examples" />
++ <ant dir="${api.home}/jsr152" target="examples" />
+
+ <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
+ <copy todir="${tomcat.build}/webapps/servlets-examples">
+@@ -779,6 +763,18 @@
+ <exclude name="WEB-INF/tagPlugins.xml" />
+ </fileset>
+ </copy>
++
++ </target>
++
++ <target name="build-webapps" depends="init"
++ description="build webapps">
++
++ <echo>========== Building: webapps </echo>
++
++ <mkdir dir="${tomcat.build}/webapps" />
++ <mkdir dir="${tomcat.build}/server/webapps" />
++
++ <antcall target="build-examples" />
+
+ <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
+ <property name="webapps.build" value="${tomcat.build}/webapps" />
+@@ -850,14 +846,7 @@
+ filtering="true" />
+
+ <!-- Build JARs for webapps classes -->
+- <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
+- <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
+- index="true">
+- <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
+- <include name="**/*.class" />
+- <include name="**/*.properties" />
+- </fileset>
+- </jar>
++ <antcall target="fix-admin-webapp" />
+ <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
+ <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
+ index="true">
+@@ -896,9 +885,20 @@
+ todir="${tomcat.build}/conf/Catalina/localhost" />
+ <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
+ todir="${tomcat.build}/conf/Catalina/localhost" />
++
++ </target>
++
++ <target name="fix-admin-webapp" unless="admin.build.notrequired">
++ <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
++ <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
++ index="true">
++ <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
++ <include name="**/*.class" />
++ <include name="**/*.properties" />
++ </fileset>
++ </jar>
+ <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
+ todir="${tomcat.build}/conf/Catalina/localhost" />
+-
+ </target>
+
+ <!-- ====================== Embed target =================== -->
+@@ -1041,11 +1041,11 @@
+ <!-- ====================== Compat target =================== -->
+
+ <target name="compat" description="Create compatibility binaries for JREs before 1.5" >
+-
++ <!--
+ <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
+ <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
+ <copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/>
+-
++ -->
+ </target>
+
+ <!-- ====================== DEPLOY: Deploy Components =================== -->
+@@ -1092,8 +1092,9 @@
+ <!-- Copy Unix JSVC from commons-daemon -->
+ <copy file="${commons-daemon.jsvc.tar.gz}"
+ tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
++ <!--
+ <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
+-
++ -->
+ <echo>Target: Webapps precompilation ...</echo>
+
+ <antcall target="build-admin"/>
+@@ -1188,10 +1189,11 @@
+ description="Catalina Tests" depends="dist-tester">
+
+ <!-- For Java 1.4 -->
++ <!--
+ <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
+ <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
+ <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
+-
++ -->
+ <parallel>
+
+ <java classname="LauncherBootstrap" fork="yes">
+@@ -1871,10 +1873,10 @@
+
+ <!-- commons-digester needs ../LICENSE -->
+ <!-- That is ugly XXX needs a review -->
++ <!--
+ <copy file="LICENSE" tofile="../LICENSE"/>
+ <copy file="LICENSE" tofile="${base.path}/LICENSE"/>
+
+- <!-- Downdown any sub package or tools needed. -->
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-beanutils.loc}"/>
+ <param name="destfile" value="${commons-beanutils.jar}"/>
+@@ -1916,7 +1918,6 @@
+ </antcall>
+
+ <antcall target="downloadgz">
+- <!-- xerces2 brings 2 files, test for one of them -->
+ <param name="sourcefile" value="${xerces.loc}"/>
+ <param name="destfile" value="${xml-apis.jar}"/>
+ </antcall>
+@@ -1937,7 +1938,6 @@
+ <param name="destfile" value="${commons-launcher.jar}"/>
+ </antcall>
+
+- <!--
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-pool.loc}"/>
+ <param name="destfile" value="${commons-pool.jar}"/>
+@@ -1948,7 +1948,6 @@
+ <param name="destfile" value="${commons-dbcp.jar}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
+- -->
+
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-httpclient.loc}"/>
+@@ -1976,7 +1975,7 @@
+ <param name="destfile" value="${tomcat-native.tar.gz}"/>
+ <param name="destdir" value="${tomcat-native.home}"/>
+ </antcall>
+-
++ -->
+ <!-- Build the dependencies that are not yet released -->
+ <antcall target="build-depends"/>
+
--- /dev/null
+# 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.22_pre.ebuild,v 1.1 2007/02/13 22:39:09 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Tomcat Servlet-2.4/JSP-2.0 Container"
+
+MY_P="apache-${P/_pre/}-src"
+MY_PV="${PV/_pre/}"
+SLOT="5.5"
+#SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
+SRC_URI="http://people.apache.org/~fhanik/${PN}/${PN}-5.5/v${MY_PV}/src/${MY_P}.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 -ppc -ppc64 ~x86 ~x86-fbsd"
+LICENSE="Apache-2.0"
+
+IUSE="admin java5 doc examples source test"
+
+RDEPEND="=dev-java/eclipse-ecj-3.1*
+ =dev-java/commons-beanutils-1.7*
+ >=dev-java/commons-collections-3.1
+ >=dev-java/commons-daemon-1.0.1
+ >=dev-java/commons-dbcp-1.2.1
+ >=dev-java/commons-digester-1.7
+ >=dev-java/commons-fileupload-1.1
+ >=dev-java/commons-io-1.1
+ >=dev-java/commons-el-1.0
+ >=dev-java/commons-launcher-0.9
+ >=dev-java/commons-logging-1.0.4
+ >=dev-java/commons-modeler-2.0
+ >=dev-java/commons-pool-1.2
+ >=dev-java/log4j-1.2.9
+ ~dev-java/tomcat-servlet-api-${PV}
+ admin? ( =dev-java/struts-1.2* )
+ dev-java/sun-javamail
+ java5? ( || ( >=virtual/jre-1.5 =virtual/jre-1.6 ) )
+ !java5? (
+ =virtual/jre-1.4*
+ =dev-java/commons-httpclient-2.0*
+ dev-java/sun-jaf
+ >=dev-java/junit-3.8.1
+ =dev-java/mx4j-core-3*
+ >=dev-java/saxpath-1.0
+ >=dev-java/xerces-2.7.1
+ =dev-java/xml-commons-external-1.3*
+ )"
+DEPEND="java5? ( || ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) )
+ !java5? ( =virtual/jdk-1.4* )
+ ${RDEPEND}
+ >=dev-java/java-config-2.0.31
+ dev-java/ant-core
+ dev-java/ant-trax"
+
+S=${WORKDIR}/${MY_P}
+
+TOMCAT_NAME="${PN}-${SLOT}"
+WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
+
+pkg_setup() {
+ # new user for tomcat
+ enewgroup tomcat
+ enewuser tomcat -1 -1 /dev/null tomcat
+
+ java-pkg_filter-compiler ecj-3.1 ecj-3.2
+
+ WANT_ANT_TASKS="ant-trax"
+
+ if use java5; then
+ JAVA_PKG_WANT_SOURCE="1.5"
+ JAVA_PKG_WANT_TARGET="1.5"
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ local PATCHES="
+ mainbuild-xml.patch
+ tomcatbuild-xml.patch
+ catalinabuild-xml.patch
+ jasperbuild-xml.patch
+ "
+ for patch in ${PATCHES}; do
+ epatch "${FILESDIR}/${MY_PV}/${patch}"
+ done
+ if use examples; then
+ epatch "${FILESDIR}/${MY_PV}/jsr152_examples_build-xml.patch"
+ epatch "${FILESDIR}/${MY_PV}/jsr154_examples_build-xml.patch"
+ fi
+
+ # avoid packed jars :-)
+ mkdir -p ${S}/build/build/common
+ cd ${S}/build/build
+
+ mkdir ./bin && cd ./bin
+ java-pkg_jar-from commons-logging commons-logging-api.jar
+ java-pkg_jar-from commons-daemon
+ if ! use java5; then
+ java-pkg_jar-from mx4j-core-3.0 mx4j.jar jmx.jar
+ java-pkg_jar-from mx4j-core-3.0 mx4j-rjmx.jar jmx-remote.jar
+ fi
+
+ if ! use java5; then
+ mkdir ${S}/build/build/common/endorsed && cd ${S}/build/build/common/endorsed
+ java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
+ java-pkg_jar-from xerces-2 xercesImpl.jar
+ fi
+
+ mkdir ${S}/build/build/common/lib && cd ${S}/build/build/common/lib
+ java-pkg_jar-from ant-core
+ java-pkg_jar-from commons-collections
+ java-pkg_jar-from commons-dbcp
+ java-pkg_jar-from commons-el
+ java-pkg_jar-from commons-pool
+ java-pkg_jar-from tomcat-servlet-api-2.4
+
+ mkdir -p ${S}/build/build/server/lib && cd ${S}/build/build/server/lib
+ java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
+ java-pkg_jar-from commons-digester
+ java-pkg_jar-from commons-modeler
+
+}
+
+src_compile(){
+ local antflags="-Dbase.path=${T}"
+
+ antflags="${antflags} -Dservletapi.build.notrequired=true"
+ antflags="${antflags} -Djspapi.build.notrequired=true"
+ antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
+ antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
+ antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
+ antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"
+ antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
+ antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
+ antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
+ antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
+ antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
+ antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
+ antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
+ antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)"
+ antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
+ antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)"
+ antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
+ antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
+ antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)"
+ antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.jar)"
+ if use admin; then
+ antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
+ antflags="${antflags} -Dstruts.home=/usr/share/struts"
+ else
+ antflags="${antflags} -Dadmin.build.notrequired=true"
+ antflags="${antflags} -Dadmin.precompile.notrequired=true"
+ fi
+ if ! use examples; then
+ antflags="${antflags} -Dexamples.build.notrequired=true"
+ antflags="${antflags} -Dexamples.precompile.notrequired=true"
+ fi
+ antflags="${antflags} -Djasper.home=${S}/jasper"
+ if ! use java5; then
+ antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf)"
+ antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
+ antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j.jar)"
+ antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j-rjmx.jar)"
+ antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
+ antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
+ antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
+ fi
+
+ # prevent classpath bloat with ant-1.7.0 which makes admin app fail
+ ANT_TASKS="ant-trax" eant ${antflags}
+}
+
+src_install() {
+ cd ${S}/build/build
+
+ # init.d, conf.d
+ newinitd ${FILESDIR}/${MY_PV}/tomcat.init ${TOMCAT_NAME}
+ newconfd ${FILESDIR}/${MY_PV}/tomcat.conf ${TOMCAT_NAME}
+
+ # create dir structure
+ diropts -m755 -o tomcat -g tomcat
+ dodir /usr/share/${TOMCAT_NAME}
+ keepdir /var/log/${TOMCAT_NAME}/
+ keepdir /var/tmp/${TOMCAT_NAME}/
+ keepdir /var/run/${TOMCAT_NAME}/
+
+ local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
+ dodir ${CATALINA_BASE}
+ keepdir ${CATALINA_BASE}/shared/lib
+ keepdir ${CATALINA_BASE}/shared/classes
+
+ keepdir /usr/share/${TOMCAT_NAME}/common/lib
+
+ dodir /etc/${TOMCAT_NAME}
+ fperms 750 /etc/${TOMCAT_NAME}
+
+ diropts -m0755
+
+ # we don't need dos scripts
+ rm -f bin/*.bat
+
+ # copy the manager and admin context's to the right position
+ mkdir -p conf/Catalina/localhost
+ if use admin; then
+ cp ${S}/container/webapps/admin/admin.xml \
+ conf/Catalina/localhost
+ fi
+ cp ${S}/container/webapps/manager/manager.xml \
+ conf/Catalina/localhost
+
+ # make the jars available via java-config -p and jar-from, etc
+ base=$(pwd)
+ libdirs="common/lib server/lib"
+ for dir in ${libdirs}
+ do
+ cd ${dir}
+
+ for jar in *.jar;
+ do
+ # replace the file with a symlink
+ if [ ! -L ${jar} ]; then
+ java-pkg_dojar ${jar}
+ rm -f ${jar}
+ ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar}
+ fi
+ done
+
+ cd ${base}
+ done
+
+ # replace a packed struts.jar
+ if use admin; then
+ cd server/webapps/admin/WEB-INF/lib
+ rm -f struts.jar
+ java-pkg_jar-from struts-1.2 struts.jar
+ cd ${base}
+ else
+ rm -fR server/webapps/admin
+ fi
+
+ cd server/webapps/manager/WEB-INF/lib
+ java-pkg_jar-from commons-fileupload
+ java-pkg_jar-from commons-io-1
+ cd ${base}
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml
+
+ # copy over the directories
+ chown -R tomcat:tomcat webapps/* conf/*
+ cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
+ cp -HR bin common server ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
+
+ keepdir ${WEBAPPS_DIR}
+ set_webapps_perms ${D}/${WEBAPPS_DIR}
+
+ # Copy over webapps, some controlled by use flags
+ cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
+ cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps
+ if use doc; then
+ cp -pr webapps/tomcat-docs ${D}${CATALINA_BASE}/webapps
+ fi
+ if use examples; then
+ cp -pr webapps/{jsp-examples,servlets-examples,webdav} \
+ ${D}${CATALINA_BASE}/webapps
+ fi
+
+ # symlink the directories to make CATALINA_BASE possible
+ dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
+ dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
+ dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
+ dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
+
+ dodoc ${S}/build/{RELEASE-NOTES,RUNNING.txt}
+ fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
+}
+
+pkg_postinst() {
+ #due to previous ebuild bloopers, make sure everything is correct
+ chown root:root /etc/init.d/${TOMCAT_NAME}
+ chown root:root /etc/conf.d/${TOMCAT_NAME}
+
+ ewarn
+ ewarn " This ebuild implements a new filesystem layout for tomcat"
+ ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
+ ewarn " for more information!."
+ elog
+ elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
+ elog " may not get seen. Thank you."
+ elog
+
+# elog "Run emerge --config =${PF}"
+# elog "to configure Tomcat if you need to for example"
+# elog "change the home directory of the Tomcat user."
+}
+
+#helpers
+set_webapps_perms() {
+ chown tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
+ chmod 750 ${1} || die "Failed to change permissions off ${1}."
+}
+
+pkg_config() {
+ # Better suggestions are welcome
+ local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
+
+ elog "The default home directory for Tomcat is /dev/null."
+ elog "You need to change it if your applications needs it to"
+ elog "be an actual directory. Current home directory:"
+ elog "${currentdir}"
+ elog ""
+ elog "Do you want to change it [yes/no]?"
+
+ local answer
+ read answer
+
+ if [[ "${answer}" == "yes" ]]; then
+ elog ""
+ elog "Suggestions:"
+ elog "${WEBAPPS_DIR}"
+ elog ""
+ elog "If you want to suggest a directory, file a bug to"
+ elog "http://bugs.gentoo.org"
+ elog ""
+ elog "Enter home directory:"
+
+ local homedir
+ read homedir
+
+ elog ""
+ elog "Setting home directory to: ${homedir}"
+
+ /usr/sbin/usermod -d"${homedir}" tomcat
+
+ elog "You can run emerge --config =${PF}"
+ elog "again to change to homedir"
+ elog "at any time."
+ fi
+}
projects / gentoo.git / commitdiff