From d8e017cbb355d1c370beac8862b72d67586b2270 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 6 Aug 2009 17:15:38 +0000
Subject: [PATCH] Upgraded tomcat to 6.0.20

svn path=/nixpkgs/trunk/; revision=16600
---
 pkgs/servers/http/tomcat/6.0.nix        | 6 +++---
 pkgs/servers/http/tomcat/builder-6.0.sh | 9 +--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix
index 00907844ba8..4fe906bedd0 100644
--- a/pkgs/servers/http/tomcat/6.0.nix
+++ b/pkgs/servers/http/tomcat/6.0.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation {
 
-  name = "apache-tomcat-6.0.18";
+  name = "apache-tomcat-6.0.20";
 
   builder = ./builder-6.0.sh;
 
   src = fetchurl {
-    url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.tar.gz;
-    md5 = "8354e156f097158f8d7b699078fd39c1";
+    url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.tar.gz;
+    sha256 = "0vh48rvbynawivqm3hs7453527g8qns9kcj7vmihjpf21mrc2hx4";
   };
 
   inherit jdk;
diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh
index 001fade3880..bcb56ee61d8 100644
--- a/pkgs/servers/http/tomcat/builder-6.0.sh
+++ b/pkgs/servers/http/tomcat/builder-6.0.sh
@@ -3,11 +3,4 @@ source $stdenv/setup
 tar zxf $src
 
 mkdir $out
-mv apache-tomcat*/* $out
-
-# Rename the context.xml to context.xml.default in order to allow a custom context.xml
-mv $out/conf/context.xml $out/conf/context.xml.default
-
-# Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
-sed -i -e 's|${catalina.home}|${catalina.base}|g' \
-       -e 's|shared.loader=|shared.loader=${catalina.base}/shared/lib/*.jar|' $out/conf/catalina.properties
+mv apache-tomcat-*/* $out