www-servers/tomcat: version bump

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

6 files changed, 15 insertions, 281 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 2a68204f77ff..9c5feb3ed934 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.250 2011/04/05 17:36:16 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.251 2011/04/07 14:13:49 fordfrog Exp $
+
+*tomcat-7.0.12 (07 Apr 2011)
+
+  07 Apr 2011; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/7/7.0.12-build-xml.patch, -files/7/7.0.8-build-xml.patch,
+  -files/7/7.0.10-build-xml.patch, -files/7/7.0.11-build-xml.patch,
+  -tomcat-7.0.11.ebuild, +tomcat-7.0.12.ebuild:
+  Bumped to latest version. Removed older version as it contains security
+  issue. Also removed orphaned files.
 
   05 Apr 2011; <elvanor@gentoo.org> files/6/tomcat.init.2:
   Modified init script for bug #361235 / #191611. Removed the --startas
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index e2b762ed0bab..983343706925 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -13,9 +13,7 @@ AUX 6/tomcat.conf 2895 RMD160 36ece62ddff5257c04f47d75b9c77bd4dc198652 SHA1 8fef
 AUX 6/tomcat.init 3529 RMD160 45aabac31804faff713ca3648f4a675e5ea7ea89 SHA1 f2b499fda69d83aecda72742f88ed8bf64f5cfb3 SHA256 744daa31e36e548f76f2997c3e3430b961163bfe0d2ba2ef6d81f5c2ddb0470c
 AUX 6/tomcat.init.2 4032 RMD160 cba893b5085f914ba656634705b0d0326c6a356b SHA1 453b8ca705e97a3497cf279785961aebc54fdca9 SHA256 adf7dd0f1d473cf95f83b53639644263039676771baadf1e5838e679b23cda26
 AUX 6/tomcat.init.3 4048 RMD160 9cd5840d7a5c98737b4720a1f22c41271265e585 SHA1 5079a0622c226e79016ecfe498e333039a8e6633 SHA256 087c73d4552df27a9d13d8bb8fb5ffcdb404e57c6b793948332c95c00879ab07
-AUX 7/7.0.10-build-xml.patch 4612 RMD160 9cec14c22e777eab0ea99e3d096a4e70647c6ec2 SHA1 b64989924cca3e121752e93100ac795a52e1d456 SHA256 5fcdfe19d7815deebb860d542cc0779012dec8727b37da4861e19dba80e771fc
-AUX 7/7.0.11-build-xml.patch 4612 RMD160 9cec14c22e777eab0ea99e3d096a4e70647c6ec2 SHA1 b64989924cca3e121752e93100ac795a52e1d456 SHA256 5fcdfe19d7815deebb860d542cc0779012dec8727b37da4861e19dba80e771fc
-AUX 7/7.0.8-build-xml.patch 4877 RMD160 e59cdf2a354260998fa06baa8baad6608d2b8bb0 SHA1 c27a869cda7742133cf4d3fecfff9f28b7786e14 SHA256 21b4642bb4dfbaf3d464bf242c068e635aec2575c48f0c6a0f64cd30eb72ee43
+AUX 7/7.0.12-build-xml.patch 4612 RMD160 9cec14c22e777eab0ea99e3d096a4e70647c6ec2 SHA1 b64989924cca3e121752e93100ac795a52e1d456 SHA256 5fcdfe19d7815deebb860d542cc0779012dec8727b37da4861e19dba80e771fc
 AUX 7/build-xml.patch 5561 RMD160 672659e5273a9d6ef450fd29cc171fae56c99c9a SHA1 08714c12a72b1db8490460b10f74d32fc951dacb SHA256 f85ec37d37cc2bceca7877da3271570701a352e087e101e6b3146bdd16f31490
 AUX 7/examples-cal.patch 565 RMD160 85294480f354eb19340bdc7357690ae55ef5a89f SHA1 e9550e02500f2d9da6f4f7b3c7ca79c1934318ea SHA256 caf76c88d3b67d29a7aadca1485accd01270d986e7bc77281a9b30f0b1582b55
 AUX 7/tomcat.conf 2895 RMD160 e0f3b7f72b925a5d681780e1dcdde46143daef48 SHA1 1b94de2c71c046045b5622756d976378678200a3 SHA256 834b38c1e17294ee73c6571a45fb35bc398f15da4ed189e4d359b8b39121bb8e
@@ -25,7 +23,7 @@ DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3
 DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f14681a0fa9924b1 SHA1 0df5e58518607ff738bbf440d829747df6acb9ce SHA256 0d6354d45de39e3593ae8f8e6e1361caaa55835e73838f003000e53c6c7ff73a
 DIST apache-tomcat-6.0.29-src.tar.gz 3330475 RMD160 eb789c63aaf629ec897b4280924e086c969169f6 SHA1 255e080706578be0b0f15c67989718ab94e52837 SHA256 9746483edb46b112a81b57376701c7c23c5c657675c2c7efa3187447c07b9d28
 DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c
