diff options
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 9 | ||||
| -rw-r--r-- | www-servers/tomcat/Manifest | 4 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-6.0.26.ebuild | 219 |
3 files changed, 229 insertions, 3 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index b7e35d828f3f..6cf304f57be4 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/tomcat -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.223 2009/11/17 14:53:52 caster Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.224 2010/03/17 10:10:58 ali_bush Exp $ + +*tomcat-6.0.26 (16 Mar 2010) + + 16 Mar 2010; Alistair Bush <ali_bush@gentoo.org> +tomcat-6.0.26.ebuild: + Version Bump. 17 Nov 2009; Vlastimil Babka <caster@gentoo.org> -tomcat-5.5.27-r3.ebuild: Remove old. diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 0bb619cdcacf..e4943d32a8a5 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -12,8 +12,10 @@ AUX 6/tomcat.conf 2895 RMD160 36ece62ddff5257c04f47d75b9c77bd4dc198652 SHA1 8fef AUX 6/tomcat.init 3529 RMD160 45aabac31804faff713ca3648f4a675e5ea7ea89 SHA1 f2b499fda69d83aecda72742f88ed8bf64f5cfb3 SHA256 744daa31e36e548f76f2997c3e3430b961163bfe0d2ba2ef6d81f5c2ddb0470c DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087f6d82e0f111f SHA1 c6217d78d2e64fa839a30372bd2724ba75030c14 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334 DIST apache-tomcat-6.0.20-src.tar.gz 3590562 RMD160 65b1b56132c03855e352e44a24b761bccd65b90c SHA1 ab538484d8d05c83a69c70ab6bf07606282633d8 SHA256 e8f709f0aeda8e164362144aca253249f050bc330e622dbb4196434db9933298 +DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3aed43bf66cd2 SHA1 afe0aa87d004a89f4ad314314b17bd4e7222250b SHA256 376a02d4fa56c4bbdc981965e62db74aa6c63fe0f056d9c82b4558013a74a88c EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01 EBUILD tomcat-6.0.20-r1.ebuild 6899 RMD160 14a5a13cdb09935cc9ba353f5cf7eb761f655a1f SHA1 5fd5dbc255a61b5f19a0c4eae71e719a478010da SHA256 33046ec344113795237a5bdccf233e6cf4f8af0c887ff516ec74a58e5fb5d113 EBUILD tomcat-6.0.20.ebuild 6790 RMD160 19b0a9b7ce9b0764ccf2e3f0355a11744bb6434b SHA1 8a2b1bd20a099b97bfb50d7658ed5db99a0482b8 SHA256 b8868770240026c71773b8e3d63469ee6a71fe621e1d0751e867f5c513d4b5f2 -MISC ChangeLog 58307 RMD160 668ecd7ff9924c6695a813d695fb67ea6e8342cb SHA1 29355597fe055561d6244e7cdd5e3159c8ac6685 SHA256 681befa4eb23cb2e601a513ad86bdf2ad0b6b737a78ebc1542c55ce4307a666f +EBUILD tomcat-6.0.26.ebuild 6896 RMD160 81b7a5b4589ea47fb1734022342a2ee951de7fc4 SHA1 5112383851bedf395cd5f41535ed0c3efc3087ca SHA256 df90e027a69d75a7233d623793a0f5363582a59490bc748adbef1cd5a2244852 +MISC ChangeLog 58430 RMD160 46d5800d1698fa015b46cb5f2a9d3720c9eb160f SHA1 dfef7dfde5fd219c1ce5e678ce0fc54b98784a73 SHA256 8f8c721e2b4f42b3939e7f57ae2eb776b8e9f69138e21b5dc6a8896764c5cb0e MISC metadata.xml 658 RMD160 db94c7bc6ba622acfe88f970aa7d2e6fa1718a2a SHA1 aa25178fefb68df9dee7d8fc0d925a2fbbb655dd SHA256 5ddc2743ca9e3ec0bef7983248a9c8eda9238425288efb3acdecc8a828714bd8 diff --git a/www-servers/tomcat/tomcat-6.0.26.ebuild b/www-servers/tomcat/tomcat-6.0.26.ebuild new file mode 100644 index 000000000000..2d4b7e0ad251 --- /dev/null +++ b/www-servers/tomcat/tomcat-6.0.26.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.1 2010/03/17 10:10:58 ali_bush Exp $ + +EAPI=2 +JAVA_PKG_IUSE="doc examples source test" +WANT_ANT_TASKS="ant-trax" + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container" + +MY_P="apache-${P}-src" +SLOT="6" +SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz" +HOMEPAGE="http://tomcat.apache.org/" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +LICENSE="Apache-2.0" + +IUSE="" + +COMMON_DEPEND="dev-java/eclipse-ecj:3.3 + dev-java/ant-eclipse-ecj:3.3 + >=dev-java/commons-dbcp-1.2.1 + >=dev-java/commons-logging-1.1 + >=dev-java/commons-pool-1.2 + ~dev-java/tomcat-servlet-api-${PV} + examples? ( dev-java/jakarta-jstl )" + +RDEPEND=">=virtual/jre-1.5 + >=dev-java/commons-daemon-1.0.1 + dev-java/ant-core + ${COMMON_DEPEND}" + +DEPEND=">=virtual/jdk-1.5 + ${COMMON_DEPEND} + test? ( =dev-java/junit-3.8* )" + +S=${WORKDIR}/${MY_P} + +TOMCAT_NAME="${PN}-${SLOT}" +TOMCAT_HOME="/usr/share/${TOMCAT_NAME}" +WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps" + +# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3 +# Find out why so +JAVA_ANT_CELEMENT_REWRITER="true" +JAVA_ANT_REWRITE_CLASSPATH="true" + +EANT_NEEDS_TOOLS="true" +EANT_GENTOO_CLASSPATH="tomcat-servlet-api-2.5,eclipse-ecj-3.3" + +EANT_BUILD_TARGET="build-only build-jasper-jdt" +EANT_DOC_TARGET="build-docs" + +EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV} -Dversion.number=${PV} +-Dcompile.debug=false -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar +-Dant.jar=ant.jar" + +pkg_setup() { + java-pkg-2_pkg_setup + enewgroup tomcat 265 + enewuser tomcat 265 -1 /dev/null tomcat +} + +java_prepare() { + rm -v webapps/examples/WEB-INF/lib/*.jar || die + + # bug # 178980 + if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then + java-pkg_force-compiler ecj-3.3 + fi + + if ! use doc; then + EANT_EXTRA_ARGS+=" -Dnobuild.docs=true" + fi + + EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)" + java-pkg_jarfrom --build-only ant-core ant.jar +} + +src_install() { + cd "${S}/bin" + rm -f *.bat + chmod 755 *.sh + + # register jars per bug #171496 + cd "${S}/output/build/lib/" + for jar in *.jar; do + java-pkg_dojar ${jar} + done + + local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/ + + # init.d, conf.d + newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME} + newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME} + + # create dir structure + dodir /usr/share/${TOMCAT_NAME} + + diropts -m750 -o tomcat -g tomcat + dodir /etc/${TOMCAT_NAME} + keepdir ${WEBAPPS_DIR} + + diropts -m755 -o tomcat -g tomcat + dodir ${CATALINA_BASE} + + diropts -m775 -o tomcat -g tomcat + dodir /etc/${TOMCAT_NAME}/Catalina/localhost + keepdir /var/log/${TOMCAT_NAME}/ + keepdir /var/run/${TOMCAT_NAME}/ + keepdir /var/tmp/${TOMCAT_NAME}/ + + cd "${S}" + # fix context's so webapps will be deployed + sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager" a:' "${S}"/webapps/host-manager/META-INF/context.xml + sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager" a:' "${S}"/webapps/manager/META-INF/context.xml + + # replace the default pw with a random one, see #92281 + local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) + sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml + + # copy over the directories + chown -R tomcat:tomcat webapps/* conf/* + cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf" + cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \ + || die "failed to copy" + # webapps get stored in /usr/share/${TOMCAT_NAME}/webapps + cd "${S}"/webapps || die + ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}" + + cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die + cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die + cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die + if use doc; then + cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die + fi + if use examples; then + cd "${S}"/webapps/examples/WEB-INF/lib + java-pkg_jar-from jakarta-jstl jstl.jar + java-pkg_jar-from jakarta-jstl standard.jar + cd "${S}"/webapps + cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die + fi + + # replace catalina.policy with gentoo specific one bug #176701 +# cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \ +# || die "failed to replace catalina.policy" + + cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \ + || die "failed to copy" + + cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die + java-pkg_jar-from tomcat-servlet-api-2.5 + + # symlink the directories to make CATALINA_BASE possible + dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf + dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs + dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp + dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work + + dodoc "${S}"/{RELEASE-NOTES,RUNNING.txt} + fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml + + #install *.sh scripts bug #278059 + exeinto /usr/share/${TOMCAT_NAME}/bin + doexe "${S}"/bin/*.sh +} + +pkg_postinst() { + ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}" + # temp fix for bug #176097 + chown -fR tomcat:tomcat /etc/${TOMCAT_NAME} + ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix." + + # bug #180519 + if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then + elog "The latest webapp has NOT been installed into" + elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists" + elog "and we do not want to overwrite any files you have put there." + elog + elog "Installing latest webapp into" + elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead" + elog + elog "Manager Symbolic Links NOT created." + + else + einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}" + cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \ + "${ROOT}""${WEBAPPS_DIR}" + # link the manager's context to the right position + dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml + dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml + fi + + elog + elog " This ebuild implements a FHS compliant layout for tomcat" + elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml" + elog " for more information." + elog + ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" + ewarn "from upstream binary if you need it. Gentoo Bug # 144276" + elog + + ewarn "The manager webapps have known exploits, please refer to" + ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450" + + if use examples ; then + ewarn + ewarn "The examples webapp has a known exploit, please refer to" + ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449" + ewarn + fi + + elog + elog " Please report any bugs to http://bugs.gentoo.org/" + elog +} |