# HG changeset patch
# User Jon Tibble <meths@btinternet.com>
# Date 1367703627 -3600
# Node ID 83227a6d4f94914f1a59d083148fb1f243ef0742
# Parent  ce7e9b552e5b41225eff073dd30342fbb791d8a2
Bump tomcat to 6.0.37

diff -r ce7e9b552e5b -r 83227a6d4f94 usr/src/cmd/tomcat/METADATA
--- a/usr/src/cmd/tomcat/METADATA	Fri May 03 22:18:05 2013 +0100
+++ b/usr/src/cmd/tomcat/METADATA	Sat May 04 22:40:27 2013 +0100
@@ -1,10 +1,10 @@
 NAME:             tomcat
-VERSION:          6.0.36
+VERSION:          6.0.37
 DESCRIPTION:      for Java Servlet and JavaServer Pages
 LICENSE:          Apache v2.0
 PACKAGE:          SUNWtcatr SUNWtcatu SUNWtcat-examples
 PROJECT_URL:      http://jakarta.apache.org/tomcat
-SOURCE_DOWNLOAD:  http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.36/src/apache-tomcat-6.0.36-src.tar.gz
+SOURCE_DOWNLOAD:  http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.37/src/apache-tomcat-6.0.37-src.tar.gz
 SUPPORT:          C
 BUGTRAQ:          solaris/utility/apache
 OSR:              6819
diff -r ce7e9b552e5b -r 83227a6d4f94 usr/src/cmd/tomcat/Patches/build.properties.patch
--- a/usr/src/cmd/tomcat/Patches/build.properties.patch	Fri May 03 22:18:05 2013 +0100
+++ b/usr/src/cmd/tomcat/Patches/build.properties.patch	Sat May 04 22:40:27 2013 +0100
@@ -4,16 +4,16 @@
  jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
  # The download will be moved to the archive area eventually. We are taking care of that in advance.
  # Note older JARs were called ecj.jar. Newer JARs are called ecj-${jdt.version}.jar
--jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
--jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
+-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+-jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 +jdt.loc.1=file://${base.path}/../ecj-${jdt.version}.jar
 +jdt.loc.2=file://${base.path}/../ecj-${jdt.version}.jar
  
  # ----- Tomcat native library -----
  tomcat-native.version=1.1.22
-@@ -129,8 +129,8 @@
- tomcat-native.dll.x64=${tomcat-native.home}/tcnative-1.dll.x64
- tomcat-native.dll.i64=${tomcat-native.home}/tcnative-1.dll.i64
+@@ -126,8 +126,8 @@
+ tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
+ tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
  
 -# ----- Commons DBCP, version 1.1 or later -----
 -commons-dbcp.version=1.3
diff -r ce7e9b552e5b -r 83227a6d4f94 usr/src/cmd/tomcat/apache-tomcat-6.0.36-src.tar.gz
Binary file usr/src/cmd/tomcat/apache-tomcat-6.0.36-src.tar.gz has changed
diff -r ce7e9b552e5b -r 83227a6d4f94 usr/src/cmd/tomcat/apache-tomcat-6.0.37-src.tar.gz
Binary file usr/src/cmd/tomcat/apache-tomcat-6.0.37-src.tar.gz has changed
diff -r ce7e9b552e5b -r 83227a6d4f94 usr/src/cmd/tomcat/ecj-3.7.2.jar
Binary file usr/src/cmd/tomcat/ecj-3.7.2.jar has changed
diff -r ce7e9b552e5b -r 83227a6d4f94 usr/src/cmd/tomcat/ecj-4.2.2.jar
Binary file usr/src/cmd/tomcat/ecj-4.2.2.jar has changed
diff -r ce7e9b552e5b -r 83227a6d4f94 usr/src/pkgdefs/SUNWtcatu/prototype_com
--- a/usr/src/pkgdefs/SUNWtcatu/prototype_com	Fri May 03 22:18:05 2013 +0100
+++ b/usr/src/pkgdefs/SUNWtcatu/prototype_com	Sat May 04 22:40:27 2013 +0100
@@ -194,6 +194,7 @@
 f none usr/tomcat6/bin/catalina-tasks.xml 0755 root bin
 f none usr/tomcat6/bin/catalina.sh 0755 root bin
 f none usr/tomcat6/bin/tool-wrapper.sh 0755 root bin
+f none usr/tomcat6/bin/daemon.sh 0755 root bin
 f none usr/tomcat6/bin/digest.sh 0755 root bin
 f none usr/tomcat6/bin/tomcat-juli.jar 0755 root bin
 f none usr/tomcat6/bin/version.sh 0755 root bin
@@ -202,7 +203,7 @@
 d none usr/tomcat6/lib 0755 root bin
 f none usr/tomcat6/lib/tomcat-coyote.jar 0644 root bin
 f none usr/tomcat6/lib/catalina-ha.jar 0644 root bin
-f none usr/tomcat6/lib/ecj-3.7.2.jar 0644 root bin
+f none usr/tomcat6/lib/ecj-4.2.2.jar 0644 root bin
 f none usr/tomcat6/lib/el-api.jar 0644 root bin
 f none usr/tomcat6/lib/tomcat-dbcp.jar 0644 root bin
 f none usr/tomcat6/lib/servlet-api.jar 0644 root bin