www-servers/tomcat: version bump

Package-Manager: portage-2.2.27

1 files changed, 71 insertions, 0 deletions

diff --git a/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch
new file mode 100644
index 000000000000..743065130f07
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch
@@ -0,0 +1,71 @@
+diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/build.xml
+--- apache-tomcat-6.0.44-src.orig/build.xml	2015-05-08 13:22:05.000000000 +0100
++++ apache-tomcat-6.0.44-src/build.xml	2015-08-25 23:38:46.147332131 +0100
+@@ -159,12 +159,14 @@
+       </fileset>
+     </copy>
+     <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+     <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+       <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+         <include name="*" />
+         <exclude name="jspxml*" />
+       </fileset>
+     </copy>
++ -->
+ 
+   </target>
+ 
+@@ -307,19 +309,25 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 2.5 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       license="${tomcat.manifests}/servlet-api.jar.license"
+       notice="${tomcat.manifests}/servlet-api.jar.notice" />
++-->
+ 
+     <!-- JSP 2.1 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+ 
+ 
+     <!-- JSP 2.1 EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}" filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap"
+@@ -492,12 +500,14 @@
+ 
+   <target name="deploy" depends="build-only,build-docs,warn.dbcp">
+ 
++<!--
+     <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">
+@@ -649,9 +659,11 @@
+       </fileset>
+     </txt2html>
+ 
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
++-->
+ 
+   </target>
+