Fixed bug #242826 (invalid tomcat version reported), patch by Yoann Pannier <gentoo-bugs.d@umsar.org>.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

3 files changed, 210 insertions, 12 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 3b3035486193..719186687460 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # 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.196 2008/09/17 21:43:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.197 2008/10/22 00:06:59 fordfrog Exp $
+
+*tomcat-6.0.18-r1 (21 Oct 2008)
+
+  21 Oct 2008; Miroslav Šulc <fordfrog@gentoo.org>
+  +tomcat-6.0.18-r1.ebuild:
+  Fixed bug #242826 (invalid tomcat version reported), patch by Yoann
+  Pannier <gentoo-bugs.d@umsar.org>.
 
   17 Sep 2008; Markus Meier <maekke@gentoo.org> tomcat-5.5.27-r1.ebuild:
   amd64/x86 stable, bug #225477
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 83585d5dc929..8022b8ce5f47 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
@@ -19,13 +16,7 @@ EBUILD tomcat-5.5.26.ebuild 10956 RMD160 def823fb1872b6a29fce27f2fbb3d821e02f004
 EBUILD tomcat-5.5.27-r1.ebuild 11239 RMD160 513f6ab8c61cf13294aab67003c7514606c102ea SHA1 94f4a35482230b0cdc4ddad08cb239346feb92f9 SHA256 224506c273eadb5c766db378a25b2cae99e025e53fa52ee8e3b1524e83083953
 EBUILD tomcat-5.5.27.ebuild 10823 RMD160 3c8839d68755592ed1423813e9536b241cbb5752 SHA1 49bbda26a57877cd09a32895ce7021e8812a63a5 SHA256 471ba2ce604e29e6f6aedd32a5d9e10c779ba2bd5834dcf812cdca2ad5ea5f94
 EBUILD tomcat-6.0.16.ebuild 6290 RMD160 8ddb427fbd5f776da58a1efbeafab9861f8ddcba SHA1 eedebefa220053bb55a5e500aba1f25129ae231d SHA256 6ea2a0011e98dd70235e7431b55a620e81b513fad110b10eda5b6c406bf634ef
+EBUILD tomcat-6.0.18-r1.ebuild 6363 RMD160 a4473b6c9be3ec223e150fe02150046e2b292990 SHA1 ebaea49746f8dfca1e11956ec8f0e034eb921409 SHA256 80a7998ed54c684c2c985a4b623959d836c90aa1f1e2ca6f28fcb3130120c911
 EBUILD tomcat-6.0.18.ebuild 6292 RMD160 06ef935b55eb04a604b909dab996d2227ab03c7a SHA1 7519b3837e81c1c4a0ddeccceaa10ea73785d457 SHA256 47ba94b7be1df148216f6b0f7dd740a5d9b3bdc2dd2fd7fb2d21c0e703551e9d
-MISC ChangeLog 54377 RMD160 c7c9ac4526669f5b8d0bfef2b93703b0cb534a2c SHA1 c1fe1eb7fc493a59b0d4b326956dfa69c1097663 SHA256 ab111e29da98307b2ab0d2dd14ac79d275ae5900c35ce47640464e542233011a
+MISC ChangeLog 54600 RMD160 16a12509bf46aeda2835e51143892fe30eb2105c SHA1 63f3dd4ed09e59cfca09201339ca7fa3880e8f8d SHA256 675c6c617f1a5c5dd059e1f84051b38a0d946431c867bd7153c8b9b50cfc6dda
 MISC metadata.xml 627 RMD160 2dab78e07362b6486455f4d572705ebecd9a291e SHA1 c4b4ef839599dded0996fc0feb31d70c0108580b SHA256 d321a949ce5495ef446bd75104539808e69fb6f6ae2e53b5fa583b48ea5f5749
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjRelcACgkQkKaRLQcq0GJEhwCeOEa3Bzr78Veka1kE0l9rxeJC
-zX0An3cxXgYpxE5aOoQM2PDbI/2xMIHG
-=M9pm
------END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-6.0.18-r1.ebuild b/www-servers/tomcat/tomcat-6.0.18-r1.ebuild
new file mode 100644
index 000000000000..f7796f63990d
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.18-r1.ebuild
@@ -0,0 +1,200 @@
+# 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-r1.ebuild,v 1.1 2008/10/22 00:06:59 fordfrog 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)"
+	antflags="${antflags} -Dversion=${PV} -Dversion.number=${PV}"
+	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
+}