summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2021-05-02 14:02:08 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2021-05-02 19:57:44 +0200
commit2ea3f543b161af65a143053bd2cf4c0e940c9df9 (patch)
treece5ad2edc37684d471efd4eb34d987b73202b21a /www-servers
parentdev-util/sysdig: remove libressl support (diff)
downloadgentoo-2ea3f543b161af65a143053bd2cf4c0e940c9df9.tar.gz
gentoo-2ea3f543b161af65a143053bd2cf4c0e940c9df9.tar.bz2
gentoo-2ea3f543b161af65a143053bd2cf4c0e940c9df9.zip
www-servers/tomcat: remove unused patch
Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/20649 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch284
1 files changed, 0 insertions, 284 deletions
diff --git a/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch
deleted file mode 100644
index 0ed246822913..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 455edf9..457c0a9 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1032,6 +1032,7 @@
- addOSGi="true" />
-
- <!-- Servlet Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -1039,21 +1040,23 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"
- addOSGi="true" />
--
-+-->
- <!-- EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- JSP Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- WebSocket API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
- filesDir="${tomcat.classes}"
-@@ -1166,10 +1169,10 @@
- addOSGi="true" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp"
-- addOSGi="true" />
-+ addOSGi="true" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1397,9 +1400,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1459,7 +1462,7 @@
- <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" />
-@@ -1502,7 +1505,7 @@
-
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- 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}"
-@@ -1517,7 +1520,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1620,9 +1623,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}" />
-+-->
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
-
- <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -2196,11 +2201,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!--
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2231,6 +2237,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+<!--
- <javadoc packagenames="jakarta.servlet.*"
- excludepackagenames="jakarta.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2295,6 +2302,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="jakarta.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2357,13 +2365,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${osgi-annotations.jar}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!--
- <link href="https://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -3083,7 +3095,7 @@ skip.installer property in build.properties" />
-
- <target name="download-compile"
- description="Download components necessary to compile"
-- depends="setup-bnd">
-+ depends="setup-bnd" unless="noget">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -3127,7 +3139,7 @@ skip.installer property in build.properties" />
- </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}"/>
-@@ -3205,7 +3217,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -3260,13 +3272,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3388,7 +3400,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3405,7 +3417,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3430,7 +3442,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3446,7 +3458,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3470,7 +3482,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3485,7 +3497,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3513,7 +3525,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3524,7 +3536,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3535,7 +3547,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3553,7 +3565,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
-
- <target name="ide-intellij"
- depends="download-compile, download-test-compile"
-- description="Creates project directory .idea for IntelliJ IDEA">
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
-
- <copy todir="${tomcat.home}/.idea">
- <fileset dir="${tomcat.home}/res/ide-support/idea"/>