diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /www-servers/tomcat | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r-- | www-servers/tomcat/Manifest | 25 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch | 266 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch | 24 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch | 284 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-10.0.4.ebuild | 2 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-10.0.5.ebuild (renamed from www-servers/tomcat/tomcat-10.0.2.ebuild) | 15 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-7.0.108.ebuild | 2 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-7.0.109.ebuild | 142 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-8.5.64.ebuild | 4 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-8.5.65.ebuild (renamed from www-servers/tomcat/tomcat-8.5.63.ebuild) | 8 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-9.0.44.ebuild | 2 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-9.0.45.ebuild (renamed from www-servers/tomcat/tomcat-9.0.43.ebuild) | 8 |
12 files changed, 727 insertions, 55 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index a1962d27ccdb..98f3aa1243cf 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -2,28 +2,31 @@ AUX tomcat-10.0.2-build.xml.patch 11108 BLAKE2B 9c8db2ed4008def42bcfdcfd99fbaf01 AUX tomcat-10.0.4-build.xml.patch 11459 BLAKE2B 841a96b09280a8790cf5bff7718219027abf793d3bf2f93c72086ca709102775995d06a4eeadcfab297742f6c0e74ac74736407606074cf6106b5948a8359ace SHA512 54e0c3ad71afa28b14c1644438daa0df0d2e6b95b55fd83d8776b30bb6ed3f8735bc18d5a8d9da6c56323c297245a34c441e126e7d1e1d2deeb331c8c382ba30 AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1322431649b276b59a93f10b97f59d03690f3531c2fd3a8ce67b81969544d498bf04e829407005dbed867067f8970347 SHA512 f8d0cb4ba0effdeea3db4049381efc84513551a1e28551b59a254340a8add306824d1dba344f6eaddc93e8b61fc0b71e1a8d0bcfc860500134cc19072deef30e AUX tomcat-8.5.57-build.xml.patch 10554 BLAKE2B 40df509d8f5e3022a9d384d8d939800062ec383ea000f1224dfd5816a76af12dbde7d36826659707ae7e2a2bf0c19c1e8bc96bec5854bcd2422910530a0530fd SHA512 c1e3b73e2aece5e849219c663a01a31bd2f6355d37b51e18b68d42a05be2a49d173520450ac1aeef7b394fe860135afda225d450b4e98d912fe90231c9d70601 +AUX tomcat-8.5.65-build.xml.patch 10854 BLAKE2B 9576793618aac5bd3653ed6f873aa13578b6da6cf865213041a00f90b4b9fb5208eda32b7733d5d5bc2b90b6517c8f927802ffdab10c0090387318a156ea3fd4 SHA512 6bb7a0ada97e8fd68950c6edf819a35dbeda2dc6e63775b63e33b84d795402afb64741b2db4d17b7fba21bfa513065401028fa7862044facf88a23a0b32380d2 AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2 AUX tomcat-9.0.40-build.xml.patch 11106 BLAKE2B 6aeb5b4055e32dd30c430bb32dad7b89180c94418cb8e9fb9518441b5d636e984a8b502bb2c3e458d0760a726b0dbe16185f0f21a38608d180a497a7fa5e374d SHA512 6d68baca85c028e81ba990e7b11e4b86a5ad1d701a3d0a413f97640388da60d96ed50ea98f0e2ed1cc99d89030cd004214309816d428def6b2d9d51d4d5d0e36 -AUX tomcat-9.0.40-insufficient-ecj.patch 1718 BLAKE2B 2a90c57c54c32b7e561c378abe4a0a10a898f80aca13859b0944bb690d59ab7bf1bd69b4c6d21bb253a4463d9e481887783a1769d651bc75437f52ae555341e1 SHA512 cd4e7347a649fec319eba6aae3b6c7aa6146b14a7b9e51f8354ccdbaed29093a8623721acaec7649bec92b98e73b37c2cd36b2a3b9136dc5b25368a0523e9c2a AUX tomcat-9.0.43-insufficient-ecj.patch 2304 BLAKE2B b25d68db5020f7ec118c1fc03e12049da99f84fbebc2fa636c896d5647cf8cdc6e136a27f611f0de975e9c2243b516144be7853a8aab05496fc32112d31478b3 SHA512 60fee887ba9e83f92dd87d75a7c0fad05b5a7458ddb94c9e718aecffd9b968beaf7ce8c2b7e9bb31b9286d5cd77f89afd3775c0ccbc1fff58bfa2b70066d06b6 +AUX tomcat-9.0.45-build.xml.patch 11406 BLAKE2B 1a4f204a6c9625c5942795cddcf71147fb962354572496733cb96d3230d867ef2f711cb95cd68f6351586e1fec4b8784473f44b0ad3e9833018345183049a48c SHA512 80cc5ae7dc2f53aaf48e3d81ad7d1f3b7756b22597c14659b4650d664e1ad9dcefdc5d3cc5576bbdf7433992a541fc9a19cadb6c84b5e5566277ba6284f95967 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.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53 DIST apache-tomcat-10.0.4-src.tar.gz 5964416 BLAKE2B 23332b90316cedd1916b59b1b31b1c16e34c193ba61660c7c8e41e3b983a35873660eaf8e3f0777704d5663f0ede2dc39b81997a73ee726ff73d6c6392582163 SHA512 677b978afd51fe1756b486c9d5576b9fa03b5b775c462263237aef6d17f36d7e718cfb5e46a49da942b1bf6681b166a4af781138f55d89a019bf12b48eb22882 +DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 5441bec39ddaa74a7a4b39e48ecb524f6edb230760272678e6bf8d0a26b4a39e9a6c276b591d5d7962d8cae7d211486d65a334f363931d7cd8750a902c8aaf98 SHA512 177e497b2355b260fc59cfcfb8b1fc2fabf5fe5a0f5705b5feee2c330881545aad359a746074c9fb180acb54035d0c2f25b23daac84202788178a256e48f0c9f DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2 -DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B d007d9922d54578bdebcbbaec3e7c0ffcafdce913e52fdd93d5c174c9d1304980b5eb7f126e957c5975a59dfb126857dcc87ef3ca5e479e44cd7910b6183e469 SHA512 d78a140117844675239e834a0890641c0ef0d6fc3c89eb4512536fece2c128f088edfdea15f79ba7a31e0478431f155230f8f60a57bfea0aed191298a95310c4 +DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce DIST apache-tomcat-8.5.64-src.tar.gz 5863485 BLAKE2B c297c0803c74a969e96b99c379bcd050d6e08cb1036d69b5c49c64311d6f17695754631738130a76def849da6c2de70a49d4452b24ee34c5720d9474f8d4d41b SHA512 ffcc8e97b56730e7e15daa8c4ce628547afcf0bb008bb8d8142ae684c963ed6a366c1dfdbaaca9080201c3c1bcda60c759b76447dd72493f0ec922a034b75f08 -DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640 SHA512 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26 +DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B fda3081d66c9018a49e5a07bfb5d54b133fe51dff69b692480065d8d9a4877ce5b5b152e33f6d4cfaf28940ec6b556c9a2455c8fda56ea0552e4d1f83f0f9cbe SHA512 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f +DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b -EBUILD tomcat-10.0.2.ebuild 5902 BLAKE2B 45d8f8191815f6e668bf9c2d927d2490c3ab486455144364e188eb97196990f85b176394a95020dd7eb6dfc4828278ac9f282e9615080dbd49bff946d7c11845 SHA512 a756ac610ca78012ae828b5843b447753196eaba9e8f7a54726e2a78758d16989d6a1c5e84df71d2e35ad9d722b67ebc1da0abf256de31483facb98ed13a8465 -EBUILD tomcat-10.0.4.ebuild 5910 BLAKE2B 87e7a8d438deaaf68bd4d9bca40c5a44759de65f0cde4bd654a5a4b0e38377f488a52f2e49de687b5eecb1bf5a0cca1b95b941acbaeee17e67eb9f8667aadbcf SHA512 e2cccc425569fdc3218b1c96c89dad7f17f8e466482454e5666fef587750d463a972a70e4783edc59dd805f26983f4a8523b1d5fb8cb11cba7c120ca14fe76fb -EBUILD tomcat-7.0.108.ebuild 4154 BLAKE2B 5505bb322a19193fc8974c76b6a5269200f14b5f09768b7e6d12b0c0457ffd26eaee75760c50c46b6f2c5b274ce173f1cd0d07b5ed3cca33d96b94eda46fb3d5 SHA512 9d523450f693c6293e62f4eacf999b662cd0e88bc1de08efab85ff676ad2aa7ff80fb7633ac48225299f5842683ee44a33ddd3b932f92214c37ffd4035e985fa -EBUILD tomcat-8.5.63.ebuild 4734 BLAKE2B b790306d322cf975ada21309e946c6b95225e2f20d768f851f3954bee11a71a817b6a54ac43bfd4830fc4d5cdbdef54c07241ed90d52ea54c5b46d0d16d65295 SHA512 1e1fae7207883a473d6f37d0f80ee3bc108a295c95d93d136e3179cedf893c9709c488a43c649fef74c757b1c064589c677c5bbbc56b201c8ca71a12feeb869c -EBUILD tomcat-8.5.64.ebuild 4735 BLAKE2B 6539f7954d5855fecd19875b513a511379efd91543d067e1b1c1404601fe9be81e72f51655c4cba9312c4a7d9b0d0a367bcf4fcb9fa8784b9cad79183536f458 SHA512 1765a85b925f95a2465e6c680ac1bc6a801cf625be7ca312e01e58fa6172d460050f0829a3732197dd9f54b95aa1bb5f7e8f9ba30427dd5e60f4471f69fb717f -EBUILD tomcat-9.0.43.ebuild 5622 BLAKE2B fc21ca59e1060940465a287bdad5a503454afa961796234f85c13a9c3eb97ad4c5914c518d74b37711a2830eb9d4e7458fadb4437dc0aa8b43bca513be243ad8 SHA512 247436d948df70533f61ddc2c5a1f2c97eaa729876f5b226437da21e717bcf2ae1e15193df92666c4020740eb92ef299a86debc8709c20e8ac434a6444524207 -EBUILD tomcat-9.0.44.ebuild 5630 BLAKE2B 279087af977cf4bb6bbd80487401004cc396e98c4601ee5981f750a2ca5e54d288dd2f40c56ec54dff71663f4feb9703b9bd9d043f658c16cc39ffe8d92237f7 SHA512 172bbbb739e8f39100eb6518a49ebe16bf2da7b9e79a38435a22a4393b0babc918d955798f86c3cadee2d6ccc9421a50eb1dfb0c6f30151d3d993f5b3f77ba12 +EBUILD tomcat-10.0.4.ebuild 5903 BLAKE2B 853176b18c2703e60030c00349e479e856a8a4cf0d8dc58179f2690e2c4994aa9d629b72db13174483d05777468fa5fe08d1e749b06efc4ce99390935d6d0a0c SHA512 351cb896068e511b50411a8a1e5686bd872f9021a90147d3476275ac9cf66e7b53d55cf593e8a3d042858b127d2631ea09784938b2fc4b1f6aa0caaef0bf06a7 +EBUILD tomcat-10.0.5.ebuild 5920 BLAKE2B e688681999674380319dcb3651162c089aec032501ee1b96d2f12e9c3d7cb5b30a197683323ca18181d68ee7a70cb5ab979669dcb12d55d9dadf75b3eec0d136 SHA512 21dfc89a64db1f34b9e4314ef8b7b1144b205548d81c93b9a89e65703619d8bc54d7359f70c78b6aa39a5f1368b63b49b32a8169259c35926536cb1bedcabc6b +EBUILD tomcat-7.0.108.ebuild 4147 BLAKE2B 8023fb9265a3e57bbdb506559bfe9a337f566e09b6cccd0e74e84341e54d1434134eb0aecaf72a97113826d8f7359dea1e5672db44e9dfb706b020cf79c51802 SHA512 0730da2fe90a5fa203e03eef5044eb8b90c5b800d064d65467370834b788c3de03ea5c57ccfe20b29deac9c560c68029e94a80be180b240356565121d453a2a4 +EBUILD tomcat-7.0.109.ebuild 4148 BLAKE2B 6ba606c3f0de9c15e19f570ae6940051ff0d28dbcf8242d3181663a708a86f41afb1e35c95a9f9b9213029599aa5b7776b986051e3f049d733e56cefb2990a9d SHA512 ad613250c438267f98e7ea591d270a13babbbd6e1539c48b174d5922abfbfeff79396fa8272b4de0b47cf269658e9f3dfd6ce8157ea22a432b01380186442b5f +EBUILD tomcat-8.5.64.ebuild 4727 BLAKE2B ae3d64371f0913ea17272fe4fb2d5091645dd3c4d4241b1aaa01c9951ffb73f71fe016e63c899931b9c6b2b54fda252f7b72894082e0ee4acf3da9f557627026 SHA512 857a16a42677b2503ce472feebfb03c870949035cdd7812faefcabcd1f8f9c56a65887f49b1c770317143704be62d92455548f2d167899d3600ae6163bb3df67 +EBUILD tomcat-8.5.65.ebuild 4737 BLAKE2B f397616c8e9f92ab44b73186bdbac134ffa52a8541d944c694d337292a8230de70376d46853e8168f77b864d3c4f7e60f0944d78dce7e6cc3599ad3d2dec2ae7 SHA512 982fe5528b949246e301ee47173c45ec78d60796a5a28cd48f31f98f4095bfe9944ee3ce1731c70f708bee744d62812f63b068f6c9ebbf76f37471cfbe751638 +EBUILD tomcat-9.0.44.ebuild 5623 BLAKE2B 0a118c86179cbea4b89e2d537d2b5c72562affd803e9341855d75a899386f94fb6d6973e0c3cf25b0c1027acb55dbf6b32fc5e1dfb238a4b9e8c09dd7c09219d SHA512 652f7cc0d5ff1fb381a1cd17bf3eb1badda4aeb013e8845c7214c01bd0826690b96ff9592b3b47f4de432bf39d982355a884bacc6cfbbf4b141afe1d8803da05 +EBUILD tomcat-9.0.45.ebuild 5632 BLAKE2B 18bccfcb61851a4e169621e3a921a1346a6f1a50d705beb082850d183bc2fff4c1a4258ef7e25f2f4da89d4bb46b8651159c1cdf30e0a6b4068440bbb9e542c6 SHA512 1cff8ca77273fe3ae406e4f03b7edd977c4bcea42543de3ae5dc6c8b8aeb025f91c53b8901d27a0ccaa078268d65c9aec786d03927d3acf9a7dd2cd2d26eea2c MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109 diff --git a/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch new file mode 100644 index 000000000000..66411238a3d8 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch @@ -0,0 +1,266 @@ +diff --git a/build.xml b/build.xml +index 19be6ed..c1557cd 100644 +--- a/build.xml ++++ b/build.xml +@@ -772,25 +772,28 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + <!-- Servlet 3.1 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" /> +- ++--> + <!-- EL Implementation JAR File --> ++<!-- + <jarIt jarfile="${el-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.el-api" + manifest="${tomcat.manifests}/el-api.jar.manifest" /> +- ++--> + <!-- JSP Implementation JAR File --> ++<!-- + <jarIt jarfile="${jsp-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.jsp-api" + manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> +- ++--> + <!-- WebSocket API JAR File --> + <jarIt jarfile="${websocket-api.jar}" + filesDir="${tomcat.classes}" +@@ -882,9 +885,9 @@ + meta-inf="${tomcat.manifests}/jasper.jar" /> + + <!-- Re-packaged Apache Commons DBCP 2--> +- <jarIt jarfile="${tomcat-dbcp.jar}" ++<!-- <jarIt jarfile="${tomcat-dbcp.jar}" + filesDir="${tomcat.classes}" +- filesId="files.tomcat-dbcp" /> ++ filesId="files.tomcat-dbcp" /> --> + + <!-- i18n JARs --> + <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar" +@@ -1099,9 +1102,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"> +@@ -1161,7 +1164,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" /> +@@ -1204,7 +1207,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}" +@@ -1220,7 +1223,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}" +@@ -1323,9 +1326,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 +@@ -1736,7 +1741,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}"/> +@@ -1921,6 +1926,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> ++<!-- + <javadoc packagenames="javax.servlet.*" + excludepackagenames="javax.servlet.jsp.*" + sourcepath="${tomcat.dist}/src/java" +@@ -1988,6 +1994,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" +@@ -2051,13 +2058,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <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/7/docs/api/"/> + <link href="https://docs.oracle.com/javaee/7/api/"/> ++--> + <packageset dir="${tomcat.dist}/src/java/"> + <include name="org/**"/> + <exclude name="org/apache/el/parser/**"/> +@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-compile" +- description="Download components necessary to compile" > ++ description="Download components necessary to compile" unless="noget" > + + <!-- Download Commons Daemon --> + <antcall target="downloadgz-2"> +@@ -2854,7 +2865,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}"/> +@@ -2932,7 +2943,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}"/> +@@ -2987,13 +2998,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> +@@ -3115,7 +3126,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}"/> +@@ -3132,7 +3143,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}"/> +@@ -3157,7 +3168,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}"/> +@@ -3173,7 +3184,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}"/> +@@ -3197,7 +3208,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}"/> +@@ -3212,7 +3223,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}"/> +@@ -3240,7 +3251,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> +@@ -3251,7 +3262,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> +@@ -3262,7 +3273,7 @@ skip.installer property in build.properties" /> + + <target name="ide-eclipse" + depends="download-compile, extras-webservices-prepare, 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"/> diff --git a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch deleted file mode 100644 index dd002e2ca216..000000000000 --- a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java -index 4722a4a..27ce287 100644 ---- a/java/org/apache/jasper/compiler/JDTCompiler.java -+++ b/java/org/apache/jasper/compiler/JDTCompiler.java -@@ -307,7 +307,7 @@ 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")) { - // Constant not available in latest ECJ version shipped with - // Tomcat. May be supported in a snapshot build. -@@ -368,8 +368,8 @@ 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")) { - // 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.45-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch new file mode 100644 index 000000000000..ab5e5e098a08 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch @@ -0,0 +1,284 @@ +diff --git a/build.xml b/build.xml +index 2958ccd..3983182 100644 +--- a/build.xml ++++ b/build.xml +@@ -1025,6 +1025,7 @@ + addOSGi="true" /> + + <!-- Servlet 4.0 Implementation JAR File --> ++<!-- + <jarIt jarfile="${servlet-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.servlet-api" +@@ -1032,21 +1033,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}" +@@ -1159,10 +1162,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" +@@ -1399,9 +1402,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"> +@@ -1461,7 +1464,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" /> +@@ -1504,7 +1507,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}" +@@ -1520,7 +1523,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}" +@@ -1623,9 +1626,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 +@@ -2208,11 +2213,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. +@@ -2243,6 +2249,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> ++<!-- + <javadoc packagenames="javax.servlet.*" + excludepackagenames="javax.servlet.jsp.*" + sourcepath="${tomcat.dist}/src/java" +@@ -2307,6 +2314,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" +@@ -2369,13 +2377,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/**"/> +@@ -3148,7 +3160,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"> +@@ -3192,7 +3204,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}"/> +@@ -3270,7 +3282,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}"/> +@@ -3325,13 +3337,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> +@@ -3453,7 +3465,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}"/> +@@ -3470,7 +3482,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}"/> +@@ -3495,7 +3507,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}"/> +@@ -3511,7 +3523,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}"/> +@@ -3535,7 +3547,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}"/> +@@ -3550,7 +3562,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}"/> +@@ -3578,7 +3590,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> +@@ -3589,7 +3601,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> +@@ -3600,7 +3612,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"/> +@@ -3618,7 +3630,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.4.ebuild b/www-servers/tomcat/tomcat-10.0.4.ebuild index a397d6e6306c..0ddf4fd7a466 100644 --- a/www-servers/tomcat/tomcat-10.0.4.ebuild +++ b/www-servers/tomcat/tomcat-10.0.4.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 prefix +inherit java-pkg-2 java-ant-2 prefix MY_P="apache-${PN}-${PV}-src" diff --git a/www-servers/tomcat/tomcat-10.0.2.ebuild b/www-servers/tomcat/tomcat-10.0.5.ebuild index 7e618f92e88f..d66b5ff36790 100644 --- a/www-servers/tomcat/tomcat-10.0.2.ebuild +++ b/www-servers/tomcat/tomcat-10.0.5.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 prefix +inherit java-pkg-2 java-ant-2 prefix MY_P="apache-${PN}-${PV}-src" @@ -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 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~amd64 ~amd64-linux" IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? @@ -33,6 +33,7 @@ SAPI_SLOT="5.0" COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} dev-java/glassfish-xmlrpc-api:0 + dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT} dev-java/wsdl4j:0" RDEPEND="${COMMON_DEP} @@ -41,10 +42,10 @@ RDEPEND="${COMMON_DEP} virtual/jre" DEPEND="${COMMON_DEP} app-admin/pwgen - >=dev-java/ant-core-1.9.13 + dev-java/ant-core virtual/jdk:1.8 test? ( - >=dev-java/ant-junit-1.9:0 + dev-java/ant-junit:0 dev-java/easymock:3.2 )" @@ -75,7 +76,7 @@ src_prepare() { # Remove bundled servlet-api rm -rv java/jakarta/{el,servlet} || die - eapply "${FILESDIR}/${P}-build.xml.patch" + eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ @@ -88,7 +89,7 @@ src_prepare() { JAVA_ANT_REWRITE_CLASSPATH="true" EANT_BUILD_TARGET="deploy" -EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j" +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j" EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" EANT_NEEDS_TOOLS="true" @@ -106,7 +107,7 @@ src_configure() { src_compile() { EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" - java-pkg-2_src_compile + LC_ALL=C java-pkg-2_src_compile } src_test() { diff --git a/www-servers/tomcat/tomcat-7.0.108.ebuild b/www-servers/tomcat/tomcat-7.0.108.ebuild index 7778f5918a2c..62b762d4f8e4 100644 --- a/www-servers/tomcat/tomcat-7.0.108.ebuild +++ b/www-servers/tomcat/tomcat-7.0.108.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 prefix +inherit java-pkg-2 java-ant-2 prefix MY_P="apache-${P}-src" diff --git a/www-servers/tomcat/tomcat-7.0.109.ebuild b/www-servers/tomcat/tomcat-7.0.109.ebuild new file mode 100644 index 000000000000..ac741e7e7f1c --- /dev/null +++ b/www-servers/tomcat/tomcat-7.0.109.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 prefix + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="7" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="extra-webapps websockets" + +RESTRICT="test" # can we run them on a production system? + +ECJ_SLOT="4.5" +SAPI_SLOT="3.0" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" +RDEPEND="${COMMON_DEP} + acct-group/tomcat + acct-user/tomcat + virtual/jre" +DEPEND="${COMMON_DEP} + virtual/jdk:1.8 + test? ( dev-java/ant-junit:0 )" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + default + + # Remove bundled servlet-api + rm -rv java/javax/{el,servlet} || die + + java-pkg_clean + + eapply "${FILESDIR}/${PN}-7.0.99-build.xml.patch" + + # For use of catalina.sh in netbeans + sed -i -e "/^# ----- Execute The Requested Command/ a\ + CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \ + bin/catalina.sh || die + + java-pkg-2_src_prepare +} + +JAVA_ANT_REWRITE_CLASSPATH="true" + +EANT_BUILD_TARGET="deploy" +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" +EANT_NEEDS_TOOLS="true" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" + +# revisions of the scripts +IM_REV="-r1" +INIT_REV="-r1" + +src_compile() { + use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}" + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" + java-pkg-2_src_compile +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + local dest="/usr/share/${PN}-${SLOT}" + + java-pkg_jarinto "${dest}"/bin + java-pkg_dojar output/build/bin/*.jar + exeinto "${dest}"/bin + doexe output/build/bin/*.sh + + java-pkg_jarinto "${dest}"/lib + java-pkg_dojar output/build/lib/*.jar + + dodoc RELEASE-NOTES RUNNING.txt + use doc && java-pkg_dojavadoc output/dist/webapps/docs/api + use source && java-pkg_dosrc java/* + + ### Webapps ### + + insinto "${dest}"/webapps + doins -r output/build/webapps/{host-manager,manager,ROOT} + use extra-webapps && doins -r output/build/webapps/{docs,examples} + + ### Config ### + + # create "logs" directory in $CATALINA_BASE + # and set correct perms, see #458890 + dodir "${dest}"/logs + fperms 0750 "${dest}"/logs + + # replace the default pw with a random one, see #92281 + local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die + + # prepend gentoo.classpath to common.loader, see #453212 + sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + newexe "${T}"/tomcat${INIT_REV}.init tomcat.init + newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash +} + +pkg_postinst() { + elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" + elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." + elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" + + elog "To manage Tomcat instances, run:" + elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" + ewarn "from upstream binary if you need it. Gentoo Bug # 144276" + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" + einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." +} diff --git a/www-servers/tomcat/tomcat-8.5.64.ebuild b/www-servers/tomcat/tomcat-8.5.64.ebuild index 9a48d1d98961..55da8b242ee0 100644 --- a/www-servers/tomcat/tomcat-8.5.64.ebuild +++ b/www-servers/tomcat/tomcat-8.5.64.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 prefix +inherit java-pkg-2 java-ant-2 prefix MY_P="apache-${P}-src" @@ -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.63.ebuild b/www-servers/tomcat/tomcat-8.5.65.ebuild index 361cd1d9a905..5d75d292205f 100644 --- a/www-servers/tomcat/tomcat-8.5.63.ebuild +++ b/www-servers/tomcat/tomcat-8.5.65.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 prefix +inherit java-pkg-2 java-ant-2 prefix MY_P="apache-${P}-src" @@ -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? @@ -52,7 +52,7 @@ src_prepare() { # Remove bundled servlet-api rm -rv java/javax/{el,servlet} || die - eapply "${FILESDIR}/${PN}-8.5.57-build.xml.patch" + eapply "${FILESDIR}/${PN}-8.5.65-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ @@ -78,7 +78,7 @@ INIT_REV="-r1" src_compile() { EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)" - java-pkg-2_src_compile + LC_ALL=C java-pkg-2_src_compile } src_test() { diff --git a/www-servers/tomcat/tomcat-9.0.44.ebuild b/www-servers/tomcat/tomcat-9.0.44.ebuild index f12d2f96fa30..00fbff882efc 100644 --- a/www-servers/tomcat/tomcat-9.0.44.ebuild +++ b/www-servers/tomcat/tomcat-9.0.44.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 prefix +inherit java-pkg-2 java-ant-2 prefix MY_P="apache-${PN}-${PV}-src" diff --git a/www-servers/tomcat/tomcat-9.0.43.ebuild b/www-servers/tomcat/tomcat-9.0.45.ebuild index e116176e1ca4..cda55f1d652e 100644 --- a/www-servers/tomcat/tomcat-9.0.43.ebuild +++ b/www-servers/tomcat/tomcat-9.0.45.ebuild @@ -5,7 +5,7 @@ EAPI=7 JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 prefix +inherit java-pkg-2 java-ant-2 prefix MY_P="apache-${PN}-${PV}-src" @@ -51,7 +51,7 @@ DEPEND="${COMMON_DEP} S=${WORKDIR}/${MY_P} PATCHES=( - "${FILESDIR}/${P}-insufficient-ecj.patch" + "${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch" ) BND_HOME="${S}/tomcat-build-libs/bnd" @@ -75,7 +75,7 @@ src_prepare() { # Remove bundled servlet-api rm -rv java/javax/{el,servlet} || die - eapply "${FILESDIR}/${PN}-9.0.40-build.xml.patch" + eapply "${FILESDIR}/${PN}-9.0.45-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ @@ -106,7 +106,7 @@ src_configure() { src_compile() { EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" - java-pkg-2_src_compile + LC_ALL=C java-pkg-2_src_compile } src_test() { |