Massive bug fixes + new versions of tomcat. Added metadata.xml.

5 files changed, 204 insertions, 9 deletions

diff --git a/net-www/tomcat/ChangeLog b/net-www/tomcat/ChangeLog
index 684d6a5aa034..20272799410c 100644
--- a/net-www/tomcat/ChangeLog
+++ b/net-www/tomcat/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for net-www/tomcat
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.23 2003/12/14 23:29:24 spider Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.24 2004/02/16 01:04:02 zx Exp $
+
+*tomcat-5.0.18 (15 Feb 2004)
+
+  15 Feb 2004; <zx@gentoo.org> tomcat-4.1.29.ebuild, tomcat-5.0.18.ebuild:
+  Massive bugfixes + version bumps. Huge thanks to Chetan Sarva
+  <gentoo-bugs@fw2.net> for the ebuilds + various fixes. This update adds 5.0.18
+  and 4.1.29 tomcat versions. It also fixes the following bugs:
+  
+  Bug #38949
+  
+  Bug #38952
+  
+  Bug #21772
+  
+  Bug #38358
+  
+  Bug #21744
+  
+  Bug #22040
+  
+  Bug #19723
+  
+  Bug #39819
+  
+  Bug #26994
+  
+  Bug #32408
+  
+  Bug #35094
 
   15 Dec 2003; <spider@gentoo.org> tomcat-4.1.24-r1.ebuild:
   QA: fixing chown user.group to user:group, bug #35127
diff --git a/net-www/tomcat/Manifest b/net-www/tomcat/Manifest
index 4b47b85e3261..7d8b4a9cf5af 100644
--- a/net-www/tomcat/Manifest
+++ b/net-www/tomcat/Manifest
@@ -1,13 +1,19 @@
 MD5 6fa6b15a6da7e622e7bf811c3e704b8d tomcat-4.1.24-r1.ebuild 3813
-MD5 5d40bb3b37859d2de32fa303b04acf9e tomcat-5.0.18.ebuild 4197
-MD5 59e67d1d95f771ddd5dd37f5b344da2a ChangeLog 5315
+MD5 3d05d585898c1192816738c1bcc3f290 tomcat-4.1.29.ebuild 4202
+MD5 5f5a1394548e680ffc46bc9ba81458a2 tomcat-5.0.18.ebuild 4198
+MD5 5dcb5ee56ba15fa591fa623f4f7540d6 ChangeLog 5802
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 f3d7f1cc3b7b8a69342e6bede7395f58 files/digest-tomcat-4.1.24-r1 74
+MD5 aadebd5a246bdfeb6ccf764f4f9b289b files/digest-tomcat-4.1.29 74
 MD5 16a563fee9101781e780f3d7909f999d files/digest-tomcat-5.0.18 75
 MD5 bf1c6e3b412968c9a06aeb15f21355e9 files/4.1.24/gentoo.diff 4002
 MD5 6edc3ed5ac8205492cf986e8550d6bc7 files/4.1.24/tomcat.conf 2709
 MD5 322e4606bb9702810840fc06a3b5a932 files/4.1.24/tomcat.init 816
 MD5 53b2c10f99d7d2c05a69fc49b7acda8b files/4.1.24/21tomcat 58
+MD5 8e78596e41abd9a751733cc48570d1a4 files/4.1.29/gentoo.diff 5815
+MD5 95c21c44abff903cd06e033e935e9376 files/4.1.29/tomcat.conf 2610
+MD5 287f73496e9a96f5f86a076752f761dc files/4.1.29/tomcat.init 713
+MD5 d686b57da55c6d8da476981c6557a3a1 files/4.1.29/21tomcat 152
 MD5 d0b4b02720bc1672f97f846c44be219e files/5.0.18/gentoo.diff 6359
 MD5 95c21c44abff903cd06e033e935e9376 files/5.0.18/tomcat.conf 2610
 MD5 287f73496e9a96f5f86a076752f761dc files/5.0.18/tomcat.init 713
