From 2aa4f21d7710d507afc203db4152c2d02c34c932 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 19 Jun 2024 17:11:06 +0200 Subject: www-servers/tomcat: add 10.1.25 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Signed-off-by: Miroslav Šulc --- www-servers/tomcat/Manifest | 2 + www-servers/tomcat/tomcat-10.1.25.ebuild | 175 +++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 www-servers/tomcat/tomcat-10.1.25.ebuild (limited to 'www-servers') diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 0c4aabcffb51..d9029fa2dc90 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -4,6 +4,8 @@ DIST apache-tomcat-10.1.23-src.tar.gz 6248107 BLAKE2B f14a652b4cbcd27dcecefbea35 DIST apache-tomcat-10.1.23-src.tar.gz.asc 833 BLAKE2B c1cd63d86406e53a093c7d0325d6ede04bf8b051a23c4b2ff54d20818a583d16aa78b25e02678148eeb6320639e7366bf8851ea983e56ef81e473e6767bd6ab5 SHA512 67d35953ee8ebf685ee441467cc0e0d1fcf760651525e6e34c7ad09e8a4a75b26c0b044fcb7781a1661d1edac24ea92c1881a6728571f14e21d29411d9839c80 DIST apache-tomcat-10.1.24-src.tar.gz 6230916 BLAKE2B ac2329499d9afa37a62ad00b5ca4954e4221d72623fd821ffd3ca0037209723acba38d03f52033f0ea7e2951c9803f3ab94cd0910ed520424693f03fd2efe5c8 SHA512 cd3113dfaf2dd14aacf8d3c2bf39fb7142665421f981ad668edd228bb0a8fe8c35ea8921930e6fe06d10c9c078f774641901efc1e5312d3b7ef52a3006bacd5f DIST apache-tomcat-10.1.24-src.tar.gz.asc 833 BLAKE2B aa1a6b3698b80f16ed567153d42655b425597bacc2cc1aee7a73e8cb20db22c57d827d2400df045a828d1cca017ffc5af1c941b9c0f94369fcf7d52458061b01 SHA512 cedc2128b2877bb4470d06df9618c403c49f488eb5006b3561f39b98b2ff7539819b931813c9af484f62a57a582e36730ed25e8f30a8743631b4d72bca4be386 +DIST apache-tomcat-10.1.25-src.tar.gz 6231246 BLAKE2B bcd216e7c19e521f1514206a0a288a3beb425399c6e0711ba33a20170610d7d743ac106e5cf5c761e921b1acdccf12a32f1a2ec42601818a32087d027a243c6f SHA512 404d1d4906f458d7de0af57283cbd4cdb4be8ffc65176df5b954f946fecacb3b7f714d4e62bb644028ca6160334a43448c665c46a60c8eb585e64c5d6e4195a8 +DIST apache-tomcat-10.1.25-src.tar.gz.asc 873 BLAKE2B 630f45765ce32281e1ee856c7bb6db6d108d1581ac996e1106b3ef6cff51b118869b816b2ea7d3f3de67de451a4bb755fb4c3571dcef4b5380b6ab6378e6595b SHA512 df98514e8da6a215b40785e6398548f8f7b992a36fae66e6a5a1f8563060c9d143436178e98a0c6ab8aed7cfb19ebce5ffa72af8508db1154d24ae290d2b156d DIST apache-tomcat-9.0.89-src.tar.gz 6319184 BLAKE2B a3c9539fe25a5ca87820214a7b7b8376c05383d940bfa19f7811f3fb5e90e2bd392f46c3f1a08a8949256bde5855bd479ac3754245dc953aa78e5f73e23f8849 SHA512 c2e8e45a98cd30764b507bb997c7cf1b8e337be9c6d1833bb5f916a5d86d96cb095f430884d0a248cdc3b510beb11e227cc160f8402ba5b2e3952399a44461d1 DIST apache-tomcat-9.0.89-src.tar.gz.asc 833 BLAKE2B 7629f94f4d036a6fc307bc6d157758eb5291a0b854bed20f0341ef0dffda8cff4722d4e47c2ad5f7e8d331ab0563532d53596859dcd990a75809f0432862f63a SHA512 5cf7dc5890f928acb43d2401e196166cfbd473236a27afde9fed621e0eefd3b9b59abe3ad8ac4e77086752e67afd0d60af9003e84f5cb2e66a58e6dee89b7366 DIST apache-tomcat-9.0.90-src.tar.gz 6311070 BLAKE2B 0e585a798f3bc476e826296a4fb77fde479dd88be7ea4c7f94982714a16ffca7b57ffa4cb527322192631a4eb617c6a3a19d338e592e9642c7e771cc77f7d9a7 SHA512 ade9eda20fe137080eb4fb43a36e510025822acabaf5564a950d24eded491e3f8846dff6ab6382716cd2f3aa676e4f134d28d7c1fa5f9d89230aa600d18071cb diff --git a/www-servers/tomcat/tomcat-10.1.25.ebuild b/www-servers/tomcat/tomcat-10.1.25.ebuild new file mode 100644 index 000000000000..bd5eec566c82 --- /dev/null +++ b/www-servers/tomcat/tomcat-10.1.25.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2024 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-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 + verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/${MY_P}.tar.gz.asc )" +S=${WORKDIR}/${MY_P} + +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/bnd-annotation:0 + dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/jax-rpc-api:0 + >=dev-java/jakartaee-migration-1.0.7-r2: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-1.10.14-r3:0 + dev-java/bnd-ant:0 + dev-java/bnd-util:0 + dev-java/bndlib:0 + dev-java/libg:0 + dev-java/osgi-cmpn:8 + dev-java/osgi-core:0 + dev-java/slf4j-api:0 + >=virtual/jdk-17:* + test? ( + >=dev-java/ant-1.10.14-r3:0[junit] + 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}/tomcat-10.1.20-do-not-copy.patch" + "${FILESDIR}/tomcat-10.1.20-offline.patch" + "${FILESDIR}/tomcat-9.0.87-gentoo-bnd.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + cat > build.properties <<-EOF || die + execute.download=false + exist=true # skip target="downloadfile-2" + ant.jar=$(java-pkg_getjar --build-only ant ant.jar) + bnd-annotation.jar=$(java-pkg_getjars bnd-annotation) + bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant) + bnd-util.jar=$(java-pkg_getjars --build-only bnd-util) + bnd.jar=$(java-pkg_getjars --build-only bnd) + bndlib.jar=$(java-pkg_getjars --build-only bndlib) + jaxrpc-lib.jar=$(java-pkg_getjars jax-rpc-api) + jdt.jar=$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT}) + libg.jar=$(java-pkg_getjars --build-only libg) + migration-lib.jar=$(java-pkg_getjars jakartaee-migration) + osgi-cmpn.jar=$(java-pkg_getjars --build-only osgi-cmpn-8) + osgi-core.jar=$(java-pkg_getjars --build-only osgi-core) + slf4j-api.jar=$(java-pkg_getjars --build-only slf4j-api) + wsdl4j-lib.jar=$(java-pkg_getjars wsdl4j) + EOF + + # 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 +} + +EANT_BUILD_TARGET="deploy" +EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_compile() { + 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" +} -- cgit v1.2.3-65-gdbad