mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-04 12:18:08 -07:00
www-servers/tomcat-9.0.24: bump
Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Miroslav Šulc
@@ -5,6 +5,7 @@ DIST apache-tomcat-8.5.42-src.tar.gz 5293083 BLAKE2B 4439b6a894aaa8d8db041ff25d3
|
||||
DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f SHA512 f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7
|
||||
DIST apache-tomcat-9.0.21-src.tar.gz 5717051 BLAKE2B 004c5256e72c62e885a9d9040396d144d9fa73789a9699eb38210212f4ca6fa5f98c4b092f6fa2165166fd8cccc892eabcaee7a21570645ee057b0b61d3e1942 SHA512 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f
|
||||
DIST apache-tomcat-9.0.22-src.tar.gz 5722896 BLAKE2B 1a006840e870ec01455285b324405e3d1ab7214daf9ea929be749a05149d6b84bcccf34787ba791a31be0d2bb295ede0dddff5053adef885080b31bc39e24ac1 SHA512 b3806caaef24821fb4b96fb1af86e0c04381d9e8943a9f94064e028e623f57b6f2ba056e62f1997bbca934fb929ee92ffecd0d0192dd08d59e2f7dde6848c5cf
|
||||
DIST apache-tomcat-9.0.24-src.tar.gz 5746934 BLAKE2B fe0ff76fd8b3caa2860c0798d66f0dfff1e907ca02d10913c768d8513b207ef11e8fe885cd7578348136b8d007e08ccc2044952198259ffcdb2d58acf9fbb8b6 SHA512 de11d0e992cce08edb83474bd4cab04857e3e2bf63ef334c8c9f3ad053edcc76691e831cc95b8c489b820773a6fa5d2755837b470d73471f9587bb7062d75a31
|
||||
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
|
||||
DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
|
||||
DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
|
||||
|
||||
182
www-servers/tomcat/tomcat-9.0.24.ebuild
Normal file
182
www-servers/tomcat/tomcat-9.0.24.ebuild
Normal file
@@ -0,0 +1,182 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2 prefix user
|
||||
|
||||
MY_P="apache-${PN}-${PV}-src"
|
||||
|
||||
# Currently we bundle binary versions of bnd.jar and bndlib.jar
|
||||
# See bugs #203080 and #676116
|
||||
BND_VERSION="4.1.0"
|
||||
BND="biz.aQute.bnd-${BND_VERSION}.jar"
|
||||
BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
|
||||
|
||||
DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
IUSE="extra-webapps"
|
||||
|
||||
RESTRICT="test" # can we run them on a production system?
|
||||
|
||||
ECJ_SLOT="4.10"
|
||||
SAPI_SLOT="4.0"
|
||||
|
||||
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
|
||||
dev-java/glassfish-xmlrpc-api:0
|
||||
dev-java/tomcat-servlet-api:${SAPI_SLOT}
|
||||
dev-java/wsdl4j:0"
|
||||
RDEPEND="${COMMON_DEP}
|
||||
!<dev-java/tomcat-native-1.1.24
|
||||
>=virtual/jre-11"
|
||||
DEPEND="${COMMON_DEP}
|
||||
app-admin/pwgen
|
||||
>=dev-java/ant-core-1.9.13
|
||||
>=virtual/jdk-11
|
||||
test? (
|
||||
>=dev-java/ant-junit-1.9:0
|
||||
dev-java/easymock:3.2
|
||||
)"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
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"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-2_pkg_setup
|
||||
enewgroup tomcat 265
|
||||
enewuser tomcat 265 -1 /dev/null tomcat
|
||||
}
|
||||
|
||||
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.19-build.xml.patch"
|
||||
|
||||
# For use of catalina.sh in netbeans
|
||||
sed -i -e "/^# ----- Execute The Requested Command/ a\
|
||||
CLASSPATH=\`java-config --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},glassfish-xmlrpc-api,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_compile() {
|
||||
EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
|
||||
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