Version bump. Includes security fixes according to upstream ChangeLog.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 0786a320f7da446e0d6ec7bbbd1f7c613cd0942f..d1895e243d4569b1cf2c8ec6844831d5281493ae 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.230 2010/06/06 12:32:33 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.231 2010/07/10 18:53:47 betelgeuse Exp $
+
+*tomcat-6.0.28 (10 Jul 2010)
+
+  10 Jul 2010; Petteri Räty <betelgeuse@gentoo.org> +tomcat-6.0.28.ebuild:
+  Version bump. Includes security fixes according to upstream ChangeLog.
 
 *tomcat-6.0.26-r1 (06 Jun 2010)
 

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ee2d57e340d9cf4dde059ad05b2604fec63c5a00..d8803e3e037144f9daa55142524f494c9b29f7fe 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.5/26-main_tomcat_catalina_jasper_build_xml.patch 16573 RMD160 53f1deaa88a39459a584cf14c761cb411d68f2e6 SHA1 69b3ca39f9dbabe12c56865d47866c06dcb7c2e3 SHA256 99a2c1bb164d97407525305512a85e6139531d81a47aa2c25f5c2cfe50aee1f6
 AUX 5.5/5.5.27-dynamic-JSSE13Factory.patch 1853 RMD160 31d20202a3be06c156b0c13f0afb3b394b8ecf02 SHA1 d7e7640dd4f7b7b92b21ac51d1b508fe56691a81 SHA256 f7db0e692088ec25a4731a521c1da4a0075e747f68690235fde3ca93c6f2e19d
 AUX 5.5/catalina.policy 10897 RMD160 d6accc56803b132d0e82e163cc583464c38248ef SHA1 585f80e24cad7e5927f8c2c6ad03f668eb904cc1 SHA256 8188db94772eb00d44b28cb9b40e9ccf30803acf576c0af1be5844ebd35d763c
@@ -13,8 +16,17 @@ AUX 6/tomcat.init 3529 RMD160 45aabac31804faff713ca3648f4a675e5ea7ea89 SHA1 f2b4
 AUX 6/tomcat.init.2 4057 RMD160 d84933e0792748e15ccd7c771b70ae9fe3fdfe2c SHA1 03348b4015f27c6b0018db74d801d5bf0b379e99 SHA256 9f100eaea7c9cb49a9c291faa8fdf8ea16cd1b2d049ddafd60f6ebdad51bc59a
 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087f6d82e0f111f SHA1 c6217d78d2e64fa839a30372bd2724ba75030c14 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334
 DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3aed43bf66cd2 SHA1 afe0aa87d004a89f4ad314314b17bd4e7222250b SHA256 376a02d4fa56c4bbdc981965e62db74aa6c63fe0f056d9c82b4558013a74a88c
+DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f14681a0fa9924b1 SHA1 0df5e58518607ff738bbf440d829747df6acb9ce SHA256 0d6354d45de39e3593ae8f8e6e1361caaa55835e73838f003000e53c6c7ff73a
 EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01
 EBUILD tomcat-6.0.26-r1.ebuild 6870 RMD160 159eb416c53876cc18d72937f901edcd2e6e8c92 SHA1 618e876b15ee3f55c6e79d474f41a603cf2f9ec8 SHA256 c9bc6777a9d5a0112c1a0e2c77b5e8f8316bfff2043af7fc3e5880102428c400
 EBUILD tomcat-6.0.26.ebuild 6861 RMD160 38045bfd3921e366823b00061ee327fb17d21bbf SHA1 272759bcbf4744ec404e6c941c2aeac3852c58e8 SHA256 1d8198ae22485ffb11a87690f969f272c6446c3a83b4137bc14b7f1f8a62cba2
-MISC ChangeLog 59562 RMD160 6efd19d2f66966c7c6dfbffb0be2df69985518a4 SHA1 cbf0d810a882a3e185df50e44044783984357234 SHA256 f823459ede278a88725b9e4ad5e369e22a336ac0227516b5abd1c7fdd2bf9873
+EBUILD tomcat-6.0.28.ebuild 6871 RMD160 4fc6d287533b7b3cfef6cc92f0ae957a757df406 SHA1 e16a7c9fb8e279200234af46b35033ee781038de SHA256 23f103747f823ad68584ea6384307e31fb77c2e2e260505cb6ed70aa9d52ff2a
+MISC ChangeLog 59746 RMD160 11e7e3d9523cdc44b0e6ca1b32db0295813ec88f SHA1 5f516c1ec6552f26d32cef2ab7366436bce638f0 SHA256 14eb41ef837a2ab43e0b003924d19d808177ac8b60bdc6f4f15544a051177770
 MISC metadata.xml 658 RMD160 db94c7bc6ba622acfe88f970aa7d2e6fa1718a2a SHA1 aa25178fefb68df9dee7d8fc0d925a2fbbb655dd SHA256 5ddc2743ca9e3ec0bef7983248a9c8eda9238425288efb3acdecc8a828714bd8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkw4wiAACgkQcxLzpIGCsLS6OACglEha04l0GGasqkY8kWIIVF+s
+yAYAn2UFAk9us7IK+pYXz3xZok/k8Pf+
+=KadX
+-----END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-6.0.28.ebuild b/www-servers/tomcat/tomcat-6.0.28.ebuild
new file mode 100644 (file)
index 0000000..f835829
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.28.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.28.ebuild,v 1.1 2010/07/10 18:53:47 betelgeuse 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 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}"
+
+       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
+}