From d1132508ea82d0e0621f8da06cb6b0f782e91689 Mon Sep 17 00:00:00 2001 From: William Thomson Date: Tue, 13 Feb 2007 22:39:09 +0000 Subject: [PATCH] Bumped 5.5 to latest development release Package-Manager: portage-2.1.2-r9 --- www-servers/tomcat/ChangeLog | 974 +----------------- www-servers/tomcat/Manifest | 56 +- .../files/5.5.22/catalinabuild-xml.patch | 30 + .../tomcat/files/5.5.22/jasperbuild-xml.patch | 10 + .../5.5.22/jsr152_examples_build-xml.patch | 10 + .../5.5.22/jsr152build-xml-examples.patch | 28 + .../5.5.22/jsr154_examples_build-xml.patch | 10 + .../5.5.22/jsr154build-xml-examples.patch | 28 + .../tomcat/files/5.5.22/mainbuild-xml.patch | 24 + www-servers/tomcat/files/5.5.22/tomcat.conf | 75 ++ www-servers/tomcat/files/5.5.22/tomcat.init | 91 ++ .../tomcat/files/5.5.22/tomcatbuild-xml.patch | 367 +++++++ .../tomcat/files/digest-tomcat-5.5.22_pre | 3 + www-servers/tomcat/tomcat-5.5.22_pre.ebuild | 342 ++++++ 14 files changed, 1083 insertions(+), 965 deletions(-) create mode 100644 www-servers/tomcat/files/5.5.22/catalinabuild-xml.patch create mode 100644 www-servers/tomcat/files/5.5.22/jasperbuild-xml.patch create mode 100644 www-servers/tomcat/files/5.5.22/jsr152_examples_build-xml.patch create mode 100644 www-servers/tomcat/files/5.5.22/jsr152build-xml-examples.patch create mode 100644 www-servers/tomcat/files/5.5.22/jsr154_examples_build-xml.patch create mode 100644 www-servers/tomcat/files/5.5.22/jsr154build-xml-examples.patch create mode 100644 www-servers/tomcat/files/5.5.22/mainbuild-xml.patch create mode 100644 www-servers/tomcat/files/5.5.22/tomcat.conf create mode 100755 www-servers/tomcat/files/5.5.22/tomcat.init create mode 100644 www-servers/tomcat/files/5.5.22/tomcatbuild-xml.patch create mode 100644 www-servers/tomcat/files/digest-tomcat-5.5.22_pre create mode 100644 www-servers/tomcat/tomcat-5.5.22_pre.ebuild diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index ca586e2e2f31..d348bf5f5d08 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,966 +1,18 @@ # 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. - +tomcat-6.0.10_pre.ebuild: - Bumped package to latest development release - - 09 Feb 2007; William L. Thomson Jr. - 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. - -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. - 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. - -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 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. - +tomcat-6.0.9_alpha.ebuild: - -m Bumped package to latest alpha - - 31 Jan 2007; Vlastimil Babka - 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 - 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. - 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. - 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. - +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. - 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. - tomcat-6.0.8_alpha.ebuild: - Added ~ppc per user request - - 26 Jan 2007; Vlastimil Babka 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. - -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. - 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. - 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. - -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ò - tomcat-6.0.7_alpha-r3.ebuild: - Add ~x86-fbsd keyword. - - 09 Jan 2007; William L. Thomson Jr. - 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. - -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. - -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. - -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. - -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. - tomcat-5.5.20-r5.ebuild, tomcat-6.0.7_alpha.ebuild: - Updated virtuals for 1.6 - - 27 Dec 2006; Timothy Redaelli 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. - 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 - 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 - 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. - 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. - -tomcat-6.0.4.ebuild, +tomcat-6.0.6.ebuild: - Bumped Tomcat 6.x to latest alpha - - 13 Dec 2006; William L. Thomson Jr. - 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. - -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ò - tomcat-5.5.20-r3.ebuild: - Add ~x86-fbsd keyword. - -*tomcat-5.5.20-r3 (08 Dec 2006) - - 08 Dec 2006; Petteri Räty - +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. - -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. - tomcat-5.5.20-r2.ebuild: - Removed false dep on jaxen from 5.5.20. - - 06 Dec 2006; Petteri Räty - tomcat-5.5.20-r2.ebuild: - It's java-pkg_filter-compiler not java-pkg_filter. - - 05 Dec 2006; William L. Thomson Jr. - 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 tomcat-5.0.28-r14.ebuild: - Update xerces dep for upcoming 2.6 slotmove. - - 28 Nov 2006; William L. Thomson Jr. - 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 tomcat-5.5.20-r2.ebuild: - Stabilized on amd64 (see bug #155622). - - 23 Nov 2006; Christian Faulhammer - tomcat-5.5.20-r2.ebuild: - stable x86, bug #155622 - -*tomcat-6.0.2 (20 Nov 2006) - - 20 Nov 2006; William L. Thomson Jr. - +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. - -tomcat-5.5.20.ebuild, -tomcat-5.5.20-r1.ebuild: - Ebuild cleanup, removed older revisions - - 18 Oct 2006; William L. Thomson Jr. - 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. - -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 tomcat-5.0.28-r14.ebuild: - Added call to java-pkg_pkg_setup, for bug #142708 - - 05 Oct 2006; Gustavo Zacarias - tomcat-5.0.27-r6.ebuild: - Dropping sparc keywords, see #96229 - - 28 Sep 2006; William L. Thomson Jr. Manifest: - Redigested, ew - -*tomcat-5.5.20 (28 Sep 2006) - - 28 Sep 2006; William L. Thomson Jr. - +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. - 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. - 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. - 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. - 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 - tomcat-5.0.27-r6.ebuild: - Remove ~alpha keyword. - -*tomcat-5.0.28-r14 (20 Sep 2006) - - 20 Sep 2006; William L. Thomson Jr. - 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. - 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. - 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. 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 - 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. +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. tomcat-5.5.17-r2.ebuild: - Take two on ebuild fix - - 04 Sep 2006; William L. Thomson Jr. ChangeLog: - Manifest did not get committed - - 04 Sep 2006; William L. Thomson Jr. 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. metadata.xml: - Updated metadata.xml to reflect new maintainer, me :) - -*tomcat-5.5.17-r1 (07 Jul 2006) - - 07 Jul 2006; Joshua Nichols - 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 - +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 - 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 - 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 - 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 for reporting. Also removed old - revisions. - - 30 Dec 2005; Petteri Räty - 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 - -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 - +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 - 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 - +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 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 - 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 - 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 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 ; - +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ò - 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 tomcat-5.0.28-r4.ebuild: - permission issue fixed, see #93778 - - 20 May 2005; Jan Brinkmann tomcat-5.0.28-r4.ebuild: - fixed problems with first time installation, see #93322 - - 17 May 2005; Jan Brinkmann 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 - -tomcat-5.0.28-r3.ebuild, +tomcat-5.0.28-r4.ebuild: - revision bump, indicate the changes - - 17 May 2005; Jan Brinkmann tomcat-5.0.28-r3.ebuild: - permission changes - -*tomcat-5.0.27-r6 (15 May 2005) - - 15 May 2005; Jan Brinkmann - -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 - -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 tomcat-5.0.28-r2.ebuild: - Added ~sparc keyword. - -*tomcat-5.0.27-r5 (13 Apr 2005) - - 13 Apr 2005; Jan Brinkmann -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 tomcat-5.0.28-r2.ebuild: - This version doesn't build on ppc64 (added -ppc64 to KEYWORDS) - - 04 Apr 2005; Thomas Matthijs tomcat-5.0.28-r2.ebuild: - change dep to reflect commons-httpclient slotting - - 28 Mar 2005; Jan Brinkmann 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 tomcat-5.0.28-r2.ebuild: - moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336 - - 22 Mar 2005; Jan Brinkmann -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 -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 +tomcat-5.0.28-r2.ebuild: - version bump to indicate the changes i recently did. - - 19 Mar 2005; Jan Brinkmann 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 +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 - files/5.0.28/scripts.patch: - added log4j to classpath in catalina.sh, fixes #84206. thanks to Santiago Gala - for the report and the fix. - - 13 Feb 2005; Jan Brinkmann - 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 +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 metadata.xml: - updated maintainer informations. - - 18 Dec 2004; Karl Trygve Kalleberg tomcat-5.0.28.ebuild: - Fixes #74858 thanks to Petteri Räty - - 17 Nov 2004; Markus Rothe tomcat-5.0.27-r4.ebuild, - tomcat-5.0.28.ebuild: - marked ~ppc64; bug #55690 - - 17 Oct 2004; Thomas Matthijs files/5.0.28/jikes.diff: - fix path in jikes patch, #67847 - -*tomcat-5.0.28 (09 Oct 2004) - - 09 Oct 2004; Thomas Matthijs - +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 - for his work on this. #18352 - - 08 Oct 2004; Thomas Matthijs 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 tomcat-4.1.30-r5.ebuild: - Marked ~amd64. - - 05 Sep 2004; Sven Wegener : - Fixed ChangeLog header. - - 03 Sep 2004; Thomas Matthijs 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 - 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 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 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 +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 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 tomcat-5.0.27-r3.ebuild: - ~amd64 - - 06 Aug 2004; Thomas Matthijs -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 +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 -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 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 +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 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 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 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 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 tomcat-5.0.18.ebuild: - QA - fix use invocation - - 08 Jun 2004; Bryan Østergaard tomcat-5.0.18.ebuild: - Stable on alpha. - -*tomcat-5.0.25 (19 May 2004) - - 19 May 2004; Chris Aniszczyk +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 tomcat-4.1.29.ebuild: - Add inherit eutils - - 10 Apr 2004; Travis Tilley tomcat-5.0.18.ebuild: - added ~amd64 keyword - - 21 Mar 2004; Martin Holzer tomcat-5.0.18.ebuild: - adding categorie. see 45110 for details - - 24 Feb 2004; Chris Aniszczyk tomcat-4.1.29.ebuild: - Heh, variable order fix ;) Bug #42071 - - 24 Feb 2004; Chris Aniszczyk 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 - for some patches. Bug #42175 - -*tomcat-5.0.18 (15 Feb 2004) -*tomcat-4.1.29 (15 Feb 2004) - - 15 Feb 2004; tomcat-4.1.29.ebuild, tomcat-5.0.18.ebuild: - Massive bugfixes + version bumps. Huge thanks to Chetan Sarva - 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; tomcat-4.1.24-r1.ebuild: - QA: fixing chown user.group to user:group, bug #35127 - - 16 Oct 2003; Sergey Kuleshov 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 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" for pointing out the - vulnerability. - -*tomcat-4.1.24 (25 Mar 2003) - - 10 Apr 2003; Dylan Carlson 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 tomcat-4.1.24.ebuild: - x86 ppc sparc moved to stable. - - 28 Mar 2003; Dylan Carlson files/4.1.24/tomcat.conf: - Fixed sed path in conf.d/tomcat. - - 25 Mar 2003; Dylan Carlson 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 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 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 and gtonic - for their contributions. - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*tomcat-4.0.6 (15 Oct 2002) - - 15 Oct 2002; Maik Schreiber : New version - - security update. Closes bug #8931. - - 26 Sep 2002; Maik Schreiber 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 : - Security update. Ebuild provided by Adrian Almenar . - -*tomcat-4.0.4 (23 Jun 2002) - - 14 Sep 2002; Owen Stampflee : - Added PPC to KEYWORDS. - - 14 Jul 2002; Daniel Ahlberg tomcat-4.0.4.ebuild : - Added KEYWORDS. - - 23 Jun 2002; William McArthur 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 tomcat-4.0.3.ebuild : - Added KEYWORDS, SLOT. - - 03 Jun 2002; Karl Trygve Kalleberg 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 tomcat-4.0.1.ebuild : - Added KEYWORDS, SLOT. - - 1 Feb 2002; G.Bevin 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 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 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 diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 81802c820439..318c47b90373 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -86,6 +86,46 @@ AUX 5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06 MD5 83d2b72b5c1c52e80492ee5199eb3625 files/5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 files/5.5.20/tomcatbuild-xml.patch 12470 SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4 files/5.5.20/tomcatbuild-xml.patch 12470 +AUX 5.5.22/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e +MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5.22/catalinabuild-xml.patch 1149 +RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5.22/catalinabuild-xml.patch 1149 +SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e files/5.5.22/catalinabuild-xml.patch 1149 +AUX 5.5.22/jasperbuild-xml.patch 463 RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 SHA1 f168e9ff231e1ccd727367a03f0fdefde3c36a1a SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714 +MD5 0139160e01d9f8c37007e700adc14edd files/5.5.22/jasperbuild-xml.patch 463 +RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 files/5.5.22/jasperbuild-xml.patch 463 +SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714 files/5.5.22/jasperbuild-xml.patch 463 +AUX 5.5.22/jsr152_examples_build-xml.patch 403 RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e SHA1 d8d596ce643a30429194f0003d1847c9565059c5 SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d +MD5 345c4483f94ba70ccd6170ee50bdabbd files/5.5.22/jsr152_examples_build-xml.patch 403 +RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e files/5.5.22/jsr152_examples_build-xml.patch 403 +SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d files/5.5.22/jsr152_examples_build-xml.patch 403 +AUX 5.5.22/jsr152build-xml-examples.patch 812 RMD160 e9449414ef88de3e2b54c094c898d75f13e4c74e SHA1 5455201aba4cca42b000477375516a45c380c766 SHA256 36b91bb7ccb67ca31db41a8217c6762b1aff88b0611319aded08421401d7f9b0 +MD5 4c33bf7e8bd654980a11408211768a2e files/5.5.22/jsr152build-xml-examples.patch 812 +RMD160 e9449414ef88de3e2b54c094c898d75f13e4c74e files/5.5.22/jsr152build-xml-examples.patch 812 +SHA256 36b91bb7ccb67ca31db41a8217c6762b1aff88b0611319aded08421401d7f9b0 files/5.5.22/jsr152build-xml-examples.patch 812 +AUX 5.5.22/jsr154_examples_build-xml.patch 406 RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 SHA1 1bfb15ad4eaec80f16a51f2e1bf0bed31792da38 SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b +MD5 4834c2eada7c9c01cf69d9d5637eae62 files/5.5.22/jsr154_examples_build-xml.patch 406 +RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 files/5.5.22/jsr154_examples_build-xml.patch 406 +SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b files/5.5.22/jsr154_examples_build-xml.patch 406 +AUX 5.5.22/jsr154build-xml-examples.patch 836 RMD160 5a0cf4831345c904b5f9b3f89bcbbc0243e676e6 SHA1 29a59f40743784327d8be9307c40c291141fa5bf SHA256 84a82ef51e8cd0470ea3f388c16f3323024e87b74212ffab65977b5d9792a191 +MD5 e715be19acef459dbe33804fc0d8b35c files/5.5.22/jsr154build-xml-examples.patch 836 +RMD160 5a0cf4831345c904b5f9b3f89bcbbc0243e676e6 files/5.5.22/jsr154build-xml-examples.patch 836 +SHA256 84a82ef51e8cd0470ea3f388c16f3323024e87b74212ffab65977b5d9792a191 files/5.5.22/jsr154build-xml-examples.patch 836 +AUX 5.5.22/mainbuild-xml.patch 892 RMD160 597cf8a0322a56543b51951807ec1c266ae8faaa SHA1 225f24dc6acadf6c1d0547feb24b0a227b1b225f SHA256 f3e13d19c04bd6d27f6d52d4a04cd311892dd334ebfca9c443bc6daf09abcc6e +MD5 ac639b069df018dc62fa4ca532696102 files/5.5.22/mainbuild-xml.patch 892 +RMD160 597cf8a0322a56543b51951807ec1c266ae8faaa files/5.5.22/mainbuild-xml.patch 892 +SHA256 f3e13d19c04bd6d27f6d52d4a04cd311892dd334ebfca9c443bc6daf09abcc6e files/5.5.22/mainbuild-xml.patch 892 +AUX 5.5.22/tomcat.conf 2689 RMD160 ef44b2f2af2d32dad82e3346727455b99e1a8c12 SHA1 a0a7d729d9663af0cd88b89daf39642fcb7c55b8 SHA256 afd4615e8a4a65f77702fcbe920ee1828ef7d572f9fb76edfecc2307264d759a +MD5 ab94d0fdf14e7f47df0cb8a64e89f0a2 files/5.5.22/tomcat.conf 2689 +RMD160 ef44b2f2af2d32dad82e3346727455b99e1a8c12 files/5.5.22/tomcat.conf 2689 +SHA256 afd4615e8a4a65f77702fcbe920ee1828ef7d572f9fb76edfecc2307264d759a files/5.5.22/tomcat.conf 2689 +AUX 5.5.22/tomcat.init 3379 RMD160 f6324e13cec0f26e8972ef079d92fb7924d175f8 SHA1 e39fc98d9b2ebe73fe7beb429167859fc0f6bf32 SHA256 fcc0ad7d3f21c5d6c74d20763beb8af3759ed08af3eb09624e6b57d18fe5ed37 +MD5 d19efb9ba652b5c441913707972e6ed4 files/5.5.22/tomcat.init 3379 +RMD160 f6324e13cec0f26e8972ef079d92fb7924d175f8 files/5.5.22/tomcat.init 3379 +SHA256 fcc0ad7d3f21c5d6c74d20763beb8af3759ed08af3eb09624e6b57d18fe5ed37 files/5.5.22/tomcat.init 3379 +AUX 5.5.22/tomcatbuild-xml.patch 13828 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 SHA1 3a8ae3d686046f1938c71bd790d6f9ecf4339556 SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9 +MD5 47210f9a3e6b7c1809b34cfdab7fdb9b files/5.5.22/tomcatbuild-xml.patch 13828 +RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 files/5.5.22/tomcatbuild-xml.patch 13828 +SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9 files/5.5.22/tomcatbuild-xml.patch 13828 AUX 6/build-xml.patch 2611 RMD160 639b3f080dc47f799bf029c36e082c2c1976fd9d SHA1 a41e61f07453d14904d1f4b59c71e577840a9b01 SHA256 7bf3bf095504f1063d5d282643ee2b61bc6bd6b4f32f80906484af53757e02c6 MD5 8533b95643881c578f24e30098d3d178 files/6/build-xml.patch 2611 RMD160 639b3f080dc47f799bf029c36e082c2c1976fd9d files/6/build-xml.patch 2611 @@ -99,6 +139,7 @@ MD5 f6cfbfe83a55a5700ad52d43483be852 files/6/tomcat.init 3291 RMD160 b6bac4cf4ce2bac5aa0bd9dec28fa88a39c42570 files/6/tomcat.init 3291 SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b files/6/tomcat.init 3291 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 +DIST apache-tomcat-5.5.22-src.tar.gz 4888257 RMD160 39a5da86cce996c7c41baddfab825e5bfbd334db SHA1 9b9ad830c4db0f0668aa2500cc1d954c1bf95b96 SHA256 206fa6040b06cc98d705afe3594d588e2556dc15eb73083d4c1da146b997216a DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199 DIST apache-tomcat-6.0.9-src.tar.gz 3218164 RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 SHA1 2194a1162c0de5c5765fcd419145dbec44470be9 SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647 DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc @@ -114,6 +155,10 @@ EBUILD tomcat-5.5.20-r8.ebuild 10296 RMD160 d745378ce830fbdc415f0f2de81e976cbff9 MD5 57d15320f6132d2222e2c9036c583f18 tomcat-5.5.20-r8.ebuild 10296 RMD160 d745378ce830fbdc415f0f2de81e976cbff91993 tomcat-5.5.20-r8.ebuild 10296 SHA256 72b899ccde992f7248ff3ce20b9274327c45790c94a4b924d4c09e8dd5528035 tomcat-5.5.20-r8.ebuild 10296 +EBUILD tomcat-5.5.22_pre.ebuild 10866 RMD160 ce36255045797989e7359c3a6d248e1db8dd2e60 SHA1 3d7e76c28f68a11d10dc702046ece7e5b039c6bd SHA256 23e4179e9d01e35d001320e76f8f1ce7f00066f8ae4c183e2bb48bab0c2da855 +MD5 f3efc8c806c832dc22cfd77098e6019d tomcat-5.5.22_pre.ebuild 10866 +RMD160 ce36255045797989e7359c3a6d248e1db8dd2e60 tomcat-5.5.22_pre.ebuild 10866 +SHA256 23e4179e9d01e35d001320e76f8f1ce7f00066f8ae4c183e2bb48bab0c2da855 tomcat-5.5.22_pre.ebuild 10866 EBUILD tomcat-6.0.10_pre.ebuild 5122 RMD160 231026bc3afedae9578dba5875e8c4274ef70bf1 SHA1 88b35e435e4d7540865814451996bc5a1d116fb2 SHA256 02a83cd1b206c9a8b0b423ec43a3451aa84467298f6fe14f1014a9ea9a3635bb MD5 cde4aa7878a33eea073c039de67451c7 tomcat-6.0.10_pre.ebuild 5122 RMD160 231026bc3afedae9578dba5875e8c4274ef70bf1 tomcat-6.0.10_pre.ebuild 5122 @@ -122,10 +167,10 @@ EBUILD tomcat-6.0.9_beta.ebuild 5050 RMD160 059a06d40d9e1a96ee8768c756a2a7d7990d MD5 b32c444a12871fe10eb20a26186da76e tomcat-6.0.9_beta.ebuild 5050 RMD160 059a06d40d9e1a96ee8768c756a2a7d7990dfef7 tomcat-6.0.9_beta.ebuild 5050 SHA256 4bddf108bd1d8772598c1473e3a069bed339f2aa3c891ead9b182f44f48b3813 tomcat-6.0.9_beta.ebuild 5050 -MISC ChangeLog 38206 RMD160 3abfcac185cbf6359dab15e61eca4ea09334043b SHA1 2804de8e5f8e0ca3ea89209e97c4d6ee757f5fd7 SHA256 63f96f2a7f02e88e4eff2ad2639ae55da235c24342fe8b5e494d6800c6b9c15e -MD5 0003ee78038be15a486ea27c9af690ff ChangeLog 38206 -RMD160 3abfcac185cbf6359dab15e61eca4ea09334043b ChangeLog 38206 -SHA256 63f96f2a7f02e88e4eff2ad2639ae55da235c24342fe8b5e494d6800c6b9c15e ChangeLog 38206 +MISC ChangeLog 778 RMD160 923d4d872b9f5c7b8dfac5ff71a41b1f5557ee1d SHA1 bdcfa55c739d7045132d8648b92a14b2e5809f15 SHA256 ed9fdf83ce9a95b206c3bcf9cf42c44ed497414e9cbe01cc2faca48b3a8398f1 +MD5 293a1c27c2b8855591a716629c285dd4 ChangeLog 778 +RMD160 923d4d872b9f5c7b8dfac5ff71a41b1f5557ee1d ChangeLog 778 +SHA256 ed9fdf83ce9a95b206c3bcf9cf42c44ed497414e9cbe01cc2faca48b3a8398f1 ChangeLog 778 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -139,6 +184,9 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277 +MD5 688aca3d811cb2516ca3d4e7efa05bb6 files/digest-tomcat-5.5.22_pre 277 +RMD160 bab389aec90e5bd2a4a67d940e7e2171ac94d257 files/digest-tomcat-5.5.22_pre 277 +SHA256 52c8b51127d5456a17e54290706ca09621523d7befa04bd76dd74ced904cad11 files/digest-tomcat-5.5.22_pre 277 MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10_pre 277 RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10_pre 277 SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10_pre 277 diff --git a/www-servers/tomcat/files/5.5.22/catalinabuild-xml.patch b/www-servers/tomcat/files/5.5.22/catalinabuild-xml.patch new file mode 100644 index 000000000000..da6b96901aab --- /dev/null +++ b/www-servers/tomcat/files/5.5.22/catalinabuild-xml.patch @@ -0,0 +1,30 @@ +--- apache-tomcat-5.5.15-src/container/catalina/build.xml 2006-01-03 10:15:07.000000000 -0500 ++++ container/catalina/build.xml 2006-01-28 11:57:25.000000000 -0500 +@@ -60,6 +60,7 @@ + + + ++ + + + +@@ -91,6 +92,7 @@ + + + ++ + + + +@@ -548,9 +550,10 @@ + ++ + + + diff --git a/www-servers/tomcat/files/5.5.22/jasperbuild-xml.patch b/www-servers/tomcat/files/5.5.22/jasperbuild-xml.patch new file mode 100644 index 000000000000..1f0de5f8a04f --- /dev/null +++ b/www-servers/tomcat/files/5.5.22/jasperbuild-xml.patch @@ -0,0 +1,10 @@ +--- jasper/build.xml 2005-02-13 19:28:36.000000000 +0100 ++++ jasper/build.xml 2005-02-13 20:46:15.554972064 +0100 +@@ -30,6 +30,7 @@ + + + ++ + + + diff --git a/www-servers/tomcat/files/5.5.22/jsr152_examples_build-xml.patch b/www-servers/tomcat/files/5.5.22/jsr152_examples_build-xml.patch new file mode 100644 index 000000000000..1e4e013b741d --- /dev/null +++ b/www-servers/tomcat/files/5.5.22/jsr152_examples_build-xml.patch @@ -0,0 +1,10 @@ +--- apache-tomcat-5.5.20-src/servletapi/jsr152/build.xml 2007-01-27 00:02:27.000000000 -0500 ++++ build.xml 2007-01-27 00:02:44.000000000 -0500 +@@ -20,6 +20,7 @@ + + + ++ + + + diff --git a/www-servers/tomcat/files/5.5.22/jsr152build-xml-examples.patch b/www-servers/tomcat/files/5.5.22/jsr152build-xml-examples.patch new file mode 100644 index 000000000000..933e2aa48242 --- /dev/null +++ b/www-servers/tomcat/files/5.5.22/jsr152build-xml-examples.patch @@ -0,0 +1,28 @@ +--- apache-tomcat-5.5.17-src/servletapi/jsr152/build.xml 2006-07-29 14:13:41.000000000 -0400 ++++ servletapi/jsr152/build.xml 2006-07-29 14:13:17.000000000 -0400 +@@ -119,6 +119,7 @@ + classpath="${jsp-anttask.jar}" /> + + ++ + + + + +- + + diff --git a/www-servers/tomcat/files/5.5.22/jsr154_examples_build-xml.patch b/www-servers/tomcat/files/5.5.22/jsr154_examples_build-xml.patch new file mode 100644 index 000000000000..9c7b417a3b1f --- /dev/null +++ b/www-servers/tomcat/files/5.5.22/jsr154_examples_build-xml.patch @@ -0,0 +1,10 @@ +--- apache-tomcat-5.5.20-src/servletapi/jsr154/build.xml 2007-01-26 23:50:15.000000000 -0500 ++++ build.xml 2007-01-26 23:56:03.000000000 -0500 +@@ -17,6 +17,7 @@ + + + ++ + + + diff --git a/www-servers/tomcat/files/5.5.22/jsr154build-xml-examples.patch b/www-servers/tomcat/files/5.5.22/jsr154build-xml-examples.patch new file mode 100644 index 000000000000..4dac35390f1d --- /dev/null +++ b/www-servers/tomcat/files/5.5.22/jsr154build-xml-examples.patch @@ -0,0 +1,28 @@ +--- apache-tomcat-5.5.17-src/servletapi/jsr154/build.xml 2006-04-14 14:12:10.000000000 -0400 ++++ servletapi/jsr154/build.xml 2006-07-29 14:41:05.000000000 -0400 +@@ -99,6 +99,7 @@ + + + ++ + + + + +- + + diff --git a/www-servers/tomcat/files/5.5.22/mainbuild-xml.patch b/www-servers/tomcat/files/5.5.22/mainbuild-xml.patch new file mode 100644 index 000000000000..07c58ea73c09 --- /dev/null +++ b/www-servers/tomcat/files/5.5.22/mainbuild-xml.patch @@ -0,0 +1,24 @@ +--- build.xml.orig 2007-02-13 13:17:34.000000000 -0500 ++++ build.xml 2007-02-13 16:57:38.000000000 -0500 +@@ -66,12 +66,10 @@ + + ++ +- +- + + + ++ --> + + + diff --git a/www-servers/tomcat/files/5.5.22/tomcat.conf b/www-servers/tomcat/files/5.5.22/tomcat.conf new file mode 100644 index 000000000000..5305af87f79b --- /dev/null +++ b/www-servers/tomcat/files/5.5.22/tomcat.conf @@ -0,0 +1,75 @@ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.22/tomcat.conf,v 1.1 2007/02/13 22:39:09 wltjr Exp $ + +# JVM Runtime +# Using the default setting, it will determine your JVM from the system-vm +# set using java-config. +# See java-config(1) manual page for assistance in determining this value. +# +# You can override this value with whatever path you wish. +# Example: JAVA_HOME=/opt/sun-jdk-1.4.2.05 + +JAVA_HOME=`java-config --jre-home` + +# (Optional) Java runtime options used when the "start", "stop", or "run" +# commands are executed. +# JAVA_OPTS="" + +# Where your web applications are located +CATALINA_HOME=/usr/share/tomcat-5.5/ +CATALINA_BASE=/var/lib/tomcat-5.5/ + +# Tomcat's User/Group +# Change these at your own risk!!! These are not supported so if it +# breaks something, you are on your own. +CATALINA_USER=tomcat +CATALINA_GROUP=tomcat + +# Location of the Tomcat JARs and classes +CATALINA_LIBDIR=/usr/share/tomcat-5.5/server/lib/ + +# The CLASSPATH for Tomcat to use, plus any others you need. +CLASSPATH=${CATALINA_LIBDIR} + +# (Optional) Directory path location of temporary directory the JVM should +# use (java.io.tmpdir). Defaults to $CATALINA_BASE/temp. +CATALINA_TMPDIR="/var/tmp/tomcat-5.5/" + +# TOMCAT STARTUP/SHUTDOWN +# debug Start Catalina in a debugger +# debug -security Debug Catalina with a security manager +# jpda start Start Catalina under JPDA debugger +# start Start Catalina in a separate window +# start -security Start in a separate window with security manager +# stop Stop Catalina" +# +# NOTE: -security requires JSSE (see below) +# NOTE: jpda requires JPDA (see below) +TOMCAT_START="start" +TOMCAT_STOP="stop" + +# (Optional) Java runtime options used when the "start", "stop", or "run" +# commands are executed. +# CATALINA_OPTS="" + +# Java Platform Debugger Architecture (JPDA) +# http://java.sun.com/products/jpda/ +# Included with Java SDK 1.3 and later. No need to specify location. +# +# JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start" +# command is executed. The default is "dt_socket". +# +# JPDA_ADDRESS (Optional) Java runtime options used when the "jpda start" +# command is executed. The default is 8000. +# +# JPDA_TRANSPORT="dt_socket" +# JPDA_ADDRESS="8000" + +# Java Secure Socket Extension (JSSE) +# http://java.sun.com/products/jsse/ +# Included with Java SDK 1.4 and later. +# +# JSSE_HOME (Optional) May point at your Java Secure Sockets Extension +# (JSSE) installation, whose JAR files will be added to the +# system class path used to start Tomcat. +# +# JSSE_HOME="/opt/sun-jdk-1.4.1.02/jre/lib/" diff --git a/www-servers/tomcat/files/5.5.22/tomcat.init b/www-servers/tomcat/files/5.5.22/tomcat.init new file mode 100755 index 000000000000..455ea37a1c8c --- /dev/null +++ b/www-servers/tomcat/files/5.5.22/tomcat.init @@ -0,0 +1,91 @@ +#!/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.22/tomcat.init,v 1.1 2007/02/13 22:39:09 wltjr Exp $ + +init_env_vars() { + # Set some sane defaults + if [ -z "${CATALINA_TMPDIR}" ] ; then + CATALINA_TMPDIR="${CATALINA_BASE}"/temp + fi + JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"} + JPDA_ADDRESS=${JPDA_ADDRESS:="8000"} + JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"} + + # Activate Logging + if [[ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]]; then + JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \ + -Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties" + fi + + # Populate the classpath + CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/server/lib:${JAVA_HOME}/lib/tools.jar" + if [[ -n "${JSSE_HOME}" ]]; then + CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar" + fi + CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/commons-logging-api.jar" + + OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} \ + -Djava.endorsed.dirs=${CATALINA_HOME}/common/endorsed \ + -classpath ${CLASSPATH}" + + CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \ + -Dcatalina.home=${CATALINA_HOME} \ + -Djava.io.tmpdir=${CATALINA_TMPDIR} \ + org.apache.catalina.startup.Bootstrap " + + if [ ! -f "${CATALINA_BASE}logs/catalina.out" ]; then + touch "${CATALINA_BASE}logs/catalina.out" + chown tomcat:tomcat "${CATALINA_BASE}logs/catalina.out" + fi +} + +start-helper() { + local executor=${1} + shift + local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \ + --make-pidfile --pidfile /var/run/tomcat.pid" + start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> "$CATALINA_BASE"/logs/catalina.out 2>&1 + return $? +} + +depend() { + use dns logger net +} + +start() { + ebegin "Starting Tomcat" + init_env_vars + # Figure out what arguments to pass start-helper based on TOMCAT_START + if [[ "${TOMCAT_START}" == "debug" ]] ; then + start-helper ${JAVA_HOME}/bin/jdb \ + -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share + elif [[ "${TOMCAT_START}" == "debug -security" ]] ; then + start-helper ${JAVA_HOME}/bin/jdb \ + -sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \ + -Djava.security.manager \ + -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy + elif [[ "${TOMCAT_START}" == "jpda start" ]] ; then + start-helper ${JAVA_HOME}/bin/java ${JPDA_OPTS} + elif [[ "${TOMCAT_START}" == "start" ]] ; then + start-helper ${JAVA_HOME}/bin/java + elif [[ "${TOMCAT_START}" == "start -security" ]] ; then + start-helper ${JAVA_HOME}/bin/java \ + -Djava.security.manager \ + -Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy + else + eerror "Invalid TOMCAT_START variable value, or one is not set" + eerror "Please see /etc/conf.d/tomcat-5.5 for more information" + eend 1 + fi + eend $? +} + +stop() { + ebegin "Stopping Tomcat" + init_env_vars + start-stop-daemon --stop --quiet \ + --make-pidfile --pidfile /var/run/tomcat.pid \ + --exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} ${STD_OUT} stop + eend $? +} diff --git a/www-servers/tomcat/files/5.5.22/tomcatbuild-xml.patch b/www-servers/tomcat/files/5.5.22/tomcatbuild-xml.patch new file mode 100644 index 000000000000..109caf67af37 --- /dev/null +++ b/www-servers/tomcat/files/5.5.22/tomcatbuild-xml.patch @@ -0,0 +1,367 @@ +--- 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 @@ + + + ++ ++ + ++ --> + + + +@@ -395,15 +396,14 @@ + + ++ ++ ++ + +- + +- + +- + + +- + + + +@@ -437,23 +437,6 @@ + addWebXmlMappings="true" + outputDir="${ROOT.base}/WEB-INF/src" /> + +- +- +- +- + + + +- +- +- +- +- +- ++ + +- ++ ++ ++ ++ ++ ++ ++ + + + + + +- ++ + + + + + + +- + +- +- ++ + +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + + +- ++ + + + + + + ++ + +- ++ ++ + + + +@@ -653,28 +665,8 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ + + + +@@ -754,19 +746,11 @@ + + + +- +- +- ========== Building: webapps +- +- +- ++ + + +- +- +- +- ++ ++ + + + +@@ -779,6 +763,18 @@ + + + ++ ++ ++ ++ ++ ++ ========== Building: webapps ++ ++ ++ ++ ++ + + + +@@ -850,14 +846,7 @@ + filtering="true" /> + + +- +- +- +- +- +- +- ++ + + +@@ -896,9 +885,20 @@ + todir="${tomcat.build}/conf/Catalina/localhost" /> + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +- + + + +@@ -1041,11 +1041,11 @@ + + + +- ++ + + + +@@ -1092,8 +1092,9 @@ + + ++ + Target: Webapps precompilation ... + + +@@ -1188,10 +1189,11 @@ + description="Catalina Tests" depends="dist-tester"> + + ++ + + + +@@ -1871,10 +1873,10 @@ + + + ++ + + + +@@ -1916,7 +1918,6 @@ + + + +- + + + +@@ -1937,7 +1938,6 @@ + + + +- + + + +@@ -1976,7 +1975,7 @@ + + + +- ++ --> + + + diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.22_pre b/www-servers/tomcat/files/digest-tomcat-5.5.22_pre new file mode 100644 index 000000000000..9f11a897bf7a --- /dev/null +++ b/www-servers/tomcat/files/digest-tomcat-5.5.22_pre @@ -0,0 +1,3 @@ +MD5 1af391c1647752d4fd8e2c3892e1be68 apache-tomcat-5.5.22-src.tar.gz 4888257 +RMD160 39a5da86cce996c7c41baddfab825e5bfbd334db apache-tomcat-5.5.22-src.tar.gz 4888257 +SHA256 206fa6040b06cc98d705afe3594d588e2556dc15eb73083d4c1da146b997216a apache-tomcat-5.5.22-src.tar.gz 4888257 diff --git a/www-servers/tomcat/tomcat-5.5.22_pre.ebuild b/www-servers/tomcat/tomcat-5.5.22_pre.ebuild new file mode 100644 index 000000000000..add7b6582931 --- /dev/null +++ b/www-servers/tomcat/tomcat-5.5.22_pre.ebuild @@ -0,0 +1,342 @@ +# 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 +} -- 2.26.2