From ef0fedb39c21a343a3f316726f272bad9005b22c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 12 Mar 2025 01:49:51 +0000 Subject: gentoo auto-resync : 12:03:2025 - 01:49:51 --- www-servers/Manifest.gz | Bin 4377 -> 4375 bytes www-servers/tomcat/Manifest | 18 +-- www-servers/tomcat/tomcat-10.1.34.ebuild | 179 ------------------------------ www-servers/tomcat/tomcat-10.1.39.ebuild | 179 ++++++++++++++++++++++++++++++ www-servers/tomcat/tomcat-11.0.2.ebuild | 185 ------------------------------- www-servers/tomcat/tomcat-11.0.5.ebuild | 185 +++++++++++++++++++++++++++++++ www-servers/tomcat/tomcat-9.0.102.ebuild | 172 ++++++++++++++++++++++++++++ www-servers/tomcat/tomcat-9.0.98.ebuild | 172 ---------------------------- 8 files changed, 545 insertions(+), 545 deletions(-) delete mode 100644 www-servers/tomcat/tomcat-10.1.34.ebuild create mode 100644 www-servers/tomcat/tomcat-10.1.39.ebuild delete mode 100644 www-servers/tomcat/tomcat-11.0.2.ebuild create mode 100644 www-servers/tomcat/tomcat-11.0.5.ebuild create mode 100644 www-servers/tomcat/tomcat-9.0.102.ebuild delete mode 100644 www-servers/tomcat/tomcat-9.0.98.ebuild (limited to 'www-servers') diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz index 2d5c226e54fd..b0323b39d6eb 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 b1a8d7e5c6e6..26b3326e9a30 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -6,31 +6,31 @@ AUX tomcat-9.0.87-gentoo-bnd.patch 1432 BLAKE2B 07964d271be70afe13116c9ce27c956a 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.34-src.tar.gz 6946871 BLAKE2B 9e25c8fd0ca4a8d19e2d4f912bb904d691b98b1597fbdd823a3381bdf99073a00cc8655924ef733c13214afb2a9ef92f75708eb4454e266245ad8861f90f64cb SHA512 0124d92eb1d184bdce1a50d5934958a0c796460a7157a8622aeee2b21060f5377198939a0260285bcdaa25cea42b880cb97575469a63f7b33ec22d532927e6ca -DIST apache-tomcat-10.1.34-src.tar.gz.asc 833 BLAKE2B 564c266e4967967450c10944a388c3df051971d00a632d8ecfe68f0a8741f89b270d965f8f62ff8cdc1f097f184f34025ec18b0e4ecfef26bed3a8db9ff8e028 SHA512 2c96d2f89f2bfc449516cdc06682a5404168cdd9e473211444a141aafe3fabe743d68d4e7e32c8a2bc2bb23d875e09c28781ca4cb33e9e13288086c97c20e891 DIST apache-tomcat-10.1.35-src.tar.gz 6979367 BLAKE2B c216bdbccdbcdefab75339cae3983c989fc392512c02c02a9fd3954b3be80d1d7dd320dbc22b68457c8771a4f8aea28f637a95d9188d38ccd4e8bee2f389db1d SHA512 08d6c80c16bb5b82c9bf2d11750c2ac9b7336cae73b3ee9e0c7316a56a68f297c75f61d780ae42f9b97eb65213ad01c36b4bcfe33885d091cae3d5414e5cb64e DIST apache-tomcat-10.1.35-src.tar.gz.asc 833 BLAKE2B e23ae9b0766bb870abf93800a2ba9b4d62ad8d5cd4836d48a8a1893861841050d7a034017076bd92279b94b0b808e634949b355845d75a584c14fe7716393790 SHA512 cbc3b325da80fe2fa574a3eadec703d4717f0acf7f76064b1790ada0bc87ab01c32fda90da8d4f2e9e6bcb2d622ccf25b622ad0440c41acd65b05e02525c4de9 DIST apache-tomcat-10.1.36-src.tar.gz 6981087 BLAKE2B 95c5fca22c65d85284fe91b384ae9a879a0b215b40610dd6ac27ffb371b64fc92bb69edb9f90a60f2d709268fd8210867bc8a73f74e8703876ceb64f780d5b6f SHA512 18123ea1639733f14cf0b1ca0df8255b8d69abc7dd19cad10ad51f4f1f1c16f8f08fba668101169df68d23400f75f3aacab9040edba9330b78939b7c6399ae10 DIST apache-tomcat-10.1.36-src.tar.gz.asc 833 BLAKE2B 560d59d5668b0c06b44dcbd4be871beed5d2b10ad54799e7792f01c8a80156565565111a5a28141494bbfe95a561df5fc5db79dcb56bbd3fb2a11bab1bbd6265 SHA512 22153e1d7797cfb519f7df0968a60f2b1a39de156cd53011fba32c4e51a61e7f8fe4a4b75b673bd5611485f4ef1ca50e43f08d7d09925731253dc114ba0221e1 -DIST apache-tomcat-11.0.2-src.tar.gz 6877090 BLAKE2B 3ed1b184ecf43d12678d3682830065562ce4442aab571ee926b91f509195e314aeceeb10ff2ad935332b38607fd09237eeca274d526df9b7daad17fe6f144508 SHA512 38c5b9c75edb7e620a89376deab0c2e2af08e5853021e207ba26f8b4a2fa1dae2aecffb79bc9c443eb989c96317268a947a42b6869ca2cd827d2bda3be426433 -DIST apache-tomcat-11.0.2-src.tar.gz.asc 849 BLAKE2B 0e670e67396068747d5371da13135696be8b4555892e1cd8338413f7540ded08203c986074cfe42bd077e475a30a05299fd35def29e8a089e570e68be473366c SHA512 ae10b95f4a5a9e922721d190ff9abfeeb62d5814277b076e1d12a5dec64491de8c382273a1b4ccc3f3d193ce561ba34214334048a9e28dcb22a50458d9103016 +DIST apache-tomcat-10.1.39-src.tar.gz 6988808 BLAKE2B a0b5c962660ce32d19d1c3470c978b6c40aec3c50f741f96ece6bad4f63805c531a9ad2255a111348e11c9f05829ac68f45a43a75e422aa5e01b6ab5285fb798 SHA512 ff36f5ba20b5305f207b80a8f2f781b8075d334de327b36f70846a009d0441e993315ca1568bc67cbbdc09520cfbbb768437c4122699507bfc9b8b5e971a9151 +DIST apache-tomcat-10.1.39-src.tar.gz.asc 833 BLAKE2B 6979ce15e50cbbe5ff610d32dfe32b42ff50f53fc3de6bca127e229551882dd1f5d59907166a35d7a5e036365cb2c7ec14d1170f0f8da399290b53e0e3883eb1 SHA512 e99937734460d80ca431610b8496a56871f9536cd93eb21ad7c07176855dcc5157043ac77423a7cfd9c5ca527bef7c53d178ab6fc9f7cfdaed663b2cda727664 DIST apache-tomcat-11.0.3-src.tar.gz 6914800 BLAKE2B 1051d30e3837478b75fc0b22932d8bd313a449a02ecbc7b3dd899259d980c8d37acd29a01496105feeaf07b39a2ddd7806d7c04868a898a956a7ce4ef502e5dd SHA512 c4c49ece1ffeeed8949fafa5ecc24ee8e92455f7a22eb18e88fc454f6bf511d45dd240e6ebc178d421e8a3e178249b7bb4f8b17b9fc3a599a6626928c209c3c7 DIST apache-tomcat-11.0.3-src.tar.gz.asc 849 BLAKE2B e42d128645f754f4a88ad3ed27ba5ba8ba438fdae0f84f2a797c7d5ec9ceab7eb270cd2231382b93111fed56d36fd2d7540dc8a5dd36a0403f8f85d3fa592563 SHA512 42f487c65d48bd4a2ffc7f2d1b7900c6a744c55970ceda11965bc6163986444d200716758e40fd1efc5325b89d903c20d5b25cde0c3acceb2f3b221e50d243ef DIST apache-tomcat-11.0.4-src.tar.gz 6916906 BLAKE2B d0259932fa5568cf921ec6f4ad1d5c221564fe1887fcfa1a8456d0389315fc5bebbf6edab241cddaf2396765093c10ae5708ebaa4a8e79fab60d3700245f7be7 SHA512 9996df1b38abd72710ef741a8858cb714a974819f033d5091d3ccd167bdaa6268c95f0501c54b35385c1164d67b2ef9e54588e92b9d59ec112bf5c74263c6131 DIST apache-tomcat-11.0.4-src.tar.gz.asc 849 BLAKE2B 98565cc37686c15fb52fb502ad7cb4cc99c2ed1d1320e204fe8ec08742866ed3d5e04fb9e23fb3c6ebc0ea217b2e297641a70149a49b2bfdc8899840ffa1056c SHA512 b0a6bed243c28d82144c27fcb29eb85a8d3bb394ae52845691c4dc70c448c7e6563813e21259e2640ab62ba405b86888347c91096c061248d831a6a0a2854768 +DIST apache-tomcat-11.0.5-src.tar.gz 6918820 BLAKE2B 90789cf6cd68cbf813ce47a7860bec03f22f00fabf90df7742e9e37a8dea458445f54e9dea4ac26d9b5b2143c337973a89c71af16fe3d0d500115b7fb158c5e4 SHA512 58d864c0a560c840b303d20b34b1aeb9c03a534bb58badcf407144d1797d355f8f83e91963b8a8f656cae6abd6f9228206eeec3c5ff61a6318f5a9393ee2f91a +DIST apache-tomcat-11.0.5-src.tar.gz.asc 849 BLAKE2B 2ebf1daddf32988d7e708eacf2d6d606d671f55fee6061d4d3381f029eb616a3e367ad982816ea63eefa8fd75b4b1f6360409ca3f9883519b72c1a7896270eb9 SHA512 c1f7d37e5e81a94fb5e5522831e772d29035b2e9684a90471ae45680d18ab536fd8acf72b06f648635df9e0cc32a69bdaab38442598684d388eb4acf9015cecb DIST apache-tomcat-9.0.100-src.tar.gz 7126491 BLAKE2B 4cc63bb9d350eb2df55b9241bf25b88a0a88b8b7a73aa76af16e05cc77a63d4cfa668f1042a0c3d1c63ce4a8f42be384b5ec314cf4aeab17df1579abe16155ff SHA512 0fb016596d1c71da54c7bae8b2b1d5976247127b120234292e96d72d7d244abd9eb0d8f44a1c93eaff853ecf091be34087c113058ae12e9d4dbadc77673b1522 DIST apache-tomcat-9.0.100-src.tar.gz.asc 833 BLAKE2B 5a9e763c63e32e7cf6845d5891d3a99524056372dd796507fdb61209c9d3ccf83c663ec557557f683593f36f713065fac6cb40ab783a9dc65258835e7da2f92e SHA512 53fac33978b490dbc61c0464ce6a13fa23f0ea6bebcd4cf832429b58ce2bd8079ca840c0fcef8fc786841d6b42cdd26f3e26f391effba1eb2a5264c094c9ec0c -DIST apache-tomcat-9.0.98-src.tar.gz 7091158 BLAKE2B 040f6a1a02140b85e324f1a17485c3866d9d336f8c032e7de4b8e3880d405339d43e853cf0999ff3e5e4e12c0551d64a39a3bb218dd0cad4cc5124ce2915a3cd SHA512 eb380dae515a259d23d5311d0b96b8ef5068c0d8d72da215410e5475582d2ff82182b7331e0d197eb993d8014a99ea40290154a343e961a07ed02be6894759cc -DIST apache-tomcat-9.0.98-src.tar.gz.asc 833 BLAKE2B 2f232eeb4af506cf81a32ae6f2bca8c2e7b7c3bc8cc8fade48685fd888e7bd7ea4da1967eb815ae2321d2a02ffbc5598f1ecc8a52695d41e3b2830447331b1ac SHA512 fb6f36bb4a19cc52c3bc1f7d6ccd922db7b61e0274a0aa93e5d79bf2ca0938446509b1e3f966963a583ca9a513fafc9d5c9039bac9d7a03dae1cdd94a722ef3b +DIST apache-tomcat-9.0.102-src.tar.gz 7133459 BLAKE2B 211ce90f9b3ea4fb4ec213ed4523c5934fd105afa6e6b9664297d26e3fa21cc2c61f8f5f9c88bcc9af3a2a2c27c13417053db30dc3d24572f61c54607aea1153 SHA512 2f06b1432a217470097704040cd7aed70e169981140f78c6fd6d46d55b2fd36fa174d85f34f288138f9373469d8c98cddeb3cd030c76dc69c724ab3e3b978095 +DIST apache-tomcat-9.0.102-src.tar.gz.asc 833 BLAKE2B 79fd45f7d94b66c0140c20dbf2711005e512e2709dc105d78e774145a07ad681c2264bef56099329db5d371252dcad4d6b7fa2762534db691ff383ff5c7b84ca SHA512 deb59a0dd77dcac3ce9996360883341d9450f00a6fcaedffb1d162e37344cb28cb816d5342b3d5c401edbfa76aae8b474c5228210f1a414d5ac1a2c71a5d9020 DIST apache-tomcat-9.0.99-src.tar.gz 7124431 BLAKE2B ed4d9c07a55823f6945bd7b14c17d3970236041c07578f68f23826195a708706e7241fcf8e3e7786c4ad67299bd8cd361f322bf39ea8843da06856ec2d485d11 SHA512 87431afb3f7d4eaf2ede17a945f49e44f27d55af508fea901a5415f1b50e40254d344d848b34574a63ccd4dd927aa79e20dea60ab3a01f09a3a43b7d852faaf2 DIST apache-tomcat-9.0.99-src.tar.gz.asc 833 BLAKE2B de6f0834b2bdfc8240d9098bd3f992a37e65ddf1c8091245fbfd9fc49f9cf4510d70a5abeb575d780360c65a99c270d7c2beeeaa2d1b9e42936a0a42e53bd457 SHA512 0fc436938e8547096827e3a5ec833573e3b495f183014b4f8957ffbcc944a7af8832132251c2aa3e1ad234059131d836f66b8105919801b2d14aa58628cb32b5 -EBUILD tomcat-10.1.34.ebuild 5434 BLAKE2B 171c19188692b17959bf50a19ba7cc901034921930d5b392dcbe28a7d6a573ebb9dd5b5f6bb8a850a1c119a57e25f6deccb437047651d482a1e5892210af2bb4 SHA512 e39ab519c32d819838fe1beef127be3a5e862f7c3b57ccb77d02827398577dfa0cde3d2c7f1d888c03e9a8b30d236a3121db557e7ed7b3433d21ccac17ff0d4f EBUILD tomcat-10.1.35.ebuild 5434 BLAKE2B 171c19188692b17959bf50a19ba7cc901034921930d5b392dcbe28a7d6a573ebb9dd5b5f6bb8a850a1c119a57e25f6deccb437047651d482a1e5892210af2bb4 SHA512 e39ab519c32d819838fe1beef127be3a5e862f7c3b57ccb77d02827398577dfa0cde3d2c7f1d888c03e9a8b30d236a3121db557e7ed7b3433d21ccac17ff0d4f EBUILD tomcat-10.1.36.ebuild 5435 BLAKE2B b0eec1155288c70b85a967c8f76b3e73800c0a0dd4b7b2a0af9ec5ae3cb15cc1c216be07bb79df9d69cfff5056682f30f13299be07ca27d0e4395d68543ff241 SHA512 1caad80ce202fd2fb59ad4de24e0159744c02ee1a21aeff87fe7a904ea31bf95e211d10081db2fefe475009c91a0d92d31e9237fbea8c590f8b421328eb4978d -EBUILD tomcat-11.0.2.ebuild 5549 BLAKE2B 9e92c011d18c1217de0247a5a522e098219b47ec5bd7676fb1657361b36fbf0e6dd32c54dd947967456d4a57c5de54d6369746ed13b45c97bd029c1730d9da90 SHA512 b1a64f98c3fd94f73736adeb38c4a66233d26746b6d2fe264410b82fdff317014f722da158f9efa3f3eaa885afd1181ab98790ec9360fab0108338ddf42a409a +EBUILD tomcat-10.1.39.ebuild 5435 BLAKE2B b0eec1155288c70b85a967c8f76b3e73800c0a0dd4b7b2a0af9ec5ae3cb15cc1c216be07bb79df9d69cfff5056682f30f13299be07ca27d0e4395d68543ff241 SHA512 1caad80ce202fd2fb59ad4de24e0159744c02ee1a21aeff87fe7a904ea31bf95e211d10081db2fefe475009c91a0d92d31e9237fbea8c590f8b421328eb4978d EBUILD tomcat-11.0.3.ebuild 5549 BLAKE2B 9e92c011d18c1217de0247a5a522e098219b47ec5bd7676fb1657361b36fbf0e6dd32c54dd947967456d4a57c5de54d6369746ed13b45c97bd029c1730d9da90 SHA512 b1a64f98c3fd94f73736adeb38c4a66233d26746b6d2fe264410b82fdff317014f722da158f9efa3f3eaa885afd1181ab98790ec9360fab0108338ddf42a409a EBUILD tomcat-11.0.4.ebuild 5550 BLAKE2B 7d7f58e609ba4b5ecb654bbfd0b46ffbe8749a9d09528ac7f60473c1a8b89cb9caac9fbc5bf6eed1fc665f8474853eac0fd04e8c551948cf153ef152eb2741aa SHA512 190ef64fae906d8551e7053754da4f9a90a46047b4d4ecd7e6e7de3a7af7d9a44f1d34ad8f3776992c0a82f1ed835f4bf6fd7302b7892915ba0ce353eec01547 +EBUILD tomcat-11.0.5.ebuild 5550 BLAKE2B 7d7f58e609ba4b5ecb654bbfd0b46ffbe8749a9d09528ac7f60473c1a8b89cb9caac9fbc5bf6eed1fc665f8474853eac0fd04e8c551948cf153ef152eb2741aa SHA512 190ef64fae906d8551e7053754da4f9a90a46047b4d4ecd7e6e7de3a7af7d9a44f1d34ad8f3776992c0a82f1ed835f4bf6fd7302b7892915ba0ce353eec01547 EBUILD tomcat-9.0.100.ebuild 5015 BLAKE2B 78cf93968d00bb774b6b855ee9e3ebfa7518bcb98acdca79bebb218171810e7a50ea8e5a8a089154dce01b16b501425b6823b33f57b18ac8f01ab6a087d0522d SHA512 a9f52428978e4af8e297f3a095b0770200ff9b5ab4e5a9935dedc45c913b0cf8ea5d455a22c870a0f2f358400b32ad4ba2d291246fb1df8741c02d66f8ac03c2 -EBUILD tomcat-9.0.98.ebuild 5014 BLAKE2B fe4e709d0f675dd3a87d272cbd1bbd9ab55672d8a1770951a6a92f779c793ea9074a214bcf43cba821b028718ecac59cb172730c385050ab728ae2209d84fda5 SHA512 fab72dfd89c51d1bd13b2859d9330f0cf0b3a8e0865658cb7a9297caa75a16873e1bd54c181477d0bc8e6e002e30efd4cc5583df43926ed3e63e15d8e86a625c +EBUILD tomcat-9.0.102.ebuild 5015 BLAKE2B 78cf93968d00bb774b6b855ee9e3ebfa7518bcb98acdca79bebb218171810e7a50ea8e5a8a089154dce01b16b501425b6823b33f57b18ac8f01ab6a087d0522d SHA512 a9f52428978e4af8e297f3a095b0770200ff9b5ab4e5a9935dedc45c913b0cf8ea5d455a22c870a0f2f358400b32ad4ba2d291246fb1df8741c02d66f8ac03c2 EBUILD tomcat-9.0.99.ebuild 5014 BLAKE2B fe4e709d0f675dd3a87d272cbd1bbd9ab55672d8a1770951a6a92f779c793ea9074a214bcf43cba821b028718ecac59cb172730c385050ab728ae2209d84fda5 SHA512 fab72dfd89c51d1bd13b2859d9330f0cf0b3a8e0865658cb7a9297caa75a16873e1bd54c181477d0bc8e6e002e30efd4cc5583df43926ed3e63e15d8e86a625c MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0 diff --git a/www-servers/tomcat/tomcat-10.1.34.ebuild b/www-servers/tomcat/tomcat-10.1.34.ebuild deleted file mode 100644 index 4b4c261716e6..000000000000 --- a/www-servers/tomcat/tomcat-10.1.34.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2025 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 prefix verify-sig - -MY_P="apache-${P}-src" - -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 - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="10.1" -KEYWORDS="amd64 ~arm64 ~amd64-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.26" - -COMMON_DEP="dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.7-r2:0 - 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-1.10.14-r3:0 - dev-java/bnd:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - >=virtual/jdk-17:* - test? ( - >=dev-java/ant-1.10.14-r3:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" - "${FILESDIR}/tomcat-10.1.20-offline.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - migration-lib.jar=$(java-pkg_getjars jakartaee-migration) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # 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 -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant - use doc && LC_ALL=C eant javadoc -} - -src_test() { - eant 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() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${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." - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} diff --git a/www-servers/tomcat/tomcat-10.1.39.ebuild b/www-servers/tomcat/tomcat-10.1.39.ebuild new file mode 100644 index 000000000000..0431b446752a --- /dev/null +++ b/www-servers/tomcat/tomcat-10.1.39.ebuild @@ -0,0 +1,179 @@ +# Copyright 1999-2025 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 prefix verify-sig + +MY_P="apache-${P}-src" + +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 + verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="10.1" +KEYWORDS="~amd64 ~arm64 ~amd64-linux" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +ECJ_SLOT="4.26" + +COMMON_DEP="dev-java/bnd-annotation:0 + dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/jax-rpc-api:0 + >=dev-java/jakartaee-migration-1.0.7-r2:0 + 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-1.10.14-r3:0 + dev-java/bnd:0 + dev-java/bnd-ant:0 + dev-java/bnd-util:0 + dev-java/bndlib:0 + dev-java/libg:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 + >=virtual/jdk-17:* + test? ( + >=dev-java/ant-1.10.14-r3:0[junit] + dev-java/easymock:3.2 + )" + +BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" + +PATCHES=( + "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" + "${FILESDIR}/tomcat-10.1.20-offline.patch" + "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + cat > build.properties <<-EOF || die + compile.debug=false + execute.download=false + exist=true # skip target="downloadfile-2" + version=${PV}-gentoo + version.number=${PV} + ant.jar=$(java-pkg_getjar --build-only ant ant.jar) + bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) + bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) + bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) + bnd.jar=$(java-pkg_getjars --build-only bnd) + bndlib.jar=$(java-pkg_getjars --build-only bndlib) + jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) + jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) + libg.jar=$(java-pkg_getjars --build-only libg) + migration-lib.jar=$(java-pkg_getjars jakartaee-migration) + osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) + osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) + slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) + wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) + EOF + if use test; then + echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ + >> build.properties || die "easymock" + fi + + # 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 +} + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_compile() { + LC_ALL=C eant + use doc && LC_ALL=C eant javadoc +} + +src_test() { + eant 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() { + einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" + einfo " ${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." + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" +} diff --git a/www-servers/tomcat/tomcat-11.0.2.ebuild b/www-servers/tomcat/tomcat-11.0.2.ebuild deleted file mode 100644 index b370601d77b4..000000000000 --- a/www-servers/tomcat/tomcat-11.0.2.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2025 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 prefix verify-sig - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-6.1/JSP-4.0/EL-6.0/WebSocket-2.2/JASPIC-3.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="11" -KEYWORDS="amd64 ~arm64 ~amd64-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.33" - -COMMON_DEP=" - dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.7-r2:0 - dev-java/wsdl4j:0" - -# jre-17:* because of line 1081, build.xml -# -RDEPEND=" - ${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-17:*" -DEPEND=" - ${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-1.10.14-r3:0 - dev-java/bnd:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - >=virtual/jdk-17:* - test? ( - >=dev-java/ant-1.10.14-r3:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" - "${FILESDIR}/tomcat-11.0.0-offline.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - migration-lib.jar=$(java-pkg_getjars jakartaee-migration) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # 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 -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant - use doc && LC_ALL=C eant javadoc -} - -src_test() { - eant 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() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${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." - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} diff --git a/www-servers/tomcat/tomcat-11.0.5.ebuild b/www-servers/tomcat/tomcat-11.0.5.ebuild new file mode 100644 index 000000000000..db48095019e5 --- /dev/null +++ b/www-servers/tomcat/tomcat-11.0.5.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2025 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 prefix verify-sig + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-6.1/JSP-4.0/EL-6.0/WebSocket-2.2/JASPIC-3.1 Container" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz + verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="11" +KEYWORDS="~amd64 ~arm64 ~amd64-linux" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +ECJ_SLOT="4.33" + +COMMON_DEP=" + dev-java/bnd-annotation:0 + dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/jax-rpc-api:0 + >=dev-java/jakartaee-migration-1.0.7-r2:0 + dev-java/wsdl4j:0" + +# jre-17:* because of line 1081, build.xml +# +RDEPEND=" + ${COMMON_DEP} + acct-group/tomcat + acct-user/tomcat + >=virtual/jre-17:*" +DEPEND=" + ${COMMON_DEP} + app-admin/pwgen + >=dev-java/ant-1.10.14-r3:0 + dev-java/bnd:0 + dev-java/bnd-ant:0 + dev-java/bnd-util:0 + dev-java/bndlib:0 + dev-java/libg:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 + >=virtual/jdk-17:* + test? ( + >=dev-java/ant-1.10.14-r3:0[junit] + dev-java/easymock:3.2 + )" + +BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" + +PATCHES=( + "${FILESDIR}/tomcat-10.1.20-do-not-copy.patch" + "${FILESDIR}/tomcat-11.0.0-offline.patch" + "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + cat > build.properties <<-EOF || die + compile.debug=false + execute.download=false + exist=true # skip target="downloadfile-2" + version=${PV}-gentoo + version.number=${PV} + ant.jar=$(java-pkg_getjar --build-only ant ant.jar) + bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) + bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) + bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) + bnd.jar=$(java-pkg_getjars --build-only bnd) + bndlib.jar=$(java-pkg_getjars --build-only bndlib) + jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) + jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) + libg.jar=$(java-pkg_getjars --build-only libg) + migration-lib.jar=$(java-pkg_getjars jakartaee-migration) + osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) + osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) + slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) + wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) + EOF + if use test; then + echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ + >> build.properties || die "easymock" + fi + + # 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 +} + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_compile() { + LC_ALL=C eant + use doc && LC_ALL=C eant javadoc +} + +src_test() { + eant 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() { + einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" + einfo " ${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." + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" +} diff --git a/www-servers/tomcat/tomcat-9.0.102.ebuild b/www-servers/tomcat/tomcat-9.0.102.ebuild new file mode 100644 index 000000000000..4b6049e0edfa --- /dev/null +++ b/www-servers/tomcat/tomcat-9.0.102.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2025 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 prefix verify-sig + +MY_P="apache-${P}-src" + +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 + verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="9" +KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +ECJ_SLOT="4.20" + +COMMON_DEP="dev-java/bnd-annotation:0 + dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/jax-rpc-api:0 + 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-1.10.14-r3:0 + dev-java/bnd:0 + dev-java/bnd-ant:0 + dev-java/bnd-util:0 + dev-java/bndlib:0 + dev-java/libg:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 + >=virtual/jdk-17:* + test? ( + >=dev-java/ant-1.10.14-r3:0[junit] + dev-java/easymock:3.2 + )" + +BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" + +PATCHES=( + "${FILESDIR}/tomcat-9.0.87-build.xml.patch" + "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + cat > build.properties <<-EOF || die + compile.debug=false + execute.download=false + exist=true # skip target="downloadfile-2" + version=${PV}-gentoo + version.number=${PV} + ant.jar=$(java-pkg_getjar --build-only ant ant.jar) + bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) + bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) + bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) + bnd.jar=$(java-pkg_getjars --build-only bnd) + bndlib.jar=$(java-pkg_getjars --build-only bndlib) + jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) + jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) + libg.jar=$(java-pkg_getjars --build-only libg) + osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) + osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) + slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) + wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) + EOF + if use test; then + echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ + >> build.properties || die "easymock" + fi + + # 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 +} + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_compile() { + LC_ALL=C eant + use doc && LC_ALL=C eant javadoc +} + +src_test() { + eant 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() { + einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" + einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" +} diff --git a/www-servers/tomcat/tomcat-9.0.98.ebuild b/www-servers/tomcat/tomcat-9.0.98.ebuild deleted file mode 100644 index eeca0d02b4c7..000000000000 --- a/www-servers/tomcat/tomcat-9.0.98.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2025 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 prefix verify-sig - -MY_P="apache-${P}-src" - -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 - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="9" -KEYWORDS="amd64 ~arm64 ~amd64-linux ~x86-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.20" - -COMMON_DEP="dev-java/bnd-annotation:0 - dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - 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-1.10.14-r3:0 - dev-java/bnd:0 - dev-java/bnd-ant:0 - dev-java/bnd-util:0 - dev-java/bndlib:0 - dev-java/libg:0 - dev-java/osgi-cmpn:8 - dev-java/osgi-core:0 - dev-java/slf4j-api:0 - >=virtual/jdk-17:* - test? ( - >=dev-java/ant-1.10.14-r3:0[junit] - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -PATCHES=( - "${FILESDIR}/tomcat-9.0.87-build.xml.patch" - "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - java-pkg_clean - - cat > build.properties <<-EOF || die - compile.debug=false - execute.download=false - exist=true # skip target="downloadfile-2" - version=${PV}-gentoo - version.number=${PV} - ant.jar=$(java-pkg_getjar --build-only ant ant.jar) - bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) - bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) - bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) - bnd.jar=$(java-pkg_getjars --build-only bnd) - bndlib.jar=$(java-pkg_getjars --build-only bndlib) - jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) - jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) - libg.jar=$(java-pkg_getjars --build-only libg) - osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) - osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) - slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) - wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) - EOF - if use test; then - echo "easymock.jar=$(java-pkg_getjars --build-only easymock-3.2)" \ - >> build.properties || die "easymock" - fi - - # 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 -} - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - LC_ALL=C eant - use doc && LC_ALL=C eant javadoc -} - -src_test() { - eant 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() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat" -} -- cgit v1.2.3