www-servers/tomcat: version bump

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 9be53b0a1a8278200f45301392cb5d8087d48eab..643ed9609cc0ebcbd9c7bd5ce009cdc6b54f0d18 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # 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.257 2011/08/15 09:24:20 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.258 2011/08/22 19:58:14 fordfrog Exp $
+
+*tomcat-6.0.33 (22 Aug 2011)
+
+  22 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org> +tomcat-6.0.33.ebuild:
+  Version bump
 
 *tomcat-7.0.20 (15 Aug 2011)
 

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 2f7f366cf93392f9cdbe420c6b08627a2ff59eb8..4b960448861114192b81df84786072e34eb9e32d 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -26,6 +26,7 @@ DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3
 DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f14681a0fa9924b1 SHA1 0df5e58518607ff738bbf440d829747df6acb9ce SHA256 0d6354d45de39e3593ae8f8e6e1361caaa55835e73838f003000e53c6c7ff73a
 DIST apache-tomcat-6.0.29-src.tar.gz 3330475 RMD160 eb789c63aaf629ec897b4280924e086c969169f6 SHA1 255e080706578be0b0f15c67989718ab94e52837 SHA256 9746483edb46b112a81b57376701c7c23c5c657675c2c7efa3187447c07b9d28
 DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c
+DIST apache-tomcat-6.0.33-src.tar.gz 3389376 RMD160 24bd6c0e1bee7daa4cb59ec56552599330f0bb4c SHA1 437db0ba55c6e398fe3af73c4fa5eed3c4666842 SHA256 6dbd5d6eedcf3acd8bf7b6e32544a6e94ec595f7c921baa92f08adb5a5d91b64
 DIST apache-tomcat-7.0.14-src.tar.gz 3898052 RMD160 7361f27ea40cbbe0e431c8dc5e39794cfe271b4b SHA1 ef717f131ff27fc52e8949ceb15eceec806ebf84 SHA256 2d50f2f67c0e2e711cb5119739ac8752c15bc6732f4c8eaf85fe00008103fb17
 DIST apache-tomcat-7.0.16-src.tar.gz 3906690 RMD160 0546da942c4fcc498bcea88cc018e19829f3534b SHA1 d19b59df519858c07cae3e94a78a08f44b648391 SHA256 a63e2ddf79748142ac28824e108a75074d1da7dbc32c87e738c8c001594e785c
 DIST apache-tomcat-7.0.19-src.tar.gz 4055185 RMD160 ea57d5ddfeff9902ded5908efb0da3224a286d9c SHA1 b2bd010fd92cc5491e383f31de01cc89ded8e433 SHA256 6d9549bf63cd69e44b48ac06e85e9a7642808abf45ff8d459b248c74e4a878d3
@@ -38,9 +39,10 @@ EBUILD tomcat-6.0.28-r1.ebuild 6948 RMD160 dcc281587e6a2bd0dd81808e1fa5d1a4c5a3a
 EBUILD tomcat-6.0.29-r1.ebuild 6948 RMD160 d340dad22a80e36a03bdc0614fee97ce9e296fe2 SHA1 4885f884254f2475a6ca004e82dcfeed9462de7b SHA256 a6f9cba93f8f07fd184b62ac7aa2830b7d420050c08e13a060db54c77c730e7f
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
 EBUILD tomcat-6.0.32-r2.ebuild 6968 RMD160 756ffd21d60906c47031e0bc202d3fc77b21c868 SHA1 a9339169846af791be4a92c5cda053324eaa923a SHA256 ad9c4ce33cb4d998b3447a106f8a9df76dde19ef28b6dd94163362d0aaff3343
+EBUILD tomcat-6.0.33.ebuild 6965 RMD160 a3221a02424e3960eec38de7db6f89b406501ec3 SHA1 d7b0e9bb92f4aa232594a63c6245f91c291f15a0 SHA256 c361b1795c611f6d97152a24ccf27ccdfc41e008f7ecf9ea87379b559d44aa50
 EBUILD tomcat-7.0.14.ebuild 7085 RMD160 7e9104de3a2201eed81725fd871d526cef8d0fc3 SHA1 a6fc7ca22901bb524dc45471105db1b47549c49c SHA256 1de546fadcb7b84b4aaa0849b703bca94e50f7b77e892f191fafa601fcffe32c
 EBUILD tomcat-7.0.16.ebuild 7085 RMD160 ed13c4fcd59a070cb0a3517e5c2d931bebe013de SHA1 771e6935e83c571456c9b2470caaa236da4d79c9 SHA256 ab9f3436c8944221c73eb61360a7f6b3218d820955465b450a309d7c2864b565
 EBUILD tomcat-7.0.19.ebuild 7147 RMD160 04def7f58e6f75b5635da8dc3138308e61cbfaa8 SHA1 9f11db6f2bb7cbad5d457780bded3d14a44b221b SHA256 97660acb392b883263db92aa86b6cb762e948200b99ef0e1c5daa33564e073a9
 EBUILD tomcat-7.0.20.ebuild 7147 RMD160 6e390e475b84c9b5ec9d79eb255f3d141fc59eb5 SHA1 1a94aff31bb323419b55e63525c14a3e7b6e00f2 SHA256 e0d24ef557db1924d0200d5ba19c4ec55899c1eabe7ac1e260c466e6a4e3e886
-MISC ChangeLog 64744 RMD160 7d3d030a5c594a6282dc8537c2eff515481bb4d7 SHA1 4b1fa204f51c4c1df8c1a4257ed16e7c0e9e0737 SHA256 2953987068d0f36f001985733c4a68abdd783414e527f18ad4c803e3f45e0076
+MISC ChangeLog 64865 RMD160 33f2b063cb296325c466cf6113ad60e02be615f2 SHA1 f426ddd63b2ccbf539608880fa3e3496ffe37694 SHA256 890570be00210edc7fee4a78d2cd13e856eca08d421632af6719f55c31a12a26
 MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22

diff --git a/www-servers/tomcat/tomcat-6.0.33.ebuild b/www-servers/tomcat/tomcat-6.0.33.ebuild
new file mode 100644 (file)
index 0000000..8d6c8d4
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.33.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.33.ebuild,v 1.1 2011/08/22 19:58:14 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="
+       !<dev-java/tomcat-native-1.1.20
+       >=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.3 ${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
+}