[pkg-java] r12573 - in trunk/tomcat6/debian: . patches

[Thierry Carrez]

Author: ttx-guest
Date: 2010-06-16 13:39:07 +0000 (Wed, 16 Jun 2010)
New Revision: 12573

Added:
   trunk/tomcat6/debian/patches/catalina-sh-security-manager.patch
Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/patches/series
   trunk/tomcat6/debian/tomcat6.init
Log:
* Fix issues preventing from running Tomcat6 with a security manager:
  - debian/tomcat6.init: Remove duplicate securitymanager options.
  - debian/patches/catalina-sh-security-manager.patch: Use the right
    location for the security.policy file in catalina.sh.
  - Closes: #585379, LP: #591802. Thanks to Jeff Turner for the original
    patches and to Adam Guthrie for the Lucid debdiff.

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-06-15 23:05:10 UTC (rev 12572)
+++ trunk/tomcat6/debian/changelog	2010-06-16 13:39:07 UTC (rev 12573)
@@ -1,3 +1,14 @@
+tomcat6 (6.0.26-4) UNRELEASED; urgency=low
+
+  * Fix issues preventing from running Tomcat6 with a security manager:
+    - debian/tomcat6.init: Remove duplicate securitymanager options.
+    - debian/patches/catalina-sh-security-manager.patch: Use the right
+      location for the security.policy file in catalina.sh.
+    - Closes: #585379, LP: #591802. Thanks to Jeff Turner for the original
+      patches and to Adam Guthrie for the Lucid debdiff.
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Wed, 16 Jun 2010 15:37:01 +0200
+
 tomcat6 (6.0.26-3) unstable; urgency=low
 
   [ Marcus Better ]

Added: trunk/tomcat6/debian/patches/catalina-sh-security-manager.patch
===================================================================
--- trunk/tomcat6/debian/patches/catalina-sh-security-manager.patch	                        (rev 0)
+++ trunk/tomcat6/debian/patches/catalina-sh-security-manager.patch	2010-06-16 13:39:07 UTC (rev 12573)
@@ -0,0 +1,36 @@
+Description: Make sure catalina.sh uses the Debian/Ubuntu java.security.policy
+ file location when Tomcat is started with a security manager.
+Author: Adam Guthrie <asguthrie at gmail.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/591802
+Bug-Debian: http://bugs.debian.org/585379
+Forwarded: not-needed
+
+--- tomcat6-6.0.24.orig/bin/catalina.sh
++++ tomcat6-6.0.24/bin/catalina.sh
+@@ -261,7 +261,7 @@ if [ "$1" = "debug" ] ; then
+         -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+         -sourcepath "$CATALINA_HOME"/../../java \
+         -Djava.security.manager \
+-        -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
++        -Djava.security.policy=="$CATALINA_BASE"/work/catalina.policy \
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+@@ -288,7 +288,7 @@ elif [ "$1" = "run" ]; then
+     exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
+       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+       -Djava.security.manager \
+-      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
++      -Djava.security.policy=="$CATALINA_BASE"/work/catalina.policy \
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+@@ -321,7 +321,7 @@ elif [ "$1" = "start" ] ; then
+     "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
+       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+       -Djava.security.manager \
+-      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
++      -Djava.security.policy=="$CATALINA_BASE"/work/catalina.policy \
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \

Modified: trunk/tomcat6/debian/patches/series
===================================================================
--- trunk/tomcat6/debian/patches/series	2010-06-15 23:05:10 UTC (rev 12572)
+++ trunk/tomcat6/debian/patches/series	2010-06-16 13:39:07 UTC (rev 12573)
@@ -8,3 +8,4 @@
 jsp-api-OSGi.patch
 allow-empty-pid-file.patch
 webapp-classloader-deadlock-fix.patch
+catalina-sh-security-manager.patch

Modified: trunk/tomcat6/debian/tomcat6.init
===================================================================
--- trunk/tomcat6/debian/tomcat6.init	2010-06-15 23:05:10 UTC (rev 12572)
+++ trunk/tomcat6/debian/tomcat6.init	2010-06-16 13:39:07 UTC (rev 12573)
@@ -107,7 +107,6 @@
 
 SECURITY=""
 if [ "$TOMCAT6_SECURITY" = "yes" ]; then
-	JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=\"$POLICY_CACHE\""
 	SECURITY="-security"
 fi