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

« back to all changes in this revision

Viewing changes to debian/patches/0006-add-JARs-below-var-to-class-loader.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
* 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:
 
1
From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 
2
Date: Mon, 28 Jun 2010 21:32:57 +0200
 
3
Subject: [PATCH] add JARs below /var to class loader
 
4
 
 
5
---
 
6
 conf/catalina.properties |    6 +++---
 
7
 1 files changed, 3 insertions(+), 3 deletions(-)
 
8
 
 
9
diff --git a/conf/catalina.properties b/conf/catalina.properties
 
10
index dc2db35..5971437 100644
 
11
--- a/conf/catalina.properties
 
12
+++ b/conf/catalina.properties
 
13
@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
 
14
 #     "foo/*.jar": Add all the JARs of the specified folder as class 
 
15
 #                  repositories
 
16
 #     "foo/bar.jar": Add bar.jar as a class repository
 
17
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
 
18
+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/var/lib/tomcat6/common/classes,/var/lib/tomcat6/common/*.jar
 
19
 
 
20
 #
 
21
 # List of comma-separated paths defining the contents of the "server" 
 
22
@@ -57,7 +57,7 @@ common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/l
 
23
 #     "foo/*.jar": Add all the JARs of the specified folder as class 
 
24
 #                  repositories
 
25
 #     "foo/bar.jar": Add bar.jar as a class repository
 
26
-server.loader=
 
27
+server.loader=${catalina.home}/server/classes,${catalina.home}/server/*.jar,/var/lib/tomcat6/server/classes,/var/lib/tomcat6/server/*.jar
 
28
 
 
29
 #
 
30
 # List of comma-separated paths defining the contents of the "shared" 
 
31
@@ -71,7 +71,7 @@ server.loader=
 
32
 #     "foo/bar.jar": Add bar.jar as a class repository 
 
33
 # Please note that for single jars, e.g. bar.jar, you need the URL form
 
34
 # starting with file:.
 
35
-shared.loader=
 
36
+shared.loader=${catalina.home}/shared/classes,${catalina.home}/shared/*.jar,/var/lib/tomcat6/shared/classes,/var/lib/tomcat6/shared/*.jar
 
37
 
 
38
 #
 
39
 # String cache configuration.
 
40
--