diff options
| author | Pedro Giffuni <pfg@apache.org> | 2012-02-11 21:08:51 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2012-02-11 21:08:51 +0000 |
| commit | 1dcb27b42013c798a5299a2b1c7c88873d4200f9 (patch) | |
| tree | 65ebecb15fd25c605058d9aeeb5de97b01a99e0f /tomcat | |
| parent | e63ec5073cc575f1b78f8aa20f194326eaa4eaa5 (diff) | |
Update Apache Tomcat to version 5.5.35
Diffstat (limited to 'tomcat')
| -rwxr-xr-x | tomcat/makefile.mk | 12 | ||||
| -rw-r--r-- | tomcat/tomcat.patch | 8 |
2 files changed, 10 insertions, 10 deletions
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" |