commit: 2bffc67033fdbe7de839adb1568e13d94e0efca9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 12:40:53 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 12:40:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bffc670
www-servers/tomcat: bump to 9.0.81
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/Manifest | 2 +
www-servers/tomcat/tomcat-9.0.81.ebuild | 180 ++++++++++++++++++++++++++++++++
2 files changed, 182 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 224a10586cc3..ccc6240c1c96 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,5 +6,7 @@ DIST apache-tomcat-8.5.93-src.tar.gz 6106306 BLAKE2B
ca9a05902b492696ca89db5017d
DIST apache-tomcat-8.5.93-src.tar.gz.asc 890 BLAKE2B
b3f64af8af6652657f76ff216e003a647bb278a8f5770babdc74f904a02bf21f91810d74d64efbbfc547282c39a14b72542dd97fad50630061207c75cd0b234e
SHA512
7b3afd083bc353680df40daac2053a52afa0bd38a902f6acd54bfd27bd274597fd40206c7b8a053223dfaf344b02b416071f662c928e3d43715f4a4f106fad79
DIST apache-tomcat-9.0.80-src.tar.gz 6272358 BLAKE2B
025e704d44e5c7576b1f96f01ab375e29771da2bb8539c88aa374afadfb15072070b2021766d8ed3b67a77b9d43782dd480f5d8ec4842bf942c5ed6e4f59dd72
SHA512
a2fb298c1fd2615e1a69371b5f84eb569e897faad3cbe17e3626460f5ce311085c120dd3f62c255fde87e6517915365ab52ada613776d45185b8e53624935114
DIST apache-tomcat-9.0.80-src.tar.gz.asc 890 BLAKE2B
c4620b61c1902c3a908aedffec22e215c72c43dc6844a32bc5de9ac13f39b5e09da7898150f6ec4f1af250d8c366280976f424e603a9a7d56f5fdfdbd773ab00
SHA512
019cbe91b7a6b34bbeaee3117b9fe620749845025d7a699179a1dd6acb9cb9169e5af506bbe515ddf0c66726832bb4c8cf9c0c5870f3f151879706309bab754f
+DIST apache-tomcat-9.0.81-src.tar.gz 6285750 BLAKE2B
ba3839ca0b4a9a4a49e3ae454f8e78cb0f4066e3313f416bba19c63e262f7ad3cea0edcc9f7c9650f9f253a412726fd3b1a268b6e35a98f9ad1bd32bc7dd4af1
SHA512
db17b8fe44637b8394ce3a12c5122899c46e62e7049c3dc5fe03b99569b544c7a552f2689df01721a5e52351421747070c9e83a3f4e64610af17235aba1eda6a
+DIST apache-tomcat-9.0.81-src.tar.gz.asc 833 BLAKE2B
50b502c5364a64ab6b91c87cb2b7fc82b40774d4782c284616f88aaebc16e83b76c759705e3538d3f91a293ca216071a30f56b1a1ee77ad6054e01105b8b307d
SHA512
e36c6aedebd5e02123f36c6c8713f190b91186cf91e06551182883115fedf7d4b1a1aaea7b50d56ff2b7aafcc64c8c4911b8677e4a07bfb60853c7059361ff9e
DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B
73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5
SHA512
b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
DIST biz.aQute.bnd-6.4.1.jar 16296222 BLAKE2B
d2229eb221dcd87ddadccc48d83f1d86c95f7fd2e551b0523d58d1e14dcf0899201f96cb09c60ada9cd9cb3b6fe5201a68e8a9bb93258d06ed29baebb4fd9260
SHA512
a9b53265fffe48934666b26e5075cb96fac4c3d4cf7273358e551e741adbb58b469eb718022e9b31088d80961c649fb23027a3fde50db1ee0a72ada55df0e96c
diff --git a/www-servers/tomcat/tomcat-9.0.81.ebuild
b/www-servers/tomcat/tomcat-9.0.81.ebuild
new file mode 100644
index 000000000000..9c3072977f33
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.81.ebuild
@@ -0,0 +1,180 @@
+# 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
+# See bugs #203080 and #676116
+BND_VERSION="6.4.1"
+BND="biz.aQute.bnd-${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}
+ 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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+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"
+
+COMMON_DEP="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-core
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/ant-junit
+ 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"
+ "${FILESDIR}/${PN}-9.0.72-build.xml.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BND_JAR="${BND_HOME}/${BND}"
+
+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}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink
bnd-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # 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},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}"
+
+# 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 jax-rpc-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() {
+ 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 and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for
more information."
+}
