www-servers/tomcat: bump to 10.0.26
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Miroslav Šulc
parent
ab721c7019
commit
e0fd275f73
|
|
@ -1,4 +1,5 @@
|
|||
DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
|
||||
DIST apache-tomcat-10.0.26-src.tar.gz 6153701 BLAKE2B fb16f83cf71dc97f21739c3714d2d3d201aa6b6b4242c351fabfc04ee767e59b6e376c7c8984dcda12d6942835221c55d4451b2d0a1245a2dbb73636c93da47c SHA512 f66387a3ca67b6b3df8504c4ae089e8f30e389811a8d0b7d2241e115b8cf712a38f3d0fea938cef7fa9745f412aa70ad47840e40e2385fbd1435b636e93b45b4
|
||||
DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
|
||||
DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
|
||||
DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
|
||||
|
|
|
|||
|
|
@ -0,0 +1,347 @@
|
|||
diff --git a/build.xml b/build.xml
|
||||
index 774e25e..2684b10 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -1041,6 +1041,7 @@
|
||||
addOSGi="true" />
|
||||
|
||||
<!-- Servlet Implementation JAR File -->
|
||||
+<!--
|
||||
<jarIt jarfile="${servlet-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.servlet-api"
|
||||
@@ -1048,21 +1049,23 @@
|
||||
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
||||
license="${tomcat.manifests}/servlet-api.jar.license"
|
||||
addOSGi="true" />
|
||||
-
|
||||
+-->
|
||||
<!-- EL Implementation JAR File -->
|
||||
+<!--
|
||||
<jarIt jarfile="${el-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.el-api"
|
||||
manifest="${tomcat.manifests}/el-api.jar.manifest"
|
||||
addOSGi="true" />
|
||||
-
|
||||
+-->
|
||||
<!-- JSP Implementation JAR File -->
|
||||
+<!--
|
||||
<jarIt jarfile="${jsp-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.jsp-api"
|
||||
manifest="${tomcat.manifests}/jsp-api.jar.manifest"
|
||||
addOSGi="true" />
|
||||
-
|
||||
+-->
|
||||
<!-- WebSocket API JAR File -->
|
||||
<jarIt jarfile="${websocket-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
@@ -1175,10 +1178,10 @@
|
||||
addOSGi="true" />
|
||||
|
||||
<!-- Re-packaged Apache Commons DBCP 2-->
|
||||
- <jarIt jarfile="${tomcat-dbcp.jar}"
|
||||
+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.tomcat-dbcp"
|
||||
- addOSGi="true" />
|
||||
+ addOSGi="true" /> -->
|
||||
|
||||
<!-- i18n JARs -->
|
||||
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
|
||||
@@ -1415,9 +1418,9 @@
|
||||
|
||||
<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">
|
||||
<fileset dir="bin">
|
||||
@@ -1477,7 +1480,7 @@
|
||||
<exclude name="${jdt.jar.filename}"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
|
||||
+<!-- <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" />
|
||||
@@ -1488,7 +1491,7 @@
|
||||
<exclude name="${migration-lib.jar.filename}"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
|
||||
+<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
|
||||
|
||||
<!-- Add sources for examples -->
|
||||
<antcall target="examples-sources" />
|
||||
@@ -1517,7 +1520,7 @@
|
||||
|
||||
</target>
|
||||
|
||||
- <target name="build-tomcat-jdbc" depends="package">
|
||||
+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
|
||||
<!-- build the jdbc-pool jar and source jar-->
|
||||
<echo message="Building Tomcat JDBC pool libraries"/>
|
||||
<ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
|
||||
@@ -1534,7 +1537,7 @@
|
||||
<copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
|
||||
</target>
|
||||
|
||||
- <target name="build-tomcat-jdbc-src">
|
||||
+ <target name="build-tomcat-jdbc-src" unless="noget">
|
||||
<!-- build the jdbc-pool source jar-->
|
||||
<echo message="Building Tomcat JDBC pool src JAR"/>
|
||||
<ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
|
||||
@@ -1637,9 +1640,11 @@
|
||||
|
||||
<copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
|
||||
<copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
|
||||
+<!--
|
||||
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
|
||||
failonerror="false"/>
|
||||
<copy file="${jdt.jar}" todir="${tomcat.embed}" />
|
||||
+-->
|
||||
<copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
|
||||
|
||||
<!-- Note the meta-inf below will work as long as there is only one JAR
|
||||
@@ -2144,11 +2149,12 @@
|
||||
</copy>
|
||||
|
||||
<!-- Source bundles for native components -->
|
||||
+<!--
|
||||
<copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
|
||||
file="${tomcat-native.tar.gz}" />
|
||||
<copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
|
||||
file="${commons-daemon.native.src.tgz}" />
|
||||
-
|
||||
+-->
|
||||
<!-- platform README files -->
|
||||
<echo append="false" file="${tomcat.dist}/bin/x64/README">
|
||||
Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
@@ -2172,13 +2178,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
additionalparam="-breakiterator -notimestamp -html5"
|
||||
source="${compile.release}"
|
||||
maxmemory="512m"
|
||||
- failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonerror="true">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path location="${ant.core.lib}"/>
|
||||
</classpath>
|
||||
</javadoc>
|
||||
+<!--
|
||||
<javadoc packagenames="jakarta.servlet.*"
|
||||
excludepackagenames="jakarta.servlet.jsp.*"
|
||||
sourcepath="${tomcat.dist}/src/java"
|
||||
@@ -2194,8 +2200,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
additionalparam="-breakiterator -notimestamp -html5"
|
||||
source="${compile.release}"
|
||||
maxmemory="512m"
|
||||
- failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonerror="true">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path location="${ant.core.lib}"/>
|
||||
@@ -2215,8 +2220,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
additionalparam="-breakiterator -notimestamp -html5"
|
||||
source="${compile.release}"
|
||||
maxmemory="512m"
|
||||
- failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonerror="true">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path location="${ant.core.lib}"/>
|
||||
@@ -2236,13 +2240,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
additionalparam="-breakiterator -notimestamp -html5"
|
||||
source="${compile.release}"
|
||||
maxmemory="512m"
|
||||
- failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonerror="true">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path location="${ant.core.lib}"/>
|
||||
</classpath>
|
||||
</javadoc>
|
||||
+-->
|
||||
<javadoc packagenames="jakarta.websocket.*"
|
||||
sourcepath="${tomcat.dist}/src/java"
|
||||
destdir="${tomcat.dist}/webapps/docs/websocketapi"
|
||||
@@ -2257,8 +2261,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
additionalparam="-breakiterator -notimestamp -html5"
|
||||
source="${compile.release}"
|
||||
maxmemory="512m"
|
||||
- failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonerror="true">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path location="${ant.core.lib}"/>
|
||||
@@ -2277,8 +2280,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
charset="UTF-8"
|
||||
additionalparam="-breakiterator -notimestamp -html5"
|
||||
maxmemory="512m"
|
||||
- failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonerror="true">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path location="${ant.core.lib}"/>
|
||||
@@ -2297,20 +2299,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
additionalparam="-breakiterator -notimestamp -html5"
|
||||
source="${compile.release}"
|
||||
maxmemory="512m"
|
||||
- failonerror="true"
|
||||
failonwarning="true">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path location="${ant.core.lib}"/>
|
||||
</classpath>
|
||||
<link href="../annotationapi"/>
|
||||
+<!--
|
||||
<link href="../servletapi"/>
|
||||
<link href="../jspapi"/>
|
||||
<link href="../elapi"/>
|
||||
+-->
|
||||
<link href="../websocketapi"/>
|
||||
<link href="../jaspicapi"/>
|
||||
+<!--
|
||||
<link href="https://docs.oracle.com/javase/8/docs/api/"/>
|
||||
<link href="https://jakarta.ee/specifications/platform/9/apidocs/"/>
|
||||
+-->
|
||||
<packageset dir="${tomcat.dist}/src/java/">
|
||||
<include name="org/**"/>
|
||||
<exclude name="org/apache/el/parser/**"/>
|
||||
@@ -3275,7 +3280,7 @@ asf.ldap.username=${release.asfusername}
|
||||
</target>
|
||||
|
||||
<target name="download-test-compile"
|
||||
- description="Download additional components for the tests" >
|
||||
+ description="Download additional components for the tests">
|
||||
|
||||
<antcall target="downloadfile">
|
||||
<param name="sourcefile" value="${junit.loc}"/>
|
||||
@@ -3403,7 +3408,7 @@ asf.ldap.username=${release.asfusername}
|
||||
</target>
|
||||
|
||||
<target name="download-dist"
|
||||
- description="Download additional components for a distribution" >
|
||||
+ description="Download additional components for a distribution">
|
||||
|
||||
<antcall target="downloadfile-2">
|
||||
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
|
||||
@@ -3458,13 +3463,13 @@ asf.ldap.username=${release.asfusername}
|
||||
|
||||
<!-- =============== Utility Targets to support downloads ================ -->
|
||||
|
||||
- <target name="setproxy" if="${proxy.use}">
|
||||
+ <target name="setproxy" if="${proxy.use}" unless="noget">
|
||||
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
|
||||
proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
|
||||
<echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
|
||||
</target>
|
||||
|
||||
- <target name="testexist">
|
||||
+ <target name="testexist" unless="noget">
|
||||
<echo message="Testing for ${destfile}"/>
|
||||
<available file="${destfile}" property="exist"/>
|
||||
</target>
|
||||
@@ -3586,7 +3591,7 @@ asf.ldap.username=${release.asfusername}
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
|
||||
+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
|
||||
<!-- Download and extract the package -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -3603,7 +3608,7 @@ asf.ldap.username=${release.asfusername}
|
||||
<delete file="${temp.file}.tar.gz"/>
|
||||
</target>
|
||||
|
||||
- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
|
||||
+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
|
||||
<!-- Download and extract the package from the two alternative locations -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -3628,7 +3633,7 @@ asf.ldap.username=${release.asfusername}
|
||||
<delete file="${temp.file}.tar.gz"/>
|
||||
</target>
|
||||
|
||||
- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
|
||||
+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
|
||||
<!-- Download and extract the package -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -3644,7 +3649,7 @@ asf.ldap.username=${release.asfusername}
|
||||
<delete file="${temp.file}"/>
|
||||
</target>
|
||||
|
||||
- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
|
||||
+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
|
||||
<!-- Download and extract the package from the two alternative locations -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -3668,7 +3673,7 @@ asf.ldap.username=${release.asfusername}
|
||||
<delete file="${temp.file}"/>
|
||||
</target>
|
||||
|
||||
- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
|
||||
+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
|
||||
<!-- Download the file -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -3683,7 +3688,7 @@ asf.ldap.username=${release.asfusername}
|
||||
<move file="${temp.file}" tofile="${destfile}"/>
|
||||
</target>
|
||||
|
||||
- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
|
||||
+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
|
||||
<!-- Download the file from the two alternative locations -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -3711,7 +3716,7 @@ asf.ldap.username=${release.asfusername}
|
||||
<move file="${temp.file}" tofile="${destfile}"/>
|
||||
</target>
|
||||
|
||||
- <target name="trydownload.check" depends="setproxy">
|
||||
+ <target name="trydownload.check" depends="setproxy" unless="noget">
|
||||
<condition property="trydownload.run">
|
||||
<and>
|
||||
<not>
|
||||
@@ -3722,7 +3727,7 @@ asf.ldap.username=${release.asfusername}
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
|
||||
+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
|
||||
<!-- Downloads a file if not yet downloaded and the source URL is available -->
|
||||
<get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
|
||||
</target>
|
||||
@@ -3733,7 +3738,7 @@ asf.ldap.username=${release.asfusername}
|
||||
|
||||
<target name="ide-eclipse"
|
||||
depends="download-compile, download-test-compile"
|
||||
- description="Prepares the source tree to be built in Eclipse">
|
||||
+ description="Prepares the source tree to be built in Eclipse" unless="noget">
|
||||
|
||||
<!-- Copy the sample project files into the root directory -->
|
||||
<copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
|
||||
@@ -3751,7 +3756,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
|
||||
|
||||
<target name="ide-intellij"
|
||||
depends="download-compile, download-test-compile"
|
||||
- description="Creates project directory .idea for IntelliJ IDEA">
|
||||
+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
|
||||
|
||||
<copy todir="${tomcat.home}/.idea">
|
||||
<fileset dir="${tomcat.home}/res/ide-support/idea"/>
|
||||
|
|
@ -0,0 +1,198 @@
|
|||
# Copyright 1999-2022 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
|
||||
|
||||
MY_P="apache-${PN}-${PV}-src"
|
||||
|
||||
# Currently we bundle binary versions of bnd.jar and bndlib.jar
|
||||
# See bugs #203080 and #676116
|
||||
BND_VERSION="6.2.0"
|
||||
BND="biz.aQute.bnd-${BND_VERSION}.jar"
|
||||
BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
|
||||
|
||||
DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.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}
|
||||
https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="10"
|
||||
KEYWORDS="~amd64 ~amd64-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"
|
||||
SAPI_SLOT="5.0"
|
||||
|
||||
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
|
||||
dev-java/glassfish-xmlrpc-api:0
|
||||
dev-java/jakartaee-migration:0
|
||||
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
|
||||
dev-java/wsdl4j:0"
|
||||
RDEPEND="${COMMON_DEP}
|
||||
acct-group/tomcat
|
||||
acct-user/tomcat
|
||||
virtual/jre"
|
||||
DEPEND="${COMMON_DEP}
|
||||
app-admin/pwgen
|
||||
dev-java/ant-core
|
||||
>=virtual/jdk-1.8:*
|
||||
test? (
|
||||
dev-java/ant-junit:0
|
||||
dev-java/easymock:3.2
|
||||
)"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
|
||||
)
|
||||
|
||||
BND_HOME="${S}/tomcat-build-libs/bnd"
|
||||
BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
|
||||
BND_JAR="${BND_HOME}/${BND}"
|
||||
BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${MY_P}.tar.gz
|
||||
|
||||
mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
|
||||
ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
|
||||
ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
find -name '*.jar' -type f -delete -print || die
|
||||
|
||||
# Remove bundled servlet-api
|
||||
rm -rv java/jakarta/{el,servlet} || die
|
||||
|
||||
eapply "${FILESDIR}/${PN}-10.0.26-build.xml.patch"
|
||||
|
||||
local vm_version="$(java-config -g PROVIDES_VERSION)"
|
||||
[[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch"
|
||||
|
||||
# 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,tomcat-servlet-api-${SAPI_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} -Dbndlib.jar=${BNDLIB_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 glassfish-xmlrpc-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() {
|
||||
elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
|
||||
elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
|
||||
elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
|
||||
|
||||
elog "To manage Tomcat instances, run:"
|
||||
elog " ${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."
|
||||
|
||||
ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
|
||||
ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
|
||||
|
||||
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."
|
||||
}
|
||||
Loading…
Reference in New Issue