summaryrefslogtreecommitdiff
path: root/www-servers
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-04-06 22:33:41 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-04-06 22:33:41 +0100
commite68d405c5d712af4387159df07e226217bdda049 (patch)
tree009ab0f3d427f0813e62930d71802cb054c07e30 /www-servers
parent401101f9c8077911929d3f2b60a37098460a5d89 (diff)
gentoo resync : 06.04.2022
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/Manifest.gzbin5040 -> 5035 bytes
-rw-r--r--www-servers/apache/Manifest1
-rw-r--r--www-servers/apache/files/apache-2.4.51-mpm-itk.patch34
-rw-r--r--www-servers/puma/Manifest7
-rw-r--r--www-servers/puma/files/puma-5.6.4-logwriter-test.patch14
-rw-r--r--www-servers/puma/puma-5.4.0.ebuild59
-rw-r--r--www-servers/puma/puma-5.6.4.ebuild (renamed from www-servers/puma/puma-5.6.1.ebuild)6
-rw-r--r--www-servers/tomcat/Manifest22
-rw-r--r--www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch347
-rw-r--r--www-servers/tomcat/files/tomcat-9.0.62-build.xml.patch319
-rw-r--r--www-servers/tomcat/tomcat-10.0.17.ebuild2
-rw-r--r--www-servers/tomcat/tomcat-10.0.20.ebuild (renamed from www-servers/tomcat/tomcat-10.0.16.ebuild)11
-rw-r--r--www-servers/tomcat/tomcat-8.5.76.ebuild2
-rw-r--r--www-servers/tomcat/tomcat-8.5.78.ebuild (renamed from www-servers/tomcat/tomcat-8.5.75.ebuild)6
-rw-r--r--www-servers/tomcat/tomcat-9.0.59.ebuild2
-rw-r--r--www-servers/tomcat/tomcat-9.0.62.ebuild (renamed from www-servers/tomcat/tomcat-9.0.58.ebuild)13
16 files changed, 719 insertions, 126 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index a0d4803b81f9..77ad47e245eb 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
Binary files differ
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index f174f4ca0bf0..c48e4d230351 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,5 +1,4 @@
AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
-AUX apache-2.4.51-mpm-itk.patch 890 BLAKE2B 882a0c92334a30c61733fe4acb314e6b25f6bd3f09fa92caf4ed29091e8e86132d184979f4b246cbb1f341aeaec309267c1313e806ea6ed0ba20b8b4981bdf4d SHA512 a15c7b53719b9a296053ae31ba0021ef6126ecab6b661229ac9bb5e448ddd8c870be004e71d328c9dbc8e8cbc70009278403b0329628acf10ba0fccb5d6bbe17
AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
diff --git a/www-servers/apache/files/apache-2.4.51-mpm-itk.patch b/www-servers/apache/files/apache-2.4.51-mpm-itk.patch
deleted file mode 100644
index 4d36fe03dffb..000000000000
--- a/www-servers/apache/files/apache-2.4.51-mpm-itk.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Backport of upstream r1894171 to fix segfaults with mpm-itk.
-
-https://bugs.gentoo.org/816258
-https://bz.apache.org/bugzilla/show_bug.cgi?id=65627
-
---- a/server/connection.c 2021/09/21 20:03:52 1893497
-+++ b/server/connection.c 2021/10/12 16:48:18 1894171
-@@ -145,9 +145,7 @@
- {
- apr_socket_t *csd = ap_get_conn_socket(c);
-
-- if (!csd) {
-- return 1;
-- }
-+ ap_assert(csd != NULL);
-
- if (ap_prep_lingering_close(c)) {
- return 1;
-@@ -178,6 +176,15 @@
- apr_time_t now, timeup = 0;
- apr_socket_t *csd = ap_get_conn_socket(c);
-
-+ if (!csd) {
-+ /* Be safe with third-party modules that:
-+ * ap_set_core_module_config(c->conn_config, NULL)
-+ * to no-op ap_lingering_close().
-+ */
-+ c->aborted = 1;
-+ return;
-+ }
-+
- if (ap_start_lingering_close(c)) {
- apr_socket_close(csd);
- return;
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index cb9508049eae..367ba7b2f0cf 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,9 +1,8 @@
-DIST puma-5.4.0.tar.gz 298525 BLAKE2B d93231582cd83519c258093fd9ac5e2b06398133e82e2d350103e7438a4ed1fd9b36f627739dbbad86e839211850c5387be57d5d114835e7e4d99940e842b128 SHA512 032a507d852c555393f401d4e72c358cf8c49d1c93ff7a559969f3d1f84c0b49180cbcee975bb6fea621d034a00874268ff05ae76f91775cc24089de0b4560da
+AUX puma-5.6.4-logwriter-test.patch 528 BLAKE2B de30ccfa68916ef4ea3d460eb96d2b28711e619792848a0fd065eab836c88f03f4ecde8699773f963b745f595dda65df00772f0dcb096102612852687112833c SHA512 d24cb26fd89ec916ceea08eeb75dbcef89fda6babe7cd9a4f3a7f143c0e53dee4ad582a656cc002c054e89c960fd6b41f367ae490442ca1c6b69e6c3d1b8d0b7
DIST puma-5.5.2.tar.gz 302778 BLAKE2B 5911accde19aaed34cffecc71eb2db02f0d9f9ea7b57437ff7cf7580b0b51245ed68b254778cbdc11bea624b9f192aef0bfa7e24acde73b77290d780ab177933 SHA512 9887b465c6ed2a8e551b15fd161f19a9d2baa96b8eb8e247f13c98df9d34f6097bce81a52e8f88d69088d9b5f8477137af9110b7546afabc53767f337ad00ef8
-DIST puma-5.6.1.tar.gz 308896 BLAKE2B 0fa28fee64da577965c16fa564275760fbb3ebd04ed3eff583e53733b2f674ec6d29c20d2734bd16cb83aca8747ff5049e86d692bb5dd70fa5112a7a2c64ebf4 SHA512 262f17343668f5bf68842664eb6445208755385428151354fdb4039411e339c5c686f684bdb32c974516add3ca86af5693d1e169cf2bf74a8614be3cc06eccb0
DIST puma-5.6.2.tar.gz 309057 BLAKE2B 21a8c02f5fdfd23863a525987b55fbdb5c6b42d550cd8bb4580a78faf0206db42ee9b98409ce7b881dfad43bf5d31d202e228e3a62f0327083f043e22de32b3a SHA512 e08ebb968cb139136d11cfb12f7ebef7f4cafcbf3f26cf229c063aa0e55769ba8c4bc1df1dd9e04a4969d6f423cae1a09ce87e154315c9df80d61ec56b6f96e7
-EBUILD puma-5.4.0.ebuild 1853 BLAKE2B 7568cd85ec3925a107a4f4c6dcfff0764eb307bf211b3c0c1fa4b340ef29f8a3a8cf617009ff6382fed5db8d06a3d93fb6d256404649d616b4a655023ea392b6 SHA512 28ea6e783aeacd7f33451b5600fb33921760b2297b236e8f141caa01b8f807d05093ef1b910f260a22e9c2eed293e21d287eb27dd274cff46a99f8bc56b3a8b6
+DIST puma-5.6.4.tar.gz 310770 BLAKE2B 124190a0ca791352d055f833caec470be3be910ec4dbae5dc6860b79f5c678566f9bada3c6cf1066bc12f040ab891e9ea1a1da3188a9715db7643ef8d8f6b26f SHA512 6321a08e99be1023a1216466914416fbc91f5436ecccec4ea4cbfdc9c4ebc4979f93894ae12b72654269b0410d6a3053230806b860cb912c1abdf89766683a27
EBUILD puma-5.5.2.ebuild 1870 BLAKE2B 9bd4d49bd03e49002e556eba71e5ba347f0963f84de9941b96fd70cb834b0b4cd96fd0a32ef5198f2cd51f54910bfc8b9b94164a671d598f9bcee32e1047c2af SHA512 87c9708034606ce77be26340b3f20da38aa5ed0aeb8d1b72d1c1ad296514056170a96e447ebe38311aae54269b77b4fa2947ea62e24c51c01821a0390b35ed4d
-EBUILD puma-5.6.1.ebuild 1865 BLAKE2B 127a5cb8ef8094bb53fee94296b13627bfe0ce423dc16c2aef68c87df56da6bd7eb166559f10621e98d0d5d466321fec589bd44e95dd26bf9710f8b5626c8919 SHA512 9789bb869f6c5de66122a547fe4d4dc54ed65dea0d11c0d7ae43b284a5adc11cf2eb99a766facdc78045a6f47eb3d4bfe1658caea285aeab2951fad6ad5a2e0c
EBUILD puma-5.6.2.ebuild 1872 BLAKE2B 3ff23c24f53d2de7a71f4e05d48808eb6125534f39c926dcc75a48496211b234562db89a6b713c9f5862004f8fd365d055a0fa425267079a8a2c98f969a81abb SHA512 13230f2638ec4c9c80504b43fa8e0d0de3f533e2edceba6085db16b702839c16c031d678ba8e580a05d6a844043c27f1441ecbba8b27fbaec3987b27dc3678c6
+EBUILD puma-5.6.4.ebuild 1916 BLAKE2B 4c9970fec1d4e60fb5e96c3b7dc8bd5aa4eab77b3871228cdefa57dd11d4a62c52c1e1a4a30a65454e5e28b43e08596e321994f61822828c967b07015f6c2541 SHA512 ac7d38115fe196b02781b7fe6dc6ca0378b2dfab287cfc162b8e3981e1d95e31c686557784058b8ba8bb70da438743a380e5dbf5fcb771ec9792732ea3a85a2d
MISC metadata.xml 710 BLAKE2B bf109653812999e453fb414a83bf404786d16df301ba9dff87c123e0f1dbff8e3024109e96b7f36a3d9e1ebe57eb7aecc7acfd923f0de1bc8c4f358a87b32379 SHA512 894c677c61b3c7f8081b1511c64c274497c4ea85171f5b19d9606a19e4dff33df00d169653e3aede3eee07737b1cf9faadb812eebcf67292be68150c026b7f8e
diff --git a/www-servers/puma/files/puma-5.6.4-logwriter-test.patch b/www-servers/puma/files/puma-5.6.4-logwriter-test.patch
new file mode 100644
index 000000000000..75086f76f027
--- /dev/null
+++ b/www-servers/puma/files/puma-5.6.4-logwriter-test.patch
@@ -0,0 +1,14 @@
+--- a/test/test_request_invalid.rb.orig 2022-03-31 08:02:24.833118111 +0200
++++ b/test/test_request_invalid.rb 2022-03-31 08:02:41.897215442 +0200
+@@ -35,9 +35,8 @@
+ [200, {}, [body]]
+ }
+
+- @log_writer = Puma::LogWriter.strings
+- events = Puma::Events.new
+- @server = Puma::Server.new app, @log_writer, events
++ events = Puma::Events.new($stdout, $stderr)
++ @server = Puma::Server.new app, events
+ @port = (@server.add_tcp_listener @host, 0).addr[1]
+ @server.run
+ sleep 0.15 if Puma.jruby?
diff --git a/www-servers/puma/puma-5.4.0.ebuild b/www-servers/puma/puma-5.4.0.ebuild
deleted file mode 100644
index 055f299b4a41..000000000000
--- a/www-servers/puma/puma-5.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0="
-
-ruby_add_bdepend "virtual/ruby-ssl
- test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
- sed -e '/bundler/ s:^:#:' \
- -e '/prove/ s:^:#:' \
- -e '/stub_const/ s:^:#:' \
- -i test/helper.rb || die
-
- # Avoid tests failing inconsistently
- sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
- # Avoid launcher tests since they make assumptions about bundler use
- rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
-
- # Skip integration tests since they make a lot of assumptions about
- # the environment
- rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
- # Avoid test that uses unpackaged stub_const
- sed -i -e '/test_shutdown_with_grace/,/^ end/ s:^:#:' test/test_thread_pool.rb || die
-
- sed -e 's/git ls-files --/find/' \
- -e 's:_relative ": "./:' \
- -i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
- einfo "Running test suite"
- ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-5.6.1.ebuild b/www-servers/puma/puma-5.6.4.ebuild
index 808b8fced84f..97be04bd98eb 100644
--- a/www-servers/puma/puma-5.6.1.ebuild
+++ b/www-servers/puma/puma-5.6.4.ebuild
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb)
RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma
-inherit multilib ruby-fakegem
+inherit ruby-fakegem
DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
HOMEPAGE="https://puma.io/"
@@ -18,12 +18,14 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE=""
DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
RDEPEND+=" dev-libs/openssl:0="
+PATCHES=( "${FILESDIR}/${P}-logwriter-test.patch" )
+
ruby_add_bdepend "virtual/ruby-ssl
test? ( dev-ruby/localhost dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d018f86c7dc6..a81e3e6a2bda 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,36 +1,36 @@
AUX tomcat-10.0.16-build.xml-strip-html5.patch 1201 BLAKE2B 57df5e44b741bc3c981312ce48330d0f43353f3ca010870c5f4a43539c120178147371129a66baa6d3a16da31328d21e0653060aa5cd4647b5935a05349d20e9 SHA512 38e194748ffae04be81624fe3dd5175acc1d0f62d07f9762e0831c5e840180c947492d03bde9722271690f6c94b5805992a5f7513520968bfdc037e33f9ba455
AUX tomcat-10.0.16-build.xml.patch 13885 BLAKE2B e1c8b3b51fb64a3fe39f33dfa0bb9fa565a53d6d1d3ff994a8d90de52fcec8ebf1f6a9998987f9146f8237cd6abbd028c186cd1e926a85a719e74bc50920d3d6 SHA512 8f3e22120a514b26dfcace7190c2d7c2bfdbca3de1b9ee5749e6e3ece69a452e5f8e741770a99f7d69433679338a840af3289d95cd523b36888f0c4152b37b66
+AUX tomcat-10.0.20-build.xml.patch 13813 BLAKE2B 2c6b1376751a768910b38de8bf4cd0e68f71e6215186f1efbfdd06e4a83e63faf8c124e7413f33f91eea50c8c35624f7cc0e43081c1ecdb18935bec6bae0f1e2 SHA512 43312b1fe6c25ff9144a20feba1871762abd6469d02cc7c92a649ffd738ce64fe3a2882d8129b6d0e1f8a69a73ba726001d6053873553cde25234701cd14e895
AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1322431649b276b59a93f10b97f59d03690f3531c2fd3a8ce67b81969544d498bf04e829407005dbed867067f8970347 SHA512 f8d0cb4ba0effdeea3db4049381efc84513551a1e28551b59a254340a8add306824d1dba344f6eaddc93e8b61fc0b71e1a8d0bcfc860500134cc19072deef30e
AUX tomcat-8.5.66-build.xml.patch 10850 BLAKE2B 69353bcf5697e6ae0b930c71fbb870401e822340f0eb0b8a6283e0d8cd1388d1d22a12190d089f7001a06e2491bb2309aab8c93b8f2a79e8439571fed8d0aebb SHA512 498c2ac8ab49cd83151ddfc6b47bd3a7a7148096e331ae55c7fe3da90007c19387208de64f5b3e796ec54b4b8534b11f906940fcf49343157acc862fcf06f5c7
AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2
AUX tomcat-9.0.50-insufficient-ecj.patch 2890 BLAKE2B 586fed374f9da437d441d59272faaadf898b684375edd999f7ea50c81a5fe1ffe98e89037ee64997e583fa835f32598a7b16f0595be75fbf947264d84eea4379 SHA512 3d31beab19f79b8bd477d06e2b0ff7575e8c5cfb6c056da6fb1c19e2a1efebe9151c9b698baa1e4168006a9c28974eb49924bf52c89795ba227111d678e38439
AUX tomcat-9.0.58-build.xml.patch 12810 BLAKE2B abcb44fea2ef4cd117f0eab62fd2e3fab6f5538ce378fd85d28027ff7878efd98d5fd1ef7bfb23bdbab9edda5fa11e753e2041c957fa71b5a3a52dd21b7d70d5 SHA512 fbc15358c087d4aadcf88aa39f83a861b18641e784949026cb256b33027088e71aa205adaf3940bc56042c1546f0bdcb444b1dedebd856c302720d1566ac1f97
+AUX tomcat-9.0.62-build.xml.patch 12687 BLAKE2B 55b0c142875581231ca65e9198d5da116f01e1b9d4b16d50cd79300e9fd49c5d9f79341f34a0285af8683e14bb51d1c4fa2bb91e893591c114692021608ffedf SHA512 0c82adb799539eeb4691f86e2e2815feefbefce579576a3419bd3b5efbaf7e6d24c03862b70d514424cfa74abb217e214a9005390b73ecf9836721c7b289a802
AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-10.0.16-src.tar.gz 6088262 BLAKE2B f02a5b08e4502d4e7be2fa14f8dae8760c2844f262cdc75e2cc821038d248ed961281d11f7bb847cf55ecf012ee05c870366508fb1fe1485da2100e87aa13c55 SHA512 44a1ac752077603c5366ec92c6a5860d33ce810bf2554190a013329106ec118d1a18d1a26823b3024d046b05160a20dda65573365451d0481be8be97218445c8
DIST apache-tomcat-10.0.17-src.tar.gz 6086996 BLAKE2B ff3584e58ec6f22f493cf7f32435423d68b941d9eec22441ee54ba69af03b50b687b23012129108485c9db147c8e7364ded037cf9ed2add174e6c928b927382a SHA512 1cc0f8e2187934c6dac3e31739f8c53a0a152527a98210deab8ce027c1347cbbd1cef3bdf0294bee3c4dbed20ba57b2291bcd887f353837fd505ea2d17e7ba3d
DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab
+DIST apache-tomcat-10.0.20-src.tar.gz 6097471 BLAKE2B 77df97d73ff87a5ad55dfc3a0df02e3a306e619a5ae4bd2df0a0e3d42d236ccf2c6a6c46f60f56311f9be1bd561be9096d810d932f136b5856ff275fb3ae8368 SHA512 1e75b0bad54a9fac6ddc650156fac88bc91933ff0bf4e9a62948f5e116454b6def10d7ad632968e709e8aac72b15c567e4497cdb9b594352cd12d7518fdaf18f
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad
DIST apache-tomcat-8.5.76-src.tar.gz 5961741 BLAKE2B 4c661c2f753edac48c28fdec3caa06c487e1546feb91f2d69003a4d9f71fb023eb2314520bb156f3087656d655acdfdbdff3f68cd3f81d0d9dfbb2c9577898ee SHA512 b1c1b8c870c77e46969fe64acc71194d37605e5ccda87d105186d8070ec2dd0b7b9c64cf2f9b276db140fd3927832405123018f6fe8f46c0ebda50af6404d8b9
DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157
-DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a
+DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32
DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3 SHA512 cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80
DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5
-DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
+DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09
DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
-DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a
-EBUILD tomcat-10.0.16.ebuild 6074 BLAKE2B b1cdc2e6a66fc2a502f23e5314d7ff9917a77c258be5f6b5b4166780a9191c8e02cd185978a829a199b9f766e5130e0d7cca1f913ad9f873f8534f14ae4f7b66 SHA512 b926ccf1948e3f3e2bd267eb72e8fdae0a42e56d5d7558a706f3b3534ed47169edac963a9b4af760ad529b1cbfc7e16f6333a0e6475ccc582df0ef22cc6d64a7
-EBUILD tomcat-10.0.17.ebuild 6258 BLAKE2B 21668cc1db4c932750ee53bbb2e8806231858bfc42cbeebbca639b272475b548db84ebf994cd89bdb72e44c5f8eabf13e002b5d372bf84c855baf98593abc0b3 SHA512 f7adac14aa388aa4ea5a3cd2ae3bdc02ac48d890bd411cc93d34c5df324fac177e9e05a69b9439a7e8d53725e8f126aae5c1808311f7e08b0b74adab4e2d7139
+EBUILD tomcat-10.0.17.ebuild 6257 BLAKE2B 95e9a101c876de408f2441f0b7a269375365b68e6b50cf8bf4da3df68537f221b87a4237d3a929aa68f8efc4cab6dc9876adb9aa0152d01ad8155d21d7fee8f6 SHA512 dcadf16232b1eb18605e90abca410e825a401057698a96c8bee7be828de97deea22ada40f282519d6d1f7ce03988b068056cf6f7641aced2a81f6f9244d2b4b5
EBUILD tomcat-10.0.18.ebuild 6258 BLAKE2B 21668cc1db4c932750ee53bbb2e8806231858bfc42cbeebbca639b272475b548db84ebf994cd89bdb72e44c5f8eabf13e002b5d372bf84c855baf98593abc0b3 SHA512 f7adac14aa388aa4ea5a3cd2ae3bdc02ac48d890bd411cc93d34c5df324fac177e9e05a69b9439a7e8d53725e8f126aae5c1808311f7e08b0b74adab4e2d7139
+EBUILD tomcat-10.0.20.ebuild 6258 BLAKE2B bc9c56962454cb375d6c8cf32a513d19b5a60cecf5441d5e2136d662580f98301b108bb1ab05f09ac4ab90180bb0e582132b632aaf1ca19472f7ea651f0fba38 SHA512 3d26aa850c8a13921c797d91445c955fb80b5e58889db3c50ff2b121505d0a3553f2b0627eda45734b78f78767b3e3612ddd34b2b4d5cb8865d7fa8e0bfdd9ac
EBUILD tomcat-7.0.109.ebuild 4147 BLAKE2B 8023fb9265a3e57bbdb506559bfe9a337f566e09b6cccd0e74e84341e54d1434134eb0aecaf72a97113826d8f7359dea1e5672db44e9dfb706b020cf79c51802 SHA512 0730da2fe90a5fa203e03eef5044eb8b90c5b800d064d65467370834b788c3de03ea5c57ccfe20b29deac9c560c68029e94a80be180b240356565121d453a2a4
-EBUILD tomcat-8.5.75.ebuild 4736 BLAKE2B 91cf48c96e95ce7abd23bbbed962540a1bc742219b1bb132dcc4e2a4af162dca181b464e835464fefb9cced0ac08525bd82fb24a7f1e336b3124042afceca857 SHA512 6d2669a61de2a004692b9acd23121696d31ef4bed0ed1c5883df9543d790b37dfb9aeb237f50196780ea59e4158d3d1dd061a111485a00466702ac542646d363
-EBUILD tomcat-8.5.76.ebuild 4749 BLAKE2B ce31b7dd5afeeb23e3be117041e0b3381d62d1efe66514354670f24223ca1086c2474d0894ee44e3ec2f8bc76a620ce601fde5a6404bfc4aabd9c79531bb555b SHA512 7bad1081b03af5f21b7e9289cc5e813379aa837b6ae0ccb3ea87dcfbe5c24a351ac5053f5dd27791ab035d22d72b06eaaf6799fe41d326e8559b0fce86d491bf
+EBUILD tomcat-8.5.76.ebuild 4748 BLAKE2B 9d71dfebbb683069226f975aca6dfbd3c6d6b81fe56b99ec9d15f50603e393ffb1f38ea7157ece56593f13dd7f9418bac17c0bb25d559ae9c6a3f4859c4189b5 SHA512 7f65aa3ba78642bf986126adc1fbb3b4a73fcc66d6473fe75c7a6e5b10991633c5333c7d6c5859b06714eac5a43fea85bdcb778ef8536b111811c07465f8477c
EBUILD tomcat-8.5.77.ebuild 4749 BLAKE2B ce31b7dd5afeeb23e3be117041e0b3381d62d1efe66514354670f24223ca1086c2474d0894ee44e3ec2f8bc76a620ce601fde5a6404bfc4aabd9c79531bb555b SHA512 7bad1081b03af5f21b7e9289cc5e813379aa837b6ae0ccb3ea87dcfbe5c24a351ac5053f5dd27791ab035d22d72b06eaaf6799fe41d326e8559b0fce86d491bf
-EBUILD tomcat-9.0.58.ebuild 5631 BLAKE2B 014e1215ae5cb576cb1f696329fd3c83530414880912a5a22c4654849c246ac20963c8c1a9a1c64ac9119fbcb2ff7e19e74eb725e2da6447c1152796411fb839 SHA512 63112890cd87c3efc6e05cd2cfe92115e64a08258e621e44c85cd4e53db6873125b6168dd4679c65951536d64a8f70522f37fe4f1e8abdad4e2829fe75ecff7f
-EBUILD tomcat-9.0.59.ebuild 5823 BLAKE2B 8aeb5f0eab7e68936fe5ac7f6855d2017ca0e8539c2751521b0e11f4be521f4996eb5b6f8790e27a3c6249f4d60dab093340c8930091df47d5f9b4c0e36efe0a SHA512 86af1c38188fca1b71acbf4d8f6c8c15a51a854681e1bf82854a695f01350ad99e4d5770131a3fe753f9f4a7afb3d39218fd3f5124982ef920c559715474da75
+EBUILD tomcat-8.5.78.ebuild 4749 BLAKE2B ce31b7dd5afeeb23e3be117041e0b3381d62d1efe66514354670f24223ca1086c2474d0894ee44e3ec2f8bc76a620ce601fde5a6404bfc4aabd9c79531bb555b SHA512 7bad1081b03af5f21b7e9289cc5e813379aa837b6ae0ccb3ea87dcfbe5c24a351ac5053f5dd27791ab035d22d72b06eaaf6799fe41d326e8559b0fce86d491bf
+EBUILD tomcat-9.0.59.ebuild 5822 BLAKE2B f72cc3f9c4d22884da100c08c1d52b83c0ee5cc4f370a73bd7d7a48beda1c942d481bef45b65097d71429b96b54a32368c401e11427bde953e34ad92f6aab67b SHA512 7591792003f8f2fd4d00e510ba6f54c9fd08cc4dec9b786827d8997affc3d984a21bc30cc251924048bd62b70d33a14f5b8deb268ecb82e22382a4e8ed79f044
EBUILD tomcat-9.0.60.ebuild 5823 BLAKE2B 8aeb5f0eab7e68936fe5ac7f6855d2017ca0e8539c2751521b0e11f4be521f4996eb5b6f8790e27a3c6249f4d60dab093340c8930091df47d5f9b4c0e36efe0a SHA512 86af1c38188fca1b71acbf4d8f6c8c15a51a854681e1bf82854a695f01350ad99e4d5770131a3fe753f9f4a7afb3d39218fd3f5124982ef920c559715474da75
+EBUILD tomcat-9.0.62.ebuild 5823 BLAKE2B 4cb40dde75f3a89d20cd2fbf069862a0cb733499e871d4d72808424d041cfdf6e03e2226f713af663f9a56069c66874079781d72619c92fd53fe367b6b07e644 SHA512 882546993468a1743de5c3cc289fdd9da57d3b95fb8bbb5184215cd7b53f8454e3a2c49a8f765514da1545d80ee14709eead03cd919fa0b056212e80de3c0901
MISC metadata.xml 713 BLAKE2B 8a4ecfb2190e156b77598a825550953f936ddc1a1303a95bcae173592ac4f482e81af1d7b62bc62248c20ac92cdd1dd3a9c351c74f684193085c0b242043fee7 SHA512 946fed270cb43e9c239f6f831ac2e8021526a9c3b1b8fea91d00d1b48f979273de3f7c227bce03009de04bcc8386803606864ffdb85666005d6b0ef5c49f01c5
diff --git a/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch
new file mode 100644
index 000000000000..7332c570160a
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch
@@ -0,0 +1,347 @@
+diff --git a/build.xml b/build.xml
+index 72e49ad..8ff8ecc 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1030,6 +1030,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1037,21 +1038,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}"
+@@ -1164,10 +1167,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"
+@@ -1404,9 +1407,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">
+@@ -1466,7 +1469,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one -->
+ <local name="migration.jar.filename" />
+@@ -1477,7 +1480,7 @@
+ <exclude name="${migration-lib.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1506,7 +1509,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}"
+@@ -1522,7 +1525,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}"
+@@ -1625,9 +1628,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
+@@ -2131,11 +2136,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.
+@@ -2159,13 +2165,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="jakarta.servlet.*"
+ excludepackagenames="jakarta.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2181,8 +2187,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2202,8 +2207,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2223,13 +2227,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="jakarta.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2244,8 +2248,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2264,8 +2267,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp -html5"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2284,20 +2286,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+ failonwarning="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </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/**"/>
+@@ -3134,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">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -3262,7 +3267,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">
+
+ <antcall target="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3317,13 +3322,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>
+@@ -3445,7 +3450,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3462,7 +3467,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3487,7 +3492,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3503,7 +3508,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3527,7 +3532,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3542,7 +3547,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3570,7 +3575,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>
+@@ -3581,7 +3586,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>
+@@ -3592,7 +3597,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"/>
+@@ -3610,7 +3615,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"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.62-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.62-build.xml.patch
new file mode 100644
index 000000000000..fdf66cf7b63a
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.62-build.xml.patch
@@ -0,0 +1,319 @@
+diff --git a/build.xml b/build.xml
+index 5a0be1b..87bfb33 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1023,6 +1023,7 @@
+ addOSGi="true" />
+
+ <!-- Servlet Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+@@ -1030,21 +1031,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}"
+@@ -1157,10 +1160,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" />
+@@ -1488,7 +1491,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}"
+@@ -1504,7 +1507,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}"
+@@ -1607,9 +1610,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
+@@ -2113,11 +2118,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.
+@@ -2141,13 +2147,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -2212,6 +2218,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2226,8 +2233,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2246,8 +2252,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp -html5"
+ maxmemory="512m"
+- failonerror="true"
+- failonwarning="true">
++ failonerror="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+@@ -2266,20 +2271,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
+ maxmemory="512m"
+- failonerror="true"
+ failonwarning="true">
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </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/**"/>
+@@ -3062,7 +3070,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">
+@@ -3106,7 +3114,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}"/>
+@@ -3234,7 +3242,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}"/>
+@@ -3289,13 +3297,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>
+@@ -3417,7 +3425,7 @@ skip.installer property in build.properties" />
+ </sequential>
+ </macrodef>
+
+- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3434,7 +3442,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3459,7 +3467,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3475,7 +3483,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3499,7 +3507,7 @@ skip.installer property in build.properties" />
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3514,7 +3522,7 @@ skip.installer property in build.properties" />
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -3542,7 +3550,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>
+@@ -3553,7 +3561,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>
+@@ -3564,7 +3572,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"/>
+@@ -3582,7 +3590,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"/>
diff --git a/www-servers/tomcat/tomcat-10.0.17.ebuild b/www-servers/tomcat/tomcat-10.0.17.ebuild
index 2d8f92da7a35..1880f8d73eaa 100644
--- a/www-servers/tomcat/tomcat-10.0.17.ebuild
+++ b/www-servers/tomcat/tomcat-10.0.17.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
LICENSE="Apache-2.0"
SLOT="10"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
IUSE="extra-webapps"
RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-10.0.16.ebuild b/www-servers/tomcat/tomcat-10.0.20.ebuild
index 7bcc165f4942..685d4e4d5ae4 100644
--- a/www-servers/tomcat/tomcat-10.0.16.ebuild
+++ b/www-servers/tomcat/tomcat-10.0.20.ebuild
@@ -11,7 +11,7 @@ MY_P="apache-${PN}-${PV}-src"
# Currently we bundle binary versions of bnd.jar and bndlib.jar
# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
+BND_VERSION="6.2.0"
BND="biz.aQute.bnd-${BND_VERSION}.jar"
BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
@@ -23,11 +23,14 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
LICENSE="Apache-2.0"
SLOT="10"
-KEYWORDS="amd64 ~amd64-linux"
+KEYWORDS="~amd64 ~amd64-linux"
IUSE="extra-webapps"
RESTRICT="test" # can we run them on a production system?
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
ECJ_SLOT="4.15"
SAPI_SLOT="5.0"
@@ -43,7 +46,7 @@ RDEPEND="${COMMON_DEP}
DEPEND="${COMMON_DEP}
app-admin/pwgen
dev-java/ant-core
- virtual/jdk:1.8
+ >=virtual/jdk-1.8:*
test? (
dev-java/ant-junit:0
dev-java/easymock:3.2
@@ -76,7 +79,7 @@ src_prepare() {
# Remove bundled servlet-api
rm -rv java/jakarta/{el,servlet} || die
- eapply "${FILESDIR}/${PN}-10.0.16-build.xml.patch"
+ eapply "${FILESDIR}/${PN}-10.0.20-build.xml.patch"
local vm_version="$(java-config -g PROVIDES_VERSION)"
[[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch"
diff --git a/www-servers/tomcat/tomcat-8.5.76.ebuild b/www-servers/tomcat/tomcat-8.5.76.ebuild
index 67b6462910bf..00727fd8a0a6 100644
--- a/www-servers/tomcat/tomcat-8.5.76.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.76.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="extra-webapps"
RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.75.ebuild b/www-servers/tomcat/tomcat-8.5.78.ebuild
index 5a0d89721993..67b6462910bf 100644
--- a/www-servers/tomcat/tomcat-8.5.75.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.78.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="extra-webapps"
RESTRICT="test" # can we run them on a production system?
@@ -28,11 +28,11 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
RDEPEND="${COMMON_DEP}
acct-group/tomcat
acct-user/tomcat
- virtual/jre"
+ >=virtual/jre-1.8:*"
DEPEND="${COMMON_DEP}
app-admin/pwgen
dev-java/ant-core
- virtual/jdk:1.8
+ >=virtual/jdk-1.8:*
doc? (
dev-java/glassfish-xmlrpc-api:0
dev-java/wsdl4j:0
diff --git a/www-servers/tomcat/tomcat-9.0.59.ebuild b/www-servers/tomcat/tomcat-9.0.59.ebuild
index bd49dfe74c96..164acb30f6e5 100644
--- a/www-servers/tomcat/tomcat-9.0.59.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.59.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
LICENSE="Apache-2.0"
SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="extra-webapps"
RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.58.ebuild b/www-servers/tomcat/tomcat-9.0.62.ebuild
index bbea8f6df4eb..e151500fc704 100644
--- a/www-servers/tomcat/tomcat-9.0.58.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.62.ebuild
@@ -11,7 +11,7 @@ MY_P="apache-${PN}-${PV}-src"
# Currently we bundle binary versions of bnd.jar and bndlib.jar
# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
+BND_VERSION="6.2.0"
BND="biz.aQute.bnd-${BND_VERSION}.jar"
BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
@@ -23,11 +23,14 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
LICENSE="Apache-2.0"
SLOT="9"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="extra-webapps"
RESTRICT="test" # can we run them on a production system?
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
ECJ_SLOT="4.15"
SAPI_SLOT="4.0"
@@ -38,11 +41,11 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
RDEPEND="${COMMON_DEP}
acct-group/tomcat
acct-user/tomcat
- virtual/jre"
+ >=virtual/jre-1.8:*"
DEPEND="${COMMON_DEP}
app-admin/pwgen
>=dev-java/ant-core-1.9.13
- virtual/jdk:1.8
+ >=virtual/jdk-1.8:*
test? (
>=dev-java/ant-junit-1.9:0
dev-java/easymock:3.2
@@ -75,7 +78,7 @@ src_prepare() {
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
- eapply "${FILESDIR}/${PN}-9.0.58-build.xml.patch"
+ eapply "${FILESDIR}/${PN}-9.0.62-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\