escape params in init script, bug 61822 + rev bump

8 files changed, 261 insertions, 13 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 60d2ee1b9637..5a3aa389e506 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/tomcat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.1 2004/08/08 18:39:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.2 2004/08/26 18:17:55 axxo Exp $
+
+*tomcat-5.0.27-r4 (26 Aug 2004)
+
+  26 Aug 2004; Thomas Matthijs <axxo@gentoo.org> files/4.1.30/tomcat.init,
+  files/5.0.27/tomcat.init, +tomcat-4.1.30-r5.ebuild,
+  +tomcat-5.0.27-r4.ebuild:
+  escape params in init script, bug 61822
 
 *tomcat-4.1.30-r4 (08 Aug 2004)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 54e5698a4212..85467b4347e0 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,29 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 6c1857b5c5632dffdc97a59186ba8862 tomcat-5.0.27-r4.ebuild 3602
 MD5 c11fdb7147ea2a703c7bb0718f23aa35 tomcat-5.0.27-r3.ebuild 3604
+MD5 d795dea0882b46701498ff1b31fe7734 tomcat-4.1.30-r5.ebuild 3574
 MD5 b195cb8574a416935e3d15a82f99fa5a tomcat-3.3.2-r2.ebuild 3216
-MD5 62bdfa7646f40e8ad368b9ea09ae4ae2 ChangeLog 10814
+MD5 ac019be44c8271f2aa2863198dc06ab5 ChangeLog 11045
 MD5 56292f22dced45d993974e198033461d metadata.xml 221
 MD5 950a3d9fb8b5ed810a0d4d1238a0235e tomcat-4.1.30-r4.ebuild 3576
 MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r4 74
+MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r5 74
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r3 75
+MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r4 75
 MD5 6940eb780efc66ecb6ecf11b6b7adb05 files/digest-tomcat-3.3.2-r2 73
 MD5 eb7830519ae94bb563d39f1f51ab590a files/3.3.2/gentoo.diff 368
 MD5 04d838f36e57a63e574b2aea1c70dc47 files/3.3.2/tomcat.conf 904
 MD5 0f654e5b22503b038f675131bd7ceb97 files/3.3.2/tomcat.init 635
 MD5 69ec5e00d8708345bd24af96c9c3fab4 files/4.1.30/gentoo.diff 463
 MD5 1b596708b069c5ac88ac293e1a759625 files/4.1.30/tomcat.conf 2660
-MD5 e77130a2fe7361a42459d1e1349c31f4 files/4.1.30/tomcat.init 638
+MD5 a32fc16c5481597ccd0f874c4098174e files/4.1.30/tomcat.init 642
 MD5 c19b85e130d0e0a565eebc406d699965 files/4.1.30/jikes.diff 510
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660
-MD5 4ceb3390440d942a513461d5ac15fe9b files/5.0.27/tomcat.init 638
+MD5 30acf279da2c8d377225a5b84ce5f7b6 files/5.0.27/tomcat.init 642
 MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.5 (GNU/Linux)
 
-iD8DBQFBF3aB/rLF9B432nYRAvWZAKDPeAdHULPm6HEOiQWD3Lo4QzLSCACeNvDa
-W5kMbA4jQyT9oB8UKUcGsg0=
-=SxSV
+iD8DBQFBLimK/rLF9B432nYRAgwfAJ9z0R4dIdIZfoaXUdIcX3um4f3zCwCgxvR6
+EzDF55WTd/kYRF8ySfiF1sg=
+=Qeb6
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/4.1.30/tomcat.init b/www-servers/tomcat/files/4.1.30/tomcat.init
index 98ccfac33043..0c29979926c2 100644
--- a/www-servers/tomcat/files/4.1.30/tomcat.init
+++ b/www-servers/tomcat/files/4.1.30/tomcat.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1998-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/4.1.30/tomcat.init,v 1.1 2004/08/08 18:39:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/4.1.30/tomcat.init,v 1.2 2004/08/26 18:17:55 axxo Exp $
 
 depend() {
 	need net
@@ -10,14 +10,14 @@ depend() {
 
 start()	{
 	ebegin "Starting Tomcat"
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_START}
+	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh -- ${TOMCAT_START}
 	sleep 5
 	eend $?
 }
 
 stop()	{
 	ebegin "Stopping Tomcat"
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_STOP}
+	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh -- ${TOMCAT_STOP}
 	sleep 5
 	eend $?
 }
