Added patch for webdav per security bug #196066. Removed past version, and various patches for that version.

(Portage version: 2.1.3.13)

14 files changed, 267 insertions, 494 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index df5e95c03add..17e8af796822 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,20 @@
 # 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.169 2007/10/12 11:38:23 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.170 2007/10/16 21:19:48 wltjr Exp $
+
+*tomcat-6.0.14-r1 (16 Oct 2007)
+*tomcat-5.5.25-r1 (16 Oct 2007)
+
+  16 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/5.5/jasper_build_xml.patch,
+  -files/5.5/jsr154_examples_build_xml.patch,
+  -files/5.5/jsr152_examples_build_xml.patch,
+  -files/5.5/main_build_xml.patch, -files/5.5/catalina_build_xml.patch,
+  -files/5.5/tomcat_build_xml.patch, +files/5.5/webdav.patch,
+  +files/6/webdav.patch, -tomcat-5.5.23-r6.ebuild, +tomcat-5.5.25-r1.ebuild,
+  +tomcat-6.0.14-r1.ebuild:
+  Added patch for webdav per security bug #196066. Removed past version, and
+  various patches for that version.
 
   12 Oct 2007; Roy Marples <uberlord@gentoo.org> tomcat-5.5.25.ebuild:
   Added ~x86-fbsd back again, #195571
