diff options
| author | Pedro Giffuni <pfg@apache.org> | 2012-10-21 00:03:31 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2012-10-21 00:03:31 +0000 |
| commit | e80be9280acfe682154de431c3d9edfea4106177 (patch) | |
| tree | 97877f55499fcfcd9756811969e07c43a6df036b | |
| parent | 2ed6694c868d3a98684e2adabc6e9abed14621dd (diff) | |
Update Apache Tomcat to 5.5.36 (final) version,
Notes
Notes:
prefer: 4f2890a8c9a0c8cadeb469b8b6e23ea7ec3f3b81
| -rw-r--r-- | external_deps.lst | 7 | ||||
| -rw-r--r-- | tomcat/makefile.mk | 6 | ||||
| -rw-r--r-- | tomcat/tomcat.patch | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/external_deps.lst b/external_deps.lst index f01268762251..c48093b8b9b8 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -199,10 +199,9 @@ if (SYSTEM_LIBXSLT != YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SOLAR_JAVA == TRUE) - MD5 = 7e4e73c21f031d5a4c93c128baf7fd75 - name = apache-tomcat-5.5.35-src.tar.gz - # This seems to be the original host, but the MD5 sum does not match. - # URL1 = http://<mirror>/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.tar.gz + MD5 = 63574e3ada44f473892a61a2da433a59 + name = apache-tomcat-5.5.36-src.tar.gz + # URL1 = http://www.alliedquotes.com/mirrors/apache/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SOLAR_JAVA == TRUE) diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk index 8f31a2bf726c..6251c4bead97 100644 --- a/tomcat/makefile.mk +++ b/tomcat/makefile.mk @@ -34,10 +34,10 @@ TARGET=servlet # --- Files -------------------------------------------------------- -TARFILE_NAME=apache-tomcat-5.5.35-src -TARFILE_MD5=7e4e73c21f031d5a4c93c128baf7fd75 +TARFILE_NAME=apache-tomcat-5.5.36-src +TARFILE_MD5=63574e3ada44f473892a61a2da433a59 -TARFILE_ROOTDIR=apache-tomcat-5.5.35-src +TARFILE_ROOTDIR=apache-tomcat-5.5.36-src ADDITIONAL_FILES = servletapi/build.xml #CONVERTFILES=build$/build.xml diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch index 9b265463f23b..3ec194448f50 100644 --- a/tomcat/tomcat.patch +++ b/tomcat/tomcat.patch @@ -1,5 +1,5 @@ ---- 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 +--- misc/apache-tomcat-5.5.36-src/servletapi/build.xml Thu Jun 19 16:03:59 2008 ++++ misc/build/apache-tomcat-5.5.36-src/servletapi/build.xml Thu Jun 19 15:56:18 2008 @@ -1,1 +1,21 @@ -dummy +<project name="jsr154 in Apache OpenOffice" default="debuild" basedir="."> |