diff --git a/net-www/tomcat/files/digest-tomcat-4.1.29 b/net-www/tomcat/files/digest-tomcat-4.1.29
new file mode 100644
index 000000000000..c38a9566e7a2
--- /dev/null
+++ b/net-www/tomcat/files/digest-tomcat-4.1.29
@@ -0,0 +1 @@
+MD5 66b03ddd10fb4a9079fe26774436db09 jakarta-tomcat-4.1.29.tar.gz 7711952
diff --git a/net-www/tomcat/tomcat-4.1.29.ebuild b/net-www/tomcat/tomcat-4.1.29.ebuild
new file mode 100644
index 000000000000..bd8ca45b0a82
--- /dev/null
+++ b/net-www/tomcat/tomcat-4.1.29.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-4.1.29.ebuild,v 1.1 2004/02/16 01:04:02 zx Exp $
+
+DESCRIPTION="Apache Servlet-2.3/JSP-1.2 Container"
+SRC_URI="http://apache.sunsite.ualberta.ca/jakarta/tomcat-4/v4.1.29/bin/${At}"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
+LICENSE="Apache-1.1"
+SLOT="0"
+DEPEND="sys-apps/sed"
+RDEPEND=">=virtual/jdk-1.2"
+
+S=${WORKDIR}/jakarta-${P}
+At="jakarta-tomcat-${PV}.tar.gz"
+
+src_unpack() {
+	tar xzf ${DISTDIR}/${At} || die
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/gentoo.diff
+}
+
+
+pkg_setup() {
+	USERADDED=false
+	if ! groupmod tomcat >/dev/null 2>&1 ; then
+		groupadd -g 265 tomcat || die "problem adding group tomcat, gid 265"
+		USERADDED=true
+	fi
+	if ! id tomcat >/dev/null 2>&1 ; then
+		useradd -u 265 -g tomcat -s /bin/bash -d /opt/tomcat -c "Apache Tomcat" tomcat || die "problem adding user tomcat, uid 265"
+		USERADDED=true
+	fi
+}
+
+src_install() {
+	TOMCAT_HOME="/opt/tomcat"
+	INSTALLING="yes"
+	DIROPTIONS="--mode=0755 --owner=tomcat --group=tomcat"
+
+	# Create directories
+	dodir ${TOMCAT_HOME}
+	dodir /var/log/${PN}
+	dosym /var/log/${PN} ${TOMCAT_HOME}/logs
+	dodir ${TOMCAT_HOME}/temp
+	dodir ${TOMCAT_HOME}/work
+
+	keepdir /var/log/${PN}
+	keepdir ${TOMCAT_HOME}/temp
+	keepdir ${TOMCAT_HOME}/work
+
+	cd ${S}
+
+	# INIT SCRIPTS AND ENV
+
+	cp -a ${FILESDIR}/${PV}/tomcat.init ${S}/tomcat
+	insinto /etc/init.d
+	insopts -m0755
+	doins ${S}/tomcat
+
+	cp -a ${FILESDIR}/${PV}/tomcat.conf ${S}/tomcat
+	insinto /etc/conf.d
+	insopts -m0644
+	doins ${S}/tomcat
+
+	cp -a ${FILESDIR}/${PV}/21tomcat ${S}/21tomcat
+	insinto /etc/env.d
+	insopts -m0644
+	doins ${S}/21tomcat
+
+	# SEND JARS TO SHARED LOCATION
+	for i in \
+		common/lib/*.jar
+	do
+		dojar ${i}
+		rm ${i}
+	done
+
+	dodoc RELEASE-NOTES-* README.txt RUNNING.txt LICENSE RELEASE-PLAN-4.1.txt
+
+	chown -R tomcat.tomcat ${S}
+	DIROPTIONS="--mode=0755 --owner=tomcat --group=tomcat"
+	dodir ${TOMCAT_HOME}/common
+	dodir ${TOMCAT_HOME}/common/classes
+	dodir ${TOMCAT_HOME}/webapps
+
+	rm bin/*.bat bin/*.exe
+
+	cp -Rdp \
+		bin \
+		server \
+		shared \
+		webapps \
+		work \
+		${D}${TOMCAT_HOME}
+
+	cp -Rdp common/endorsed ${D}${TOMCAT_HOME}/common/
+
+	cp -Rdp conf ${D}/etc/tomcat
+	fperms 640 /etc/tomcat/tomcat-users.xml
+
+	dosym /usr/share/tomcat/package.env ${TOMCAT_HOME}/common/package.env
+	dosym /usr/share/tomcat/lib ${TOMCAT_HOME}/common/lib
+	dosym /etc/tomcat ${TOMCAT_HOME}/conf
+
+}
+
+pkg_postinst() {
+	einfo " "
+	einfo " NOTICE!"
+	if ${USERADDED} ; then
+		einfo " User and group 'tomcat' have been added."
+		einfo " "
+	fi
+	einfo " FILE LOCATIONS:"
+	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
+	einfo "     Contains application data, configuration files."
+	einfo " 2.  Runtime settings: /etc/conf.d/tomcat"
+	einfo "     Contains CLASSPATH and JAVA_HOME settings."
+	einfo " 3.  Configuration:  /etc/tomcat/"
+	einfo " 4.  Logs:  /var/log/tomcat/"
+	einfo " 5.  Executables, libraries:  /usr/share/tomcat/"
+	einfo " "
+	einfo " "
+	einfo " STARTING AND STOPPING TOMCAT:"
+	einfo "   /etc/init.d/tomcat start"
+	einfo "   /etc/init.d/tomcat stop"
+	einfo "   /etc/init.d/tomcat restart"
+	einfo " "
+	einfo " "
+	einfo " NETWORK CONFIGURATION:"
+	einfo " By default, Tomcat runs on port 8080.  You can change this"
+	einfo " value by editing /etc/tomcat/server.xml."
+	einfo " "
+	einfo " To test Tomcat while it's running, point your web browser to:"
+	einfo " http://${HOSTNAME}:8080/"
+	einfo " "
+	einfo " "
+	einfo " BUGS:"
+	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	einfo " may not get seen.  Thank you."
+	einfo " "
+	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
+	sleep 10
+}
+
+# pkg_postrm() gets called during an unmerge and seperately (new environment)
+# from the src_install() earlier so setting the INSTALLING var does not work.
+#pkg_postrm() {
+#	if [ -z "${INSTALLING}" ] ; then
+#		einfo ">>> Removing user for Tomcat"
+#		userdel tomcat || die "Error removing Tomcat user"
+#		einfo ">>> Removing group for Tomcat"
+#		groupdel tomcat || die "Error removing Tomcat group"
+#	else
+#		einfo ">>> Tomcat user and group preserved"
+#	fi
+#}
diff --git a/net-www/tomcat/tomcat-5.0.18.ebuild b/net-www/tomcat/tomcat-5.0.18.ebuild
index dd0d84c343d2..2ec39d8fb94b 100644
--- a/net-www/tomcat/tomcat-5.0.18.ebuild
+++ b/net-www/tomcat/tomcat-5.0.18.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-5.0.18.ebuild,v 1.1 2004/02/16 00:50:18 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-5.0.18.ebuild,v 1.2 2004/02/16 01:04:02 zx Exp $
 
-S=${WORKDIR}/jakarta-${P}
-At="jakarta-tomcat-${PV}.tar.gz"
 DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
 SRC_URI="http://apache.mirrors.pair.com/jakarta/tomcat-`echo ${PV} | cut -b 1`/v${PV}/bin/jakarta-${P}.tar.gz"
 HOMEPAGE="http://jakarta.apache.org/tomcat"
 KEYWORDS="x86 ppc sparc ~alpha"
 LICENSE="Apache-1.1"
 SLOT="0"
-DEPEND=">=virtual/jdk-1.2"
-RDEPEND="sys-apps/sed"
+DEPEND="sys-apps/sed"
+RDEPEND=">=virtual/jdk-1.2"
+
+S=${WORKDIR}/jakarta-${P}
+At="jakarta-tomcat-${PV}.tar.gz"
 
 src_unpack() {
 	tar xzf ${DISTDIR}/${At} || die