-DIST apache-tomcat-7.0.11-src.tar.gz 3846862 RMD160 6fdd09877b2655239406cf1ca8fd5919aadb2575 SHA1 e3abc434b8bae29761c552f7cd815ec182caebf4 SHA256 ebd0a840a7932fbdf476e10156f3e28ebcc16501e536051e992f3363f6ac7953
+DIST apache-tomcat-7.0.12-src.tar.gz 3873145 RMD160 fc2785ae050378096c5a5879421345c9b11e9c6b SHA1 cd0f0e4c1f98c7c7b4085c613edc1a08e2cd6637 SHA256 87d6d5ca402c1c08da40e2ffaae72eb7b1a3448ca0429ffa561ed130842295d8
 EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01
 EBUILD tomcat-5.5.27-r5.ebuild 10119 RMD160 ef3c4d2d31ca81fdc357afdb11c13704ed14a5a1 SHA1 daf3d57e12f9bd8f25465e74be7f3bef945a8db2 SHA256 2dcbf313716d4e208f3c70abc759a9c43cb066705793d1ad94304363b270906f
 EBUILD tomcat-6.0.26-r2.ebuild 6913 RMD160 bdf0aba8f686216106286f7210823387699e1960 SHA1 75ea1850ed3d9f2ab7a2194cefa022e0652e286a SHA256 33fe5868df3c1eb86983fc9c220629947b2ec0538f7467aaafa14ed1571a14a2
@@ -34,6 +32,6 @@ EBUILD tomcat-6.0.28-r1.ebuild 6948 RMD160 dcc281587e6a2bd0dd81808e1fa5d1a4c5a3a
 EBUILD tomcat-6.0.29-r1.ebuild 6948 RMD160 d340dad22a80e36a03bdc0614fee97ce9e296fe2 SHA1 4885f884254f2475a6ca004e82dcfeed9462de7b SHA256 a6f9cba93f8f07fd184b62ac7aa2830b7d420050c08e13a060db54c77c730e7f
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
 EBUILD tomcat-6.0.32-r2.ebuild 6968 RMD160 756ffd21d60906c47031e0bc202d3fc77b21c868 SHA1 a9339169846af791be4a92c5cda053324eaa923a SHA256 ad9c4ce33cb4d998b3447a106f8a9df76dde19ef28b6dd94163362d0aaff3343
-EBUILD tomcat-7.0.11.ebuild 7085 RMD160 603bb6c1cfbf41bb638f4bdccb6dd204361c668d SHA1 23f3c23e08467df8636d93e7bcd4af4a725d920d SHA256 e57fac0fbb1a999ce7554cc0d0ba0619e831a345df3e0421bd1c0780712728b0
-MISC ChangeLog 63274 RMD160 4ee0b42e015aa0800de2f50260c1ae548246f9be SHA1 59f5b03a9bb9cdb369c48ab257f535771ced057c SHA256 dbe3c5255e288d273217128d23e3e71e44d03847cc6b9f21f07ee2261e28636a
+EBUILD tomcat-7.0.12.ebuild 7085 RMD160 650ff42e0c6505ec2d57d4095b0d7e4cac8c0a84 SHA1 3a41daa161322e880b783348e3347e0a2390f4b6 SHA256 b184d3fae2dce09b773d24388af284496c7525b7b633a81c3b5a202b65d92b23
+MISC ChangeLog 63653 RMD160 8c02ba4b9d4cd7cc4bc2326557762061aee5fc4e SHA1 595e65f20d9688f5d9f31d624aa7c931bf9588a2 SHA256 c0eb683f93cbb2e1e06dc53ad285259a230b5382b9f5decc694b1eb58ce16f6c
 MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22
