-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
www-servers/tomcat: add 10.1.20 unbundling bnd
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: #35320 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
- Loading branch information
Showing
4 changed files
with
219 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| --- a/build.xml | ||
| +++ b/build.xml | ||
| #<!-- we provide tomcat native as another package and we don't need commons-daemon | ||
| @@ -1469,7 +1469,6 @@ | ||
| <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" | ||
| description="Default. Builds a working Tomcat instance"> | ||
|
|
||
| - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> | ||
|
|
||
| <!-- Copy scripts --> | ||
| <copy todir="${tomcat.build}/bin"> | ||
| #<!-- we provide jdt jar externally | ||
| @@ -1530,7 +1529,6 @@ | ||
| <exclude name="${jdt.jar.filename}"/> | ||
| </fileset> | ||
| </delete> | ||
| - <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> | ||
|
|
||
| <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one --> | ||
| <local name="migration.jar.filename" /> | ||
| #<!-- we provide migration tool externally | ||
| @@ -1541,7 +1539,6 @@ | ||
| <exclude name="${migration-lib.jar.filename}"/> | ||
| </fileset> | ||
| </delete> | ||
| - <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> | ||
|
|
||
| <!-- Delete all other versions of OpenSSL support for Tomcat and copy the current one --> | ||
| <!-- After module release |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- a/build.xml | ||
| +++ b/build.xml | ||
| # javadoc would fail without network access | ||
| @@ -2413,8 +2410,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. | ||
| <link href="../elapi"/> | ||
| <link href="../websocketapi"/> | ||
| <link href="../jaspicapi"/> | ||
| - <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/> | ||
| - <link href="https://jakarta.ee/specifications/platform/10/apidocs/"/> | ||
| <packageset dir="${tomcat.dist}/src/java/"> | ||
| <include name="org/**"/> | ||
| <exclude name="org/apache/el/parser/**"/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| # 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.27" | ||
|
|
||
| COMMON_DEP="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-annotation: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 | ||
| find -name '*.jar' -type f -delete -print || die | ||
|
|
||
| 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 --build-only 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 --build-only 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 and" | ||
| einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." | ||
| } |