gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

www-servers/tomcat: version bump for slot 7 and 8

Browse Source
This commit is contained in:
Miroslav Šulc
2018-02-15 17:59:00 +01:00
parent 60be1f3ed2
commit fdfd796061
5 changed files with 733 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www-servers/tomcat/Manifest
View File

@@ -1,7 +1,9 @@
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48 SHA512 ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74
DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044
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

161
www-servers/tomcat/files/tomcat-7.0.85-build.xml.patch Normal file
View File

@@ -0,0 +1,161 @@
diff --git a/build.xml b/build.xml
index 3f1229c..13894ed 100644
--- a/build.xml
+++ b/build.xml
@@ -671,12 +671,14 @@
</fileset>
</copy>
<!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
+<!--
<copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
<fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
<include name="*" />
<exclude name="jspxml*" />
</fileset>
</copy>
+-->
</target>
@@ -733,26 +735,32 @@
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
<!-- Servlet 3.0 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.2 Implementation JAR File -->
+<!--
<jarIt jarfile="${jsp-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.jsp-api"
manifest="${tomcat.manifests}/jsp-api.jar.manifest"
notice="${tomcat.manifests}/jsp-api.jar.notice"
license="${tomcat.manifests}/jsp-api.jar.license" />
+-->
<!-- JSP 2.2 EL Implementation JAR File -->
+<!--
<jarIt jarfile="${el-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.el-api"
manifest="${tomcat.manifests}/el-api.jar.manifest" />
+-->
<!-- Bootstrap JAR File -->
<jarIt jarfile="${bootstrap.jar}"
@@ -999,9 +1007,9 @@
<target name="deploy" depends="package,build-docs,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">
@@ -1060,14 +1068,15 @@
<exclude name="${jdt.jar.filename}"/>
</fileset>
</delete>
+<!--
<copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-
+-->
<!-- Add sources for examples -->
<antcall target="examples-sources" />
-
+<!--
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
failonerror="false"/>
-
+-->
<!-- 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}"
@@ -1697,7 +1706,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}"/>
@@ -1886,11 +1895,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.
@@ -1902,6 +1912,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
description="Create the Tomcat javadoc" >
<fail unless="java.7.home"
message="The java.7.home property must be set for javadoc build"/>
+<!--
<javadoc packagenames="javax.servlet.*"
excludepackagenames="javax.servlet.jsp.*"
sourcepath="${tomcat.dist}/src/java"
@@ -1966,6 +1977,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"
@@ -2006,9 +2018,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/"/>
@@ -2632,7 +2646,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
</target>
<target name="download-compile"
- description="Download (and build) components necessary to compile" >
+ description="Download (and build) components necessary to compile" unless="noget">
<!-- Download Commons Daemon -->
<antcall target="downloadgz-2">
@@ -2675,7 +2689,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
</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}"/>
@@ -2721,7 +2735,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
</target>
<target name="download-dist"
- description="Download additional components for a distribution" >
+ description="Download additional components for a distribution" unless="noget">
<antcall target="downloadfile-2">
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/>

267
www-servers/tomcat/files/tomcat-8.0.50-build.xml.patch Normal file
View File

@@ -0,0 +1,267 @@
diff --git a/build.xml b/build.xml
index 3152712..9e09384 100644
--- a/build.xml
+++ b/build.xml
@@ -718,24 +718,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,9 +1010,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">
@@ -1067,7 +1072,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" />
@@ -1101,7 +1106,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}"
@@ -1116,7 +1121,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}"
@@ -1220,9 +1225,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
@@ -1615,7 +1622,7 @@
<target name="extras-commons-logging-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-2">
<param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
@@ -1754,7 +1761,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}"/>
@@ -1941,11 +1948,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.
@@ -1955,6 +1963,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"
@@ -2016,6 +2025,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"
@@ -2054,9 +2064,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/"/>
@@ -2791,7 +2803,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">
<!-- Download Commons Daemon -->
<antcall target="downloadgz-2">
@@ -2811,7 +2823,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}"/>
@@ -2868,7 +2880,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="downloadfile-2">
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
@@ -2908,18 +2920,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}"/>
@@ -2931,7 +2943,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}"/>
@@ -2950,7 +2962,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}"/>
@@ -2961,7 +2973,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}"/>
@@ -2979,7 +2991,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}"/>
@@ -2989,7 +3001,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}"/>
@@ -3012,7 +3024,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>
@@ -3023,7 +3035,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>
@@ -3034,7 +3046,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"/>

146
www-servers/tomcat/tomcat-7.0.85.ebuild Normal file
View File

@@ -0,0 +1,146 @@
# 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.0/JSP-2.2 Container"
HOMEPAGE="https://tomcat.apache.org/"
SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="7"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="extra-webapps websockets"
RESTRICT="test" # can we run them on a production system?
ECJ_SLOT="4.5"
SAPI_SLOT="3.0"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
dev-java/tomcat-servlet-api:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
virtual/jre
!<dev-java/tomcat-native-1.1.24"
DEPEND="${COMMON_DEP}
virtual/jdk:1.8
test? ( dev-java/ant-junit:0 )"
S=${WORKDIR}/${MY_P}
pkg_setup() {
java-pkg-2_pkg_setup
enewgroup tomcat 265
enewuser tomcat 265 -1 /dev/null tomcat
}
src_prepare() {
default
# Remove bundled servlet-api
rm -rv java/javax/{el,servlet} || die
java-pkg_clean
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_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="-r1"
INIT_REV="-r1"
src_compile() {
use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
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 ###
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=$(echo ${RANDOM}|md5sum|cut -c 1-15)
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://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
}

157
www-servers/tomcat/tomcat-8.0.50.ebuild Normal file
View File

@@ -0,0 +1,157 @@
# 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 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"
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:${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"
# 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://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
}