Date: Tue, 24 Jul 2007 13:04:44 -0700 (PDT) From: Nick Barkas <snb@threerings.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/114873: [patch] update www/tomcat6 to 6.0.13 Message-ID: <20070724200444.18D2517045@maguro.moduli.net> Resent-Message-ID: <200707242010.l6OKA2iJ022298@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 114873
>Category: ports
>Synopsis: [patch] update www/tomcat6 to 6.0.13
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 24 20:10:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Nick Barkas
>Release: FreeBSD 6.1-RELEASE-p10 i386
>Organization:
Three Rings Design
>Environment:
System: FreeBSD maguro.moduli.net 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Fri Dec 1 23:08:05 PST 2006 root@maguro.moduli.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This patch contains an update of the www/tomcat6 port to 6.0.13. The update
fixes the security vulnerabilities pointed out in recent entries to the VuXML
for Tomcat versions 6.0-6.0.10.
>How-To-Repeat:
>Fix:
--- tomcat6.patch begins here ---
diff -urN tomcat6.orig/Makefile tomcat6/Makefile
--- tomcat6.orig/Makefile Sat May 19 13:25:34 2007
+++ tomcat6/Makefile Tue Jul 24 11:40:30 2007
@@ -6,8 +6,7 @@
#
PORTNAME= apache-tomcat
-PORTVERSION= 6.0.10
-PORTREVISION= 1
+PORTVERSION= 6.0.13
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= tomcat/tomcat-6/v${PORTVERSION}/bin
diff -urN tomcat6.orig/distinfo tomcat6/distinfo
--- tomcat6.orig/distinfo Sat Mar 24 07:22:33 2007
+++ tomcat6/distinfo Tue Jul 24 12:08:26 2007
@@ -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 -urN tomcat6.orig/files/patch-conf__server.xml tomcat6/files/patch-conf__server.xml
--- tomcat6.orig/files/patch-conf__server.xml Sun Feb 18 04:56:16 2007
+++ tomcat6/files/patch-conf__server.xml Tue Jul 24 12:46:33 2007
@@ -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 Fri May 4 18:42:40 2007
++++ conf/server.xml Tue Jul 24 12:45:27 2007
@@ -2,7 +2,7 @@
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
@@ -9,16 +9,16 @@
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-@@ -40,7 +40,7 @@
+@@ -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 -urN tomcat6.orig/pkg-plist tomcat6/pkg-plist
--- tomcat6.orig/pkg-plist Sun Feb 18 04:56:15 2007
+++ tomcat6/pkg-plist Tue Jul 24 12:57:36 2007
@@ -66,6 +66,7 @@
%%T%%/webapps/ROOT/tomcat.svg
%%T%%/webapps/docs/BUILDING.txt
%%T%%/webapps/docs/NOTICE
+%%T%%/webapps/docs/RELEASE-NOTES.txt
%%T%%/webapps/docs/RUNNING.txt
%%T%%/webapps/docs/WEB-INF/web.xml
%%T%%/webapps/docs/aio.html
@@ -127,6 +128,7 @@
%%T%%/webapps/docs/config/cluster.html
%%T%%/webapps/docs/config/context.html
%%T%%/webapps/docs/config/engine.html
+%%T%%/webapps/docs/config/executor.html
%%T%%/webapps/docs/config/globalresources.html
%%T%%/webapps/docs/config/host.html
%%T%%/webapps/docs/config/http.html
@@ -146,6 +148,7 @@
%%T%%/webapps/docs/config/printer/cluster.html
%%T%%/webapps/docs/config/printer/context.html
%%T%%/webapps/docs/config/printer/engine.html
+%%T%%/webapps/docs/config/printer/executor.html
%%T%%/webapps/docs/config/printer/globalresources.html
%%T%%/webapps/docs/config/printer/host.html
%%T%%/webapps/docs/config/printer/http.html
@@ -436,6 +439,7 @@
%%T%%/webapps/examples/jsp/jsptoserv/jts.html
%%T%%/webapps/examples/jsp/num/numguess.html
%%T%%/webapps/examples/jsp/num/numguess.jsp
+%%T%%/webapps/examples/jsp/plugin/applet/Clock2.class
%%T%%/webapps/examples/jsp/plugin/applet/Clock2.java
%%T%%/webapps/examples/jsp/plugin/plugin.html
%%T%%/webapps/examples/jsp/plugin/plugin.jsp
@@ -473,7 +477,6 @@
%%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/images/add.gif
%%T%%/webapps/host-manager/images/asf-logo.gif
%%T%%/webapps/host-manager/images/code.gif
@@ -485,6 +488,8 @@
%%T%%/webapps/host-manager/images/void.gif
%%T%%/webapps/host-manager/manager.xml
%%T%%/webapps/manager/401.jsp
+%%T%%/webapps/manager/sessionsList.jsp
+%%T%%/webapps/manager/sessionDetail.jsp
%%T%%/webapps/manager/META-INF/context.xml
%%T%%/webapps/manager/WEB-INF/web.xml
%%T%%/webapps/manager/images/add.gif
@@ -496,11 +501,8 @@
%%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
@dirrm %%T%%/work
@dirrm %%T%%/webapps/manager/images
@dirrm %%T%%/webapps/manager/WEB-INF
--- tomcat6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070724200444.18D2517045>