cleanup, removed old vulnerable versions. see #85383

(Portage version: 2.0.51.19)

12 files changed, 8 insertions, 423 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index cf418502de78..0d9ed5dac00d 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.20 2005/03/19 22:56:38 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.21 2005/03/20 16:33:17 luckyduck Exp $
+
+  20 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/3.3.2/gentoo.diff,
+  -files/3.3.2/tomcat.conf, -files/3.3.2/tomcat.init,
+  -files/4.1.30/gentoo.diff, -files/4.1.30/jikes.diff,
+  -files/4.1.30/tomcat.conf, -files/4.1.30/tomcat.init,
+  -tomcat-3.3.2-r2.ebuild, -tomcat-4.1.30-r5.ebuild:
+  cleanup, removed old vulnerable versions. see #85383
 
 *tomcat-5.0.28-r2 (19 Mar 2005)
 
diff --git a/www-servers/tomcat/files/3.3.2/gentoo.diff b/www-servers/tomcat/files/3.3.2/gentoo.diff
deleted file mode 100644
index f30a6017c879..000000000000
--- a/www-servers/tomcat/files/3.3.2/gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- bin/tomcat     2004-03-07 19:49:41.000000000 +0100
-+++ bin/tomcat  2004-07-27 14:10:18.560850792 +0200
-@@ -49,6 +49,9 @@
- #java -cp lib/tomcat.jar org.apache.tomcat.startup.Main $*
- #java -jar lib/tomcat.jar
- 
-+source /etc/profile
-+source /etc/conf.d/tomcat3
-+
- # OS specific support.  $var _must_ be set to either true or false.
- cygwin=false
- case "`uname`" in
-
diff --git a/www-servers/tomcat/files/3.3.2/tomcat.conf b/www-servers/tomcat/files/3.3.2/tomcat.conf
deleted file mode 100644
index 303f1ce71fa5..000000000000
--- a/www-servers/tomcat/files/3.3.2/tomcat.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/3.3.2/tomcat.conf,v 1.1 2004/08/08 18:39:49 stuart 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.1.01
-
-#JAVA_HOME=`java-config -O`
-
-# (Optional) Java runtime options used when the "start", "stop", or "run"
-# commands are executed.
-# JAVA_OPTS=""
-
-# Where your web applications are located
-TOMCAT_HOME=/opt/tomcat3
-
-# Extra options to pass to Tomcat (see docs)
-#TOMCAT_OPTS=
-
-# Tomcat's User
-TOMCAT_USER=tomcat
-
-# Tomcat Console Log Location
-CONSOLE_LOG=/var/log/tomcat3/console.log
-
-# Location of the Tomcat JARs and classes
-TOMCAT_LIBDIR=/usr/share/tomcat3/lib
-
-TOMCAT_INSTALL=${TOMCAT_HOME}
diff --git a/www-servers/tomcat/files/3.3.2/tomcat.init b/www-servers/tomcat/files/3.3.2/tomcat.init
deleted file mode 100644
index 42e30ee8f919..000000000000
--- a/www-servers/tomcat/files/3.3.2/tomcat.init
+++ /dev/null
@@ -1,23 +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/3.3.2/tomcat.init,v 1.2 2004/10/08 13:38:08 axxo Exp $
-
-depend() {
-	use dns net
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	cd ${TOMCAT_HOME}
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${TOMCAT_HOME}/bin/startup >${CONSOLE_LOG} 2>&1 
-	sleep 5
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Tomcat"
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${TOMCAT_HOME}/bin/shutdown >${CONSOLE_LOG} 2>&1 
-	sleep 5
-	eend $?
-}
diff --git a/www-servers/tomcat/files/4.1.30/gentoo.diff b/www-servers/tomcat/files/4.1.30/gentoo.diff
deleted file mode 100644
index a3a281499128..000000000000
--- a/www-servers/tomcat/files/4.1.30/gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- bin/catalina.sh	2004-05-19 02:25:07.000000000 -0400
-+++ bin/catalina.sh	2004-05-19 02:23:20.128089696 -0400
-@@ -38,6 +38,10 @@
- # $Id: gentoo.diff,v 1.1 2004/08/08 18:39:49 stuart Exp $
- # -----------------------------------------------------------------------------
- 
-+# source the appropriate files right away
-+source /etc/profile
-+source /etc/conf.d/tomcat4
-+
- # OS specific support.  $var _must_ be set to either true or false.
- cygwin=false
- os400=false
diff --git a/www-servers/tomcat/files/4.1.30/jikes.diff b/www-servers/tomcat/files/4.1.30/jikes.diff
deleted file mode 100644
index a91210d56c99..000000000000
--- a/www-servers/tomcat/files/4.1.30/jikes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- conf/web.xml	2004-06-18 03:10:14.000000000 +0200
-+++ conf/web.xml	2004-07-28 18:51:39.192165664 +0200
-@@ -186,6 +186,10 @@
-     <servlet>
-         <servlet-name>jsp</servlet-name>
-         <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-+        <init-param>
-+            <param-name>compiler</param-name>
-+            <param-value>jikes</param-value>
-+        </init-param>
-         <init-param>
-             <param-name>fork</param-name>
-             <param-value>false</param-value>
diff --git a/www-servers/tomcat/files/4.1.30/tomcat.conf b/www-servers/tomcat/files/4.1.30/tomcat.conf
deleted file mode 100644
index 1adc708f2e5c..000000000000
--- a/www-servers/tomcat/files/4.1.30/tomcat.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/4.1.30/tomcat.conf,v 1.1 2004/08/08 18:39:49 stuart 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 -O`
-
-# (Optional) Java runtime options used when the "start", "stop", or "run"
-# commands are executed.
-# JAVA_OPTS=""
-
-# Where your web applications are located
-CATALINA_HOME=/opt/tomcat4
-#CATALINA_BASE=${CATALINA_HOME}
-
-# Tomcat's User
-CATALINA_USER=tomcat
-
-# Tomcat Console Log Location
-CATALINA_OUT=/var/log/tomcat4/catalina.log
-
-# Location of the Tomcat JARs and classes
-#CATALINA_LIBDIR=/usr/share/tomcat4/lib
-
-# The CLASSPATH for Tomcat to use, plus any others you need.
-#CLASSPATH=${CLASSPATH}:${CATALINA_LIBDIR}
-
-# (Optional) Directory path location of temporary directory the JVM should 
-# use (java.io.tmpdir).  Defaults to $CATALINA_BASE/temp.
-# CATALINA_TMPDIR="/your/path/here"
-
-# TOMCAT STARTUP/SHUTDOWN
-# 	debug             Start Catalina in a debugger
-# 	debug -security   Debug Catalina with a security manager
-# 	embedded          Start Catalina in embedded mode
-# 	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/4.1.30/tomcat.init b/www-servers/tomcat/files/4.1.30/tomcat.init
deleted file mode 100644
index d71cd63028e7..000000000000
--- a/www-servers/tomcat/files/4.1.30/tomcat.init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1998-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/4.1.30/tomcat.init,v 1.3 2004/10/08 13:38:08 axxo Exp $
-
-depend() {
-	use dns logger mysql postgresql net
-}
-
-start()	{
-	ebegin "Starting Tomcat"
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh -- ${TOMCAT_START}
-	sleep 5
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Tomcat"
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh -- ${TOMCAT_STOP}
-	sleep 5
-	eend $?
-}
diff --git a/www-servers/tomcat/files/digest-tomcat-3.3.2-r2 b/www-servers/tomcat/files/digest-tomcat-3.3.2-r2
deleted file mode 100644
index 44bcb5d64a95..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-3.3.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 edaa93b5867df0e007be7a9b44f48e0c jakarta-tomcat-3.3.2.tar.gz 6527346
diff --git a/www-servers/tomcat/files/digest-tomcat-4.1.30-r5 b/www-servers/tomcat/files/digest-tomcat-4.1.30-r5
deleted file mode 100644
index a1651a599a01..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-4.1.30-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff27f6a5900768c1aafab4a68675b2ed jakarta-tomcat-4.1.30.tar.gz 7894019
diff --git a/www-servers/tomcat/tomcat-3.3.2-r2.ebuild b/www-servers/tomcat/tomcat-3.3.2-r2.ebuild
deleted file mode 100644
index fb6bbaa89236..000000000000
--- a/www-servers/tomcat/tomcat-3.3.2-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-3.3.2-r2.ebuild,v 1.4 2005/02/07 23:43:14 luckyduck Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache Servlet-2.2/JSP-1.1 Container"
-
-JT_P="jakarta-${P}.tar.gz"
-S=${WORKDIR}/jakarta-${P}
-SLOT="${PV/.*}"
-SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="x86 ppc ~sparc ~alpha"
-LICENSE="Apache-2.0"
-DEPEND="sys-apps/sed"
-RDEPEND=">=virtual/jdk-1.3
-		sys-apps/sed"
-IUSE=""
-
-TOMCAT_HOME="/opt/${PN}${SLOT}"
-TOMCAT_NAME="${PN}${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-}
-
-src_install() {
-	dodoc LICENSE
-
-	# INIT SCRIPTS AND ENV
-	insinto /etc/init.d
-	insopts -m0750
-	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-
-	insinto /etc/conf.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-
-	diropts -m750
-	dodir ${TOMCAT_HOME} /var/log/${TOMCAT_NAME} /etc/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}
-
-	mv conf/* ${D}/etc/${TOMCAT_NAME}
-	mv bin doc lib modules native webapps ${D}${TOMCAT_HOME}
-
-	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
-	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
-}
-
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-}
-
-pkg_postinst() {
-	#due to previous ebuild bloopers, make sure everything is correct
-	chown -R root:root /usr/share/doc/${PF}
-	chown root:root /etc/init.d/${TOMCAT_NAME}
-	chown root:root /etc/conf.d/${TOMCAT_NAME}
-
-	chown -R tomcat:tomcat /opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
-
-	chmod 750 /etc/${TOMCAT_NAME}
-
-	einfo " "
-	einfo " NOTICE!"
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
-	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/${TOMCAT_NAME} start"
-	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
-	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
-	einfo " "
-	einfo " "
-	ewarn " If you are upgrading from older ebuild do NOT use"
-	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
-	ewarn " want to remove these. "
-	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
-	ewarn " can be installed side by side"
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	einfo " "
-	einfo " "
-	einfo " BUGS:"
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo " "
-}
diff --git a/www-servers/tomcat/tomcat-4.1.30-r5.ebuild b/www-servers/tomcat/tomcat-4.1.30-r5.ebuild
deleted file mode 100644
index a70e622f5c51..000000000000
--- a/www-servers/tomcat/tomcat-4.1.30-r5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-4.1.30-r5.ebuild,v 1.6 2005/02/07 23:43:14 luckyduck Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache Servlet-2.3/JSP-1.2 Container"
-
-JT_P="jakarta-${P}.tar.gz"
-S=${WORKDIR}/jakarta-${P}
-SLOT="${PV/.*}"
-SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="x86 ppc ~sparc ~alpha ~amd64"
-LICENSE="Apache-2.0"
-DEPEND="sys-apps/sed"
-RDEPEND=">=virtual/jdk-1.3
-		jikes? ( dev-java/jikes )"
-IUSE="doc jikes"
-
-TOMCAT_HOME="/opt/${PN}${SLOT}"
-TOMCAT_NAME="${PN}${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
-}
-
-src_install() {
-	dodoc RELEASE* RUNNING.txt LICENSE
-
-	# INIT SCRIPTS AND ENV
-	insinto /etc/init.d
-	insopts -m0750
-	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-
-	insinto /etc/conf.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
-
-	diropts -m750
-	dodir ${TOMCAT_HOME} /var/log/${TOMCAT_NAME} /etc/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}
-
-	mv conf/* ${D}/etc/${TOMCAT_NAME}
-	mv bin common server shared temp work ${D}${TOMCAT_HOME}
-	keepdir ${TOMCAT_HOME}/work
-
-	if ! use doc ; then
-		rm -rf webapps/{examples,tomcat-docs}
-	fi
-	mv webapps ${D}${TOMCAT_HOME}
-
-	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
-	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
-
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-}
-
-pkg_postinst() {
-	#due to previous ebuild bloopers, make sure everything is correct
-	chown -R root:root /usr/share/doc/${PF}
-	chown root:root /etc/init.d/${TOMCAT_NAME}
-	chown root:root /etc/conf.d/${TOMCAT_NAME}
-
-	chown -R tomcat:tomcat /opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
-	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
-
-	chmod 750 /etc/${TOMCAT_NAME}
-
-	einfo " "
-	einfo " NOTICE!"
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
-	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/${TOMCAT_NAME} start"
-	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
-	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
-	einfo " "
-	einfo " "
-	ewarn " If you are upgrading from older ebuild do NOT use"
-	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
-	ewarn " want to remove these. "
-	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
-	ewarn " can be installed side by side"
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	einfo " "
-	einfo " "
-	einfo " BUGS:"
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo " "
-}