mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
www-servers/tomcat: removed obsolete versions
Package-Manager: Portage-2.3.28, Repoman-2.3.9
This commit is contained in:
Miroslav Šulc
@@ -4,10 +4,7 @@ DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8
|
||||
DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
|
||||
DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
|
||||
DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
|
||||
DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
|
||||
DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab
|
||||
DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5
|
||||
DIST apache-tomcat-8.5.30-src.tar.gz 5143270 BLAKE2B 3bdcff663ca509efc3b2ee92ce140a3a22abf7fc0e32b5fa9a0ee713bdc1065ebde0b77cf624cedc2e0893194518d10e1f5df5b2f41edf76cb61157ac4d02862 SHA512 53729cfd1859872109f816df2642e3cd776a7faf8c55b1d50df0459f12958aacbf36debe6e8f10c19ab0a5bb2973fa63a2fec57f83ecaf19f4cf9d82e4a20265
|
||||
DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
|
||||
DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84
|
||||
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
|
||||
|
||||
@@ -1,247 +0,0 @@
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -714,24 +714,29 @@
|
||||
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
|
||||
|
||||
<!-- Servlet 3.1 Implementation JAR File -->
|
||||
+<!--
|
||||
<jarIt jarfile="${servlet-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.servlet-api"
|
||||
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
|
||||
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
||||
license="${tomcat.manifests}/servlet-api.jar.license" />
|
||||
-
|
||||
+-->
|
||||
<!-- JSP 2.3 Implementation JAR File -->
|
||||
+<!--
|
||||
<jarIt jarfile="${jsp-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.jsp-api"
|
||||
manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
|
||||
+-->
|
||||
|
||||
<!-- EL 3.0 Implementation JAR File -->
|
||||
+<!--
|
||||
<jarIt jarfile="${el-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.el-api"
|
||||
manifest="${tomcat.manifests}/el-api.jar.manifest" />
|
||||
+-->
|
||||
|
||||
<!-- WebSocket 1.1 API JAR File -->
|
||||
<jarIt jarfile="${websocket-api.jar}"
|
||||
@@ -1005,14 +1010,14 @@
|
||||
|
||||
<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/tomcat-native.tar.gz"
|
||||
file="${tomcat-native.tar.gz}" />
|
||||
<copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
|
||||
file="${commons-daemon.native.src.tgz}" />
|
||||
|
||||
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
|
||||
-
|
||||
+-->
|
||||
<!-- Copy scripts -->
|
||||
<copy todir="${tomcat.build}/bin">
|
||||
<fileset dir="bin">
|
||||
@@ -1072,7 +1077,7 @@
|
||||
<exclude name="${jdt.jar.filename}"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
|
||||
+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
|
||||
|
||||
<!-- Add sources for examples -->
|
||||
<antcall target="examples-sources" />
|
||||
@@ -1106,7 +1111,7 @@
|
||||
</javac>
|
||||
</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}"
|
||||
@@ -1121,7 +1126,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}"
|
||||
@@ -1225,9 +1230,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
|
||||
@@ -1608,7 +1615,7 @@
|
||||
|
||||
<target name="extras-webservices-prepare"
|
||||
depends="extras-prepare"
|
||||
- description="Prepare to build web services extras package">
|
||||
+ description="Prepare to build web services extras package" unless="noget">
|
||||
|
||||
<antcall target="downloadfile">
|
||||
<param name="sourcefile" value="${jaxrpc-lib.loc}"/>
|
||||
@@ -1756,6 +1763,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
|
||||
<target name="javadoc" depends="dist-source,extras-webservices-prepare"
|
||||
description="Create the Tomcat javadoc" >
|
||||
+<!--
|
||||
<javadoc packagenames="javax.servlet.*"
|
||||
excludepackagenames="javax.servlet.jsp.*"
|
||||
sourcepath="${tomcat.dist}/src/java"
|
||||
@@ -1820,6 +1828,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
<path location="${ant.core.lib}"/>
|
||||
</classpath>
|
||||
</javadoc>
|
||||
+-->
|
||||
<javadoc packagenames="javax.websocket.*"
|
||||
sourcepath="${tomcat.dist}/src/java"
|
||||
destdir="${tomcat.dist}/webapps/docs/websocketapi"
|
||||
@@ -1860,9 +1869,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
||||
<path refid="tomcat.webservices.classpath"/>
|
||||
<path location="${ant.core.lib}"/>
|
||||
</classpath>
|
||||
+<!--
|
||||
<link href="../servletapi"/>
|
||||
<link href="../jspapi"/>
|
||||
<link href="../elapi"/>
|
||||
+-->
|
||||
<link href="../websocketapi"/>
|
||||
<link href="http://docs.oracle.com/javase/7/docs/api/"/>
|
||||
<link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
|
||||
@@ -2607,7 +2618,7 @@ skip.installer property in build.properties" />
|
||||
</target>
|
||||
|
||||
<target name="download-compile"
|
||||
- description="Download (and build) components necessary to compile" >
|
||||
+ description="Download (and build) components necessary to compile" unless="noget">
|
||||
|
||||
<antcall target="downloadfile-2">
|
||||
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
|
||||
@@ -2641,7 +2652,7 @@ skip.installer property in build.properties" />
|
||||
</target>
|
||||
|
||||
<target name="download-test-compile"
|
||||
- description="Download additional components for the tests" >
|
||||
+ description="Download additional components for the tests" unless="noget">
|
||||
|
||||
<antcall target="downloadfile">
|
||||
<param name="sourcefile" value="${junit.loc}"/>
|
||||
@@ -2698,7 +2709,7 @@ skip.installer property in build.properties" />
|
||||
</target>
|
||||
|
||||
<target name="download-dist"
|
||||
- description="Download additional components for a distribution" >
|
||||
+ description="Download additional components for a distribution" unless="noget">
|
||||
|
||||
<antcall target="downloadzip-2">
|
||||
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>
|
||||
@@ -2724,18 +2735,18 @@ skip.installer property in build.properties" />
|
||||
|
||||
<!-- =============== 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>
|
||||
|
||||
- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
|
||||
+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
|
||||
<!-- Download and extract the package -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -2747,7 +2758,7 @@ skip.installer property in build.properties" />
|
||||
<delete file="${temp.file}.tar.gz"/>
|
||||
</target>
|
||||
|
||||
- <target name="downloadgz-2" unless="exist" depends="testexist">
|
||||
+ <target name="downloadgz-2" unless="noget" depends="testexist">
|
||||
<!-- Download and extract the package from the two alternative locations -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" />
|
||||
<delete file="${temp.file}.tar.gz"/>
|
||||
</target>
|
||||
|
||||
- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
|
||||
+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
|
||||
<!-- Download and extract the package -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -2777,7 +2788,7 @@ skip.installer property in build.properties" />
|
||||
<delete file="${temp.file}"/>
|
||||
</target>
|
||||
|
||||
- <target name="downloadzip-2" unless="exist" depends="testexist">
|
||||
+ <target name="downloadzip-2" unless="noget" depends="testexist">
|
||||
<!-- Download and extract the package from the two alternative locations -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" />
|
||||
<delete file="${temp.file}"/>
|
||||
</target>
|
||||
|
||||
- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
|
||||
+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
|
||||
<!-- Download the file -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -2805,7 +2816,7 @@ skip.installer property in build.properties" />
|
||||
<move file="${temp.file}" tofile="${destfile}"/>
|
||||
</target>
|
||||
|
||||
- <target name="downloadfile-2" unless="exist" depends="testexist">
|
||||
+ <target name="downloadfile-2" unless="noget" depends="testexist">
|
||||
<!-- Download the file from the two alternative locations -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" />
|
||||
<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>
|
||||
@@ -2839,7 +2850,7 @@ skip.installer property in build.properties" />
|
||||
</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>
|
||||
@@ -2850,7 +2861,7 @@ skip.installer property in build.properties" />
|
||||
|
||||
<target name="ide-eclipse"
|
||||
depends="download-compile, extras-webservices-prepare, 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"/>
|
||||
@@ -1,158 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2 prefix user
|
||||
|
||||
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"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="8.5"
|
||||
KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
IUSE="extra-webapps"
|
||||
|
||||
RESTRICT="test" # can we run them on a production system?
|
||||
|
||||
ECJ_SLOT="4.5"
|
||||
SAPI_SLOT="3.1"
|
||||
|
||||
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
|
||||
>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
|
||||
RDEPEND="${COMMON_DEP}
|
||||
!<dev-java/tomcat-native-1.1.24
|
||||
>=virtual/jre-1.7"
|
||||
DEPEND="${COMMON_DEP}
|
||||
app-admin/pwgen
|
||||
>=virtual/jdk-1.7
|
||||
test? (
|
||||
>=dev-java/ant-junit-1.9:0
|
||||
dev-java/easymock:3.2
|
||||
)"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-2_pkg_setup
|
||||
enewgroup tomcat 265
|
||||
enewuser tomcat 265 -1 /dev/null tomcat
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
find -name '*.jar' -type f -delete -print || die
|
||||
|
||||
# Remove bundled servlet-api
|
||||
rm -rv java/javax/{el,servlet} || die
|
||||
|
||||
epatch "${FILESDIR}/${P}-build.xml.patch"
|
||||
|
||||
# For use of catalina.sh in netbeans
|
||||
sed -i -e "/^# ----- Execute The Requested Command/ a\
|
||||
CLASSPATH=\`java-config --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},tomcat-servlet-api-${SAPI_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)"
|
||||
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 "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."
|
||||
}
|
||||
@@ -1,158 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2 prefix user
|
||||
|
||||
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"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="8.5"
|
||||
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
IUSE="extra-webapps"
|
||||
|
||||
RESTRICT="test" # can we run them on a production system?
|
||||
|
||||
ECJ_SLOT="4.5"
|
||||
SAPI_SLOT="3.1"
|
||||
|
||||
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
|
||||
>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
|
||||
RDEPEND="${COMMON_DEP}
|
||||
!<dev-java/tomcat-native-1.1.24
|
||||
>=virtual/jre-1.7"
|
||||
DEPEND="${COMMON_DEP}
|
||||
app-admin/pwgen
|
||||
>=virtual/jdk-1.7
|
||||
test? (
|
||||
>=dev-java/ant-junit-1.9:0
|
||||
dev-java/easymock:3.2
|
||||
)"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-2_pkg_setup
|
||||
enewgroup tomcat 265
|
||||
enewuser tomcat 265 -1 /dev/null tomcat
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
find -name '*.jar' -type f -delete -print || die
|
||||
|
||||
# Remove bundled servlet-api
|
||||
rm -rv java/javax/{el,servlet} || die
|
||||
|
||||
epatch "${FILESDIR}/${PN}-8.5.27-build.xml.patch"
|
||||
|
||||
# For use of catalina.sh in netbeans
|
||||
sed -i -e "/^# ----- Execute The Requested Command/ a\
|
||||
CLASSPATH=\`java-config --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},tomcat-servlet-api-${SAPI_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)"
|
||||
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 "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."
|
||||
}
|
||||
@@ -1,158 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2 prefix user
|
||||
|
||||
MY_P="apache-${PN}-${PV}-src"
|
||||
|
||||
DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
|
||||
HOMEPAGE="https://tomcat.apache.org/"
|
||||
SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="9"
|
||||
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
IUSE="extra-webapps"
|
||||
|
||||
RESTRICT="test" # can we run them on a production system?
|
||||
|
||||
ECJ_SLOT="4.5"
|
||||
SAPI_SLOT="4.0"
|
||||
|
||||
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
|
||||
=dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
|
||||
RDEPEND="${COMMON_DEP}
|
||||
!<dev-java/tomcat-native-1.1.24
|
||||
>=virtual/jre-1.8"
|
||||
DEPEND="${COMMON_DEP}
|
||||
app-admin/pwgen
|
||||
>=virtual/jdk-1.8
|
||||
test? (
|
||||
>=dev-java/ant-junit-1.9:0
|
||||
dev-java/easymock:3.2
|
||||
)"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-2_pkg_setup
|
||||
enewgroup tomcat 265
|
||||
enewuser tomcat 265 -1 /dev/null tomcat
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
find -name '*.jar' -type f -delete -print || die
|
||||
|
||||
# Remove bundled servlet-api
|
||||
rm -rv java/javax/{el,servlet} || die
|
||||
|
||||
epatch "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
|
||||
|
||||
# For use of catalina.sh in netbeans
|
||||
sed -i -e "/^# ----- Execute The Requested Command/ a\
|
||||
CLASSPATH=\`java-config --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},tomcat-servlet-api-${SAPI_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"
|
||||
|
||||
# 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)"
|
||||
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 "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."
|
||||
}
|
||||
Reference in New Issue
Block a user