From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 74FB1158013 for ; Wed, 13 Dec 2023 22:01:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8D472BC015; Wed, 13 Dec 2023 22:01:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 932872BC015 for ; Wed, 13 Dec 2023 22:01:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A368A335D76 for ; Wed, 13 Dec 2023 22:01:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21AE011C7 for ; Wed, 13 Dec 2023 22:01:23 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1702504872.b215eb6614874987c6767b0c19f2b575e10e10fd.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/tomcat/Manifest www-servers/tomcat/tomcat-8.5.97.ebuild X-VCS-Directories: www-servers/tomcat/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: b215eb6614874987c6767b0c19f2b575e10e10fd X-VCS-Branch: master Date: Wed, 13 Dec 2023 22:01:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cfe8c54a-e6f8-470a-b160-b9cd019ed50c X-Archives-Hash: 09c825710cf71ac429c1987b0b101ea1 commit: b215eb6614874987c6767b0c19f2b575e10e10fd Author: Miroslav Šulc gentoo org> AuthorDate: Wed Dec 13 22:01:12 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Dec 13 22:01:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b215eb66 www-servers/tomcat: bump to 8.5.97 Signed-off-by: Miroslav Šulc gentoo.org> www-servers/tomcat/Manifest | 2 + www-servers/tomcat/tomcat-8.5.97.ebuild | 157 ++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index cfd1b9e8fab8..5d7f5cf91b2e 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -4,6 +4,8 @@ DIST apache-tomcat-10.1.17-src.tar.gz 6157591 BLAKE2B cd7b21a5ac698570914598bb72 DIST apache-tomcat-10.1.17-src.tar.gz.asc 849 BLAKE2B a517cfbddb778002c9e32e81e2bcb55e9e91a4f77909ce93736c86294dbadf8262a0dd178b236b9119a2d4c1e63367af7dfa19372f76f66519cd2bbd6ad853df SHA512 b0e5937ae0a4960d709a8d120caf7e91cc0af3650d6428e3165c880506f028f451ceb64a2318dd3e9d40bad69c6bf711a0e082ef2497fcbe55e201c87e84a6c1 DIST apache-tomcat-8.5.96-src.tar.gz 6135041 BLAKE2B 7bb00cb835f1c56a9eb79ab44333436782ed526bc22ba31b2522323a0ab7c80384b76d049e2d9f0703a07cd5ecd449995125b2b7ce319943ab85b65f7acb66ff SHA512 3d2652e06d81eb014623bf1b0f03c238f330487682a255a4ed37a2b722f99194d08e3083b491d962917bc21cfbefd44f0e7808248c6b90c6a87db292138144dd DIST apache-tomcat-8.5.96-src.tar.gz.asc 849 BLAKE2B 2f1e20008cdad11bca95146542566c64956b79ff10571b7bc8068fe65cf3025e190bc43f94d29511f12c5091f79f2a69a02afeff51f8e78aef7058264c32e35f SHA512 fa86689b1438d39ea1fbe376cef2941d09c572fba2f1aa2d4f63cfa238da94880d4e8eb6403175073bfa379434abf0571f4b85c3789714a04183c416db94f25f +DIST apache-tomcat-8.5.97-src.tar.gz 6142056 BLAKE2B 8aa2078d88fe796631c5fa5a611b84ea1622d44e4ccc4ce8bbf6e494d8bd17324fcb849d55dae3d20c9197743712e1b31f3144c3e1c1fba094f271114d439014 SHA512 bb2aeac13cf953b98faae35eaf4b9d95acbe334088f26acfe9ae3a0cc1429a5e56c43a6c29829f52472e6abef9077477f38f8b759972c6f11f7fc3143d041eda +DIST apache-tomcat-8.5.97-src.tar.gz.asc 849 BLAKE2B 920009a2da8a7d98bb358575a59e0163f6bbafc661fddf8edb1e402623ab41c7faf99fb56f3d6979e7d53987f3d27333674dc539f6e57b8eac3f2abcbe74ba02 SHA512 c35f3e4280dd618ec3b91d56a35c25ac3e27b16df1863466bc24a676a9f3e5a676448ba4952f1c13c57d059eedd34505217c86b9cf395a452f8a3c5132f78569 DIST apache-tomcat-9.0.83-src.tar.gz 6300235 BLAKE2B 207f617e6af89898be2a120376d6ee926ea1b67becfeb4e35ab7eb1c97aa09a59d714e642722f3cfeadbc71d90f49b483a02d1d2d909fdf1f28954ff8326e0f9 SHA512 28e112a9d01918434ad03c414058275bbc4e34be408c2cfe2d819c3a08cadc3c31920e279c5312529aa2f5abf1e002537012c5f06d43ba8894448afd5585c231 DIST apache-tomcat-9.0.83-src.tar.gz.asc 833 BLAKE2B b9aa578aaf28db7837576e19ab7d3443546d29c087789c9a98650b75c387b4169c0d2b16b7dfabb1d046972a6b78b82462d5d44c85c964903627702bf31037e2 SHA512 f8aa1859e79e403587feb7c5dad44664b68f1627f953d65848e53e971cd30f2addc94572849119031978a33114a90e64e2a50fb2a0e0be3c26bc5f31ed196e3d DIST apache-tomcat-9.0.84-src.tar.gz 6308431 BLAKE2B 34e06e408cf27ab0e0748814df6c97905c40b6415038a67cca161f9c249cfbf26234edc3efbc6f508cc2e0a3742f2c7678e897222e2447ec5b18c1d78c26a6f8 SHA512 380db944f8ffd130406182ac22a4f8e4dbaaa54d74cd062261d8ff86eaefa6162a7b01fc868b66999b9ee45450ad1ec3064790166c5cb47fa4bfd7c9eb680c04 diff --git a/www-servers/tomcat/tomcat-8.5.97.ebuild b/www-servers/tomcat/tomcat-8.5.97.ebuild new file mode 100644 index 000000000000..571c2a833db2 --- /dev/null +++ b/www-servers/tomcat/tomcat-8.5.97.ebuild @@ -0,0 +1,157 @@ +# 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-${P}-src" + +DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz + 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="8.5" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +ECJ_SLOT="4.15" + +# we don't use ~ for el and jsp because the same implementation +# is also present in tomcat 9 and it would be impossible to install +# both tomcat 8.5 and 9 at the same time +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}" +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:* + doc? ( + dev-java/jax-rpc-api:0 + dev-java/wsdl4j:0 + ) + test? ( + >=dev-java/ant-junit-1.9:0 + 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}/${PN}-8.5.86-build.xml.patch" + "${FILESDIR}/${PN}-8.5.95-min.java.patch" +) + +S=${WORKDIR}/${MY_P} + +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}" +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 -Dexecute.validate=false" + +# 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)" + use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)" + 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." +}