[pkg-java] r11209 - trunk/tomcat6/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2009-12-07 12:42:09 +0000 (Mon, 07 Dec 2009)
New Revision: 11209

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.default
   trunk/tomcat6/debian/tomcat6.init
Log:
Undo JVM_TMP change and expose JSVC_CLASSPATH.

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-12-06 22:15:55 UTC (rev 11208)
+++ trunk/tomcat6/debian/changelog	2009-12-07 12:42:09 UTC (rev 11209)
@@ -2,8 +2,6 @@
 
   * Corrected some spelling mistakes in debian/control.
     (Closes: #557377, #557378)
-  * Changed the default value for JVM_TMP in the init script
-    to avoid a security problem.
   * Added patches to install the OSGi metadata in some of the jars.
     (Closes: #558176)
   * Updated 03catalina.policy to allow "setContextClassLoader".
@@ -17,6 +15,8 @@
     (Build-)Depends.
   * Added more alternatives for java implementations to the Depends of
     libservlet2.5-java.
+  * Exposed JSVC_CLASSPATH to the configuration file.
+    (Closes: LP: #475457)
 
  -- Niels Thykier <niels at thykier.net>  Sat, 28 Nov 2009 17:51:49 +0100
 

Modified: trunk/tomcat6/debian/tomcat6.default
===================================================================
--- trunk/tomcat6/debian/tomcat6.default	2009-12-06 22:15:55 UTC (rev 11208)
+++ trunk/tomcat6/debian/tomcat6.default	2009-12-07 12:42:09 UTC (rev 11209)
@@ -34,3 +34,6 @@
 # Location of the JVM temporary directory
 # WARNING: This directory will be destroyed and recreated at every startup !
 #JVM_TMP=/tmp/tomcat6-temp
+
+# JSVC Classpath.
+JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar"

Modified: trunk/tomcat6/debian/tomcat6.init
===================================================================
--- trunk/tomcat6/debian/tomcat6.init	2009-12-06 22:15:55 UTC (rev 11208)
+++ trunk/tomcat6/debian/tomcat6.init	2009-12-07 12:42:09 UTC (rev 11209)
@@ -27,7 +27,7 @@
 DAEMON=/usr/bin/jsvc
 CATALINA_HOME=/usr/share/$NAME
 DEFAULT=/etc/default/$NAME
-JVM_TMP=/var/cache/$NAME
+JVM_TMP=/tmp/tomcat6-tmp
 
 if [ `id -u` -ne 0 ]; then
 	echo "You need root privileges to run this script"
@@ -84,6 +84,9 @@
 # overwrite settings from default file
 if [ -f "$DEFAULT" ]; then
 	. "$DEFAULT"
+else
+    # In case the default is not present - set some sane default.
+    JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar"    
 fi
 
 if [ ! -f "$CATALINA_HOME/bin/bootstrap.jar" ]; then
@@ -114,7 +117,6 @@
 # Define other required variables
 CATALINA_PID="/var/run/$NAME.pid"
 BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap
-JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar"
 
 # Look for Java Secure Sockets Extension (JSSE) JARs
 if [ -z "${JSSE_HOME}" -a -r "${JAVA_HOME}/jre/lib/jsse.jar" ]; then