www-servers/tomcat: add 10.1.33

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/39270
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Volkmar W. Pogatzki
2024-11-11 19:13:12 +01:00
committed by Miroslav Šulc
parent 02f82df42a
commit 3355961f7b
2 changed files with 181 additions and 0 deletions

View File

@@ -1,5 +1,7 @@
DIST apache-tomcat-10.1.31-src.tar.gz 6898465 BLAKE2B bcc4b1e973be8f83a02b046bd0df046367d1eaef897e0e5ef88127ede77988ed97243e39f240542a24ab81ffbe3d97abef81a39b790a63e2319e1990c2aacb84 SHA512 79d4052935c6f1757de34cd5cab1560095c901764d363509d84a3c77527e146f38776c78ae934adde19cf04d863b0e6010adba5cb403dae1ff48bdc99e9126e9
DIST apache-tomcat-10.1.31-src.tar.gz.asc 833 BLAKE2B 59d59001cdaa03d52ab807689959349b41d59fed0a896106567c8fc2392966aa365c355fd1ac944943e0571202a088c3ebbd439b62b8e446a1d48c001d9d7be3 SHA512 11f917d616ea00c1d53b7e439cfe0033fa922bb8a0a3c4d430e3bfae536c24af0de5fbba4ab99b2cd84dc0e3b4f98a5ac4c8fe776e2d2f2fb7335fef6a7c78b1
DIST apache-tomcat-10.1.33-src.tar.gz 6926625 BLAKE2B 4502c02d618569eb9f526769877f0817722d4a474a72ad9020c2fbf86ff6ec17599df547d019d81656d433a22efb7d81c56902e435bf3fde636849957070cdd5 SHA512 63ef609bbb2d664f5fe969216eee157a3f45f040f2aa90b6885c9ebe706099896beb620b7659d2dc8c759a08a0370d7849f5e664844e3b78bc82d521617bfd8d
DIST apache-tomcat-10.1.33-src.tar.gz.asc 833 BLAKE2B 8bf20910fbefc277cf7e677c06aa3476ad4190f38fafb820063e4af59854d955666ff77eede13e6a7a952a21b88d169d9601655dcfcd38682f87db5522310e2a SHA512 111e8d7c7d7d365a8fee2207307fb64685a3c77e1b87a73ede8fe87a083e3e2f3425c41ca6072f6ded51ba6e59ff2997b7198f048d86daa1a947a91fcfe276e4
DIST apache-tomcat-11.0.0-src.tar.gz 6827697 BLAKE2B 7568d29fea915cd0dfbb62961eac1d864c8760706b1f76c6244c124ee3f00ea650b5a702c11439352cd5de9515dded91958666d6bf45bba7745ca5dbd53caf1d SHA512 1628ff115e3c44a6f66051e78cd5910bc9a748d1f47f484098b3a24c10c50b74c554997d35558e8e563694f718a9017c0f2ad33f4159d206dde1c838369ec426
DIST apache-tomcat-11.0.0-src.tar.gz.asc 849 BLAKE2B a6974cd097f30f2b46654362d1f05d9d02d82c5c6c2555500a42b094ab1835f70c700b7b3f6994a794bc2532a9f81cccd0cf81f66ef37626d278a7bc9f1c64ed SHA512 745338894fe8f579ec51b9b18d43c7419af8756bd9adcfaefb3eba8a8bd6cf0436fecfb38decc4accb3b47f89ca7a513077bf05a3968d0df8f9927b6b99649d3
DIST apache-tomcat-11.0.1-src.tar.gz 6857402 BLAKE2B 7e8b006454578328b200a2ecb93ab6db7f5db19c9a7be5af794cd90cf72a6836170c1ca8228b89c132ef42adedbc4a6ac4ee0b0c11ab77cdd3180cbdd40ad394 SHA512 9e05a85331d5c868b149476e8bad4618c4608cd82d425c2bd907c1c4888e7d7e8eebba623ad7e5ded03123e089a1a8c271f69d4d9c62c3829634fe145b668588

View File

@@ -0,0 +1,179 @@
# Copyright 1999-2024 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"
}