From 1dcb27b42013c798a5299a2b1c7c88873d4200f9 Mon Sep 17 00:00:00 2001
From: Pedro Giffuni <pfg@apache.org>
Date: Sat, 11 Feb 2012 21:08:51 +0000
Subject: Update Apache Tomcat to version 5.5.35

---
 ooo.lst             |  2 +-
 tomcat/makefile.mk  | 12 ++++++------
 tomcat/tomcat.patch |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ooo.lst b/ooo.lst
index d96bef254450..95410e4f3050 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -15,7 +15,7 @@ http://svn.apache.org/repos/asf/incubator/ooo/trunk/ext_sources/
 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+7e4e73c21f031d5a4c93c128baf7fd75-apache-tomcat-5.5.35-src.tar.gz
 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
 2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk
index c15271d29ba9..8f31a2bf726c 100755
--- a/tomcat/makefile.mk
+++ b/tomcat/makefile.mk
@@ -23,7 +23,7 @@
 
 PRJ=.
 
-PRJNAME=tomacat
+PRJNAME=tomcat
 TARGET=servlet
 
 .IF "$(SOLAR_JAVA)" != ""
@@ -34,17 +34,17 @@ TARGET=servlet
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=jakarta-tomcat-5.0.30-src
-TARFILE_MD5=2a177023f9ea8ec8bd00837605c5df1b
+TARFILE_NAME=apache-tomcat-5.5.35-src
+TARFILE_MD5=7e4e73c21f031d5a4c93c128baf7fd75
 
-TARFILE_ROOTDIR=jakarta-tomcat-5.0.30-src
+TARFILE_ROOTDIR=apache-tomcat-5.5.35-src
 
-ADDITIONAL_FILES = jakarta-servletapi-5/build.xml
+ADDITIONAL_FILES = servletapi/build.xml
 #CONVERTFILES=build$/build.xml
 
 PATCH_FILES=tomcat.patch
 
-BUILD_DIR=jakarta-servletapi-5
+BUILD_DIR=servletapi
 BUILD_ACTION=$(ANT)
 
 # --- Targets ------------------------------------------------------
diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch
index 1815660b1b5b..97c66aa1767d 100644
--- a/tomcat/tomcat.patch
+++ b/tomcat/tomcat.patch
@@ -1,11 +1,11 @@
---- misc/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml	Thu Jun 19 16:03:59 2008
-+++ misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml	Thu Jun 19 15:56:18 2008
+--- misc/apache-tomcat-5.5.35-src/servletapi/build.xml	Thu Jun 19 16:03:59 2008
++++ misc/build/apache-tomcat-5.5.35-src/servletapi/build.xml	Thu Jun 19 15:56:18 2008
 @@ -1,1 +1,31 @@
 -dummy
-+<project name="jsr152 and jsr154 in Debian" default="debuild" basedir=".">
++<project name="jsr152 and jsr154 in Apache OpenOffice" default="debuild" basedir=".">
 +
 +  <target name="debuild"
-+   description="Build jsr154 and jsr152 for Debian (Default)">
++   description="Build jsr154 and jsr152 for Apache OpenOffice (Default)">
 +    <echo message="Building Servlet 2.4 API"/>
 +    <ant antfile="jsr154/build.xml"
 +         target="dist"
-- 
cgit v1.2.3