commit: 609f79fdfb476bdb305a18b6a022b9ba0f427fcf Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue May 13 08:05:58 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Jun 18 18:50:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609f79fd
www-servers/tomcat: add 11.0.8 - Restricts to || ( virtual/jdk:21 virtual/jdk:17 ) in order to avoid "Incorrect bytecode version found" when built with jdk-25. - Registers jakarta-mail as runtime dependency Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/42067 Closes: https://github.com/gentoo/gentoo/pull/42067 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> www-servers/tomcat/Manifest | 2 + www-servers/tomcat/tomcat-11.0.8.ebuild | 193 ++++++++++++++++++++++++++++++++ 2 files changed, 195 insertions(+) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 9547842dc7b6..64f9518a61d8 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -4,6 +4,8 @@ DIST apache-tomcat-10.1.42-src.tar.gz 7224728 BLAKE2B 5cf0d5ed4f17dd77272a78855d DIST apache-tomcat-10.1.42-src.tar.gz.asc 833 BLAKE2B 75c261cdabf9bfb52e442cefa4b7b96dbd61252c2ead3f01cae2982c7ef255db07163a081dc9da4c45b08ac40e6eeaa23eda806a4f39f83894fb857bbf52624b SHA512 22d6c5df53a6315003338d91be659ad8ef2f42bfe772947645b6af349fd4d570968618a3d6a2f9ef203fe834c5b64b442a913d14da00e91bee9db9ade2bad29a DIST apache-tomcat-11.0.6-src.tar.gz 6923455 BLAKE2B 1381bfe42390235e9726c5704ff943707b3f8f776a25ca8093f013b39bdcf219eb43e0151eafda7d86b9d7f4f2f6d4d117bc9f9be46b77147287387109967771 SHA512 83ac60a058eb1fdff77b94708cd1c54efe7754b2dc4db6fe9ebae58791db74901a9646707d3e5f34856d134fa9a50e77866a3c1726dfec7622b064cee3265b9f DIST apache-tomcat-11.0.6-src.tar.gz.asc 849 BLAKE2B 21ac13391c6fe25496ede76af999032dfaec14edb3d8babe99bf63f6fed047eedb240c4aa557370d787c62cf2169a7e4333a036231f81f2684b4407b30fbf55e SHA512 9a42f9a7264c8f757b710b1cf6ab0642b0446838b56644ef51799b0f2c7202d03e7fd57d89e6bc42fedbf8ab42838128151554d5109e5206ca36853e3b9eab9b +DIST apache-tomcat-11.0.8-src.tar.gz 7145586 BLAKE2B 05a7f94f9b0d907ffbc4b0bc5a7638c236e3d218846155134d558dcfef9357175920dc83913c771a05f5874380a11c82b671c9654d2d71a2110aae87b259c067 SHA512 6e266f3fbb9ed8f8308bf4d5cc8644700864e26d75e6d94b2306bd4c5ca72bae42e98ed3ebf54769956a191f039b354e9f901bfbe64a182ed69e78abfaad6f7e +DIST apache-tomcat-11.0.8-src.tar.gz.asc 849 BLAKE2B c0531021bb03030afec7dade9b5d894b7fa6ba32fa2c688b9d4c311e2ddbf2df05af9c8fa359545bccd402445f8f31d0e905cd30775fabb322fb480bb0da806d SHA512 50fa400f572203c985a4d2b5602c2a515a7ac4ddb81d0c56f526c5e5aa44b0e1110c7894a55c4c9a62d5f5495c4d28dfa45250524e44a8ea8a8399139c9b0f74 DIST apache-tomcat-9.0.104-src.tar.gz 7141508 BLAKE2B 125a38e2e46e190e84368f7269968b5724cc84dea0b1ced5f6edf0fc2f494b6fb60d70b27fc046ce4007565b428ad922c3e14ed8b0f1960726b0cc67d01d95af SHA512 d2d66a1e0bf55cd6379154a023aaccec5e4007a95412e7207ecf729d315c6afdc3125a985cdf1289ad66162a180f24798161436e99d792e24deee71aaf521a4c DIST apache-tomcat-9.0.104-src.tar.gz.asc 833 BLAKE2B 2d42e131df4c42dc831c0d0b8d2068083c5812e500737e84f3c6a37a1a695311e871b2c1ad7bacbdfd53b2400fe1211039bdcfa48908335551bef99a5de7da89 SHA512 533f81f8dce8f840c19796d306565aff4bd16797dc3c2786ae6a748e2b91214768849036477d465e1de522880458bc35e38424a2cd30e13152561df575af7947 DIST apache-tomcat-9.0.106-src.tar.gz 7365623 BLAKE2B ee1b2025b99deab2c845fc0ebf0a651786fa947a42b20287a20b93da7d4bcd58470654d816f91c70be09293893d67e6df83bf05a7050178a52592f5d0a740ade SHA512 1b95f7899a488bd3435ab45999e371a9d8cdd42e4e575ae14b4fcb0387034d150d96c8d62d036b95fad187c810015eda43db50a46919296812653c0a153e8cee diff --git a/www-servers/tomcat/tomcat-11.0.8.ebuild b/www-servers/tomcat/tomcat-11.0.8.ebuild new file mode 100644 index 000000000000..a9f34c39647e --- /dev/null +++ b/www-servers/tomcat/tomcat-11.0.8.ebuild @@ -0,0 +1,193 @@ +# 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? + +# We use ECJ_SLOT="4.33" instead of "4.35" because "4.35" would need Java +# version 23 or higher to build which is not keyworded: +# To use "4.33" we also added "tomcat-11.0.6-avoid_eclipse-ecj_4.35.patch". +ECJ_SLOT="4.33" + +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.7-r2:0 + dev-java/wsdl4j:0" + +# jre-17:* because of line 1081, build.xml +# <filter token="target.jdk" value="${compile.release}"/> +RDEPEND=" + ${COMMON_DEP} + acct-group/tomcat + acct-user/tomcat + dev-java/jakarta-mail:0 + >=virtual/jre-17:*" +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-${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-11.0.6-avoid_eclipse-ecj_4.35.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 --build-only 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 --build-only 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 + + java-pkg_register-dependency jakarta-mail + + 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"; +}
