From a451f0eb3eaf04b9b39ec40d10fc1ac723a894eb Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Sat, 12 Feb 2011 16:51:04 +0000 Subject: www-servers/tomcat: fixed bug #354447 (Portage version: 2.1.9.39/cvs/Linux x86_64) --- www-servers/tomcat/ChangeLog | 8 +- www-servers/tomcat/tomcat-6.0.32-r1.ebuild | 223 +++++++++++++++++++++++++++++ www-servers/tomcat/tomcat-6.0.32.ebuild | 222 ---------------------------- 3 files changed, 230 insertions(+), 223 deletions(-) create mode 100644 www-servers/tomcat/tomcat-6.0.32-r1.ebuild delete mode 100644 www-servers/tomcat/tomcat-6.0.32.ebuild (limited to 'www-servers') diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 81d34cd6755a..229dc9325d32 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.240 2011/02/10 14:10:55 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.241 2011/02/12 16:51:04 fordfrog Exp $ + +*tomcat-6.0.32-r1 (12 Feb 2011) + + 12 Feb 2011; Miroslav Šulc -tomcat-6.0.32.ebuild, + +tomcat-6.0.32-r1.ebuild: + Fixed problem with JSP compilation (bug #354447) 10 Feb 2011; Miroslav Šulc metadata.xml: Removing mike@weisso.com (Mike Weissman) from maintainer as I did not see any diff --git a/www-servers/tomcat/tomcat-6.0.32-r1.ebuild b/www-servers/tomcat/tomcat-6.0.32-r1.ebuild new file mode 100644 index 000000000000..b93bde55e612 --- /dev/null +++ b/www-servers/tomcat/tomcat-6.0.32-r1.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.32-r1.ebuild,v 1.1 2011/02/12 16:51:04 fordfrog 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" +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 and #312293 + if use amd64; 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.2 ${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}" + + dodir /usr/share/${TOMCAT_NAME}/webapps + 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 + java-pkg_jar-from eclipse-ecj-3.3 + + # 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 +} diff --git a/www-servers/tomcat/tomcat-6.0.32.ebuild b/www-servers/tomcat/tomcat-6.0.32.ebuild deleted file mode 100644 index c0ac823a3471..000000000000 --- a/www-servers/tomcat/tomcat-6.0.32.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.32.ebuild,v 1.1 2011/02/10 13:08:51 fordfrog 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" -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 and #312293 - if use amd64; 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.2 ${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}" - - dodir /usr/share/${TOMCAT_NAME}/webapps - 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 -} -- cgit v1.2.3-65-gdbad