Bump to fix bug #276059. Thanks to weisso.

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

3 files changed, 227 insertions, 12 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 5bb267489a86..ba5fe438d269 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.217 2009/06/27 19:24:59 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.218 2009/07/03 11:02:15 ali_bush Exp $
+
+*tomcat-6.0.20-r1 (03 Jul 2009)
+
+  03 Jul 2009; Alistair Bush <ali_bush@gentoo.org> +tomcat-6.0.20-r1.ebuild:
+  Bump to fix bug #276059.  Thanks to weisso.
 
   27 Jun 2009; Alex Legler <a3li@gentoo.org> tomcat-6.0.20.ebuild:
   amd64 stable, security bug 272566.
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index a027ce977779..cce73378cdf0 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,3 @@
------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
@@ -18,13 +15,7 @@ DIST apache-tomcat-6.0.18-src.tar.gz 3484249 RMD160 ef85db0d65a4f3bdd3ca821420d0
 DIST apache-tomcat-6.0.20-src.tar.gz 3590562 RMD160 65b1b56132c03855e352e44a24b761bccd65b90c SHA1 ab538484d8d05c83a69c70ab6bf07606282633d8 SHA256 e8f709f0aeda8e164362144aca253249f050bc330e622dbb4196434db9933298
 EBUILD tomcat-5.5.27-r3.ebuild 11069 RMD160 d9c95564e67d1bc56f047f40ed5549214fb9637c SHA1 b964b523482df1326784bf2abaae5d411797bc06 SHA256 51865974bfc0df017966b895fb286fae8ac3d1aaeedb04fe19eed64d28082bf2
 EBUILD tomcat-6.0.18-r3.ebuild 6406 RMD160 9de624d68107f5e1ee997ed36b4d2145837e51a6 SHA1 d2f7419b263539b6c56091c53d07af366eb629d5 SHA256 a36febf0d1ab039bd7a18bd1b2313d57cad019e1e86b997f6ccffae729d034f0
+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 57650 RMD160 7208be1302dcbd943800fdaba426bbfc57ae8b0a SHA1 6b397ac1e0629caacf26cc1ae64fa7d55eb89bd0 SHA256 de5062a95521336b27a2feb250ec9df6cc6060b8a5ff8eb148bc01c06042628b
+MISC ChangeLog 57811 RMD160 9ab9fd5b01c71ee53e06222243ed041ab5167121 SHA1 f50790815d741b0abe24e8f47de83b0ff0ea469a SHA256 dd6844f5b1cafac17ec16c98f52d2e265e16d1b31b97314f8c505b74fcb2d2d9
 MISC metadata.xml 658 RMD160 db94c7bc6ba622acfe88f970aa7d2e6fa1718a2a SHA1 aa25178fefb68df9dee7d8fc0d925a2fbbb655dd SHA256 5ddc2743ca9e3ec0bef7983248a9c8eda9238425288efb3acdecc8a828714bd8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpGchMACgkQaGsKqSU7eCSlmgCbB5mesQznvSIrlsHmweE1vHPb
-WPIAn2Iq7E/pshahUjhz9XnCG/JAoYR6
-=D1pJ
------END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-6.0.20-r1.ebuild b/www-servers/tomcat/tomcat-6.0.20-r1.ebuild
new file mode 100644
index 000000000000..e36aadbd5df3
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.20-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.20-r1.ebuild,v 1.1 2009/07/03 11:02:15 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
+}