← Back to branch summary

~ubuntu-branches/ubuntu/maverick/tomcat6/maverick

« back to all changes in this revision

Viewing changes to debian/patches/0011-Use-java.security.policy-file-in-catalina.sh.patch

  • Committer: Bazaar Package Importer
  • Author(s): Torsten Werner
  • Date: 2010-06-28 21:41:31 UTC
  • mfrom: (2.2.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100628214131-3wktukpb3lgdf83h
Tags: 6.0.26-5
http://bugs.debian.org/587447
* Convert patches to dep3 format.
* Backport security fix from trunk to fix CVE-2010-1157. (Closes: #587447)
* Set urgency to medium due to the security fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0011-Use-java.security.policy-file-in-catalina.sh.patch
 
1
From: Adam Guthrie <asguthrie@gmail.com>
 
2
Date: Mon, 28 Jun 2010 21:53:50 +0200
 
3
Subject: [PATCH] Use java.security.policy file in catalina.sh
 
4
 
 
5
Make sure catalina.sh uses the Debian/Ubuntu java.security.policy
 
6
file location when Tomcat is started with a security manager.
 
7
 
 
8
Bug-Ubuntu: https://bugs.launchpad.net/bugs/591802
 
9
Bug-Debian: http://bugs.debian.org/585379
 
10
Forwarded: not-needed
 
11
---
 
12
 bin/catalina.sh |    6 +++---
 
13
 1 files changed, 3 insertions(+), 3 deletions(-)
 
14
 
 
15
diff --git a/bin/catalina.sh b/bin/catalina.sh
 
16
index 5843b56..783b382 100755
 
17
--- a/bin/catalina.sh
 
18
+++ b/bin/catalina.sh
 
19
@@ -261,7 +261,7 @@ if [ "$1" = "debug" ] ; then
 
20
         -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
 
21
         -sourcepath "$CATALINA_HOME"/../../java \
 
22
         -Djava.security.manager \
 
23
-        -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
 
24
+        -Djava.security.policy=="$CATALINA_BASE"/work/catalina.policy \
 
25
         -Dcatalina.base="$CATALINA_BASE" \
 
26
         -Dcatalina.home="$CATALINA_HOME" \
 
27
         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
 
28
@@ -288,7 +288,7 @@ elif [ "$1" = "run" ]; then
 
29
     exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
 
30
       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
 
31
       -Djava.security.manager \
 
32
-      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
 
33
+      -Djava.security.policy=="$CATALINA_BASE"/work/catalina.policy \
 
34
       -Dcatalina.base="$CATALINA_BASE" \
 
35
       -Dcatalina.home="$CATALINA_HOME" \
 
36
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
 
37
@@ -321,7 +321,7 @@ elif [ "$1" = "start" ] ; then
 
38
     "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
 
39
       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
 
40
       -Djava.security.manager \
 
41
-      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
 
42
+      -Djava.security.policy=="$CATALINA_BASE"/work/catalina.policy \
 
43
       -Dcatalina.base="$CATALINA_BASE" \
 
44
       -Dcatalina.home="$CATALINA_HOME" \
 
45
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
 
46
--