diff --git a/www-servers/tomcat/files/7/7.0.11-build-xml.patch b/www-servers/tomcat/files/7/7.0.11-build-xml.patch
deleted file mode 100644
index 72d67161fd66..000000000000
--- a/www-servers/tomcat/files/7/7.0.11-build-xml.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- build.xml.orig	2011-03-05 14:11:01.000000000 +0100
-+++ build.xml	2011-03-08 17:39:53.752257789 +0100
-@@ -147,6 +147,7 @@
-   
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-+    <pathelement location="${ant.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-   </path>
- 
-@@ -291,6 +292,7 @@
-     <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
-     <exclude name="org/apache/catalina/tribes/**" />
-     <exclude name="org/apache/naming/factory/webservices/**" />
-+    <exclude name="javax/servlet/**" />
-   </patternset>
- 
-   <patternset id="files.catalina-tribes">
-@@ -420,7 +422,7 @@
-     
-   </target>
- 
--  <target name="validate" depends="download-validate" if="${execute.validate}">
-+  <target name="validate" if="${execute.validate}">
-     <!-- Required so we can cache checkstyle results -->
-     <mkdir dir="${tomcat.output}/res/checkstyle"/>
- 
-@@ -464,7 +466,7 @@
-     </checkstyle>
-   </target>
- 
--  <target name="compile" depends="build-prepare,download-compile,validate">
-+  <target name="compile" depends="build-prepare,validate">
- 
-     <!-- Compile internal server components -->
-     <javac srcdir="java" destdir="${tomcat.classes}"
-@@ -525,7 +527,7 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!-- Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -533,7 +535,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -541,12 +543,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    JSP 2.2 EL Implementation JAR File
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
--
-+-->
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-       filesDir="${tomcat.classes}"
-@@ -637,7 +639,7 @@
- 
-   </target>
- 
--  <target name="build-docs" description="Builds all documentation from XML sources">
-+  <target name="build-docs" unless="nobuild.docs" description="Builds all documentation from XML sources">
- 
-     <copy todir="${tomcat.build}/webapps">
-       <fileset dir="webapps">
-@@ -745,14 +747,14 @@
- 
-   <target name="deploy" depends="package,build-docs"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -809,7 +811,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="${tomcat.classes}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -821,7 +823,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="$tomcat.lcasses}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -829,11 +831,11 @@
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
--
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
--
-+-->
-   </target>
- 
-   <target name="examples-sources" description="Create examples sources"
-@@ -1008,7 +1010,7 @@
- 
-   </target>
- 
--  <target name="test-compile" depends="compile,download-test-compile" >
-+  <target name="test-compile" depends="compile" >
-     <mkdir dir="${test.classes}"/>
-     <!-- Compile -->
-     <javac srcdir="test" destdir="${test.classes}"
diff --git a/www-servers/tomcat/files/7/7.0.10-build-xml.patch b/www-servers/tomcat/files/7/7.0.12-build-xml.patch
index 72d67161fd66..72d67161fd66 100644
--- a/www-servers/tomcat/files/7/7.0.10-build-xml.patch
+++ b/www-servers/tomcat/files/7/7.0.12-build-xml.patch
diff --git a/www-servers/tomcat/files/7/7.0.8-build-xml.patch b/www-servers/tomcat/files/7/7.0.8-build-xml.patch
deleted file mode 100644
index d8211bff0dda..000000000000
--- a/www-servers/tomcat/files/7/7.0.8-build-xml.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur apache-tomcat-7.0.6-src_orig/build.xml apache-tomcat-7.0.5-src/build.xml
---- apache-tomcat-7.0.6-src_orig/build.xml	2010-12-06 17:20:48.777166339 -0500
-+++ apache-tomcat-7.0.6-src/build.xml	2010-12-06 17:58:10.529303918 -0500
-@@ -149,6 +149,7 @@
- 
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-+    <pathelement location="${ant.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-   </path>
- 
-@@ -291,6 +292,7 @@
-     <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
-     <exclude name="org/apache/catalina/tribes/**" />
-     <exclude name="org/apache/naming/factory/webservices/**" />
-+    <exclude name="javax/servlet/**" />
-   </patternset>
- 
-   <patternset id="files.catalina-tribes">
-@@ -420,7 +422,7 @@
-     
-   </target>
- 
--  <target name="validate" depends="download-validate" if="${execute.validate}">
-+  <target name="validate" if="${execute.validate}">
-     <taskdef resource="checkstyletask.properties"
-              classpath="${checkstyle.jar}" />
-     <checkstyle config="checkstyle.xml">
-@@ -437,7 +439,7 @@
-     </checkstyle>
-   </target>
- 
--  <target name="compile" depends="build-prepare,download-compile,validate">
-+  <target name="compile" depends="build-prepare,validate">
- 
-     <!-- Compile internal server components -->
-     <javac srcdir="java" destdir="${tomcat.classes}"
-@@ -498,7 +500,7 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!-- Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -506,7 +508,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -514,12 +516,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    JSP 2.2 EL Implementation JAR File
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
--
-+-->
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-       filesDir="${tomcat.classes}"
-@@ -610,7 +612,7 @@
- 
-   </target>
- 
--  <target name="build-docs" description="Builds all documentation from XML sources">
-+  <target name="build-docs" unless="nobuild.docs" description="Builds all documentation from XML sources">
- 
-     <copy todir="${tomcat.build}/webapps">
-       <fileset dir="webapps">
-@@ -718,14 +720,14 @@
- 
-   <target name="deploy" depends="package,build-docs"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -782,7 +784,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="${tomcat.classes}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -794,7 +796,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="$tomcat.lcasses}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -802,11 +804,11 @@
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
--
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
--
-+-->
-   </target>
- 
-   <target name="examples-sources" description="Create examples sources"
-@@ -946,7 +948,7 @@
-           description="Creates the experimental embedded release"
-           depends="embed,embed-sources,embed-extras" />
- 
--  <target name="test-compile" depends="compile,download-test-compile" >
-+  <target name="test-compile" depends="compile" >
-     <mkdir dir="${test.classes}"/>
-     <!-- Compile -->
-     <javac srcdir="test" destdir="${test.classes}"
diff --git a/www-servers/tomcat/tomcat-7.0.11.ebuild b/www-servers/tomcat/tomcat-7.0.12.ebuild
index e60568d1a7f7..2e7e3c089921 100644
--- a/www-servers/tomcat/tomcat-7.0.11.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.11.ebuild,v 1.1 2011/03/11 16:28:54 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.12.ebuild,v 1.1 2011/04/07 14:13:49 fordfrog Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"