diff options
author | Patrice Clement <monsieurp@gentoo.org> | 2015-06-03 14:45:09 +0000 |
---|---|---|
committer | Patrice Clement <monsieurp@gentoo.org> | 2015-06-03 14:45:09 +0000 |
commit | ee1605dd4625583b5e31d8720de51f53053e1db4 (patch) | |
tree | 8da0f5d94ef9239de869cd8d61e0a048d6b89905 /www-servers | |
parent | Tomcat 6.0.44 version bump. EAPI 5 bump. Remove vulnerable versions. Fix secu... (diff) | |
download | gentoo-2-ee1605dd4625583b5e31d8720de51f53053e1db4.tar.gz gentoo-2-ee1605dd4625583b5e31d8720de51f53053e1db4.tar.bz2 gentoo-2-ee1605dd4625583b5e31d8720de51f53053e1db4.zip |
Remove vulnerable versions < Tomcat 7.0.59. Fix security bug 549536.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/tomcat/ChangeLog | 7 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-7.0.56-build.xml.patch | 100 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-7.0.57-build.xml.patch | 179 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-7.0.56.ebuild | 144 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-7.0.57.ebuild | 144 |
5 files changed, 6 insertions, 568 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index cfb88f46e96f..91a4da7f7d68 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.350 2015/06/03 14:41:12 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.351 2015/06/03 14:45:09 monsieurp Exp $ + + 03 Jun 2015; Patrice Clement <monsieurp@gentoo.org> + -files/tomcat-7.0.56-build.xml.patch, -files/tomcat-7.0.57-build.xml.patch, + -tomcat-7.0.56.ebuild, -tomcat-7.0.57.ebuild: + Remove vulnerable versions < Tomcat 7.0.59. Fix security bug 549536. *tomcat-6.0.44 (03 Jun 2015) diff --git a/www-servers/tomcat/files/tomcat-7.0.56-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.56-build.xml.patch deleted file mode 100644 index 6b431d97a4fa..000000000000 --- a/www-servers/tomcat/files/tomcat-7.0.56-build.xml.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/apache-tomcat-7.0.56-src/build.xml b/apache-tomcat-7.0.56-src/build.xml -index 166f45e..66a95ce 100644 ---- a/apache-tomcat-7.0.56-src/build.xml -+++ b/apache-tomcat-7.0.56-src/build.xml -@@ -687,26 +687,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}" -@@ -952,12 +958,14 @@ - <target name="deploy" depends="package,build-docs,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"> -@@ -1011,9 +1019,11 @@ - <!-- Add sources for examples --> - <antcall target="examples-sources" /> - -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> -+--> - - <!-- build the jdbc-pool jar and source jar--> - <echo message="Building Tomcat JDBC pool libraries"/> -@@ -1606,7 +1616,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}"/> -@@ -2651,7 +2661,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"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2708,7 +2718,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}"/> -@@ -2736,7 +2746,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="downloadzip-2"> - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> diff --git a/www-servers/tomcat/files/tomcat-7.0.57-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.57-build.xml.patch deleted file mode 100644 index 6a78027fcb89..000000000000 --- a/www-servers/tomcat/files/tomcat-7.0.57-build.xml.patch +++ /dev/null @@ -1,179 +0,0 @@ -diff --git a/apache-tomcat-7.0.57-src/build.xml b/apache-tomcat-7.0.57-src/build.xml -index 60018a4..0283688 100644 ---- a/apache-tomcat-7.0.57-src/build.xml -+++ b/apache-tomcat-7.0.57-src/build.xml -@@ -686,26 +686,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}" -@@ -951,12 +957,14 @@ - <target name="deploy" depends="package,build-docs,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"> -@@ -1016,14 +1024,14 @@ - <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" /> -- -+<!-- - <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}" -@@ -1170,9 +1178,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}" /> -+--> - - <!-- Note the meta-inf below will work as long as there is only one JAR - that needs to add entries. If there is more than one a more complex -@@ -1618,7 +1628,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}"/> -@@ -1825,8 +1835,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - <target name="javadoc" depends="dist-source,extras-webservices-prepare" - 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" -@@ -1840,8 +1852,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - docencoding="ISO-8859-1" - charset="ISO-8859-1" - additionalparam="-breakiterator -notimestamp" -- maxmemory="256m" -- executable="${java.7.home}/bin/javadoc"> -+ maxmemory="256m"> - <classpath> - <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> -@@ -1860,8 +1871,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - docencoding="ISO-8859-1" - charset="ISO-8859-1" - additionalparam="-breakiterator -notimestamp" -- maxmemory="256m" -- executable="${java.7.home}/bin/javadoc"> -+ maxmemory="256m"> - <classpath> - <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> -@@ -1880,8 +1890,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - docencoding="ISO-8859-1" - charset="ISO-8859-1" - additionalparam="-breakiterator -notimestamp" -- maxmemory="256m" -- executable="${java.7.home}/bin/javadoc"> -+ maxmemory="256m"> - <classpath> - <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> -@@ -1900,8 +1909,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - docencoding="ISO-8859-1" - charset="ISO-8859-1" - additionalparam="-breakiterator -notimestamp" -- maxmemory="256m" -- executable="${java.7.home}/bin/javadoc"> -+ maxmemory="256m"> - <classpath> - <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> -@@ -1919,8 +1927,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - docencoding="ISO-8859-1" - charset="ISO-8859-1" - additionalparam="-breakiterator -notimestamp" -- maxmemory="256m" -- executable="${java.7.home}/bin/javadoc"> -+ maxmemory="256m"> - <classpath> - <path refid="compile.classpath"/> - <path refid="tomcat.webservices.classpath"/> -@@ -2605,7 +2612,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"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2662,7 +2669,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}"/> -@@ -2690,7 +2697,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="downloadzip-2"> - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> diff --git a/www-servers/tomcat/tomcat-7.0.56.ebuild b/www-servers/tomcat/tomcat-7.0.56.ebuild deleted file mode 100644 index d953360782ba..000000000000 --- a/www-servers/tomcat/tomcat-7.0.56.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v 1.7 2014/11/29 13:35:40 ago Exp $ - -EAPI=5 - -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="http://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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="extra-webapps websockets" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.4" -SAPI_SLOT="3.0" - -COMMON_DEP=" - dev-java/eclipse-ecj:${ECJ_SLOT} - ~dev-java/tomcat-servlet-api-${PV} - extra-webapps? ( dev-java/jakarta-jstl:0 )" -RDEPEND="${COMMON_DEP} - !<dev-java/tomcat-native-1.1.24 - websockets? ( >=virtual/jre-1.6 ) - !websockets? ( >=virtual/jre-1.6 )" -DEPEND="${COMMON_DEP} - websockets? ( >=virtual/jdk-1.6 ) - !websockets? ( >=virtual/jdk-1.6 ) - >=dev-java/ant-core-1.8.1:0 - test? ( - dev-java/ant-junit:0 - dev-java/junit:4 - )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat -} - -java_prepare() { - find -type f -name '*.jar' -exec rm -frv {} + || 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_ANT_REWRITE_CLASSPATH="true" - -EANT_BUILD_TARGET="deploy" -EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_NEEDS_TOOLS="true" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" - -# revision of the instance-manager script -IM_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 -} - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" - -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 - - # so we don't have to call java-config with --with-dependencies, which might - # bring in more jars then actually desired. - java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})" - - 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 ### - - # 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 - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - doexe "${T}"/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 http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." -} diff --git a/www-servers/tomcat/tomcat-7.0.57.ebuild b/www-servers/tomcat/tomcat-7.0.57.ebuild deleted file mode 100644 index 47d269a60750..000000000000 --- a/www-servers/tomcat/tomcat-7.0.57.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.57.ebuild,v 1.2 2015/04/19 09:44:25 pacho Exp $ - -EAPI=5 - -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="http://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 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="extra-webapps websockets" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.4" -SAPI_SLOT="3.0" - -COMMON_DEP=" - dev-java/eclipse-ecj:${ECJ_SLOT} - ~dev-java/tomcat-servlet-api-${PV} - extra-webapps? ( dev-java/jakarta-jstl:0 )" -RDEPEND="${COMMON_DEP} - websockets? ( >=virtual/jre-1.7 ) - !websockets? ( >=virtual/jre-1.6 ) - !<dev-java/tomcat-native-1.1.24" -DEPEND="${COMMON_DEP} - websockets? ( >=virtual/jdk-1.7 ) - !websockets? ( >=virtual/jdk-1.6 ) - >=dev-java/ant-core-1.8.1:0 - test? ( - dev-java/ant-junit:0 - dev-java/junit:4 - )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat -} - -java_prepare() { - find -type f -name '*.jar' -exec rm -frv {} + || 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_ANT_REWRITE_CLASSPATH="true" - -EANT_BUILD_TARGET="deploy" -EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_NEEDS_TOOLS="true" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" - -# revision of the instance-manager script -IM_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 -} - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" - -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 - - # so we don't have to call java-config with --with-dependencies, which might - # bring in more jars then actually desired. - java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})" - - 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 ### - - # 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 - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - doexe "${T}"/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 http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." -} |