diff --git a/www-servers/tomcat/files/5.0.27/tomcat.init b/www-servers/tomcat/files/5.0.27/tomcat.init
index 8f739b9e3669..ad4d22fd6062 100644
--- a/www-servers/tomcat/files/5.0.27/tomcat.init
+++ b/www-servers/tomcat/files/5.0.27/tomcat.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.27/tomcat.init,v 1.1 2004/08/08 18:39:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.27/tomcat.init,v 1.2 2004/08/26 18:17:55 axxo Exp $
 
 depend() {
 	need net
@@ -10,14 +10,14 @@ depend() {
 
 start()	{
 	ebegin "Starting Tomcat"
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_START}
+	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh -- ${TOMCAT_START}
 	sleep 5
 	eend $?
 }
 
 stop()	{
 	ebegin "Stopping Tomcat"
-	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh ${TOMCAT_STOP}
+	start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh -- ${TOMCAT_STOP}
 	sleep 5
 	eend $?
 }
diff --git a/www-servers/tomcat/files/digest-tomcat-4.1.30-r5 b/www-servers/tomcat/files/digest-tomcat-4.1.30-r5
new file mode 100644
index 000000000000..a1651a599a01
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-4.1.30-r5
@@ -0,0 +1 @@
+MD5 ff27f6a5900768c1aafab4a68675b2ed jakarta-tomcat-4.1.30.tar.gz 7894019
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.27-r4 b/www-servers/tomcat/files/digest-tomcat-5.0.27-r4
new file mode 100644
index 000000000000..f96d1cd9d33a
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-5.0.27-r4
@@ -0,0 +1 @@
+MD5 b802ee042677e284bcf65738c7bdc3b6 jakarta-tomcat-5.0.27.tar.gz 10298374
diff --git a/www-servers/tomcat/tomcat-4.1.30-r5.ebuild b/www-servers/tomcat/tomcat-4.1.30-r5.ebuild
new file mode 100644
index 000000000000..59be99430c06
--- /dev/null
+++ b/www-servers/tomcat/tomcat-4.1.30-r5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-4.1.30-r5.ebuild,v 1.1 2004/08/26 18:17:55 axxo Exp $
+
+inherit eutils
+
+DESCRIPTION="Apache Servlet-2.3/JSP-1.2 Container"
+
+JT_P="jakarta-${P}.tar.gz"
+S=${WORKDIR}/jakarta-${P}
+SLOT="${PV/.*}"
+SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+LICENSE="Apache-2.0"
+DEPEND="sys-apps/sed"
+RDEPEND=">=virtual/jdk-1.3
+		jikes? ( dev-java/jikes )"
+IUSE="doc jikes"
+
+TOMCAT_HOME="/opt/${PN}${SLOT}"
+TOMCAT_NAME="${PN}${SLOT}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/gentoo.diff
+	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
+}
+
+src_install() {
+	dodoc RELEASE* RUNNING.txt LICENSE
+
+	# INIT SCRIPTS AND ENV
+	insinto /etc/init.d
+	insopts -m0750
+	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
+
+	insinto /etc/conf.d
+	insopts -m0644
+	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
+	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
+
+	diropts -m750
+	dodir ${TOMCAT_HOME} /var/log/${TOMCAT_NAME} /etc/${TOMCAT_NAME}
+	keepdir /var/log/${TOMCAT_NAME}
+
+	mv conf/* ${D}/etc/${TOMCAT_NAME}
+	mv bin common server shared temp work ${D}${TOMCAT_HOME}
+	if ! use doc ; then
+		rm -rf webapps/{examples,tomcat-docs}
+	fi
+	mv webapps ${D}${TOMCAT_HOME}
+
+	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
+	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
+
+	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
+}
+
+pkg_preinst() {
+	enewgroup tomcat
+	enewuser tomcat -1 -1 /dev/null tomcat
+
+	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
+	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
+	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
+}
+
+pkg_postinst() {
+	#due to previous ebuild bloopers, make sure everything is correct
+	chown -R root:root /usr/share/doc/${PF}
+	chown root:root /etc/init.d/${TOMCAT_NAME}
+	chown root:root /etc/conf.d/${TOMCAT_NAME}
+
+	chown -R tomcat:tomcat /opt/${TOMCAT_NAME}
+	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
+	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
+
+	chmod 750 /etc/${TOMCAT_NAME}
+
+	einfo " "
+	einfo " NOTICE!"
+	einfo " FILE LOCATIONS:"
+	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
+	einfo "     Contains application data, configuration files."
+	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
+	einfo "     Contains CLASSPATH and JAVA_HOME settings."
+	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
+	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
+	einfo " "
+	einfo " "
+	einfo " STARTING AND STOPPING TOMCAT:"
+	einfo "   /etc/init.d/${TOMCAT_NAME} start"
+	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
+	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
+	einfo " "
+	einfo " "
+	ewarn " If you are upgrading from older ebuild do NOT use"
+	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
+	ewarn " want to remove these. "
+	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
+	ewarn " can be installed side by side"
+	einfo " "
+	einfo " NETWORK CONFIGURATION:"
+	einfo " By default, Tomcat runs on port 8080.  You can change this"
+	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
+	einfo " "
+	einfo " To test Tomcat while it's running, point your web browser to:"
+	einfo " http://localhost: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 " "
+}
diff --git a/www-servers/tomcat/tomcat-5.0.27-r4.ebuild b/www-servers/tomcat/tomcat-5.0.27-r4.ebuild
new file mode 100644
index 000000000000..0d618ae82860
--- /dev/null
+++ b/www-servers/tomcat/tomcat-5.0.27-r4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.27-r4.ebuild,v 1.1 2004/08/26 18:17:55 axxo Exp $
+
+inherit eutils
+
+DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
+
+JT_P="jakarta-${P}.tar.gz"
+S=${WORKDIR}/jakarta-${P}
+SLOT="${PV/.*}"
+SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
+HOMEPAGE="http://jakarta.apache.org/tomcat"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
+LICENSE="Apache-2.0"
+DEPEND="sys-apps/sed"
+RDEPEND=">=virtual/jdk-1.3
+		jikes? ( dev-java/jikes )"
+IUSE="doc jikes"
+
+TOMCAT_HOME="/opt/${PN}${SLOT}"
+TOMCAT_NAME="${PN}${SLOT}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/gentoo.diff
+	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
+}
+
+src_install() {
+	dodoc RELEASE* RUNNING.txt LICENSE
+
+	# INIT SCRIPTS AND ENV
+	insinto /etc/init.d
+	insopts -m0750
+	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
+
+	insinto /etc/conf.d
+	insopts -m0644
+	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
+	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
+
+	diropts -m750
+	dodir ${TOMCAT_HOME} /var/log/${TOMCAT_NAME} /etc/${TOMCAT_NAME}
+	keepdir /var/log/${TOMCAT_NAME}
+
+	mv conf/* ${D}/etc/${TOMCAT_NAME}
+	mv bin common server shared temp work ${D}${TOMCAT_HOME}
+	if ! use doc; then
+		rm -rf webapps/{tomcat-docs,jsp-examples,servlets-examples}
+	fi
+	mv webapps ${D}${TOMCAT_HOME}
+
+	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
+	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
+
+	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
+}
+
+
+pkg_preinst() {
+	enewgroup tomcat
+	enewuser tomcat -1 -1 /dev/null tomcat
+
+	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
+	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
+	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
+}
+
+pkg_postinst() {
+	#due to previous ebuild bloopers, make sure everything is correct
+	chown -R root:root /usr/share/doc/${PF}
+	chown root:root /etc/init.d/${TOMCAT_NAME}
+	chown root:root /etc/conf.d/${TOMCAT_NAME}
+
+	chown -R tomcat:tomcat /opt/${TOMCAT_NAME}
+	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
+	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
+
+	chmod 750 /etc/${TOMCAT_NAME}
+
+	einfo " "
+	einfo " NOTICE!"
+	einfo " FILE LOCATIONS:"
+	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
+	einfo "     Contains application data, configuration files."
+	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
+	einfo "     Contains CLASSPATH and JAVA_HOME settings."
+	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
+	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
+	einfo " "
+	einfo " "
+	einfo " STARTING AND STOPPING TOMCAT:"
+	einfo "   /etc/init.d/${TOMCAT_NAME} start"
+	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
+	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
+	einfo " "
+	einfo " "
+	ewarn " If you are upgrading from older ebuild do NOT use"
+	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
+	ewarn " want to remove these. "
+	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
+	ewarn " can be installed side by side"
+	einfo " "
+	einfo " NETWORK CONFIGURATION:"
+	einfo " By default, Tomcat runs on port 8080.  You can change this"
+	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
+	einfo " "
+	einfo " To test Tomcat while it's running, point your web browser to:"
+	einfo " http://localhost: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 " "
+}