diff options
author | William Thomson <wltjr@gentoo.org> | 2007-09-08 00:26:16 +0000 |
---|---|---|
committer | William Thomson <wltjr@gentoo.org> | 2007-09-08 00:26:16 +0000 |
commit | 28da9a3f927cb471a627fd1f465ac6d83bdf59ec (patch) | |
tree | 08ed17cf8755a09b632a444d8c4889819626b04b /www-servers | |
parent | bad wolf31o2\! BAD\! Breaking Manifests\! (diff) | |
download | historical-28da9a3f927cb471a627fd1f465ac6d83bdf59ec.tar.gz historical-28da9a3f927cb471a627fd1f465ac6d83bdf59ec.tar.bz2 historical-28da9a3f927cb471a627fd1f465ac6d83bdf59ec.zip |
House cleaning, removed older versions and older conf/init files from removed 5.5
Package-Manager: portage-2.1.3.7
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/tomcat/ChangeLog | 8 | ||||
-rw-r--r-- | www-servers/tomcat/Manifest | 41 | ||||
-rw-r--r-- | www-servers/tomcat/files/5.5/tomcat.conf | 75 | ||||
-rwxr-xr-x | www-servers/tomcat/files/5.5/tomcat.init | 91 | ||||
-rw-r--r-- | www-servers/tomcat/files/digest-tomcat-5.5.23-r1 | 3 | ||||
-rw-r--r-- | www-servers/tomcat/files/digest-tomcat-6.0.13-r3 | 3 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-5.5.23-r1.ebuild | 339 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-6.0.13-r3.ebuild | 196 |
8 files changed, 11 insertions, 745 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 667fa6989817..cc5cdbf88812 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.162 2007/08/31 21:42:30 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.163 2007/09/08 00:26:15 wltjr Exp $ + + 08 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org> + -files/5.5/tomcat.conf, -files/5.5/tomcat.init, -tomcat-5.5.23-r1.ebuild, + -tomcat-6.0.13-r3.ebuild: + House cleaning, removed older versions and older conf/init files from + removed 5.5 31 Aug 2007; Christian Faulhammer <opfer@gentoo.org> tomcat-6.0.14.ebuild: stable x86, security bug 188871 diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index e4f22af4f7ba..7ec3934323da 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 5.5/catalina.policy 10897 RMD160 d6accc56803b132d0e82e163cc583464c38248ef SHA1 585f80e24cad7e5927f8c2c6ad03f668eb904cc1 SHA256 8188db94772eb00d44b28cb9b40e9ccf30803acf576c0af1be5844ebd35d763c MD5 993e3718a15ef29f63779e56e15a1638 files/5.5/catalina.policy 10897 RMD160 d6accc56803b132d0e82e163cc583464c38248ef files/5.5/catalina.policy 10897 @@ -25,18 +22,10 @@ AUX 5.5/main_build_xml.patch 892 RMD160 597cf8a0322a56543b51951807ec1c266ae8faaa MD5 ac639b069df018dc62fa4ca532696102 files/5.5/main_build_xml.patch 892 RMD160 597cf8a0322a56543b51951807ec1c266ae8faaa files/5.5/main_build_xml.patch 892 SHA256 f3e13d19c04bd6d27f6d52d4a04cd311892dd334ebfca9c443bc6daf09abcc6e files/5.5/main_build_xml.patch 892 -AUX 5.5/tomcat.conf 2686 RMD160 37658c50dfc468fd446327e22db290aec2160403 SHA1 6ecab84b436edbdf47bf9c8d634cb541c602bde1 SHA256 d95cbcfc5e23911755b11807868e64622e1e0c5b473d77db7ff758aa999a5f6c -MD5 e466bcc62d074cc60b2d0e508da5a0d7 files/5.5/tomcat.conf 2686 -RMD160 37658c50dfc468fd446327e22db290aec2160403 files/5.5/tomcat.conf 2686 -SHA256 d95cbcfc5e23911755b11807868e64622e1e0c5b473d77db7ff758aa999a5f6c files/5.5/tomcat.conf 2686 AUX 5.5/tomcat.conf.2 2775 RMD160 9ab105f0e57276c105fb406d5632cc2a47401c26 SHA1 cb00a622c7858a81838292200d36d7901ee9cb2e SHA256 7539da9262abd8f8b04e9589e8a733a64670f641035a1ca8a40a236e486038f2 MD5 2414998ef3f5b7c89ed3db952803d948 files/5.5/tomcat.conf.2 2775 RMD160 9ab105f0e57276c105fb406d5632cc2a47401c26 files/5.5/tomcat.conf.2 2775 SHA256 7539da9262abd8f8b04e9589e8a733a64670f641035a1ca8a40a236e486038f2 files/5.5/tomcat.conf.2 2775 -AUX 5.5/tomcat.init 3376 RMD160 bde20b2d738174fda5792531037b36ed27db8280 SHA1 5f3986a35e3046ffd81b839780f81322210fe879 SHA256 421ca1e7e4ab413e30ea708b0cacad398d472b857425b0d7a2963a4a4ce99e62 -MD5 19e200c22e63a7ce3b20ca5f6ba35eb4 files/5.5/tomcat.init 3376 -RMD160 bde20b2d738174fda5792531037b36ed27db8280 files/5.5/tomcat.init 3376 -SHA256 421ca1e7e4ab413e30ea708b0cacad398d472b857425b0d7a2963a4a4ce99e62 files/5.5/tomcat.init 3376 AUX 5.5/tomcat.init.2 3679 RMD160 48068f010cb0f0fd4bf54384485faa8791b0d00d SHA1 a37bd7ba46d4fd25ee719b1e0d6042778be5f999 SHA256 e0f64f1e1b104c9cd9807308809e6e09a99b2fff235e4c1c7923fa64d9326e80 MD5 ad04646bf2b9928dcb02b11e65429743 files/5.5/tomcat.init.2 3679 RMD160 48068f010cb0f0fd4bf54384485faa8791b0d00d files/5.5/tomcat.init.2 3679 @@ -62,48 +51,26 @@ MD5 f6b8899fba578a03064c63fce6fcb916 files/6/tomcat.init 3355 RMD160 169a9af752e814f7cafbfa849fb1dbc433bbbbf3 files/6/tomcat.init 3355 SHA256 d53e31a221a3e78f6cc8686d7e123da10216a46851e64a2f5819f1f8147b86b8 files/6/tomcat.init 3355 DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd -DIST apache-tomcat-6.0.13-src.tar.gz 3454302 RMD160 2ef73ec380736661969f28c231a4a0c9fbd6d29c SHA1 8a60e80b878609dc207a357fede749c67857dd54 SHA256 273c6d56283677c0c7033e6ecce53ba7f1fac6930e20e83acccfe2ac88c6a6ff DIST apache-tomcat-6.0.14-src.tar.gz 3458776 RMD160 24f586d946654edcc70c5ec1ee457022c4a5d070 SHA1 3156b0b853f8f340ef825c58d0281cdda3f5816e SHA256 ef57398cc8e0294fb74d0d76debdaebf51ec47f18c9c927ddc98530dfa93cf88 -EBUILD tomcat-5.5.23-r1.ebuild 10930 RMD160 3eccd694f37bebd9b8f827a3446eb59df1a2889e SHA1 f268c6b677ebd1839917537409f139e67de38c1a SHA256 b9f02c81150d88932f35db49158fbdd1fcf13de8cc0336ed33b75cf2a22748f1 -MD5 9b53dd2cac285f9e9682b90a0e920b53 tomcat-5.5.23-r1.ebuild 10930 -RMD160 3eccd694f37bebd9b8f827a3446eb59df1a2889e tomcat-5.5.23-r1.ebuild 10930 -SHA256 b9f02c81150d88932f35db49158fbdd1fcf13de8cc0336ed33b75cf2a22748f1 tomcat-5.5.23-r1.ebuild 10930 EBUILD tomcat-5.5.23-r6.ebuild 11112 RMD160 851ad5099ac493ad620ceb839c26f54946acc5ea SHA1 609a7c30a363d702f1c995ff3b9ca16ef3c0e625 SHA256 c113387935a465be335a3babda495e1d325111d521e62bfd30f6f50ea4ae6c43 MD5 4c81411d4b4f3836c5f0611d43edcbf5 tomcat-5.5.23-r6.ebuild 11112 RMD160 851ad5099ac493ad620ceb839c26f54946acc5ea tomcat-5.5.23-r6.ebuild 11112 SHA256 c113387935a465be335a3babda495e1d325111d521e62bfd30f6f50ea4ae6c43 tomcat-5.5.23-r6.ebuild 11112 -EBUILD tomcat-6.0.13-r3.ebuild 6207 RMD160 9cf0a031e74422a664585eb3e2b879e673c98080 SHA1 18b3385cde21a1d4356851e04d9a783607fc4b43 SHA256 29e083ee1d2db4f5e8b288beb48087eb119206d869bd1bc774dd969b216323ec -MD5 1c9636fcfe27c1c2c45b0496fa1c1b39 tomcat-6.0.13-r3.ebuild 6207 -RMD160 9cf0a031e74422a664585eb3e2b879e673c98080 tomcat-6.0.13-r3.ebuild 6207 -SHA256 29e083ee1d2db4f5e8b288beb48087eb119206d869bd1bc774dd969b216323ec tomcat-6.0.13-r3.ebuild 6207 EBUILD tomcat-6.0.14.ebuild 6203 RMD160 9493504efc84f173d074344111e948d64ca4ab9c SHA1 45518287c4cbf78120402b5822a301281632e4a7 SHA256 c3bb69fa2b1556477f8390631aa899e4d430246a1f3c5186bc32c87c5858bdd0 MD5 a401e5173b19ff5f9ed992c25342f416 tomcat-6.0.14.ebuild 6203 RMD160 9493504efc84f173d074344111e948d64ca4ab9c tomcat-6.0.14.ebuild 6203 SHA256 c3bb69fa2b1556477f8390631aa899e4d430246a1f3c5186bc32c87c5858bdd0 tomcat-6.0.14.ebuild 6203 -MISC ChangeLog 48660 RMD160 08b9e8e2e07fd44d76affe35d0153018e6e70c9f SHA1 6fa9fa470cddc6b1e13bcb75c913853019067a88 SHA256 475936e2a2977be8a2dac644cd545f6d5cee383babdcf77f646eea0bc1fd563c -MD5 508566fad2997b5829b14e28e7ae95f4 ChangeLog 48660 -RMD160 08b9e8e2e07fd44d76affe35d0153018e6e70c9f ChangeLog 48660 -SHA256 475936e2a2977be8a2dac644cd545f6d5cee383babdcf77f646eea0bc1fd563c ChangeLog 48660 +MISC ChangeLog 48908 RMD160 cfcc20c70d712f064fadfe41dd60195057e11d36 SHA1 06bc908c57b6d0bf688e3b6d9f1e51bdc95f623b SHA256 f71a02727ff45ccd42aed36bbc1306c605f094c631d7b79ec5b512d7263757fd +MD5 6ba210caffc63c0778ff799e258465a4 ChangeLog 48908 +RMD160 cfcc20c70d712f064fadfe41dd60195057e11d36 ChangeLog 48908 +SHA256 f71a02727ff45ccd42aed36bbc1306c605f094c631d7b79ec5b512d7263757fd ChangeLog 48908 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 metadata.xml 556 -MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r1 277 -RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r1 277 -SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r1 277 MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r6 277 RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r6 277 SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r6 277 -MD5 689139367c10950ec819a442eb5dd0c1 files/digest-tomcat-6.0.13-r3 277 -RMD160 ede80f760c03677d75cfabf3c000208361d6c3c0 files/digest-tomcat-6.0.13-r3 277 -SHA256 66e25a7d2aed203cbc675c9e7c247da0627936e4bb7c7f9b992e511110f2993c files/digest-tomcat-6.0.13-r3 277 MD5 40b1111393676c7daa27f18d8959234e files/digest-tomcat-6.0.14 277 RMD160 473b4b9d359d3cdbff1e3cf049766a860bf358f2 files/digest-tomcat-6.0.14 277 SHA256 11687ab86da3ae9d5b5f6a655e0a315ab2bc30285221a64716f3ea7b120739e5 files/digest-tomcat-6.0.14 277 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.7 (GNU/Linux) - -iD8DBQFG2ItPNQqtfCuFneMRAtDnAJ9T8pm7uED1F038KZLdcpCXqYuGTQCgjEs/ -G5EsFpoHChdG4/hItCvqRKs= -=HQpI ------END PGP SIGNATURE----- diff --git a/www-servers/tomcat/files/5.5/tomcat.conf b/www-servers/tomcat/files/5.5/tomcat.conf deleted file mode 100644 index 1a35df1e87f7..000000000000 --- a/www-servers/tomcat/files/5.5/tomcat.conf +++ /dev/null @@ -1,75 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.conf,v 1.1 2007/03/09 17:33:15 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/tomcat.init b/www-servers/tomcat/files/5.5/tomcat.init deleted file mode 100755 index 95e2d8cc26fb..000000000000 --- a/www-servers/tomcat/files/5.5/tomcat.init +++ /dev/null @@ -1,91 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init,v 1.1 2007/03/09 17:33:15 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/digest-tomcat-5.5.23-r1 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r1 deleted file mode 100644 index e0e59f68fbb2..000000000000 --- a/www-servers/tomcat/files/digest-tomcat-5.5.23-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 362d1d8b15dc09882440dcab8c592dd7 apache-tomcat-5.5.23-src.tar.gz 4895919 -RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 apache-tomcat-5.5.23-src.tar.gz 4895919 -SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd apache-tomcat-5.5.23-src.tar.gz 4895919 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.13-r3 b/www-servers/tomcat/files/digest-tomcat-6.0.13-r3 deleted file mode 100644 index d9bfd1fdd00f..000000000000 --- a/www-servers/tomcat/files/digest-tomcat-6.0.13-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 50b3744d734eb12b679c25ac34f8a6ab apache-tomcat-6.0.13-src.tar.gz 3454302 -RMD160 2ef73ec380736661969f28c231a4a0c9fbd6d29c apache-tomcat-6.0.13-src.tar.gz 3454302 -SHA256 273c6d56283677c0c7033e6ecce53ba7f1fac6930e20e83acccfe2ac88c6a6ff apache-tomcat-6.0.13-src.tar.gz 3454302 diff --git a/www-servers/tomcat/tomcat-5.5.23-r1.ebuild b/www-servers/tomcat/tomcat-5.5.23-r1.ebuild deleted file mode 100644 index 27f302643927..000000000000 --- a/www-servers/tomcat/tomcat-5.5.23-r1.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r1.ebuild,v 1.5 2007/06/17 15:53:56 wltjr Exp $ - -#WANT_ANT_TASKS="ant-trax" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Tomcat Servlet-2.4/JSP-2.0 Container" - -MY_P="apache-${P}-src" -SLOT="5.5" -SRC_URI="mirror://apache/${PN}/${PN}-5/v${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.2* - =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-httpclient-2.0* - >=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/junit-3.8.1 - >=dev-java/log4j-1.2.9 - >=dev-java/saxpath-1.0 - ~dev-java/tomcat-servlet-api-${PV} - dev-java/ant-core - admin? ( =dev-java/struts-1.2* ) - dev-java/sun-javamail - java5? ( >=virtual/jre-1.5 ) - !java5? ( - =virtual/jre-1.4* - dev-java/sun-jaf - =dev-java/mx4j-core-3* - >=dev-java/xerces-2.7.1 - =dev-java/xml-commons-external-1.3* - )" -DEPEND="java5? ( >=virtual/jdk-1.5 ) - !java5? ( =virtual/jdk-1.4* ) - ${RDEPEND} - || ( dev-java/ant-trax dev-java/ant-tasks ) " - -S=${WORKDIR}/${MY_P} - -TOMCAT_NAME="${PN}-${SLOT}" -WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps" - -pkg_setup() { - java-pkg-2_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 -} - -src_unpack() { - unpack ${A} - cd ${S} - - local PATCHES=" - main_build_xml.patch - tomcat_build_xml.patch - catalina_build_xml.patch - jasper_build_xml.patch - " - for patch in ${PATCHES}; do - epatch "${FILESDIR}/${SLOT}/${patch}" - done - if use examples; then - epatch "${FILESDIR}/${SLOT}/jsr152_examples_build_xml.patch" - epatch "${FILESDIR}/${SLOT}/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 - 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-pkg_getjars commons-collections)" - antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjars commons-daemon)" - antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)" - antflags="${antflags} -Dcommons-dbcp.jar=$(java-pkg_getjars commons-dbcp)" - antflags="${antflags} -Dcommons-el.jar=$(java-pkg_getjars commons-el)" - antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)" - antflags="${antflags} -Dcommons-httpclient.jar=$(java-pkg_getjars commons-httpclient)" - antflags="${antflags} -Dcommons-launcher.jar=$(java-pkg_getjars 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-pkg_getjars commons-pool)" - antflags="${antflags} -Dcommons-modeler.jar=$(java-pkg_getjars commons-modeler)" - antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)" - antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)" - antflags="${antflags} -Djunit.jar=$(java-pkg_getjars junit)" - antflags="${antflags} -Dlog4j.jar=$(java-pkg_getjars log4j)" - antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)" - antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.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-pkg_getjars sun-jaf)" - 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} -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}/${SLOT}/tomcat.init ${TOMCAT_NAME} - newconfd ${FILESDIR}/${SLOT}/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-pkg_getjar 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} - - elog - elog " This ebuild implements a new filesystem layout for tomcat" - elog " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml" - elog " for more information!." - elog - ewarn "naming-factory-dbcp.jar is not built at this time. Please fetch" - ewarn "jar from upstream binary if you need it. Gentoo Bug # 144276" - elog - ewarn "The manager webapps have known exploits, please refer to" - ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450" - if use examples ; then - elog - ewarn "The examples webapp has a known exploit, please refer to" - ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449" - fi - elog - elog " Please file any bugs at http://bugs.gentoo.org/ or else it" - elog " may not get seen. Thank you." - elog -} - -#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 -} diff --git a/www-servers/tomcat/tomcat-6.0.13-r3.ebuild b/www-servers/tomcat/tomcat-6.0.13-r3.ebuild deleted file mode 100644 index 6ffa6aed0ab2..000000000000 --- a/www-servers/tomcat/tomcat-6.0.13-r3.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# 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-6.0.13-r3.ebuild,v 1.7 2007/08/15 21:42:57 wltjr Exp $ - -WANT_ANT_TASKS="ant-trax" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container" - -MY_P="apache-${P}-src" -SLOT="6" -SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz" -HOMEPAGE="http://tomcat.apache.org/" -KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd" -LICENSE="Apache-2.0" - -IUSE="doc examples source test" - -COMMON_DEPEND="=dev-java/eclipse-ecj-3.2* - >=dev-java/commons-daemon-1.0.1 - >=dev-java/commons-dbcp-1.2.1 - >=dev-java/commons-logging-1.1 - >=dev-java/commons-pool-1.2 - ~dev-java/tomcat-servlet-api-${PV} - examples? ( dev-java/jakarta-jstl )" - -RDEPEND=">=virtual/jre-1.5 - dev-java/ant-core - ${COMMON_DEPEND}" - -DEPEND=">=virtual/jdk-1.5 - ${COMMON_DEPEND} - test? ( dev-java/junit )" - -S=${WORKDIR}/${MY_P} - -TOMCAT_NAME="${PN}-${SLOT}" -TOMCAT_HOME="/usr/share/${TOMCAT_NAME}" -WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps" - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${SLOT}/build-xml.patch" - - cd webapps/examples/WEB-INF/lib/ - rm -v *.jar -} - -src_compile(){ - # Fix for bug # 178980 - if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then - java-pkg_force-compiler ecj-3.2 - fi - - local antflags="build-jasper-jdt deploy -Dbase.path=${T}" - antflags="${antflags} -Dcompile.debug=false" - if ! use doc; then - antflags="${antflags} -Dnobuild.docs=true" - fi - antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)" - antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)" - antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)" - antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 jsp-api.jar)" - antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 servlet-api.jar)" - eant ${antflags} -} - -src_install() { - cd "${S}/output/build/bin" - rm -f *.bat commons-daemon.jar - java-pkg_jar-from commons-daemon - chmod 755 *.sh - - # register jars per bug #171496 - cd "${S}/output/build/lib/" - for jar in *.jar; do - java-pkg_dojar ${jar} - done - - local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/ - - # init.d, conf.d - newinitd ${FILESDIR}/${SLOT}/tomcat.init ${TOMCAT_NAME} - newconfd ${FILESDIR}/${SLOT}/tomcat.conf ${TOMCAT_NAME} - - # create dir structure - dodir /usr/share/${TOMCAT_NAME} - - diropts -m750 -o tomcat -g tomcat - dodir /etc/${TOMCAT_NAME} - keepdir ${WEBAPPS_DIR} - - diropts -m755 -o tomcat -g tomcat - dodir ${CATALINA_BASE} - - diropts -m775 -o tomcat -g tomcat - dodir /etc/${TOMCAT_NAME}/Catalina/localhost - keepdir /var/log/${TOMCAT_NAME}/ - keepdir /var/run/${TOMCAT_NAME}/ - keepdir /var/tmp/${TOMCAT_NAME}/ - - cd "${S}" - # fix context's so webapps will be deployed - sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager" a:' ${S}/webapps/host-manager/META-INF/context.xml - sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager" a:' ${S}/webapps/manager/META-INF/context.xml - - # 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.xml - - # copy over the directories - chown -R tomcat:tomcat webapps/* conf/* - cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf" - cp -pPR output/build/bin ${D}/usr/share/${TOMCAT_NAME} \ - || die "failed to copy" - - # replace catalina.policy with gentoo specific one bug #176701 -# cp ${FILESDIR}/${SLOT}/catalina.policy ${D}/etc/${TOMCAT_NAME} \ -# || die "failed to replace catalina.policy" - - cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \ - || die "failed to copy" - - cd "${D}/usr/share/${TOMCAT_NAME}/lib" - java-pkg_jar-from tomcat-servlet-api-2.5 - - cd "${S}" - - # 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 - - diropts -m755 -o tomcat -g tomcat - dodir ${TOMCAT_HOME}/webapps - cp -pr webapps/host-manager ${D}${TOMCAT_HOME}/webapps - cp -pr webapps/manager ${D}${TOMCAT_HOME}/webapps - - if use doc; then - cp -pr output/build/webapps/docs ${D}${CATALINA_BASE}/webapps - fi - if use examples; then - cd output/build/webapps/examples/WEB-INF/lib - java-pkg_jar-from jakarta-jstl jstl.jar - java-pkg_jar-from jakarta-jstl standard.jar - cd "${S}" - cp -pPr output/build/webapps/examples ${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 - - # link the manager's context to the right position - dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml - dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml - - dodoc ${S}/{RELEASE-NOTES,RUNNING.txt} - fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml -} - -pkg_postinst() { - ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}" - # temp fix for bug #176097 - chown -fR tomcat:tomcat /etc/${TOMCAT_NAME} - ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix." - - elog - elog " This ebuild implements a FHS compliant layout for tomcat" - elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml" - elog " for more information." - elog - ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" - ewarn "from upstream binary if you need it. Gentoo Bug # 144276" - elog - ewarn "The manager webapps have known exploits, please refer to" - ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450" - if use examples ; then - elog - ewarn "The examples webapp has a known exploit, please refer to" - ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449" - fi - elog - elog " Please report any bugs to http://bugs.gentoo.org/" - elog -} |