commit: 5b5d0638ef1928bc8624846dc3287a998bfd3aee Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Jan 28 06:00:14 2026 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Jan 28 19:17:14 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5d0638
www-servers/tomcat: add 10.1.52 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/45552 Closes: https://github.com/gentoo/gentoo/pull/45552 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> www-servers/tomcat/Manifest | 2 + www-servers/tomcat/tomcat-10.1.52.ebuild | 182 +++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 06525230ad77..77296e656ade 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,5 +1,7 @@ DIST apache-tomcat-10.1.50-src.tar.gz 7282665 BLAKE2B c92a4b5d213279aaf71edc96cfcafce24754a8dfc54e0837722e61ac9b96a8f75bf3cba50697c14164cadf0d1cc687396cd8a4c14e5eabaa9fe85856e35931cc SHA512 d6392d8850e451cb96ba61169e2bf9f3c1585fe806fcdf64257d5e99b4a4f342b4846fed5ba36dcf3eef5a6a2fead8fb535f59419da2f5e57315cfe5ee2fcf26 DIST apache-tomcat-10.1.50-src.tar.gz.asc 833 BLAKE2B e607140e5a88ee4c015b27b3b6e61b985a53dac573d19e6acfe940bbff59aca0f50126803f5ad7d9ca3e5d7ff22205bc4bc60cd79de58ae9abcc7ffb5dbced1d SHA512 b54bed1c11e3a1e95fd13fb74a4987b82af11c0f83f87eb2e01294cd517ec6a4523185b8a14e2527ff52d6c99c654385e13b8fe3cf3e9631263d3659f3074b93 +DIST apache-tomcat-10.1.52-src.tar.gz 7304782 BLAKE2B b9ff4ff1116b205671b9240a9d7f2300463eb069cb554bfc4740c72e3006ab3a628d9bdc44e6772f276894fdf63709e1c46887f4844bdebd53171c68c51f871f SHA512 6da5d15282bf3785f0aed12e497b36bf38678631fc6aef134162b930136e6b32fa8b09c055c3d9bf7713c36f727db59338391a3876e811763b99dae362cba230 +DIST apache-tomcat-10.1.52-src.tar.gz.asc 833 BLAKE2B c2c2812ecad52669ed5892993cacdb48fddc353188341a0232ced6c9c4058b2d07c124138e4eeb194aecb60caee28785ca0dbedfc4bc4b8358805f2983486940 SHA512 f07c25b499c272d284cfc779fd9707349916d5f88fbb6b30a8507dad66c525c827771c15dc6edfed2cba9567c697c4dd0c5202a7c0b5136dd17efb77e2545f2a DIST apache-tomcat-11.0.15-src.tar.gz 7201779 BLAKE2B 82dcdd8a2b8dad6131dd6e9beac498343c55182ca01f43b523d3cdde0c349d8d3a8e0a56d3b2b3e92a77a76bc59ec9a72ffdb45961056e1511e714a839aa87bb SHA512 b1cc6d3420c6bc813bd1db3b6a5831c1106941220de3f042149095884e4dbf8b6fbc36d70bc1a131ee0084b32062fc8039c185cfb75d35ec3ba6dc7bf9cf5f7f DIST apache-tomcat-11.0.15-src.tar.gz.asc 849 BLAKE2B d45e5eeb5cdf9c28765433502ecc36e9550153a5e272d35c809d4f6e76f72e062043cc60d668599d6bd2137ba22349f05f4225c2b6d8dda45b6c72ceb5d5a237 SHA512 5a8e3f8314c9f12b1cf56c90f568200e64fc9c4526d9c10d4b9c555c903527548eaca1b0082c37c662b453000028b969bffb5797e324558704356449423d524c DIST apache-tomcat-11.0.18-src.tar.gz 7227123 BLAKE2B 0fc7fb24ef2b54dd1a1161752f721e7047aec135cf820c68ef1076d76ff5ae5bc77fa76801f7170f0123bf20a738323e13ef4b2fd9281aab234284e55331d110 SHA512 265e97669bc26fd4a52a65ee48da79c7d4a0cfb77a052d790fdd9e7858b8012938b5e7710fbfbbdb612beada73d4cafaf9954c1a8da6c02ed5911a2c16b4806e diff --git a/www-servers/tomcat/tomcat-10.1.52.ebuild b/www-servers/tomcat/tomcat-10.1.52.ebuild new file mode 100644 index 000000000000..48d67a3655e4 --- /dev/null +++ b/www-servers/tomcat/tomcat-10.1.52.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2026 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" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +ECJ_SLOT="4.26" + +COMMON_DEP=" + >=dev-java/ant-1.10.15:0 + dev-java/bnd-annotation:0 + dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/jax-rpc-api:0 + >=dev-java/jakartaee-migration-1.0.9: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/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:21 virtual/jdk:17 ) + test? ( + >=dev-java/ant-1.10.15:0[junit] + dev-java/easymock:3.2 + )" + +BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-$(ver_cut 1) )" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-$(ver_cut 1).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"; +}
