From dd5b71d2ad69f1887985ee1ca67b254e04157f73 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 23 Mar 2023 06:44:33 +0000 Subject: gentoo auto-resync : 23:03:2023 - 06:44:33 --- www-servers/Manifest.gz | Bin 4527 -> 4527 bytes www-servers/tomcat/Manifest | 24 +- .../tomcat/files/tomcat-10.1.0-build.xml.patch | 347 --------------------- .../tomcat/files/tomcat-10.1.6-build.xml.patch | 2 - .../tomcat/files/tomcat-8.5.66-build.xml.patch | 266 ---------------- .../tomcat/files/tomcat-8.5.86-build.xml.patch | 2 - .../files/tomcat-9.0.37-fix-build-rewrite.patch | 2 - .../files/tomcat-9.0.50-insufficient-ecj.patch | 2 - .../tomcat/files/tomcat-9.0.62-build.xml.patch | 319 ------------------- .../tomcat/files/tomcat-9.0.72-build.xml.patch | 2 - www-servers/tomcat/tomcat-10.1.5.ebuild | 202 ------------ www-servers/tomcat/tomcat-8.5.85.ebuild | 171 ---------- www-servers/tomcat/tomcat-9.0.71-r1.ebuild | 202 ------------ 13 files changed, 5 insertions(+), 1536 deletions(-) delete mode 100644 www-servers/tomcat/files/tomcat-10.1.0-build.xml.patch delete mode 100644 www-servers/tomcat/files/tomcat-8.5.66-build.xml.patch delete mode 100644 www-servers/tomcat/files/tomcat-9.0.62-build.xml.patch delete mode 100644 www-servers/tomcat/tomcat-10.1.5.ebuild delete mode 100644 www-servers/tomcat/tomcat-8.5.85.ebuild delete mode 100644 www-servers/tomcat/tomcat-9.0.71-r1.ebuild (limited to 'www-servers') diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz index b4ae4402293d..7a61870960dc 100644 Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 5cba08ae4e5d..42840d16de60 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,34 +1,20 @@ -AUX tomcat-10.1.0-build.xml.patch 13790 BLAKE2B f84bfdd9da38d738cc8fbd91bc4bf29b76feb82bb7b562e90aa9fbaa55009e482260c39958210912c0fa9936b29e7a479951765d99f49c8d70fe2190aa50cabe SHA512 c30fba95c36190dd1d0b61497536c5b8880c3e2ef629e697509c343a34be24a4848d84279ad9881196752b40d5d9b1d496840ffc317f4f9e668290f52ebc48a8 -AUX tomcat-10.1.6-build.xml.patch 4921 BLAKE2B 3413bbab4324c0741c780db57e190446b2cdf6d3327802d6ba127481b80fcf369560dccbc969613497ae005410cedaef367c7a8ef06d00033cb750b130856fc9 SHA512 01581bff021cdcf87fa3d96818e27e41a719c8bd999134a05341fc7cb310408ccead01849158d2a27c738446f5a68b5c0e3504043b381067c37abf57834cd2f6 -AUX tomcat-8.5.66-build.xml.patch 10850 BLAKE2B 69353bcf5697e6ae0b930c71fbb870401e822340f0eb0b8a6283e0d8cd1388d1d22a12190d089f7001a06e2491bb2309aab8c93b8f2a79e8439571fed8d0aebb SHA512 498c2ac8ab49cd83151ddfc6b47bd3a7a7148096e331ae55c7fe3da90007c19387208de64f5b3e796ec54b4b8534b11f906940fcf49343157acc862fcf06f5c7 -AUX tomcat-8.5.86-build.xml.patch 4229 BLAKE2B 5ddcbd0ead6c3d4fb8306a9311efaa94c6f336f77c26e79ef6b5d570f5abe38aa3bca0be82972fe9f90313b382fee1fb82ad62c3b4f1694bda8283b8faed9190 SHA512 adcba3a3e37176708851b62ed49bffc205f4b6a4a581210ab38ec43f8083310e387394e519a8c3ed38569f81e6a58dd282e79201a8499556bec48822c8238231 -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.62-build.xml.patch 12687 BLAKE2B 55b0c142875581231ca65e9198d5da116f01e1b9d4b16d50cd79300e9fd49c5d9f79341f34a0285af8683e14bb51d1c4fa2bb91e893591c114692021608ffedf SHA512 0c82adb799539eeb4691f86e2e2815feefbefce579576a3419bd3b5efbaf7e6d24c03862b70d514424cfa74abb217e214a9005390b73ecf9836721c7b289a802 -AUX tomcat-9.0.72-build.xml.patch 3859 BLAKE2B 5d59c5d8bd831a5992d1b73529193b941fb6260c1948a3d10dc3fc6f705f863ec81fd01017896df48b6f734f49385f63cdbcec2235d3ffc559ee88210b4ec2f7 SHA512 9dedf92cdf82d65c72fb24206dc2edfcde754d5fda4e1d86c77737251a524e64a0aec2faff47181052e90f53e6ba643be5914c7ca2aa47bd2c4cc92ac7acf9b0 +AUX tomcat-10.1.6-build.xml.patch 4856 BLAKE2B ed44d53877c96f06cab6354b034f88ba3382c34eaf504f10c9fcaaaf2b0c812901f3bfca8114f2aab4faa2604800f81f18932ac12065d09846f879edc1eaad96 SHA512 005d0b3fe6e14dca303bc3d5c4ab1fbf35a309be9a8ffcebd24e739301f33f202616e17973dd954bd1bd1ae89978c3147593d42ee2508c56026579d37722470b +AUX tomcat-8.5.86-build.xml.patch 4164 BLAKE2B 27aba54a5a8e570a9e73ff1133dcdc43ac9536bb2cb8b2542fe3eb12c2c92145066c8d742ff35a6b320515cb91ce9a17a1b0e7954623a68326677b42547f1027 SHA512 7f924be4b979178fc92d7a3b63224c87860ae1795b2cc10e734ff8518d6ab3b15138718ed392b1fb747457d4abf5acf9b5fac13f321cd7e8dd7fe832c0e82577 +AUX tomcat-9.0.37-fix-build-rewrite.patch 448 BLAKE2B 323a726c80b04a225e47b04506969116bccda3fdddca6e00bab85a8a758b58b5461792b8419d56e3f55742218a9dd36ab11e14d7af49ba1be4c8543f1a6c1fb3 SHA512 58413426f3997af610819f55a63c161b5ae2953337fdaddd854b3f4fb239f198434731598d23858cf5911d7506387907a14c0f1cca0df5801767c1f868bf9a07 +AUX tomcat-9.0.50-insufficient-ecj.patch 2747 BLAKE2B d229acd5e0e90323e75eb44e575c893759884df526a8aebb92b648ad3c15b29312153d701472d86406e4be6d7fa646b7b4c2952a01fd42a52dcc8980c6540cfe SHA512 2327b26213a507c91e9bad5a224c2a3925b97cb41a54ddd58bd901266dcb72b355f4378f5ec9911cd3ca1ba5456a98012adfb185cb7d501c4865d414b51355dc +AUX tomcat-9.0.72-build.xml.patch 3794 BLAKE2B 886bf69f4c78f385249e02e1f91ed91065cd242a4b17db0b852ea6ef5561bf3c5de18a9590ef78c40296075975c92b8620a36224b8e7902dd8f61acba016e197 SHA512 ffa15a7c8ae2a11aab89f4070bf4d2d1eec636fceebedc62a7191449e8e3c5e0e2e969e600b2771762452156c479750af63fe705d20b888159fe59bf59f88b74 AUX tomcat-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.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02 -DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712 DIST apache-tomcat-10.1.7-src.tar.gz 6075723 BLAKE2B ef00c3c43a6cd6c68b09930fd7dc8f822b49f5cec3a0c2b3dad1cb20e5f37ff17f35dfd48c5a8537dedbb9c3887620b6e0ec29272a002df46aa8fa0e5ccbaaa7 SHA512 3daeb5cb3650382224ba4b5cf830c7288531b7f565fdde4a8acca1ee66bebbbfafb4790a6ce50b965e176e9669203e90342e61d42d1656fd12f656d9394c3283 DIST apache-tomcat-10.1.7-src.tar.gz.asc 849 BLAKE2B 79d5d6885dd3304999a3ec1e16ffeca95df0b0b135ad6733b932b745e248bfd84be06f7eb70588167e7a8b74c4fa1db93cfba99dee10b8ebc00b7ce46226e128 SHA512 ae5c9238ea33743ed40dc74e47e6441f52437322376df94b770dd00e354dc67851cedeb2b4b1148262bdb12b15f7ded49d0f5ee050d451006fa81c5c86b20768 -DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736 -DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5 DIST apache-tomcat-8.5.87-src.tar.gz 6041463 BLAKE2B 2b41e324be028b9bf4db3fcd32a45ad6a84644535c20c5a46c7850c8b0ee054130a7fa5091009928b71c8ece2f24f49530845727cc3f1b6d5907de07d7ad3703 SHA512 cd15fc27c781a0835ec5c35726832f51abfc8bba9b647e690b3dadb7141b5c96b5014f0d6ebf46277d43cf10e2839ef0229dccf87c0449f2004ae90041ef10b6 DIST apache-tomcat-8.5.87-src.tar.gz.asc 849 BLAKE2B 05a5911b344b5ffdcb392189b64dc4c4d31d000a8b653338780e74ab569a3b024a13b491ba4946bbf68b5955af65df05bfe7b4795a120977f1b26a2bcff0c96d SHA512 fb56af00d3f9302251e65a08d852992192137eeed0eecf100bcfafb778e01dfb92fc024f47ef41ca71f01eebb3622fcaa53fcb776403939313502039080a2b4c -DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930 -DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80 DIST apache-tomcat-9.0.73-src.tar.gz 6229040 BLAKE2B 97b1348e532eea75c4d0723c314cc24a9c13bd4a948a8eea4d1ee1c5121472f2fedec7d30c240b2617a51ef57898fbd96c254f9d84c9e943ebe808f1dba4cf16 SHA512 1691a0087ceaf2100ce17fe9b9a973d079c39b20effbe0c0d68f92d2684a681e001b0c2b8bde40c289754ac02ba02f9eb4dfac617fccb8f451c96dfdd4741237 DIST apache-tomcat-9.0.73-src.tar.gz.asc 833 BLAKE2B 0d9e81e16e356aded1f02dc02833f24875584794358591b70a2fe54d67d116c7305dc5a477d158395afe3b72b2958c2dc0e102a893b8ef504a3f24acec14ba41 SHA512 fda56cb885fd6ab0bb00907084977217c2e23bbfb2fe25374bea1bd9f863f5275dd8949e3ff2a88d5d10f37788978b484ae59460c1bb43d2ca0ac814426efcac -DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85 -DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608 DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef SHA512 15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d -EBUILD tomcat-10.1.5.ebuild 6535 BLAKE2B 5af622a02ce2b9efcbba0949dd617ae1c2b53155765d164f26a6172097f1b67f9605132804f4370788e4a8ea39f6b9e5e8d03956bc0a14fb4ff263bbb41f333a SHA512 f64bd088116ce2ffe04b3c53f98872ce5cf580b90351272b4751be52658c9995c2be636497e2a54c8f77ac15d2341ce1fcedf245e6a66bf42e323af20bd90f71 EBUILD tomcat-10.1.7.ebuild 5786 BLAKE2B 0dde89723c9e9ea059f846e184bfe502014a828e921a8b2d2df2204939aa53b9be4602c2b757cfc93fb36dc8e9ba18612a38a49bb527758bfb92737661ea182d SHA512 a5327a33f611f68e5582a22026452f8a89eff27abcf267e75c928aea078737ac5b44f179bf5dc6ef0436243f16b5226431d0ef03c6b8a157f835d5afc8f08503 -EBUILD tomcat-8.5.85.ebuild 5433 BLAKE2B 23d065fe01d845eea65eb05b826d84423e9e90fe9bc19077f0fe84765e3bf37ca0b1996276effdc701a8b7a87f23fadb322eb93d26cd65112128499172d48918 SHA512 d3e1cd656754f5e2bd02fba376c08ad2fdcae4aea6235c973cf525a59fe0436c2e20e47bf10503898ae3e1cd16f1673e310739d40af155ff5393d93cdc36f601 EBUILD tomcat-8.5.87.ebuild 4649 BLAKE2B 1e4b40f696dff7f9e3f8eceba242cf13059f90904a16fca5334e7705b5905f2ce14175eba2f9a8c4e6c88aec0668a96a90057ade846ce3bfa0d5c671efdf3169 SHA512 e531dd28399421d9cc78237cd36c70bcb21aa0d760d3e9375f5b2a20a08a640dba2854af9a67eff2501efc8f917fce7ef9b13d9f553902af7b47d81f675349aa -EBUILD tomcat-9.0.71-r1.ebuild 6424 BLAKE2B 2189fb588d1e9d65c7ba6e00acc2db9bf747af77693011e9333be410a217c4c6aea6836e168f3b2929edbd63d32d5d45ed443f4e950702ee8b80482f9409ddff SHA512 64bd43df27bad8e5119e1e42d5af81a9a8381a108be27dcb3f143ad4755215aeab7424acf3a389a237cc139603a8c38603dda81f961e34c1a509e3d136bd2766 EBUILD tomcat-9.0.73.ebuild 5665 BLAKE2B 7a5d46aa3919e1a0f021d96ff6de326f7f0d17f7eeb31ff1863e15f5b56919cd4383c36c3b72c9e8409ae3f2998f92204d0279da27c1935c797e25aac269ec3b SHA512 041d17c1a05ecb482b64c2cedd744901615519d8e7cc25fea74d643cd850d5bc4ea138ecdc3232c9db9e2cb76ec09562593860a284ec56cb24b97df3ac2753d3 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9 diff --git a/www-servers/tomcat/files/tomcat-10.1.0-build.xml.patch b/www-servers/tomcat/files/tomcat-10.1.0-build.xml.patch deleted file mode 100644 index da51f82d9bd7..000000000000 --- a/www-servers/tomcat/files/tomcat-10.1.0-build.xml.patch +++ /dev/null @@ -1,347 +0,0 @@ -diff --git a/build.xml b/build.xml -index bdd0801..28319a5 100644 ---- a/build.xml -+++ b/build.xml -@@ -1046,6 +1046,7 @@ - addOSGi="true" /> - - -+ - -+ - -+ - - - - -- -+ addOSGi="true" /> --> - - - -- -+ - - - -@@ -1489,7 +1492,7 @@ - - - -- -+ - - - -@@ -1500,7 +1503,7 @@ - - - -- -+ - - - - - - - -- -+ - - - - -+ - - - -+ - - - Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -2210,13 +2216,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"> - - - - - -+ - -+ failonerror="true"> - - - -@@ -2315,8 +2318,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"> - - - -@@ -2335,20 +2337,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - additionalparam="-breakiterator -notimestamp -html5" - source="${compile.release}" - maxmemory="512m" -- failonerror="true" - failonwarning="true"> - - - - - -+ - - -+ - - - -@@ -3320,7 +3325,7 @@ asf.ldap.username=${release.asfusername} - - - -+ description="Download additional components for the tests"> - - - -@@ -3448,7 +3453,7 @@ asf.ldap.username=${release.asfusername} - - - -+ description="Download additional components for a distribution"> - - - -@@ -3503,13 +3508,13 @@ asf.ldap.username=${release.asfusername} - - - -- -+ - - - - -- -+ - - - -@@ -3631,7 +3636,7 @@ asf.ldap.username=${release.asfusername} - - - -- -+ - - - -@@ -3648,7 +3653,7 @@ asf.ldap.username=${release.asfusername} - - - -- -+ - - - -@@ -3673,7 +3678,7 @@ asf.ldap.username=${release.asfusername} - - - -- -+ - - - -@@ -3689,7 +3694,7 @@ asf.ldap.username=${release.asfusername} - - - -- -+ - - - -@@ -3713,7 +3718,7 @@ asf.ldap.username=${release.asfusername} - - - -- -+ - - - -@@ -3728,7 +3733,7 @@ asf.ldap.username=${release.asfusername} - - - -- -+ - - - -@@ -3756,7 +3761,7 @@ asf.ldap.username=${release.asfusername} - - - -- -+ - - - -@@ -3767,7 +3772,7 @@ asf.ldap.username=${release.asfusername} - - - -- -+ - - - -@@ -3778,7 +3783,7 @@ asf.ldap.username=${release.asfusername} - - -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - - -@@ -3796,7 +3801,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - -+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> - - - diff --git a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch index 341813c73123..41cf58bc908c 100644 --- a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch @@ -1,5 +1,3 @@ -diff --git a/build.xml b/build.xml -index bea41a8..08ef1db 100644 --- a/build.xml +++ b/build.xml @@ -1457,9 +1457,9 @@ diff --git a/www-servers/tomcat/files/tomcat-8.5.66-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.66-build.xml.patch deleted file mode 100644 index 3dcf6fe19e55..000000000000 --- a/www-servers/tomcat/files/tomcat-8.5.66-build.xml.patch +++ /dev/null @@ -1,266 +0,0 @@ -diff --git a/build.xml b/build.xml -index ad55d0b..0c44bb5 100644 ---- a/build.xml -+++ b/build.xml -@@ -780,25 +780,28 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - -+ - -+ - -+ - - - - -- -+ filesId="files.tomcat-dbcp" /> --> - - - -- -+ - - - -@@ -1169,7 +1172,7 @@ - - - -- -+ - - - -@@ -1212,7 +1215,7 @@ - - - -- -+ - - - - - -- -+ - - - - -+ - - - - - - -+ - - -+ - - - -@@ -2836,7 +2847,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download components necessary to compile" unless="noget" > - - - -@@ -2862,7 +2873,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -2949,7 +2960,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for a distribution" unless="noget"> - - - -@@ -3004,13 +3015,13 @@ skip.installer property in build.properties" /> - - - -- -+ - - - - -- -+ - - - -@@ -3132,7 +3143,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3149,7 +3160,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3174,7 +3185,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3190,7 +3201,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3214,7 +3225,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3229,7 +3240,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3257,7 +3268,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3268,7 +3279,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3279,7 +3290,7 @@ skip.installer property in build.properties" /> - - -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - - diff --git a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch index 8888e3589ce3..85ad9ab64682 100644 --- a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch @@ -1,5 +1,3 @@ -diff --git a/build.xml b/build.xml -index d407be0..7c69a1b 100644 --- a/build.xml +++ b/build.xml @@ -1148,9 +1148,9 @@ diff --git a/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch index 7aa1e883f133..e324b7602ec8 100644 --- a/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch +++ b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch @@ -1,5 +1,3 @@ -diff --git a/build.xml b/build.xml -index 9ba357b..352e141 100644 --- a/build.xml +++ b/build.xml @@ -2716,7 +2716,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho diff --git a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch index 13e82c9c6517..d8f933c417b1 100644 --- a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch +++ b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch @@ -1,5 +1,3 @@ -diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java -index 10d80e0..34ff7e0 100644 --- a/java/org/apache/jasper/compiler/JDTCompiler.java +++ b/java/org/apache/jasper/compiler/JDTCompiler.java @@ -306,11 +306,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { 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 deleted file mode 100644 index fdf66cf7b63a..000000000000 --- a/www-servers/tomcat/files/tomcat-9.0.62-build.xml.patch +++ /dev/null @@ -1,319 +0,0 @@ -diff --git a/build.xml b/build.xml -index 5a0be1b..87bfb33 100644 ---- a/build.xml -+++ b/build.xml -@@ -1023,6 +1023,7 @@ - addOSGi="true" /> - - -+ - -+ - -+ - - - - -- -+ addOSGi="true" /> --> - - - -- -+ - - - -@@ -1459,7 +1462,7 @@ - - - -- -+ - - - -@@ -1488,7 +1491,7 @@ - - - -- -+ - - - - - -- -+ - - - - -+ - - - -+ - - - 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"> - - - - - -+ - -+ failonerror="true"> - - - -@@ -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"> - - - -@@ -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"> - - - - - -+ - - -+ - - - -@@ -3062,7 +3070,7 @@ skip.installer property in build.properties" /> - - -+ depends="setup-bnd" unless="noget"> - - - -@@ -3106,7 +3114,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -3234,7 +3242,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for a distribution" unless="noget"> - - - -@@ -3289,13 +3297,13 @@ skip.installer property in build.properties" /> - - - -- -+ - - - - -- -+ - - - -@@ -3417,7 +3425,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3434,7 +3442,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3459,7 +3467,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3475,7 +3483,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3499,7 +3507,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3514,7 +3522,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3542,7 +3550,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3553,7 +3561,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3564,7 +3572,7 @@ skip.installer property in build.properties" /> - - -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - - -@@ -3582,7 +3590,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - -+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> - - - diff --git a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch index 985d5d4f94fb..bdf2efccbdbd 100644 --- a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch @@ -1,5 +1,3 @@ -diff --git a/build.xml b/build.xml -index b420c2a..abecfde 100644 --- a/build.xml +++ b/build.xml @@ -1436,9 +1436,9 @@ diff --git a/www-servers/tomcat/tomcat-10.1.5.ebuild b/www-servers/tomcat/tomcat-10.1.5.ebuild deleted file mode 100644 index 576fea230290..000000000000 --- a/www-servers/tomcat/tomcat-10.1.5.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 prefix verify-sig - -MY_P="apache-${PN}-${PV}-src" - -# Currently we bundle binary versions of bnd.jar and bndlib.jar -# See bugs #203080 and #676116 -BND_VERSION="6.3.1" -BND="biz.aQute.bnd-${BND_VERSION}.jar" -BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" - -DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB} - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="10.1" -KEYWORDS="amd64 ~amd64-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.26" -SERVLET_API_SLOT="6.0" -JSP_API_SLOT="3.1" -EL_API_SLOT="5.0" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/glassfish-xmlrpc-api:0 - >=dev-java/jakartaee-migration-1.0.5:0 - ~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT} - ~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT} - ~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT} - dev-java/wsdl4j:0" -RDEPEND="${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-11:*" -DEPEND="${COMMON_DEP} - app-admin/pwgen - dev-java/ant-core - >=virtual/jdk-11:* - test? ( - dev-java/ant-junit:0 - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -S=${WORKDIR}/${MY_P} - -BND_HOME="${S}/tomcat-build-libs/bnd" -BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" -BND_JAR="${BND_HOME}/${BND}" -BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" - -src_unpack() { - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} - fi - - unpack ${MY_P}.tar.gz - - mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" - ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" - ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" -} - -src_prepare() { - default - - find -name '*.jar' -type f -delete -print || die - - # Remove bundled servlet-api - rm -rv java/jakarta/{el,servlet} || die - - eapply "${FILESDIR}/${PN}-10.1.0-build.xml.patch" - - local vm_version="$(java-config -g PROVIDES_VERSION)" - - # 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},jakartaee-migration,tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT},wsdl4j" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_NEEDS_TOOLS="true" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_configure() { - java-ant-2_src_configure - - eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" -} - -src_compile() { - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" - LC_ALL=C 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 ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - 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="$(pwgen -s -B 15 1)" - 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 "Please note that since version 10 the primary package for all implemented APIs" - ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" - ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." - - 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.85.ebuild b/www-servers/tomcat/tomcat-8.5.85.ebuild deleted file mode 100644 index d046474cd03e..000000000000 --- a/www-servers/tomcat/tomcat-8.5.85.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="8.5" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.15" -SERVLET_API_SLOT="3.1" -JSP_API_SLOT="2.3" -EL_API_SLOT="3.0" - -# we don't use ~ for el and jsp because the same implementation -# is also present in tomcat 9 and it would be impossible to install -# both tomcat 8.5 and 9 at the same time -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - >=dev-java/tomcat-el-api-${PV}:${EL_API_SLOT} - >=dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT} - ~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT} -" -RDEPEND="${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-1.8:*" -DEPEND="${COMMON_DEP} - app-admin/pwgen - dev-java/ant-core - >=virtual/jdk-1.8:* - doc? ( - dev-java/glassfish-xmlrpc-api:0 - dev-java/wsdl4j:0 - ) - test? ( - >=dev-java/ant-junit-1.9:0 - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - find -name '*.jar' -type f -delete -print || die - - # Remove bundled servlet-api - rm -rv java/javax/{el,servlet} || die - - eapply "${FILESDIR}/${PN}-8.5.66-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-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT}" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_NEEDS_TOOLS="true" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" - -# revisions of the scripts -IM_REV="-r2" -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)" - LC_ALL=C 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 ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - 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="$(pwgen -s -B 15 1)" - 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-9.0.71-r1.ebuild b/www-servers/tomcat/tomcat-9.0.71-r1.ebuild deleted file mode 100644 index eb57bb016223..000000000000 --- a/www-servers/tomcat/tomcat-9.0.71-r1.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 prefix verify-sig - -MY_P="apache-${PN}-${PV}-src" - -# Currently we bundle binary versions of bnd.jar and bndlib.jar -# See bugs #203080 and #676116 -BND_VERSION="6.3.1" -BND="biz.aQute.bnd-${BND_VERSION}.jar" -BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" - -DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB} - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="9" -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" -SERVLET_API_SLOT="4.0" -JSP_API_SLOT="2.3" -EL_API_SLOT="3.0" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/glassfish-xmlrpc-api:0 - ~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT} - ~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT} - ~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT} - dev-java/wsdl4j:0" -RDEPEND="${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-1.8:*" -DEPEND="${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-core-1.9.13 - >=virtual/jdk-1.8:* - test? ( - >=dev-java/ant-junit-1.9:0 - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch" -) - -BND_HOME="${S}/tomcat-build-libs/bnd" -BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" -BND_JAR="${BND_HOME}/${BND}" -BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" - -src_unpack() { - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} - fi - - unpack ${MY_P}.tar.gz - - mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" - ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" - ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" -} - -src_prepare() { - default - - find -name '*.jar' -type f -delete -print || die - - # Remove bundled servlet-api - rm -rv java/javax/{el,servlet} || die - - eapply "${FILESDIR}/${PN}-9.0.62-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-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT},wsdl4j" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_NEEDS_TOOLS="true" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}" - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_configure() { - java-ant-2_src_configure - - eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" -} - -src_compile() { - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)" - LC_ALL=C 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 ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - 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="$(pwgen -s -B 15 1)" - 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." -} -- cgit v1.2.3