Package: tomcat6
Version: 6.0.35-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
- d/tomcat6-instance-create: Quote access to files and directories
so that spaces can be used when creating user instances.
- d/tomcat6.init: Make NAME dynamic, to allow starting multiple instances.
It would be great if these patches could be merged into the Debian packaging
so we can re-sync on the next set of updates
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJPoqPmAAoJEL/srsug59jDCoYQAMYbuCAUS44zizpgIRL4sSIZ
JSVbep+4+n8LNhIbiUE1WJR73FOEtZLHrtv+e6ZchuLAKzAFIewV8LxQsDvA7W3V
I0RbzYMOaUQSrfrDXyg8nmPel05LyciWQPNXmCJffcZyAWdireL0vvTjsod6X0Pb
3ubZIz7MBGGHWFnk7S7YILpEKd23bOhQ0u4nGjt8S2ybfbkkg1vEmuDjHZmb4PQo
Lc1rfIRsLUqHlcPo35BzLkTRInwuuohutSxcBE2csWG9bgcZjsQGnpsFEJGbxFHt
0815tPqgolUTqN7oNVGxuzaQWIt5jjG2l1DLFG1H0Vuxpj9ZntijV6gFajtSdAHj
SJF9FJr2P2MaT62mKteKm3vJZ9GZVaKLdBInn5/AnFi2JH9W59C5brRQv1vDiDYZ
icjyx6Uxu1sl2o0hIR/ocblT8c/siIKhkMKQ65LIrTkrRhF7ZzRC6WAKW+I2K3qn
5jOZTtF8ncWXUxPeu/NXrFmT4g4ZhcNRlWhweCWb1+ZwtrtXgtkTD6WKFLIeJnZo
k3rzXL/nikq/XVILS2HQljDbvrT1uuyird0cE5jrcWXMM22URDyB6MHeytgufjSx
E3pgriYpdk4IjYZMlmmsGCj7ylJiySpA4tEyJZ/dx6vK+jC9disr5ATyyBP03yvC
asDSUGZap/SNUbwn8dDz
=hDnW
-----END PGP SIGNATURE-----
diff -Nru tomcat6-6.0.35/debian/tomcat6.init tomcat6-6.0.35/debian/tomcat6.init
--- tomcat6-6.0.35/debian/tomcat6.init 2012-04-14 19:01:15.000000000 +0100
+++ tomcat6-6.0.35/debian/tomcat6.init 2012-05-03 16:03:43.000000000 +0100
@@ -23,7 +23,7 @@
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=tomcat6
+NAME="$(basename "$0" | sed 's/^[KS][0-9]\{2\}//')"
DESC="Tomcat servlet engine"
DEFAULT=/etc/default/$NAME
JVM_TMP=/tmp/tomcat6-$NAME-tmp
diff -Nru tomcat6-6.0.35/debian/tomcat6-instance-create tomcat6-6.0.35/debian/tomcat6-instance-create
--- tomcat6-6.0.35/debian/tomcat6-instance-create 2012-04-14 19:01:15.000000000 +0100
+++ tomcat6-6.0.35/debian/tomcat6-instance-create 2012-05-03 16:03:43.000000000 +0100
@@ -117,38 +117,38 @@
read answer
fi
-mkdir -p ${TARGET}
+mkdir -p "${TARGET}"
-FULLTARGET=`cd ${TARGET} > /dev/null && pwd`
+FULLTARGET=`cd "${TARGET}" > /dev/null && pwd`
-mkdir ${TARGET}/conf
-mkdir ${TARGET}/logs
-mkdir ${TARGET}/webapps
-mkdir ${TARGET}/work
-mkdir ${TARGET}/temp
-cp -r /usr/share/tomcat6/skel/* ${TARGET}
+mkdir "${TARGET}/conf"
+mkdir "${TARGET}/logs"
+mkdir "${TARGET}/webapps"
+mkdir "${TARGET}/work"
+mkdir "${TARGET}/temp"
+cp -r /usr/share/tomcat6/skel/* "${TARGET}"
# Create necessary symbolic links so that eclipse can be properly configured
-ln -s /usr/share/tomcat6/lib ${TARGET}/lib
-ln -s /usr/share/tomcat6/bin/bootstrap.jar ${TARGET}/bin/bootstrap.jar
+ln -s /usr/share/tomcat6/lib "${TARGET}/lib"
+ln -s /usr/share/tomcat6/bin/bootstrap.jar "${TARGET}/bin/bootstrap.jar"
-sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"8005\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" ${TARGET}/conf/server.xml
+sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"8005\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml"
-cat > ${TARGET}/bin/startup.sh << EOT
+cat > "${TARGET}/bin/startup.sh" << EOT
#!/bin/sh
-export CATALINA_BASE=${FULLTARGET}
+export CATALINA_BASE="${FULLTARGET}"
/usr/share/tomcat6/bin/startup.sh
echo "Tomcat started"
EOT
-cat > ${TARGET}/bin/shutdown.sh << EOT
+cat > "${TARGET}/bin/shutdown.sh" << EOT
#!/bin/sh
-export CATALINA_BASE=${FULLTARGET}
+export CATALINA_BASE="${FULLTARGET}"
/usr/share/tomcat6/bin/shutdown.sh
echo "Tomcat stopped"
EOT
-chmod a+x ${TARGET}/bin/startup.sh ${TARGET}/bin/shutdown.sh
+chmod a+x "${TARGET}/bin/startup.sh" "${TARGET}/bin/shutdown.sh"
echo "* New Tomcat instance created in ${TARGET}"
echo "* You might want to edit default configuration in ${TARGET}/conf"
echo "* Run ${TARGET}/bin/startup.sh to start your Tomcat instance"
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
