ercpe 14/12/14 11:51:54
Added: tomcat-7.0.57-build.xml.patch
Log:
Version bump to 7.0.57 with fix for bug #503090
* JDK/JRE 1.7 is required for +websockets.
* JDK 1.7 restriction for javadocs removed from build.xml
This will open up CVE-2013-1571, but this is true for any other package in
the tree build with USE="doc" and an old JDK.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
77C501ED)
Revision Changes Path
1.1 www-servers/tomcat/files/tomcat-7.0.57-build.xml.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat-7.0.57-build.xml.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat-7.0.57-build.xml.patch?rev=1.1&content-type=text/plain
Index: tomcat-7.0.57-build.xml.patch
===================================================================
diff --git a/apache-tomcat-7.0.57-src/build.xml
b/apache-tomcat-7.0.57-src/build.xml
index 60018a4..0283688 100644
--- a/apache-tomcat-7.0.57-src/build.xml
+++ b/apache-tomcat-7.0.57-src/build.xml
@@ -686,26 +686,32 @@
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
<!-- Servlet 3.0 Implementation JAR File -->
+<!--
<jarIt jarfile="${servlet-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.servlet-api"
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
notice="${tomcat.manifests}/servlet-api.jar.notice"
license="${tomcat.manifests}/servlet-api.jar.license" />
+-->
<!-- JSP 2.2 Implementation JAR File -->
+<!--
<jarIt jarfile="${jsp-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.jsp-api"
manifest="${tomcat.manifests}/jsp-api.jar.manifest"
notice="${tomcat.manifests}/jsp-api.jar.notice"
license="${tomcat.manifests}/jsp-api.jar.license" />
+-->
<!-- 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}"
@@ -951,12 +957,14 @@
<target name="deploy" depends="package,build-docs,compile-webapp-examples"
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">
@@ -1016,14 +1024,14 @@
<exclude name="${jdt.jar.filename}"/>
</fileset>
</delete>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
<!-- Add sources for examples -->
<antcall target="examples-sources" />
-
+<!--
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
failonerror="false"/>
-
+-->
<!-- build the jdbc-pool jar and source jar-->
<echo message="Building Tomcat JDBC pool libraries"/>
<ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
@@ -1170,9 +1178,11 @@
<copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
<copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
+<!--
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
failonerror="false"/>
<copy file="${jdt.jar}" todir="${tomcat.embed}" />
+-->
<!-- Note the meta-inf below will work as long as there is only one JAR
that needs to add entries. If there is more than one a more complex
@@ -1618,7 +1628,7 @@
<target name="extras-webservices-prepare"
depends="extras-prepare"
- description="Prepare to build web services extras package">
+ description="Prepare to build web services extras package"
unless="noget">
<antcall target="downloadfile">
<param name="sourcefile" value="${jaxrpc-lib.loc}"/>
@@ -1825,8 +1835,10 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
<target name="javadoc" depends="dist-source,extras-webservices-prepare"
description="Create the Tomcat javadoc" >
+<!--
<fail unless="java.7.home"
message="The java.7.home property must be set for javadoc build"/>
+-->
<javadoc packagenames="javax.servlet.*"
excludepackagenames="javax.servlet.jsp.*"
sourcepath="${tomcat.dist}/src/java"
@@ -1840,8 +1852,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
docencoding="ISO-8859-1"
charset="ISO-8859-1"
additionalparam="-breakiterator -notimestamp"
- maxmemory="256m"
- executable="${java.7.home}/bin/javadoc">
+ maxmemory="256m">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
@@ -1860,8 +1871,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
docencoding="ISO-8859-1"
charset="ISO-8859-1"
additionalparam="-breakiterator -notimestamp"
- maxmemory="256m"
- executable="${java.7.home}/bin/javadoc">
+ maxmemory="256m">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
@@ -1880,8 +1890,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
docencoding="ISO-8859-1"
charset="ISO-8859-1"
additionalparam="-breakiterator -notimestamp"
- maxmemory="256m"
- executable="${java.7.home}/bin/javadoc">
+ maxmemory="256m">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
@@ -1900,8 +1909,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
docencoding="ISO-8859-1"
charset="ISO-8859-1"
additionalparam="-breakiterator -notimestamp"
- maxmemory="256m"
- executable="${java.7.home}/bin/javadoc">
+ maxmemory="256m">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
@@ -1919,8 +1927,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
docencoding="ISO-8859-1"
charset="ISO-8859-1"
additionalparam="-breakiterator -notimestamp"
- maxmemory="256m"
- executable="${java.7.home}/bin/javadoc">
+ maxmemory="256m">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
@@ -2605,7 +2612,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
</target>
<target name="download-compile"
- description="Download (and build) components necessary to compile" >
+ description="Download (and build) components necessary to compile"
unless="noget">
<antcall target="downloadfile-2">
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
@@ -2662,7 +2669,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
</target>
<target name="download-test-compile"
- description="Download additional components for the tests" >
+ description="Download additional components for the tests"
unless="noget">
<antcall target="downloadfile">
<param name="sourcefile" value="${junit.loc}"/>
@@ -2690,7 +2697,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
</target>
<target name="download-dist"
- description="Download additional components for a distribution" >
+ description="Download additional components for a distribution"
unless="noget">
<antcall target="downloadzip-2">
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>
