diff options
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r-- | www-servers/tomcat/Manifest | 13 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch | 247 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch (renamed from www-servers/tomcat/files/tomcat-9.0.17-build.xml.patch) | 80 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-8.5.37.ebuild (renamed from www-servers/tomcat/tomcat-8.5.39.ebuild) | 2 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-8.5.38.ebuild | 2 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-9.0.14.ebuild (renamed from www-servers/tomcat/tomcat-9.0.17.ebuild) | 6 |
6 files changed, 50 insertions, 300 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 75290413fd8a..c004221832ef 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,9 +1,8 @@ AUX tomcat-7.0.84-build.xml.patch 5771 BLAKE2B fc7ceb5503836f2d2e52611b1fef76390d62668ac030cfc51b51ab20278d80fb4c3561e6ff4eb0fa5f7461b72f73930a69af6c616bc10b6dd6a3c4033d6ad618 SHA512 3583167e6e7b307ab282982779ef58e1f401e0ada8ddf0fc1ac9669147a22d6472ab9ec09aa293f2846be2f406dda63df5fc0351eac67c86742606140293a0c3 AUX tomcat-8.0.53-build.xml.patch 10949 BLAKE2B 2693f3e74a69967ceeb5f4ee41756b840da5bc2ab3c64cb855d52bd099bad8d6115f1d01903bacdcb634c24b9085dbb2ef34027f71325f887f20826721b268aa SHA512 20373a340dcb17595e7ff52608e8d3d3b1eddd5f0104b588c5f91b21eb4510047df61a0dfd9ed8674fb7b0b709945d5014d6e1cad4027414ff9e72c2b5d56cfc AUX tomcat-8.5.37-build.xml.patch 9814 BLAKE2B 8f25989b1fa957337686beacc12d9b1fa5427fc26582645c0b9fd7a45fba11100fbd10516ed9bdd510afc25a180986076db00f8b026e9ed8ca00b285404889c9 SHA512 ac1328a6fb755c87cd8804b5538aaec7b09a966e427c0a9c3db408947135087ce5e1e81c9e18243d7b34f1751002afbe538424b975a6772a1d5c7443dab73f8f -AUX tomcat-8.5.39-build.xml.patch 10037 BLAKE2B f8815ff5c9b959daa58260ce029d0af337ef38a8e057f9cabe4c7079a443149890803c9a379fdfcbf7128392e2e1220385616488b30f6bba9afed1ed9598e22b SHA512 b33d8b018fd8def02a7f9bfaf0aed2f7954d70e110c82f3999104aec933f616d1b68fb2bf2cbe2ba00810b571333d17bae47d60bdea212803eb131f46314ffaf +AUX tomcat-9.0.14-build.xml.patch 10582 BLAKE2B 01609bf6867784f789ae41cb06acdd9496b0fc62dd65d72420cd01f1d73070ef10d74e038629cb4c983e313a958f810cd8f5f02bb5c464924f8a6b73be084dca SHA512 8bb3d5b58c9c49386a15f3bcb1e13656adfeed0e1d4c3bf76589577cae7fcdd6f107cf02126e69b5864f6077ad2660fb7fc811ea52b5ac89de822e535a36826b AUX tomcat-9.0.16-build.xml.patch 10623 BLAKE2B ff6b110604628cbf750a75cea2544789cb65357f2f5bd87e8f781fcffade2a538f4a76ed4c8709a34dbb5995006a550e10e13b74487570b0474ca451ea21c209 SHA512 27f5040e2384ad4c212c1e25aaa850c26fec93de73b86a1b3e06e763ff5e13ed491153427d1206eec662eb225ee0890c43f292cbe95dd6521702254632983df1 -AUX tomcat-9.0.17-build.xml.patch 10600 BLAKE2B 34ac1539155c8263b8fbf48096685a4e63567727fa129ba33c896d82e1d57fefb5d390375cc1655312f7f3b69ab3f51b1990857b6765c954c4026d650d9a8f24 SHA512 0065397d64c8a508c62d3acc689bb968c2ccb303f7e8013de107feb63d15637f58a2fcefdd24dbf6edfddf8f5e4227277c9a5b7b188c65adb0c02985bb3bd4c0 AUX tomcat-9.0.4-build.xml.patch 10399 BLAKE2B 3ec7f4d315b51056884b44abbd03093e2bf3675acfb572c556a62a8a32de3209dae82ee3f3b1c65178b2a62b42f5d4c3fba2e765aa27aa7147a9d8478d09f0f0 SHA512 60729e4f085951aa1133b0d6fdc6386bac9fd4bcd421814eb87c8a45a62819fab1ea2347dfffd12150e93c54fda2ba98bf1df4bc39a622de5ac9ea0c2e81a710 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed @@ -12,19 +11,19 @@ AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e +DIST apache-tomcat-8.5.37-src.tar.gz 5233414 BLAKE2B 1848180c3e0a3f4559e5c232bea8bad6d05f09d9c4f2f9f903178012b7b8837d395a5ac73c8ac0504fbd3d1df3c2dc785022e1c97da4441cfdcf8b790170ff7c SHA512 29ddbf7bfef19441a8a043020b5f1149d12590dac8120012a2167b6892e3db7c644990e49ba14cc4b4c7339faed65f010a7b24d660db0fb8adde34f032099cec DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480 SHA512 b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486ceeee -DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859 SHA512 ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d +DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342 SHA512 46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6 DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc SHA512 60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce -DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7 SHA512 b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30 EBUILD tomcat-7.0.92.ebuild 4230 BLAKE2B 4a16e1282fff97b370a2b1b676fcaba190c3dd75ae6e0355cdebc32f97a43e244c135a8445862f5c8105af101563fcc4aced9a5a582ad3ed096870e7496c4ca1 SHA512 ae58f357dddbd7aa960c85c7f903cb8ba45d845ba93b836ad273c16a16672f34cce1bedf90d6e71b589c4bc112853184f2fc7a3ad20bfd79bbd6d291b6fe0892 EBUILD tomcat-7.0.93.ebuild 4231 BLAKE2B b1bed407c15f9562cb15a7360ae8091ce6c2143a5597c9f0e0a0cfea3f382661f916b9cdf66a94a6317629d54d0351667ad6694abc5d772fda0eb17c7a4b70e8 SHA512 c40e6edb3b38c116e3f367a4d744d8c785d49fa59e955aad1ebfd9faed50dc7c0aad1729f3ff05c5b6cea7bb8315be161bfae30b585bcc46491b49fc5d413170 EBUILD tomcat-8.0.53.ebuild 4554 BLAKE2B acdadf7f369b1c69ad391056abbe79dccfbaa1b561cdf050f7da1cb1da0bd3b8be0004ebfd9795bd1cdaa2b9b58d2b3cbfd84e97453a8a70455bd99d2d46b524 SHA512 665c4bd33e542f36268f4c4b1384f10a69e65dd81aca1a603e9b3969380a050754c215684131683940e346300bca77e7c1fee0714a5e4ee785531c5c3edeb2e9 -EBUILD tomcat-8.5.38.ebuild 4610 BLAKE2B c874fc536892996a46f5d0da15486f6cd3082f5178c4843e2ffc421b11c9ed36fcb79b9f9a8dc7e01993318562323963c3b3158af51321fab592fe76f27f32fb SHA512 86a36fe791e700969331df3a9a1d7f45e79a0c8a6d22bfb4aa524d37c765057a7e2f26ab748c79ba209021906fc7568088e5ae89aa046c9b3ca2fbb07ff5c790 -EBUILD tomcat-8.5.39.ebuild 4603 BLAKE2B ebef90f1f6cbf209a87aef11bb43042465dbbd4d2275150f3ac7425b27b3929d1804690d3c3fae7a18aa0e25c44ea53168b1201eb8cb857a9285d61bbd1af321 SHA512 15a61c6f1e16d43f60998e5f1a668d46fc5187f920b720033cad4b1d0c0521e647cbaede2245de1542b7e487273a7b8ffdd9319d126b4f6d5a879ecd40ac0468 +EBUILD tomcat-8.5.37.ebuild 4602 BLAKE2B 5c780c1fe4dc7a62830114f5bc0de0d2dcd5b49a15af8ce363c68c3c820af2bc308e2732da3a3c38c6e68216e31d601a3178adcb2a5f136afaada9c9ceeca1a4 SHA512 b79c3a1093be0f6d1301bda73df499ba64d69eb3c840070b2909c123f262ddb65baf05ce1757e78375f2366b5bfa656d4c69342dfa635726b838c25a8535eeed +EBUILD tomcat-8.5.38.ebuild 4611 BLAKE2B 1ebc6c2eda263ab66957c68625ee2e0047e0038c33f79a47c3b04d18433c47ac07f0038471d7e9e059d290ab34900fe4ffc40d6785ec193fc5523e0cfe1ebc18 SHA512 c6c8008050c04919fc277a68dac04a346b196ce3f8001fe5aa86081ba94b696db6c43dcc6ccfe9ef04b8b6f3f1935d266bd210b922f4133e1fad66d8ad8dda6f +EBUILD tomcat-9.0.14.ebuild 5433 BLAKE2B b347fa0d21bd81df62c6cda9d16d7669a83c404216b0919d13907058c0a1fe3510f46b857aac01a70cd0e08276ae3c1e9bbe89098c2f0a8c04712c5e97553660 SHA512 5014cd47e3355184552bf3fd98215506dd36cf8919efd8cc1cc624d8243f2bc7800490c13f7625966b46fe63bd7bc47cbbcc89e150d5907771a3838bd5326cf7 EBUILD tomcat-9.0.16.ebuild 5513 BLAKE2B 2675ab6497b53e3f02d88dfd419ead40db3e20df8ffb447218b772d9c5bca9a696190b523b4ea104d056a312619532c3478695171968eadea013b5b1962116b0 SHA512 0880a152d77a9b9db7e2fdd360208d20ae8ffea03a76f3b40ed4288a03f6c7d3dd3dd261d5942234a58806184885bd8eb1faa35590d8c434b0835fda73bf70b6 -EBUILD tomcat-9.0.17.ebuild 5513 BLAKE2B 2675ab6497b53e3f02d88dfd419ead40db3e20df8ffb447218b772d9c5bca9a696190b523b4ea104d056a312619532c3478695171968eadea013b5b1962116b0 SHA512 0880a152d77a9b9db7e2fdd360208d20ae8ffea03a76f3b40ed4288a03f6c7d3dd3dd261d5942234a58806184885bd8eb1faa35590d8c434b0835fda73bf70b6 EBUILD tomcat-9.0.7.ebuild 4564 BLAKE2B bb3e1e254fc8eada11610515139c5edf3e4c310dca7990a3d1595862848dbd4157eb7380362a893ae2a904cadfc1f1e6e5c576f89a2c1b5fb48c047e9bb70328 SHA512 cc933b2ddccd45542d8be98cb18b2288ef7eb1db9f587405cc0d04591b0de9334394b4962b0c1deecbd3e8cb0429b2cacabb5de607203030aaf6fcc4134fe9c4 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109 diff --git a/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch deleted file mode 100644 index 4b9bc77170a7..000000000000 --- a/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch +++ /dev/null @@ -1,247 +0,0 @@ -diff --git a/build.xml b/build.xml -index 8f5f5c5..cebfcfa 100644 ---- a/build.xml -+++ b/build.xml -@@ -722,24 +722,29 @@ - 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" /> -- -+--> - <!-- JSP 2.3 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> -+--> - - <!-- EL 3.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- WebSocket 1.1 API JAR File --> - <jarIt jarfile="${websocket-api.jar}" -@@ -1025,9 +1030,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"> -@@ -1087,7 +1092,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" /> -@@ -1123,7 +1128,7 @@ - </javac> - </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}" -@@ -1138,7 +1143,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}" -@@ -1241,9 +1246,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 -@@ -1623,7 +1630,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}"/> -@@ -1787,6 +1794,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - <target name="javadoc" depends="dist-source,extras-webservices-prepare" - description="Create the Tomcat javadoc" > -+<!-- - <javadoc packagenames="javax.servlet.*" - excludepackagenames="javax.servlet.jsp.*" - sourcepath="${tomcat.dist}/src/java" -@@ -1851,6 +1859,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" -@@ -1891,9 +1900,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - <path refid="tomcat.webservices.classpath"/> - <path location="${ant.core.lib}"/> - </classpath> -+<!-- - <link href="../servletapi"/> - <link href="../jspapi"/> - <link href="../elapi"/> -+--> - <link href="../websocketapi"/> - <link href="http://docs.oracle.com/javase/7/docs/api/"/> - <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> -@@ -2617,7 +2628,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"> -@@ -2643,7 +2654,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}"/> -@@ -2721,7 +2732,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}"/> -@@ -2776,13 +2787,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> -@@ -2904,7 +2915,7 @@ skip.installer property in build.properties" /> - </sequential> - </macrodef> - -- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2921,7 +2932,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadgz-2" unless="exist" depends="testexist"> -+ <target name="downloadgz-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2946,7 +2957,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2962,7 +2973,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}"/> - </target> - -- <target name="downloadzip-2" unless="exist" depends="testexist"> -+ <target name="downloadzip-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2986,7 +2997,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}"/> - </target> - -- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> - <!-- Download the file --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3001,7 +3012,7 @@ skip.installer property in build.properties" /> - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="downloadfile-2" unless="exist" depends="testexist"> -+ <target name="downloadfile-2" unless="noget" depends="testexist"> - <!-- Download the file from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3029,7 +3040,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> -@@ -3040,7 +3051,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> -@@ -3051,7 +3062,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.17-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch index b86841762a09..c3f3e71c0ebf 100644 --- a/www-servers/tomcat/files/tomcat-9.0.17-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch @@ -1,8 +1,8 @@ diff --git a/build.xml b/build.xml -index 54507d1..9c0bf6d 100644 +index 971f912..1e43ae0 100644 --- a/build.xml +++ b/build.xml -@@ -742,6 +742,7 @@ +@@ -769,6 +769,7 @@ addOSGi="true" /> <!-- Servlet 4.0 Implementation JAR File --> @@ -10,7 +10,7 @@ index 54507d1..9c0bf6d 100644 <jarIt jarfile="${servlet-api.jar}" filesDir="${tomcat.classes}" filesId="files.servlet-api" -@@ -749,21 +750,23 @@ +@@ -776,21 +777,23 @@ notice="${tomcat.manifests}/servlet-api.jar.notice" license="${tomcat.manifests}/servlet-api.jar.license" addOSGi="true" /> @@ -37,7 +37,7 @@ index 54507d1..9c0bf6d 100644 <!-- WebSocket 1.1 API JAR File --> <jarIt jarfile="${websocket-api.jar}" filesDir="${tomcat.classes}" -@@ -1114,9 +1117,9 @@ +@@ -1131,9 +1134,9 @@ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" description="Default. Builds a working Tomcat instance"> @@ -49,7 +49,7 @@ index 54507d1..9c0bf6d 100644 <!-- Copy scripts --> <copy todir="${tomcat.build}/bin"> <fileset dir="bin"> -@@ -1176,7 +1179,7 @@ +@@ -1193,7 +1196,7 @@ <exclude name="${jdt.jar.filename}"/> </fileset> </delete> @@ -58,7 +58,7 @@ index 54507d1..9c0bf6d 100644 <!-- Add sources for examples --> <antcall target="examples-sources" /> -@@ -1212,7 +1215,7 @@ +@@ -1229,7 +1232,7 @@ </javac> </target> @@ -67,7 +67,7 @@ index 54507d1..9c0bf6d 100644 <!-- 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}" -@@ -1227,7 +1230,7 @@ +@@ -1244,7 +1247,7 @@ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> </target> @@ -76,7 +76,7 @@ index 54507d1..9c0bf6d 100644 <!-- 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}" -@@ -1330,9 +1333,11 @@ +@@ -1348,9 +1351,11 @@ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> @@ -88,7 +88,16 @@ index 54507d1..9c0bf6d 100644 <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> <!-- Note the meta-inf below will work as long as there is only one JAR -@@ -1785,11 +1790,12 @@ +@@ -1734,7 +1739,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}"/> +@@ -1884,11 +1889,12 @@ </copy> <!-- Source bundles for native components --> @@ -102,15 +111,15 @@ index 54507d1..9c0bf6d 100644 <!-- platform README files --> <echo append="false" file="${tomcat.dist}/bin/x64/README"> Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -1799,6 +1805,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1898,6 +1904,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - <target name="javadoc" depends="dist-source" + <target name="javadoc" depends="dist-source,extras-webservices-prepare" description="Create the Tomcat javadoc" > +<!-- <javadoc packagenames="javax.servlet.*" excludepackagenames="javax.servlet.jsp.*" sourcepath="${tomcat.dist}/src/java" -@@ -1860,6 +1867,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1962,6 +1969,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. <path location="${ant.core.lib}"/> </classpath> </javadoc> @@ -118,8 +127,8 @@ index 54507d1..9c0bf6d 100644 <javadoc packagenames="javax.websocket.*" sourcepath="${tomcat.dist}/src/java" destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1898,9 +1906,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - <path refid="compile.classpath"/> +@@ -2002,9 +2010,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path refid="tomcat.webservices.classpath"/> <path location="${ant.core.lib}"/> </classpath> +<!-- @@ -130,17 +139,17 @@ index 54507d1..9c0bf6d 100644 <link href="../websocketapi"/> <link href="http://docs.oracle.com/javase/8/docs/api/"/> <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/> -@@ -2616,7 +2626,7 @@ skip.installer property in build.properties" /> +@@ -2727,7 +2737,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" > +- description="Download (and build) components necessary to compile" > ++ description="Download (and build) components necessary to compile" unless="noget"> <!-- Download Commons Daemon --> <antcall target="downloadgz-2"> -@@ -2671,7 +2681,7 @@ skip.installer property in build.properties" /> - </target> +@@ -2763,7 +2773,7 @@ skip.installer property in build.properties" /> + </target> <target name="download-test-compile" - description="Download additional components for the tests" > @@ -148,7 +157,7 @@ index 54507d1..9c0bf6d 100644 <antcall target="downloadfile"> <param name="sourcefile" value="${junit.loc}"/> -@@ -2749,7 +2759,7 @@ skip.installer property in build.properties" /> +@@ -2841,7 +2851,7 @@ skip.installer property in build.properties" /> </target> <target name="download-dist" @@ -157,7 +166,7 @@ index 54507d1..9c0bf6d 100644 <antcall target="downloadfile-2"> <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2804,13 +2814,13 @@ skip.installer property in build.properties" /> +@@ -2896,13 +2906,13 @@ skip.installer property in build.properties" /> <!-- =============== Utility Targets to support downloads ================ --> @@ -173,7 +182,7 @@ index 54507d1..9c0bf6d 100644 <echo message="Testing for ${destfile}"/> <available file="${destfile}" property="exist"/> </target> -@@ -2932,7 +2942,7 @@ skip.installer property in build.properties" /> +@@ -3024,7 +3034,7 @@ skip.installer property in build.properties" /> </sequential> </macrodef> @@ -182,7 +191,7 @@ index 54507d1..9c0bf6d 100644 <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -2949,7 +2959,7 @@ skip.installer property in build.properties" /> +@@ -3041,7 +3051,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}.tar.gz"/> </target> @@ -191,7 +200,7 @@ index 54507d1..9c0bf6d 100644 <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -2974,7 +2984,7 @@ skip.installer property in build.properties" /> +@@ -3066,7 +3076,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}.tar.gz"/> </target> @@ -200,7 +209,7 @@ index 54507d1..9c0bf6d 100644 <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -2990,7 +3000,7 @@ skip.installer property in build.properties" /> +@@ -3082,7 +3092,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}"/> </target> @@ -209,7 +218,7 @@ index 54507d1..9c0bf6d 100644 <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3014,7 +3024,7 @@ skip.installer property in build.properties" /> +@@ -3106,7 +3116,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}"/> </target> @@ -218,7 +227,7 @@ index 54507d1..9c0bf6d 100644 <!-- Download the file --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3029,7 +3039,7 @@ skip.installer property in build.properties" /> +@@ -3121,7 +3131,7 @@ skip.installer property in build.properties" /> <move file="${temp.file}" tofile="${destfile}"/> </target> @@ -227,7 +236,7 @@ index 54507d1..9c0bf6d 100644 <!-- Download the file from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3057,7 +3067,7 @@ skip.installer property in build.properties" /> +@@ -3149,7 +3159,7 @@ skip.installer property in build.properties" /> <move file="${temp.file}" tofile="${destfile}"/> </target> @@ -236,7 +245,7 @@ index 54507d1..9c0bf6d 100644 <condition property="trydownload.run"> <and> <not> -@@ -3068,7 +3078,7 @@ skip.installer property in build.properties" /> +@@ -3160,7 +3170,7 @@ skip.installer property in build.properties" /> </condition> </target> @@ -245,21 +254,12 @@ index 54507d1..9c0bf6d 100644 <!-- Downloads a file if not yet downloaded and the source URL is available --> <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> </target> -@@ -3079,7 +3089,7 @@ skip.installer property in build.properties" /> +@@ -3171,7 +3181,7 @@ skip.installer property in build.properties" /> <target name="ide-eclipse" - depends="download-compile, download-test-compile" + 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"/> -@@ -3097,7 +3107,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-8.5.39.ebuild b/www-servers/tomcat/tomcat-8.5.37.ebuild index 3d8ad6af6922..eaca4fb8c6ac 100644 --- a/www-servers/tomcat/tomcat-8.5.39.ebuild +++ b/www-servers/tomcat/tomcat-8.5.37.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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ~x86 ~x86-fbsd ~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.38.ebuild b/www-servers/tomcat/tomcat-8.5.38.ebuild index f4aff4478a60..19c5ce31a3ef 100644 --- a/www-servers/tomcat/tomcat-8.5.38.ebuild +++ b/www-servers/tomcat/tomcat-8.5.38.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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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.17.ebuild b/www-servers/tomcat/tomcat-9.0.14.ebuild index e6cda13656f0..94606ee34539 100644 --- a/www-servers/tomcat/tomcat-9.0.17.ebuild +++ b/www-servers/tomcat/tomcat-9.0.14.ebuild @@ -32,9 +32,7 @@ ECJ_SLOT="4.10" SAPI_SLOT="4.0" COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/glassfish-xmlrpc-api:0 - dev-java/tomcat-servlet-api:${SAPI_SLOT} - dev-java/wsdl4j:0" + dev-java/tomcat-servlet-api:${SAPI_SLOT}" RDEPEND="${COMMON_DEP} !<dev-java/tomcat-native-1.1.24 >=virtual/jre-11" @@ -89,7 +87,7 @@ src_prepare() { JAVA_ANT_REWRITE_CLASSPATH="true" EANT_BUILD_TARGET="deploy" -EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},glassfish-xmlrpc-api,wsdl4j" +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" EANT_NEEDS_TOOLS="true" |