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 0D24A15800A for ; Tue, 15 Aug 2023 08:52:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BE152BC02E; Tue, 15 Aug 2023 08:52:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 210022BC02E for ; Tue, 15 Aug 2023 08:52:58 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D0DC340E43 for ; Tue, 15 Aug 2023 08:52:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E108FAA for ; Tue, 15 Aug 2023 08:52:55 +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: <1692089556.91be779853d1cf2399be22640f1610e3e03ac592.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-10.1.12.ebuild X-VCS-Directories: www-servers/tomcat/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 91be779853d1cf2399be22640f1610e3e03ac592 X-VCS-Branch: master Date: Tue, 15 Aug 2023 08:52:55 +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: fb008201-d906-4ad7-ae56-af61f37a5a02 X-Archives-Hash: 600b7e211805d0b633d6b87be13ef776 commit: 91be779853d1cf2399be22640f1610e3e03ac592 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Aug 15 08:52:36 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Aug 15 08:52:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91be7798 www-servers/tomcat: bump to 10.1.12 Signed-off-by: Miroslav Šulc gentoo.org> www-servers/tomcat/Manifest | 2 + www-servers/tomcat/tomcat-10.1.12.ebuild | 181 +++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 504acb09a239..7b27d12df29e 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,5 +1,7 @@ DIST apache-tomcat-10.1.11-src.tar.gz 6118924 BLAKE2B 0e97bafe7a0451c34d16f2c3ae37263d09746d3b240d0770970ccaaefa05d1a6e0687e17db5dd71ca6b305a6b9fdf2fd58e86f97bd07fd60ff239f5f262a5164 SHA512 5c722344bb5886fb33ef70f81d5e2500e6c8446b628cb118ee5fac710ee1d7f4cfbd134eac6955090cc0ba99518e3ddd18970c5f16793f51f089249959ec088f DIST apache-tomcat-10.1.11-src.tar.gz.asc 849 BLAKE2B 6427668fe4f93b1de322bafbefb9ef6ac47baca8d8cc56bddb267a35bd280792ce096971a032eacb04c0322d68c21af32b681d9ef9ba006c78dde489247429d0 SHA512 6895f874bf1265b2cab94594ff542d0b9760afaa70f1486b882b25593878470ab8a4d399cf5320bec9ae9d18f2a881f59072f0909345ddeb42d549ded460f791 +DIST apache-tomcat-10.1.12-src.tar.gz 6122423 BLAKE2B 6de2189e415aba38168ebf09493e96d5906a72e77cbb5af358144e510e6de9fcb342db83c64ac6827ec8e03ab7402e24648b3cfb1a5385153a85dec71d2c55a9 SHA512 f383a4f401c21cb1acd93b6446fd915ba41da9a67c2538d7177a90238adc3294d260f29ef2ebb72e300cb93b4a7a42090e1c3b478b5deea344eb3d19992a9fd7 +DIST apache-tomcat-10.1.12-src.tar.gz.asc 849 BLAKE2B 8f1f5cb35a24fe22999b0ba68b50e1fe4118b3a645d3c991c55161448356d505d6b953e40d70b4fd5e17d20e63f873d04388f315b96eb4fdc2025d1ed7b897a0 SHA512 1f3cbdf57e289013111726f14f868dad69f9c24faf375497408560e8b46ccf131a79095f097378ea2cdfcc802120a65d7a36e655ce62361bdb7511cb9cfa3c70 DIST apache-tomcat-8.5.91-src.tar.gz 6098592 BLAKE2B 026fb19cb938986401e95f5441c5a775c73bf31b5ca23c8be54d30a710fd9a5badd0ed9360598883ed641056594c3f471c21c834f79af3cdb4a879bb54402399 SHA512 f3a69630e3cd144c74ea3edce68f8e39bc67e734bf02822caf7c6e59a2e4db404a5c0bdf40a22614b6dd85bac3dc5821e6b74c56a1147655f602cdf39fb651f5 DIST apache-tomcat-8.5.91-src.tar.gz.asc 849 BLAKE2B 9f5f347692101a93dedf7014dc9d5351dfee5b956247edeec87c29b33548ff9c78c55a6e426aac40626a616ffaa73dd7f01ee5a384d080845f86b13c92f1cd63 SHA512 3d4bce771c7f044338eaad0d7d959c360396be67e989938a5595dfc42d1f7cfe451fc00de9197cd1a20ac2fc50f8b7ad93ecee07fe50c097fdeabf8ae1b8bf3d DIST apache-tomcat-9.0.78-src.tar.gz 6266960 BLAKE2B 15bf31c4d4445d0f7b8f53ea23aedefaa0e5635c3dce7e6bc35d11f7bba0e8f5b00263c680287c0b0a4743317dbf8191c1759fbe1f899e1aa157d488c037276d SHA512 220bf46004c4cbad536a7040c979651ee49a13994cf83045369c1bfdc0a96c0172ddc8fd24ab76c9526591c50033d915dbd258939b24d22d660050dcb5abcad4 diff --git a/www-servers/tomcat/tomcat-10.1.12.ebuild b/www-servers/tomcat/tomcat-10.1.12.ebuild new file mode 100644 index 000000000000..6320540b940d --- /dev/null +++ b/www-servers/tomcat/tomcat-10.1.12.ebuild @@ -0,0 +1,181 @@ +# 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.0" +BND="biz.aQute.bnd-${BND_VERSION}.jar" + +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 + 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="10.1" +KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +ECJ_SLOT="4.26" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/jax-rpc-api:0 + >=dev-java/jakartaee-migration-1.0.5: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/ant-core + >=virtual/jdk-11:* + test? ( + dev-java/ant-junit:0 + 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" + +PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" ) + +S=${WORKDIR}/${MY_P} + +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 + + local vm_version="$(java-config -g PROVIDES_VERSION)" + + # 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},jakartaee-migration,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" + + 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 and" + einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." +}