aboutsummaryrefslogtreecommitdiff
path: root/www/tomcat6
diff options
context:
space:
mode:
Diffstat (limited to 'www/tomcat6')
-rw-r--r--www/tomcat6/Makefile2
-rw-r--r--www/tomcat6/distinfo6
-rw-r--r--www/tomcat6/files/patch-conf__server.xml21
-rw-r--r--www/tomcat6/pkg-plist12
4 files changed, 26 insertions, 15 deletions
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 87215212d339..c72fa16f70bd 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= apache-tomcat
-PORTVERSION= 6.0.10
+PORTVERSION= 6.0.13
PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index 71be163d6034..fa0fa45299ba 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache-tomcat-6.0.10.tar.gz) = 7c81324d08a22f90dfcf98c1b85a2537
-SHA256 (apache-tomcat-6.0.10.tar.gz) = 34c743cd82039c9a04236fc07979a087bda4a4d0fccac5cf5ccd730827673484
-SIZE (apache-tomcat-6.0.10.tar.gz) = 5816033
+MD5 (apache-tomcat-6.0.13.tar.gz) = 50442a96332f0ec0cc1fba354f733ad6
+SHA256 (apache-tomcat-6.0.13.tar.gz) = 4dd237e6cfced1d92b6e9725bc98ddddd8497eb7fea5f5a5d35b91eaaec2c1a2
+SIZE (apache-tomcat-6.0.13.tar.gz) = 5965952
diff --git a/www/tomcat6/files/patch-conf__server.xml b/www/tomcat6/files/patch-conf__server.xml
index 10c464bc2b25..053e0b758087 100644
--- a/www/tomcat6/files/patch-conf__server.xml
+++ b/www/tomcat6/files/patch-conf__server.xml
@@ -1,5 +1,5 @@
---- ./conf/server.xml.orig Wed Feb 14 18:01:28 2007
-+++ ./conf/server.xml Wed Feb 14 18:01:20 2007
+--- ./conf/server.xml.orig 2007-07-24 22:33:24.134058137 +0800
++++ ./conf/server.xml 2007-07-24 22:34:42.223606359 +0800
@@ -2,7 +2,7 @@
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
@@ -9,16 +9,25 @@
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-@@ -40,7 +40,7 @@
+@@ -15,7 +15,7 @@
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+- <GlobalNamingResources>
++ <GlobalNamingResources>
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users
+ -->
+@@ -47,7 +47,7 @@
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL HTTP/1.1 Connector on port 8080
-->
- <Connector port="8080" protocol="HTTP/1.1"
+ <Connector port="%%HTTP_PORT%%" protocol="HTTP/1.1"
- maxThreads="150" connectionTimeout="20000"
+ connectionTimeout="20000"
redirectPort="8443" />
-
-@@ -55,7 +55,7 @@
+ <!-- A "Connector" using the shared thread pool-->
+@@ -68,7 +68,7 @@
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index 0b1d046e6b45..142e9c7d5787 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -256,7 +256,11 @@
%%T%%/webapps/docs/tribes/introduction.html
%%T%%/webapps/docs/tribes/setup.html
%%T%%/webapps/docs/virtual-hosting-howto.html
+%%T%%/webapps/docs/config/printer/executor.html
+%%T%%/webapps/docs/config/executor.html
+%%T%%/webapps/docs/RELEASE-NOTES.txt
%%T%%/webapps/docs/windows-service-howto.html
+%%T%%/webapps/examples/jsp/plugin/applet/Clock2.class
%%T%%/webapps/examples/WEB-INF/classes/CookieExample.class
%%T%%/webapps/examples/WEB-INF/classes/CookieExample.java
%%T%%/webapps/examples/WEB-INF/classes/HelloWorldExample.class
@@ -473,7 +477,7 @@
%%T%%/webapps/examples/servlets/sessions.html
%%T%%/webapps/host-manager/META-INF/context.xml
%%T%%/webapps/host-manager/WEB-INF/web.xml
-%%T%%/webapps/host-manager/host-manager.xml
+%%T%%/webapps/host-manager/manager.xml
%%T%%/webapps/host-manager/images/add.gif
%%T%%/webapps/host-manager/images/asf-logo.gif
%%T%%/webapps/host-manager/images/code.gif
@@ -483,7 +487,6 @@
%%T%%/webapps/host-manager/images/tomcat.gif
%%T%%/webapps/host-manager/images/update.gif
%%T%%/webapps/host-manager/images/void.gif
-%%T%%/webapps/host-manager/manager.xml
%%T%%/webapps/manager/401.jsp
%%T%%/webapps/manager/META-INF/context.xml
%%T%%/webapps/manager/WEB-INF/web.xml
@@ -496,11 +499,10 @@
%%T%%/webapps/manager/images/tomcat.gif
%%T%%/webapps/manager/images/update.gif
%%T%%/webapps/manager/images/void.gif
-%%T%%/webapps/manager/manager.xml
%%T%%/webapps/manager/status.xsd
%%T%%/webapps/manager/xform.xsl
-@dirrm share/nls/en_US.US-ASCII
-@dirrm share/nls/POSIX
+%%T%%/webapps/manager/sessionsList.jsp
+%%T%%/webapps/manager/sessionDetail.jsp
@dirrm %%T%%/work
@dirrm %%T%%/webapps/manager/images
@dirrm %%T%%/webapps/manager/WEB-INF