Bumped to latest release, addresses recent security issue. Compiles and installs, should be good, but little time. Comitted from Houston Aiport, committer on way to LWE 08

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r4 x86_64

3 files changed, 211 insertions, 2 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index b22b8ce5c7e6..66a11e2323e5 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.184 2008/05/13 02:06:49 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.185 2008/08/02 01:28:30 wltjr Exp $
+
+*tomcat-6.0.18 (02 Aug 2008)
+
+  02 Aug 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +tomcat-6.0.18.ebuild:
+  Bumped to latest release, addresses recent security issue. Compiles and
+  installs, should be good, but little time. Comitted from Houston Aiport,
+  committer on way to LWE 08
 
   13 May 2008; William L. Thomson Jr. <wltjr@gentoo.org>
   -files/5.5/main_tomcat_catalina_jasper_build_xml.patch,
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 8115c179f688..148eff24a4e6 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -9,7 +9,9 @@ AUX 6/tomcat.conf 2756 RMD160 4679e6b1e15c3ef70b832f57f1e7f85b21d60b38 SHA1 a48e
 AUX 6/tomcat.init 3355 RMD160 169a9af752e814f7cafbfa849fb1dbc433bbbbf3 SHA1 96a474418bfe6844468ac43fd7b4ecc53e7ce942 SHA256 d53e31a221a3e78f6cc8686d7e123da10216a46851e64a2f5819f1f8147b86b8
 DIST apache-tomcat-5.5.26-src.tar.gz 5062991 RMD160 c82e7640b36c27cfc6ea51f01dc3ff492441a930 SHA1 1eb1c479023d3a7e459ce03860d9d984b673ab27 SHA256 ddc677d7391c438e6102d0b3e9653eaca661344ef74b0260c1f488340d660395
 DIST apache-tomcat-6.0.16-src.tar.gz 3527896 RMD160 8e6c0900889439f4cb89db35afb0c27e77103c00 SHA1 74127ba3da450a97869f2a2a2f0e134d23474018 SHA256 9e0a776f9d9c5fe935a39b066f74c07e7d26b4f30b66b22622a20dec235b0a7f
+DIST apache-tomcat-6.0.18-src.tar.gz 3484249 RMD160 ef85db0d65a4f3bdd3ca821420d06535050b6a93 SHA1 9182b0d6b2d0cb2d60f04be6211f3b3516bc518e SHA256 f5ad5dd12e221d75e25234ca734fb434cf45f3fcea93623232a73dc9bfd03dc4
 EBUILD tomcat-5.5.26.ebuild 10956 RMD160 def823fb1872b6a29fce27f2fbb3d821e02f0047 SHA1 c55fc5fe2815405cce9df2700e0194f2e5b23610 SHA256 fe7e7e9dc8bad29644611cc532ff6d6709056b5953929d8bf91e6ec3093ba4b7
 EBUILD tomcat-6.0.16.ebuild 6290 RMD160 8ddb427fbd5f776da58a1efbeafab9861f8ddcba SHA1 eedebefa220053bb55a5e500aba1f25129ae231d SHA256 6ea2a0011e98dd70235e7431b55a620e81b513fad110b10eda5b6c406bf634ef
-MISC ChangeLog 52607 RMD160 1d37ff3b5655cb2d2ab4d45e88e0971508af9cfa SHA1 ba7da64cc327a0894b9c4f3f997206cebe778037 SHA256 1d81a1b7d45a91a41d5dacf21da8c96a57bcc82473315e911d42cee608cc57df
+EBUILD tomcat-6.0.18.ebuild 6294 RMD160 4872a5b5c94e467896ffbd56e135093a787807f4 SHA1 00bd72287d744b8dc66d7b86aa9aa67bc36ccbaf SHA256 e8463e86a6dabfced786498d6599a1cbe79606bb787cf00fb454e415b83c8fd3
+MISC ChangeLog 52898 RMD160 057a990b08ee541613840b87796e0a46a935dd21 SHA1 6f2ea9564cb6664003b3d84cb8f35fe4ddf6ec64 SHA256 d92d295c844e3f5f3a6312f9780f5a7bc7bd64cc0a9512770cedd04df06a1024
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
diff --git a/www-servers/tomcat/tomcat-6.0.18.ebuild b/www-servers/tomcat/tomcat-6.0.18.ebuild
new file mode 100644
index 000000000000..0d36821ddba5
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.18.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.18.ebuild,v 1.1 2008/08/02 01:28:30 wltjr Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc source"
+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="examples test"
+
+COMMON_DEPEND="dev-java/eclipse-ecj:3.3
+	dev-java/ant-eclipse-ecj:3.3
+	>=dev-java/commons-daemon-1.0.1
+	>=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/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"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${SLOT}/build-xml.patch"
+
+	cd webapps/examples/WEB-INF/lib/
+	rm -v *.jar
+}
+
+src_compile(){
+	# Fix for bug # 178980
+	if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then
+	        java-pkg_force-compiler ecj-3.3
+	fi
+
+	local antflags="build-jasper-jdt deploy -Dbase.path=${T}"
+	antflags="${antflags} -Dcompile.debug=false"
+	if ! use doc; then
+		antflags="${antflags} -Dnobuild.docs=true"
+	fi
+	antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
+	antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)"
+	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)"
+	antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 jsp-api.jar)"
+	antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 servlet-api.jar)"
+	eant ${antflags}
+}
+
+src_install() {
+	cd "${S}/output/build/bin"
+	rm -f *.bat commons-daemon.jar
+	java-pkg_jar-from commons-daemon
+	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"
+
+	# 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"
+	java-pkg_jar-from tomcat-servlet-api-2.5
+
+	cd "${S}"
+
+	# Copy over webapps, some controlled by use flags
+	cp -p RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
+	cp -pr webapps/ROOT "${D}"${CATALINA_BASE}/webapps
+
+	diropts -m755 -o tomcat -g tomcat
+	dodir ${TOMCAT_HOME}/webapps
+	cp -pr webapps/host-manager "${D}"${TOMCAT_HOME}/webapps
+	cp -pr webapps/manager "${D}"${TOMCAT_HOME}/webapps
+
+	if use doc; then
+		cp -pr output/build/webapps/docs "${D}"${CATALINA_BASE}/webapps
+	fi
+	if use examples; then
+		cd output/build/webapps/examples/WEB-INF/lib
+		java-pkg_jar-from jakarta-jstl jstl.jar
+		java-pkg_jar-from jakarta-jstl standard.jar
+		cd "${S}"
+		cp -pPr output/build/webapps/examples "${D}"${CATALINA_BASE}/webapps
+	fi
+
+	# 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
+
+	# 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
+
+	dodoc  "${S}"/{RELEASE-NOTES,RUNNING.txt}
+	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
+}
+
+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."
+
+	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
+		elog
+		ewarn "The examples webapp has a known exploit, please refer to"
+		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
+	fi
+	elog
+	elog " Please report any bugs to http://bugs.gentoo.org/"
+	elog
+}