diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-05-10 00:01:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-10 00:01:14 +0100 |
commit | 17e5f1ea4a2e1c5664f96480ca46348d008e8711 (patch) | |
tree | 7166d1b58a582290a4ad23ff5882cca911b8035c /www-servers | |
parent | a0ce545d52f231499bf9f3644493113d8af58ec9 (diff) |
gentoo auto-resync : 10:05:2024 - 00:01:13
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/Manifest.gz | bin | 4700 -> 4705 bytes | |||
-rw-r--r-- | www-servers/tomcat/Manifest | 2 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch | 38 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch | 97 |
4 files changed, 0 insertions, 137 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz Binary files differindex f2b9af1d5a2c..d9bebd6f16d9 100644 --- a/www-servers/Manifest.gz +++ b/www-servers/Manifest.gz diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 623a275edea1..dc07cdaa47ad 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -4,8 +4,6 @@ AUX tomcat-10.1.6-build.xml.patch 4856 BLAKE2B ed44d53877c96f06cab6354b034f88ba3 AUX tomcat-8.5.86-build.xml.patch 4164 BLAKE2B 27aba54a5a8e570a9e73ff1133dcdc43ac9536bb2cb8b2542fe3eb12c2c92145066c8d742ff35a6b320515cb91ce9a17a1b0e7954623a68326677b42547f1027 SHA512 7f924be4b979178fc92d7a3b63224c87860ae1795b2cc10e734ff8518d6ab3b15138718ed392b1fb747457d4abf5acf9b5fac13f321cd7e8dd7fe832c0e82577 AUX tomcat-8.5.95-min.java.patch 1435 BLAKE2B 016eff198e0da7a9659a96e31fd50a0da51841a44920f39eadfb87c634485db843e45ca5fca581c2fe19ac20e2b206099fa6c6820bb3502d3d5011417fe2a83e SHA512 8fa4ec05f2dcfd919abf3b0ef5b33351d22bb882bf11df43742c28ead7c8f868bfc9792f77f3b17dbd38baa5c68c60d1e4e7f4a8c2472f889592975cf45295e2 AUX tomcat-9.0.37-fix-build-rewrite.patch 448 BLAKE2B 323a726c80b04a225e47b04506969116bccda3fdddca6e00bab85a8a758b58b5461792b8419d56e3f55742218a9dd36ab11e14d7af49ba1be4c8543f1a6c1fb3 SHA512 58413426f3997af610819f55a63c161b5ae2953337fdaddd854b3f4fb239f198434731598d23858cf5911d7506387907a14c0f1cca0df5801767c1f868bf9a07 -AUX tomcat-9.0.50-insufficient-ecj.patch 2747 BLAKE2B d229acd5e0e90323e75eb44e575c893759884df526a8aebb92b648ad3c15b29312153d701472d86406e4be6d7fa646b7b4c2952a01fd42a52dcc8980c6540cfe SHA512 2327b26213a507c91e9bad5a224c2a3925b97cb41a54ddd58bd901266dcb72b355f4378f5ec9911cd3ca1ba5456a98012adfb185cb7d501c4865d414b51355dc -AUX tomcat-9.0.72-build.xml.patch 3794 BLAKE2B 886bf69f4c78f385249e02e1f91ed91065cd242a4b17db0b852ea6ef5561bf3c5de18a9590ef78c40296075975c92b8620a36224b8e7902dd8f61acba016e197 SHA512 ffa15a7c8ae2a11aab89f4070bf4d2d1eec636fceebedc62a7191449e8e3c5e0e2e969e600b2771762452156c479750af63fe705d20b888159fe59bf59f88b74 AUX tomcat-9.0.87-build.xml.patch 1240 BLAKE2B 26fbfd5ba353fd3f5a02a1feb984eee7b6e5b9ed1f711e969e135e87761f0b6be5503abf93a53ecdfa7de35e00765f1c3a7e057702fe14d62bfb58cc93356b84 SHA512 b62fc4d3a0d2d1134587fe284956a4961b353c730a4084e50f4cbf1ec096a2261c8c77a58940c808e47e5c0a8cdbffdbbb74de45de0251bddff9e461a5fe450c AUX tomcat-9.0.87-gentoo-bnd.patch 1432 BLAKE2B 07964d271be70afe13116c9ce27c956a6812f5da0237b19a1bc915ac3a0abd1e3e1ad89d59049152c1f3f24b84a45a076375f7dc6784c87ebac440b15ec5557d SHA512 210754982a5ac789aecedd9916d45190c8ca92661b9f492d40b6c4f0758c69a2d5b961150cc83573c9b7890a73fc4e8bd130a2837d6de9164fc8a18bee0e7676 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed 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" |