mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
www-servers/tomcat: drop 9.0.65
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Volkmar W. Pogatzki
committed by
Miroslav Šulc
Miroslav Šulc
parent
75e37bc0ba
commit
0806501759
@@ -5,7 +5,6 @@ DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671
|
||||
DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
|
||||
DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
|
||||
DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
|
||||
DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
|
||||
DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
|
||||
DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
|
||||
DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
|
||||
|
||||
@@ -1,190 +0,0 @@
|
||||
# Copyright 1999-2022 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
|
||||
|
||||
MY_P="apache-${PN}-${PV}-src"
|
||||
|
||||
# Currently we bundle binary versions of bnd.jar and bndlib.jar
|
||||
# See bugs #203080 and #676116
|
||||
BND_VERSION="6.2.0"
|
||||
BND="biz.aQute.bnd-${BND_VERSION}.jar"
|
||||
BNDLIB="biz.aQute.bndlib-${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}
|
||||
https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="9"
|
||||
KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
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"
|
||||
SAPI_SLOT="4.0"
|
||||
|
||||
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
|
||||
dev-java/glassfish-xmlrpc-api:0
|
||||
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
|
||||
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-1.9.13
|
||||
>=virtual/jdk-1.8:*
|
||||
test? (
|
||||
>=dev-java/ant-junit-1.9:0
|
||||
dev-java/easymock:3.2
|
||||
)"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
|
||||
)
|
||||
|
||||
BND_HOME="${S}/tomcat-build-libs/bnd"
|
||||
BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
|
||||
BND_JAR="${BND_HOME}/${BND}"
|
||||
BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${MY_P}.tar.gz
|
||||
|
||||
mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
|
||||
ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
|
||||
ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
find -name '*.jar' -type f -delete -print || die
|
||||
|
||||
# Remove bundled servlet-api
|
||||
rm -rv java/javax/{el,servlet} || die
|
||||
|
||||
eapply "${FILESDIR}/${PN}-9.0.62-build.xml.patch"
|
||||
|
||||
# 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},tomcat-servlet-api-${SAPI_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} -Dbndlib.jar=${BNDLIB_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 glassfish-xmlrpc-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() {
|
||||
elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
|
||||
elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
|
||||
elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
|
||||
|
||||
elog "To manage Tomcat instances, run:"
|
||||
elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
|
||||
|
||||
ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
|
||||
ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
|
||||
|
||||
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."
|
||||
}
|
||||
Reference in New Issue
Block a user