commit: 6fa39ad24289b738fc426772b610ddb359cb9631
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed May 8 18:12:35 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu May 9 10:57:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fa39ad2
www-servers/tomcat: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../files/tomcat-9.0.50-insufficient-ecj.patch | 38 ---------
.../tomcat/files/tomcat-9.0.72-build.xml.patch | 97 ----------------------
2 files changed, 135 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
deleted file mode 100644
index d8f933c417b1..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/java/org/apache/jasper/compiler/JDTCompiler.java
-+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -306,11 +306,11 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
- } else if(opt.equals("13")) {
- settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_13);
- } else if(opt.equals("14")) {
-- settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_14);
-+ settings.put(CompilerOptions.OPTION_Source, "14");
- } else if(opt.equals("15")) {
-- settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_15);
-+ settings.put(CompilerOptions.OPTION_Source, "15");
- } else if(opt.equals("16")) {
-- settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_16);
-+ settings.put(CompilerOptions.OPTION_Source, "16");
- } else if(opt.equals("17")) {
- // Constant not available in latest ECJ version shipped with
- // Tomcat. May be supported in a snapshot build.
-@@ -366,14 +366,14 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
- settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_13);
- settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_13);
- } else if(opt.equals("14")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_14);
-- settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_14);
-+ settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
-+ settings.put(CompilerOptions.OPTION_Compliance, "14");
- } else if(opt.equals("15")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_15);
-- settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_15);
-+ settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
-+ settings.put(CompilerOptions.OPTION_Compliance, "15");
- } else if(opt.equals("16")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_16);
-- settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_16);
-+ settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
-+ settings.put(CompilerOptions.OPTION_Compliance, "16");
- } else if(opt.equals("17")) {
- // Constant not available in latest ECJ version shipped with
- // Tomcat. May be supported in a snapshot build.
diff --git a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
deleted file mode 100644
index bdf2efccbdbd..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -1436,9 +1436,9 @@
-
- <target name="deploy"
depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!-- not needed for us
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar"
file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1498,7 +1498,9 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!-- we provide jdt jar externally
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+-->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -2154,11 +2156,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!-- we provide tomcat native as another package and we don't need
commons-daemon
- <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.
-@@ -2319,8 +2322,10 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
- <link href="../elapi"/>
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!-- net is not accessed from emerge
- <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/**"/>
-@@ -3234,6 +3239,7 @@ asf.ldap.username=${release.asfusername}
- depends="setup-bnd">
-
- <!-- Download Commons Daemon -->
-+<!-- not needed
- <antcall target="downloadgz-2">
- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-@@ -3242,8 +3248,9 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm"
value="${commons-daemon.bin.checksum.algorithm}"/>
- <param name="checksum.value"
value="${commons-daemon.bin.checksum.value}"/>
- </antcall>
--
-+-->
- <!-- Download JDT (Eclipse compiler) -->
-+<!-- we provide JDT
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${jdt.loc.1}"/>
- <param name="sourcefile.2" value="${jdt.loc.2}"/>
-@@ -3253,8 +3260,9 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
- <param name="checksum.value" value="${jdt.checksum.value}"/>
- </antcall>
--
-+-->
- <!-- Download WS API -->
-+<!-- we provide jaxrpc
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
- <param name="destfile" value="${jaxrpc-lib.jar}"/>
-@@ -3263,6 +3271,8 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm"
value="${jaxrpc-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
- </antcall>
-+-->
-+<!-- we provide wsdl4j
- <antcall target="downloadfile">
- <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
- <param name="destfile" value="${wsdl4j-lib.jar}"/>
-@@ -3271,7 +3281,7 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm"
value="${wsdl4j-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
- </antcall>
--
-+-->
- </target>
-
- <target name="download-test-compile"
