commit: bfd87dd2b9ab61088a75b46a2f442c3210629c29 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Feb 19 06:07:18 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Feb 19 17:05:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd87dd2
www-servers/tomcat: add 11.0.4 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/40647 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> www-servers/tomcat/Manifest | 2 + www-servers/tomcat/tomcat-11.0.4.ebuild | 185 ++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index f64aded806f9..665c50c6890f 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -8,6 +8,8 @@ DIST apache-tomcat-11.0.2-src.tar.gz 6877090 BLAKE2B 3ed1b184ecf43d12678d3682830 DIST apache-tomcat-11.0.2-src.tar.gz.asc 849 BLAKE2B 0e670e67396068747d5371da13135696be8b4555892e1cd8338413f7540ded08203c986074cfe42bd077e475a30a05299fd35def29e8a089e570e68be473366c SHA512 ae10b95f4a5a9e922721d190ff9abfeeb62d5814277b076e1d12a5dec64491de8c382273a1b4ccc3f3d193ce561ba34214334048a9e28dcb22a50458d9103016 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-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 diff --git a/www-servers/tomcat/tomcat-11.0.4.ebuild b/www-servers/tomcat/tomcat-11.0.4.ebuild new file mode 100644 index 000000000000..db48095019e5 --- /dev/null +++ b/www-servers/tomcat/tomcat-11.0.4.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 +# <filter token="target.jdk" value="${compile.release}"/> +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"; +}
