summaryrefslogtreecommitdiff
path: root/www-servers/tomcat
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-10-15 11:27:17 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-10-15 11:27:17 +0100
commit24968da221fcb0848cdb4dc82a8d39b7f2ee7861 (patch)
tree9424c48116aac52891212771adc326c7b7df2185 /www-servers/tomcat
parent90cc39f2232ae2db1954af4df82965ad2960c174 (diff)
gentoo auto-resync : 15:10:2023 - 11:27:17
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r--www-servers/tomcat/Manifest3
-rw-r--r--www-servers/tomcat/tomcat-9.0.82.ebuild180
2 files changed, 183 insertions, 0 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0e50d074ceff..9398f49c154d 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -12,8 +12,11 @@ DIST apache-tomcat-8.5.94-src.tar.gz 6119709 BLAKE2B ff1dcedd285eda225391b93f7aa
DIST apache-tomcat-8.5.94-src.tar.gz.asc 849 BLAKE2B afbf8426f0801dd1ed43a0e535a436b2977cc152df2e38d370f025024d24d4d8a87d8519287395204c69f69aad3b38d1b7c65d889e14500ffb9dbdcbaf0fa4a7 SHA512 17ffe4a0fb46c6cf8aa0995121a708f1069521ddc1a5580108abd2167da1775ccbafe7ebceb14ae30955a8d5180ceee339f2cc8555309c0b4c4166576fbc9ef7
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 apache-tomcat-9.0.82-src.tar.gz 6285653 BLAKE2B 026a3f5ec58ff78c1fe0a30507ff36b9e407c5b1d8d1902a4a94b9aee8f97ac5fc9234bc1aae50e001fb9ff05369c6445712faaeb508b0d63f18271e774676e4 SHA512 0291196832150147230a263bcfd64f7ac9ce9f6c26924f72b831d28479e7886f00b9ab3adff175785e8c5b47d8b16f7a7897acafa3474428f48cec02fd852b3e
+DIST apache-tomcat-9.0.82-src.tar.gz.asc 833 BLAKE2B 9874c7ee35d5d4d3ec352799bfc7cfb4b866d3f7da4e2619ac48c212de46dd90510ec36b44409602967bff1c863b60428ec8ca60689814adbb12e83f7ecba695 SHA512 fdb9c5f0004bbf3192cafd4b66bb479de251934a0b82eaaac9bb77894abad3269b383032220ef076f4327e6ddd5b1e76a78917b6b46f467a030351eb5fd5f749
DIST biz.aQute.bnd-6.4.1.jar 16296222 BLAKE2B d2229eb221dcd87ddadccc48d83f1d86c95f7fd2e551b0523d58d1e14dcf0899201f96cb09c60ada9cd9cb3b6fe5201a68e8a9bb93258d06ed29baebb4fd9260 SHA512 a9b53265fffe48934666b26e5075cb96fac4c3d4cf7273358e551e741adbb58b469eb718022e9b31088d80961c649fb23027a3fde50db1ee0a72ada55df0e96c
EBUILD tomcat-10.1.14.ebuild 5432 BLAKE2B b444613867e4c16731e5633e4d73cf0db8f64a88d264f441388a73d928e5511e709d61a9a8ff6f2b7a1571207f29d9b46b93a8817f622a222f884a0ab725402e SHA512 c05d3f8d76837be7f57b2299e668cf6920a4c734019cebdb707a42a8e923480ace314b16e49e9bc2bd5ffe380eb05733ce875f53706db76d08a39c1ba77ce0e2
EBUILD tomcat-8.5.94.ebuild 4636 BLAKE2B 16d14d1b7ad61614010e6d3eb5cbf25f9545b8737d30422ad3ba140e40a686ae31ae091fc481f4d8835fd1cd71f44b9930c6cf41a561ba5121156088d6693f69 SHA512 9729f7813e53c57908b37d71d113df349880f1993ba6814f7470599960cfda8188d662d532c000338ed091ec3bf6bee7f5a4ae267cc7cd1cd232e800a0ff4bdb
EBUILD tomcat-9.0.81.ebuild 5281 BLAKE2B cd971449b5aca9d9901e658c6779727c1b2d1fe26ca518112bfa6efe965f0186f15a608bfebd270aa4b9978ebeac7232f423d7c9647051bb1274a01dcfd6d55c SHA512 7ff66e617afb64716d6eb7c1139eddebee65381f944f181995f9915388f94d568e51762ea2c7ae250dd4949b4041019bf057e4e3001af5dd70754aaec980f021
+EBUILD tomcat-9.0.82.ebuild 5282 BLAKE2B c757afb4524031287836406c7fe81eb63a77c55d9ee0ecba629b38fb77c370ba614fb44a24ed27dd048af5113088ffa951204196425ef18b1968d5f124471d72 SHA512 a66febd6e023eb03b0dba16e0830a3d103f9d83f7c0494658954c6a06369e0fc2c9e33950f72c934160f6248037864e96bc43942f6f89976fa64466b8f758100
MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-9.0.82.ebuild b/www-servers/tomcat/tomcat-9.0.82.ebuild
new file mode 100644
index 000000000000..9c3072977f33
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.82.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."
+}