mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
www-servers/tomcat: add 10.1.43
Bug: https://bugs.gentoo.org/960748 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/42902 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
@@ -2,6 +2,8 @@ DIST apache-tomcat-10.1.40-src.tar.gz 6995521 BLAKE2B b196e637d488501cf6b309d452
|
||||
DIST apache-tomcat-10.1.40-src.tar.gz.asc 833 BLAKE2B 5b28148654ea28d637529f40388c9f1f0a9f415f131a4ee25c6b0667da03ee5e071363490c5b966b70c01e4efc9184f2f834307726ee2b06320870d2bed98e81 SHA512 0b2f3aa14613dd507d11451b922cf570e065f13f7f070a62805ccaebb2fcd2c3ae3ac66caee5d6161d94ec0b4706e314643a1465c8e7988ba34a936eff96f29c
|
||||
DIST apache-tomcat-10.1.42-src.tar.gz 7224728 BLAKE2B 5cf0d5ed4f17dd77272a78855d74ec64cb7e34da2ad1391f839228efca8dfcfdce6e17ec6d139ca1d92982ef25d6fa4154b443d5edf8a973883ffd0f60517a3b SHA512 bed9b8120728addeda86fd87c72af9659f4195ff11701f2b3d92f0a059adfc1f33e0deacef1cba2586af26e70dfaa4b0440aadb60f9e677b195d559c25a479c3
|
||||
DIST apache-tomcat-10.1.42-src.tar.gz.asc 833 BLAKE2B 75c261cdabf9bfb52e442cefa4b7b96dbd61252c2ead3f01cae2982c7ef255db07163a081dc9da4c45b08ac40e6eeaa23eda806a4f39f83894fb857bbf52624b SHA512 22d6c5df53a6315003338d91be659ad8ef2f42bfe772947645b6af349fd4d570968618a3d6a2f9ef203fe834c5b64b442a913d14da00e91bee9db9ade2bad29a
|
||||
DIST apache-tomcat-10.1.43-src.tar.gz 7226931 BLAKE2B 284f1d094a1a08180b372b7973120e7b735b520a013c48f5b6a31fd62820b46ee74b8278e3f3b90b23a5eb91ab8d12e9d8c9c984679fa74b66a75b39db2f92ae SHA512 24672a4ea4d6e0bfd5e7dbb8694f260216bea47f21c347dd549d3e0851915aa7616695356cbf6714780ff1527f346ad2119f7f52f66779c4d0510ad0f83e9978
|
||||
DIST apache-tomcat-10.1.43-src.tar.gz.asc 833 BLAKE2B bfdf4eda2ae7e7c735e4efd2cb4d0b2b69da720268259d67522bb25c4b86a8d512256a8b1ae4b2ed13abc82d2953d7fabc6c24006d10674846fde623d44fbd92 SHA512 baed33b8a8a9196ba97290e62642fa1bbd0341e46752b3391ff871b5a802b327103bfb02ee33bf549dd246a7a38beb3b8f8ceb7ccb5962c67ac7987a3b97332d
|
||||
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
|
||||
|
||||
@@ -0,0 +1,182 @@
|
||||
# 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.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/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"
|
||||
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-${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"
|
||||
}
|
||||
Reference in New Issue
Block a user