diff --git a/www-servers/tomcat/files/5.5/catalina_build_xml.patch b/www-servers/tomcat/files/5.5/catalina_build_xml.patch
deleted file mode 100644
index da6b96901aab..000000000000
--- a/www-servers/tomcat/files/5.5/catalina_build_xml.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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 @@
-     <pathelement location="${jaas.jar}"/>
-     <pathelement location="${javagroups.jar}"/>
-     <pathelement location="${jcert.jar}"/>
-+    <pathelement location="${jdt.jar}"/>
-     <pathelement location="${jmx.jar}"/>
-     <pathelement location="${jmx-remote.jar}"/>
-     <pathelement location="${jndi.jar}"/>
-@@ -91,6 +92,7 @@
-     <pathelement location="${commons-modeler.jar}"/>
-     <pathelement location="${jaas.jar}"/>
-     <pathelement location="${jcert.jar}"/>
-+    <pathelement location="${jdt.jar}"/>
-     <pathelement location="${jmx.jar}"/>
-     <pathelement location="${jndi.jar}"/>
-     <pathelement location="${jnet.jar}"/>
-@@ -548,9 +550,10 @@
- <!--
-     <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
- -->
-+    <!--
-     <copy todir="${catalina.build}/common/lib"
-            file="${tomcat-dbcp.jar}" />
--
-+    -->
-     <!-- Configuration Files -->
-     <copy todir="${catalina.build}/conf">
-       <fileset dir="src/conf">
diff --git a/www-servers/tomcat/files/5.5/jasper_build_xml.patch b/www-servers/tomcat/files/5.5/jasper_build_xml.patch
deleted file mode 100644
index 1f0de5f8a04f..000000000000
--- a/www-servers/tomcat/files/5.5/jasper_build_xml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 @@
-     <pathelement location="${jsp-api.jar}"/>
-     <pathelement location="${tools.jar}"/>
-     <pathelement location="${jasper-compiler-jdt.jar}"/>
-+    <pathelement location="${jdt.jar}"/>
-     <pathelement location="${xerces.jar}"/>
-     <pathelement location="${xercesImpl.jar}"/>
-     <pathelement location="${xml-apis.jar}"/>
diff --git a/www-servers/tomcat/files/5.5/jsr152_examples_build_xml.patch b/www-servers/tomcat/files/5.5/jsr152_examples_build_xml.patch
deleted file mode 100644
index 1e4e013b741d..000000000000
--- a/www-servers/tomcat/files/5.5/jsr152_examples_build_xml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 @@
- 
-   <path id="examples.classpath">
-     <pathelement location="${jsp-api.build}/classes"/>
-+    <pathelement location="${jsp-api.jar}"/>
-     <pathelement location="${servlet-api.jar}"/>
-     <pathelement location="${mail.jar}"/>
-   </path>
diff --git a/www-servers/tomcat/files/5.5/jsr154_examples_build_xml.patch b/www-servers/tomcat/files/5.5/jsr154_examples_build_xml.patch
deleted file mode 100644
index 9c7b417a3b1f..000000000000
--- a/www-servers/tomcat/files/5.5/jsr154_examples_build_xml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 @@
-   <property name="servlet-api.jar" value="${servlet-api.dist}/lib/servlet-api.jar"/>
-   <path id="examples.classpath">
-     <pathelement location="${servlet-api.build}/classes"/>
-+    <pathelement location="${servlet-api.jar}"/>
-   </path>
- 
- 
diff --git a/www-servers/tomcat/files/5.5/main_build_xml.patch b/www-servers/tomcat/files/5.5/main_build_xml.patch
deleted file mode 100644
index 07c58ea73c09..000000000000
--- a/www-servers/tomcat/files/5.5/main_build_xml.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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 @@
-   <target name="checkout"
-           description="Update or checkout required sources from SVN">
- 
-+    <!--
-     <echo level="info"
-           message="If the checkout fails, see http://tomcat.apache.org/svn.html and http://subversion.tigris.org/faq.html#proxy" />
- 
--    <!-- Bugzilla 37977: http://issues.apache.org/bugzilla/show_bug.cgi?id=37977 -->
--    <!--  hackish: inputstring="t${line.separator}" is t+<enter> for svn         -->
--    <!--  to temporarily accept the certificate of svn.apache.org.               -->
-     <exec dir="${basedir}"
-           executable="svn"
-           inputstring="t${line.separator}"
-@@ -80,6 +78,7 @@
-       <arg value="${svnroot}/${current.loc}" />
-       <arg value="${basedir}" />
-     </exec>
-+    -->
- 
-   </target>
- 
diff --git a/www-servers/tomcat/files/5.5/tomcat_build_xml.patch b/www-servers/tomcat/files/5.5/tomcat_build_xml.patch
deleted file mode 100644
index 109caf67af37..000000000000
--- a/www-servers/tomcat/files/5.5/tomcat_build_xml.patch
+++ /dev/null
@@ -1,367 +0,0 @@
---- apache-tomcat-5.5.20-src/build/build.xml	2007-01-26 19:10:26.000000000 -0500
-+++ build.xml	2007-01-26 19:31:49.000000000 -0500
-@@ -143,6 +143,7 @@
- 
-   <!-- ====================== DEPLOY: Copy Static Files =================== -->
-   <target name="deploy-static" depends="init">
-+  <!--
-     <copy file="${jsp-api.jar}"  todir="${tomcat.build}/common/lib"/>
-     <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
- 
-@@ -161,9 +162,9 @@
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
- 
--    <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
--    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
-+    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
-     <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
-+    -->
-   </target>
- 
-   <!-- ====================== Build all components =================== -->
-@@ -395,15 +396,14 @@
-   <target name="build-webapps-precompile"
-           depends="init" description="Precompile webapps" >
- 
-+    <antcall target="build-webapp-precompile-admin" />
-+    <antcall target="build-webapp-precompile-examples" />
-+
-     <!-- JSPC -->
--    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-     <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
--    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
- 
--    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-     <mkdir dir="${ROOT.base}/WEB-INF/src" />
-     <mkdir dir="${ROOT.base}/WEB-INF/classes" />
--    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
- 
-     <path id="jspc.classpath">
-       <pathelement location="${java.home}/../lib/tools.jar"/>
-@@ -437,23 +437,6 @@
-              addWebXmlMappings="true"
-              outputDir="${ROOT.base}/WEB-INF/src" />
- 
--    <jasper2
--             compile="false"
--             validateXml="false"
--             uriroot="${jsp-examples.base}"
--         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
--             addWebXmlMappings="true"
--             outputDir="${jsp-examples.base}/WEB-INF/src" />
--
--    <jasper2
--             package="admin"
--             compile="false"
--             validateXml="false"
--             uriroot="${admin.base}"
--             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
--             addWebXmlMappings="true"
--             outputDir="${admin.base}/WEB-INF/src/admin" />
--
-     <javac destdir="${ROOT.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-@@ -475,61 +458,90 @@
-       <include name="**" />
-     </javac>
- 
--    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
--    <copy todir="${jsp-examples.base}/WEB-INF/classes">
--      <fileset dir="${jsp-examples.base}/WEB-INF/src">
--        <include name="**/*.class" />
--      </fileset>
--    </copy>
-+  </target>
- 
--    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-+  <target name="build-webapp-precompile-admin" unless="admin.precompile.notrequired">
-+    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-+    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-+    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
-+      <classpath refid="jspc.classpath"/>
-+    </taskdef>
-+    <jasper2
-+             package="admin"
-+             compile="false"
-+             validateXml="false"
-+             uriroot="${admin.base}"
-+             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
-+             addWebXmlMappings="true"
-+             outputDir="${admin.base}/WEB-INF/src/admin" />
-+    <javac destdir="${admin.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
-            source="${compile.source}"
-            failonerror="false"
--           srcdir="${jsp-examples.base}/WEB-INF/src"
-+           srcdir="${admin.base}/WEB-INF/src"
-        excludes="**/*.smap">
-       <classpath>
-         <pathelement location="${java.home}/../lib/tools.jar"/>
-         <fileset dir="${tomcat.build}/server/lib">
-           <include name="*.jar"/>
-         </fileset>
--        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-+        <fileset dir="${admin.base}/WEB-INF/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <fileset dir="${tomcat.build}/common/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <pathelement location="${tomcat.build}/classes"/>
--        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-       </classpath>
--      <include name="**" />
--      <exclude name="tags/**" />
-+      <include name="admin/**" />
-     </javac>
--
--    <javac destdir="${admin.base}/WEB-INF/classes"
-+  </target>
-+  
-+  <target name="build-webapp-precompile-examples" unless="examples.precompile.notrequired">
-+    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
-+    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
-+    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
-+      <classpath refid="jspc.classpath"/>
-+    </taskdef>
-+    <jasper2
-+             compile="false"
-+             validateXml="false"
-+             uriroot="${jsp-examples.base}"
-+         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
-+             addWebXmlMappings="true"
-+             outputDir="${jsp-examples.base}/WEB-INF/src" />
-+    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
-+    <copy todir="${jsp-examples.base}/WEB-INF/classes">
-+      <fileset dir="${jsp-examples.base}/WEB-INF/src">
-+        <include name="**/*.class" />
-+      </fileset>
-+    </copy>
-+    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
-            optimize="off"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
-            source="${compile.source}"
-            failonerror="false"
--           srcdir="${admin.base}/WEB-INF/src"
-+           srcdir="${jsp-examples.base}/WEB-INF/src"
-        excludes="**/*.smap">
-       <classpath>
-         <pathelement location="${java.home}/../lib/tools.jar"/>
-         <fileset dir="${tomcat.build}/server/lib">
-           <include name="*.jar"/>
-         </fileset>
--        <fileset dir="${admin.base}/WEB-INF/lib">
-+        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <fileset dir="${tomcat.build}/common/lib">
-           <include name="*.jar"/>
-         </fileset>
-         <pathelement location="${tomcat.build}/classes"/>
-+        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
-       </classpath>
--      <include name="admin/**" />
-+      <include name="**" />
-+      <exclude name="tags/**" />
-     </javac>
-   </target>
- 
-@@ -653,28 +665,8 @@
- 
-     <!-- <antcall target="build-commons-modeler" /> -->
-     <!-- <antcall target="build-commons-daemon"  /> -->
--
--    <antcall target="downloadgz">
--      <param name="sourcefile" value="${commons-collections-src.loc}"/>
--      <param name="destfile" value="${tomcat-dbcp.jar}" />
--    </antcall>
--    <antcall target="downloadgz">
--      <param name="sourcefile" value="${commons-pool-src.loc}"/>
--      <param name="destfile" value="${tomcat-dbcp.jar}" />
--    </antcall>
--    <antcall target="downloadgz">
--      <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
--      <param name="destfile" value="${tomcat-dbcp.jar}" />
--    </antcall>
--
--    <antcall target="build-tomcat-dbcp" />
--
--    <antcall target="downloadzip">
--      <param name="sourcefile" value="${jdt.loc}"/>
--      <param name="destfile" value="${jdt.jar}"/>
--      <param name="destdir" value="${base.path}"/>
--    </antcall>
--    <antcall target="build-jasper-compiler-jdt" />
-+    <!-- <antcall target="build-tomcat-dbcp" /> -->
-+    <!-- <antcall target="build-jasper-compiler-jdt" /> -->
-   </target>
- 
-   <target name="build-tomcat-dbcp">
-@@ -754,19 +746,11 @@
-         </jar>
-       </target>
- 
--  <target name="build-webapps" depends="init"
--          description="build  webapps">
--
--    <echo>========== Building: webapps </echo>
--
--    <mkdir dir="${tomcat.build}/webapps" />
--    <mkdir dir="${tomcat.build}/server/webapps" />
-+  <target name="build-examples" unless="examples.build.notrequired">
- 
-     <!-- The build files are far too difficult to hack - just build it and copy -->
--    <ant dir="${api.home}/jsr154" target="dist">
--    </ant>
--    <ant dir="${api.home}/jsr152" target="dist">
--    </ant>
-+    <ant dir="${api.home}/jsr154" target="examples" />
-+    <ant dir="${api.home}/jsr152" target="examples" />
- 
-     <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
-     <copy todir="${tomcat.build}/webapps/servlets-examples">
-@@ -779,6 +763,18 @@
-         <exclude name="WEB-INF/tagPlugins.xml" />
-       </fileset>
-     </copy>
-+    
-+  </target>
-+
-+  <target name="build-webapps" depends="init"
-+          description="build  webapps">
-+
-+    <echo>========== Building: webapps </echo>
-+
-+    <mkdir dir="${tomcat.build}/webapps" />
-+    <mkdir dir="${tomcat.build}/server/webapps" />
-+
-+	<antcall target="build-examples" />
- 
-     <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
-         <property name="webapps.build" value="${tomcat.build}/webapps" />
-@@ -850,14 +846,7 @@
-         filtering="true" />
- 
-     <!-- Build JARs for webapps classes -->
--    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
--    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
--         index="true">
--       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
--          <include name="**/*.class" />
--          <include name="**/*.properties" />
--       </fileset>
--    </jar>
-+    <antcall target="fix-admin-webapp" />
-     <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
-     <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
-          index="true">
-@@ -896,9 +885,20 @@
-          todir="${tomcat.build}/conf/Catalina/localhost" />
-     <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
-          todir="${tomcat.build}/conf/Catalina/localhost" />
-+
-+  </target>
-+
-+  <target name="fix-admin-webapp" unless="admin.build.notrequired">
-+    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
-+    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
-+         index="true">
-+       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
-+          <include name="**/*.class" />
-+          <include name="**/*.properties" />
-+       </fileset>
-+    </jar>
-     <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
-          todir="${tomcat.build}/conf/Catalina/localhost" />
--
-   </target>
- 
-   <!-- ====================== Embed target =================== -->
-@@ -1041,11 +1041,11 @@
-   <!-- ====================== Compat target =================== -->
- 
-   <target name="compat" description="Create compatibility binaries for JREs before 1.5" >
--
-+    <!--
-     <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
-     <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
-     <copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/>
--
-+    -->
-   </target>
- 
-   <!-- ====================== DEPLOY: Deploy Components =================== -->
-@@ -1092,8 +1092,9 @@
-     <!-- Copy Unix JSVC from commons-daemon -->
-     <copy file="${commons-daemon.jsvc.tar.gz}"
-         tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
-+    <!--
-     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
--
-+    -->
-     <echo>Target: Webapps precompilation ...</echo>
- 
-     <antcall target="build-admin"/>
-@@ -1188,10 +1189,11 @@
-    description="Catalina Tests" depends="dist-tester">
- 
-     <!-- For Java 1.4 -->
-+    <!--
-     <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
-     <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
-     <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
--
-+    -->
-     <parallel>
- 
-         <java classname="LauncherBootstrap" fork="yes">
-@@ -1871,10 +1873,10 @@
- 
-     <!-- commons-digester needs ../LICENSE -->
-     <!-- That is ugly XXX needs a review -->
-+    <!--
-     <copy file="LICENSE" tofile="../LICENSE"/>
-     <copy file="LICENSE" tofile="${base.path}/LICENSE"/>
- 
--    <!-- Downdown any sub package or tools needed. -->
-     <antcall target="downloadgz">
-       <param name="sourcefile" value="${commons-beanutils.loc}"/>
-       <param name="destfile" value="${commons-beanutils.jar}"/>
-@@ -1916,7 +1918,6 @@
-     </antcall>
- 
-     <antcall target="downloadgz">
--      <!-- xerces2 brings 2 files, test for one of them -->
-       <param name="sourcefile" value="${xerces.loc}"/>
-       <param name="destfile" value="${xml-apis.jar}"/>
-     </antcall>
-@@ -1937,7 +1938,6 @@
-       <param name="destfile" value="${commons-launcher.jar}"/>
-     </antcall>
- 
--    <!--
-     <antcall target="downloadgz">
-       <param name="sourcefile" value="${commons-pool.loc}"/>
-       <param name="destfile" value="${commons-pool.jar}"/>
-@@ -1948,7 +1948,6 @@
-       <param name="destfile" value="${commons-dbcp.jar}"/>
-       <param name="destdir" value="${base.path}"/>
-     </antcall>
--    -->
- 
-     <antcall target="downloadgz">
-       <param name="sourcefile" value="${commons-httpclient.loc}"/>
-@@ -1976,7 +1975,7 @@
-       <param name="destfile" value="${tomcat-native.tar.gz}"/>
-       <param name="destdir" value="${tomcat-native.home}"/>
-     </antcall>
--
-+    -->
-     <!-- Build the dependencies that are not yet released -->
-     <antcall target="build-depends"/>
- 
diff --git a/www-servers/tomcat/files/5.5/webdav.patch b/www-servers/tomcat/files/5.5/webdav.patch
new file mode 100644
index 000000000000..80d6cae60ec9
--- /dev/null
+++ b/www-servers/tomcat/files/5.5/webdav.patch
@@ -0,0 +1,11 @@
+diff -Naur apache-tomcat-5.5.25-src_orig/container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java apache-tomcat-5.5.25-src/container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
+--- apache-tomcat-5.5.25-src_orig/container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java	2007-10-16 16:54:54.000000000 -0400
++++ apache-tomcat-5.5.25-src/container/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java	2007-10-16 16:56:57.000000000 -0400
+@@ -252,6 +252,7 @@
+         try {
+             documentBuilderFactory = DocumentBuilderFactory.newInstance();
+             documentBuilderFactory.setNamespaceAware(true);
++            documentBuilderFactory.setExpandEntityReferences(false);
+             documentBuilder = documentBuilderFactory.newDocumentBuilder();
+         } catch(ParserConfigurationException e) {
+             throw new ServletException
diff --git a/www-servers/tomcat/files/6/webdav.patch b/www-servers/tomcat/files/6/webdav.patch
new file mode 100644
index 000000000000..e82614ab6044
--- /dev/null
+++ b/www-servers/tomcat/files/6/webdav.patch
@@ -0,0 +1,11 @@
+diff -Naur apache-tomcat-6.0.14-src_orig/java/org/apache/catalina/servlets/WebdavServlet.java apache-tomcat-6.0.14-src/java/org/apache/catalina/servlets/WebdavServlet.java
+--- apache-tomcat-6.0.14-src_orig/java/org/apache/catalina/servlets/WebdavServlet.java	2007-10-16 16:59:48.000000000 -0400
++++ apache-tomcat-6.0.14-src/java/org/apache/catalina/servlets/WebdavServlet.java	2007-10-16 17:01:20.000000000 -0400
+@@ -242,6 +242,7 @@
+         try {
+             documentBuilderFactory = DocumentBuilderFactory.newInstance();
+             documentBuilderFactory.setNamespaceAware(true);
++            documentBuilderFactory.setExpandEntityReferences(false);
+             documentBuilder = documentBuilderFactory.newDocumentBuilder();
+         } catch(ParserConfigurationException e) {
+             throw new ServletException
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.23-r6 b/www-servers/tomcat/files/digest-tomcat-5.5.23-r6
deleted file mode 100644
index e0e59f68fbb2..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.5.23-r6
+++ /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-5.5.25-r1 b/www-servers/tomcat/files/digest-tomcat-5.5.25-r1
new file mode 100644
index 000000000000..f35f6957fec8
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.25-r1
@@ -0,0 +1,3 @@
+MD5 2d6cc9a16aceeef4ec3610cd782d5c9d apache-tomcat-5.5.25-src.tar.gz 5106363
+RMD160 83bb506b3f0fbde75e346e02832645bd6526fa7d apache-tomcat-5.5.25-src.tar.gz 5106363
+SHA256 b7618f0a1e04623bfc9e14bdb51ae54203fa1e80f6c7ee61e2387cb11de8736f apache-tomcat-5.5.25-src.tar.gz 5106363
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.14-r1 b/www-servers/tomcat/files/digest-tomcat-6.0.14-r1
new file mode 100644
index 000000000000..2c2b4605716a
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.14-r1
@@ -0,0 +1,3 @@
+MD5 468adfaf8a4e5d2f5db97e74de0429b7 apache-tomcat-6.0.14-src.tar.gz 3458776
+RMD160 24f586d946654edcc70c5ec1ee457022c4a5d070 apache-tomcat-6.0.14-src.tar.gz 3458776
+SHA256 ef57398cc8e0294fb74d0d76debdaebf51ec47f18c9c927ddc98530dfa93cf88 apache-tomcat-6.0.14-src.tar.gz 3458776
diff --git a/www-servers/tomcat/tomcat-5.5.23-r6.ebuild b/www-servers/tomcat/tomcat-5.5.25-r1.ebuild
index d0c61f6de370..6ed32272a5cf 100644
--- a/www-servers/tomcat/tomcat-5.5.23-r6.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r6.ebuild,v 1.6 2007/08/10 06:54:44 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25-r1.ebuild,v 1.1 2007/10/16 21:19:48 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -12,12 +12,12 @@ 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"
+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*
+RDEPEND="=dev-java/eclipse-ecj-3.3*
 	=dev-java/commons-beanutils-1.7*
 	>=dev-java/commons-collections-3.1
 	>=dev-java/commons-daemon-1.0.1
@@ -66,28 +66,16 @@ pkg_setup() {
 
 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
+	cd "${S}"
+
+	epatch "${FILESDIR}/${SLOT}/webdav.patch"
+	epatch "${FILESDIR}/${SLOT}/main_tomcat_catalina_jasper_build_xml.patch"
 
-	rm -v "${S}"/connectors/jk/jkstatus/build/classes/org/apache/jk/status/*.class || die
-	rm -v "${S}"/connectors/jk/jkstatus/dist/*.jar || die
+	use examples && epatch "${FILESDIR}/${SLOT}/jsr152_jsr154_examples_build_xml.patch"
 
 	# avoid packed jars :-)
-	mkdir -p ${S}/build/build/common
-	cd ${S}/build/build
+	mkdir -p "${S}"/build/build/common
+	cd "${S}"/build/build
 
 	mkdir ./bin && cd ./bin
 	java-pkg_jar-from commons-logging commons-logging-api.jar
@@ -95,12 +83,12 @@ src_unpack() {
 	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
+		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
+	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
@@ -108,7 +96,7 @@ src_unpack() {
 	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
+	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
@@ -133,7 +121,7 @@ src_compile(){
 	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} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 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)"
@@ -164,11 +152,11 @@ src_compile(){
 }
 
 src_install() {
-	cd ${S}/build/build
+	cd "${S}"/build/build
 
 	# init.d, conf.d
-	newinitd ${FILESDIR}/${SLOT}/tomcat.init.2 ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${SLOT}/tomcat.conf.2 ${TOMCAT_NAME}
+	newinitd "${FILESDIR}"/${SLOT}/tomcat.init.2 ${TOMCAT_NAME}
+	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf.2 ${TOMCAT_NAME}
 
 	# create dir structure
 	diropts -m755 -o tomcat -g tomcat
@@ -195,10 +183,10 @@ src_install() {
 	# 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 \
+		cp "${S}"/container/webapps/admin/admin.xml \
 			conf/Catalina/localhost
 	fi
-	cp ${S}/container/webapps/manager/manager.xml \
+	cp "${S}"/container/webapps/manager/manager.xml \
 		conf/Catalina/localhost
 
 	# make the jars available via java-pkg_getjar and jar-from, etc
@@ -242,24 +230,24 @@ src_install() {
 
 	# 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"
+	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"
 
 	# 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 "${FILESDIR}"/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} || die "failed to replace catalina.policy"
 
 	keepdir               ${WEBAPPS_DIR}
-	set_webapps_perms     ${D}/${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
+	cp -pr webapps/ROOT "${D}"${CATALINA_BASE}/webapps
 	if use doc; then
-		cp -pr webapps/tomcat-docs ${D}${CATALINA_BASE}/webapps
+		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
+			"${D}"${CATALINA_BASE}/webapps
 	fi
 
 	# symlink the directories to make CATALINA_BASE possible
@@ -268,7 +256,7 @@ src_install() {
 	dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
 	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
 
-	dodoc  ${S}/build/{RELEASE-NOTES,RUNNING.txt}
+	dodoc  "${S}"/build/{RELEASE-NOTES,RUNNING.txt}
 	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
 }
 
diff --git a/www-servers/tomcat/tomcat-6.0.14-r1.ebuild b/www-servers/tomcat/tomcat-6.0.14-r1.ebuild
new file mode 100644
index 000000000000..225529f4ec24
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.14-r1.ebuild
@@ -0,0 +1,197 @@
+# 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.14-r1.ebuild,v 1.1 2007/10/16 21:19:48 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}/webdav.patch"
+	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
+}