From snb@c213-100-26-131.swipnet.se  Fri Sep 12 01:12:04 2008
Return-Path: <snb@c213-100-26-131.swipnet.se>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4FBE5106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Sep 2008 01:12:04 +0000 (UTC)
	(envelope-from snb@c213-100-26-131.swipnet.se)
Received: from swip.net (mailfe05.swip.net [212.247.154.129])
	by mx1.freebsd.org (Postfix) with ESMTP id A2E458FC21
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Sep 2008 01:12:03 +0000 (UTC)
	(envelope-from snb@c213-100-26-131.swipnet.se)
Received: from c213-100-26-131.swipnet.se (account mj607215@tele2.se [213.100.26.131] verified)
  by mailfe05.swip.net (CommuniGate Pro SMTP 5.2.6)
  with ESMTPA id 970534530 for FreeBSD-gnats-submit@freebsd.org; Fri, 12 Sep 2008 02:11:59 +0200
Received: by c213-100-26-131.swipnet.se (Postfix, from userid 1001)
	id CC4775C1A; Fri, 12 Sep 2008 02:11:31 +0200 (CEST)
Message-Id: <20080912001140.CC4775C1A@c213-100-26-131.swipnet.se>
Date: Fri, 12 Sep 2008 02:11:31 +0200 (CEST)
From: Nick Barkas <snb@threerings.net>
Reply-To: Nick Barkas <snb@threerings.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] Upgrade www/tomcat6 to 6.0.18
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         127306
>Category:       ports
>Synopsis:       [patch] Upgrade www/tomcat6 to 6.0.18
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 12 01:20:05 UTC 2008
>Closed-Date:    Fri Dec 12 13:22:13 UTC 2008
>Last-Modified:  Fri Dec 12 13:22:13 UTC 2008
>Originator:     Nick Barkas
>Release:        FreeBSD 7.0-RELEASE-p4 amd64
>Organization:
Three Rings Design
>Environment:
System: FreeBSD c213-100-26-131.swipnet.se 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #0: Tue Sep 2 18:48:24 UTC 2008 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
This upgrades www/tomcat6 to the latest version, 6.0.18. This fixes a few
security vulnerabilities that exist in earlier releases:
http://tomcat.apache.org/security-6.html
>How-To-Repeat:
>Fix:
--- tomcat6.diff begins here ---
diff -urN tomcat6.orig/Makefile tomcat6/Makefile
--- tomcat6.orig/Makefile	2008-06-23 00:26:29.000000000 -0700
+++ tomcat6/Makefile	2008-09-11 16:30:23.000000000 -0700
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	apache-tomcat
-PORTVERSION=	6.0.16
+PORTVERSION=	6.0.18
 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	2008-06-23 00:26:29.000000000 -0700
+++ tomcat6/distinfo	2008-09-11 16:32:08.000000000 -0700
@@ -1,3 +1,3 @@
-MD5 (apache-tomcat-6.0.16.tar.gz) = 4985fed02341a9e04ea43e91e6444ace
-SHA256 (apache-tomcat-6.0.16.tar.gz) = eb6de12a8e8ef02ea9844155579863553ff9ea0417b781324c2b8c913a455c65
-SIZE (apache-tomcat-6.0.16.tar.gz) = 6153560
+MD5 (apache-tomcat-6.0.18.tar.gz) = 8354e156f097158f8d7b699078fd39c1
+SHA256 (apache-tomcat-6.0.18.tar.gz) = bbbf01a91587c7133b8555abf415d72610f233c42544dc9f819df7382e7791b2
+SIZE (apache-tomcat-6.0.18.tar.gz) = 6142197
diff -urN tomcat6.orig/pkg-plist tomcat6/pkg-plist
--- tomcat6.orig/pkg-plist	2008-06-23 00:26:29.000000000 -0700
+++ tomcat6/pkg-plist	2008-09-11 16:40:04.000000000 -0700
@@ -55,7 +55,6 @@
 %%T%%/temp/safeToDelete.tmp
 %%T%%/webapps/ROOT/RELEASE-NOTES.txt
 %%T%%/webapps/ROOT/WEB-INF/web.xml
-%%T%%/webapps/ROOT/admin/index.html
 %%T%%/webapps/ROOT/asf-logo-wide.gif
 %%T%%/webapps/ROOT/build.xml
 %%T%%/webapps/ROOT/favicon.ico
@@ -91,7 +90,6 @@
 %%T%%/webapps/docs/appdev/sample/src/mypackage/Hello.java
 %%T%%/webapps/docs/appdev/sample/web/WEB-INF/web.xml
 %%T%%/webapps/docs/appdev/sample/web/hello.jsp
-%%T%%/webapps/docs/appdev/sample/web/images/Thumbs.db
 %%T%%/webapps/docs/appdev/sample/web/images/tomcat.gif
 %%T%%/webapps/docs/appdev/sample/web/index.html
 %%T%%/webapps/docs/appdev/source.html
@@ -157,11 +155,13 @@
 %%T%%/webapps/docs/config/printer/resources.html
 %%T%%/webapps/docs/config/printer/server.html
 %%T%%/webapps/docs/config/printer/service.html
+%%T%%/webapps/docs/config/printer/systemprops.html
 %%T%%/webapps/docs/config/printer/valve.html
 %%T%%/webapps/docs/config/realm.html
 %%T%%/webapps/docs/config/resources.html
 %%T%%/webapps/docs/config/server.html
 %%T%%/webapps/docs/config/service.html
+%%T%%/webapps/docs/config/systemprops.html
 %%T%%/webapps/docs/config/valve.html
 %%T%%/webapps/docs/connectors.html
 %%T%%/webapps/docs/default-servlet.html
@@ -189,7 +189,6 @@
 %%T%%/webapps/docs/funcspecs/printer/index.html
 %%T%%/webapps/docs/funcspecs/printer/mbean-names.html
 %%T%%/webapps/docs/html-manager-howto.html
-%%T%%/webapps/docs/images/Thumbs.db
 %%T%%/webapps/docs/images/add.gif
 %%T%%/webapps/docs/images/asf-logo.gif
 %%T%%/webapps/docs/images/code.gif
@@ -244,7 +243,6 @@
 %%T%%/webapps/docs/printer/setup.html
 %%T%%/webapps/docs/printer/ssi-howto.html
 %%T%%/webapps/docs/printer/ssl-howto.html
-%%T%%/webapps/docs/printer/status.html
 %%T%%/webapps/docs/printer/virtual-hosting-howto.html
 %%T%%/webapps/docs/printer/windows-service-howto.html
 %%T%%/webapps/docs/proxy-howto.html
@@ -253,7 +251,6 @@
 %%T%%/webapps/docs/setup.html
 %%T%%/webapps/docs/ssi-howto.html
 %%T%%/webapps/docs/ssl-howto.html
-%%T%%/webapps/docs/status.html
 %%T%%/webapps/docs/tribes/faq.html
 %%T%%/webapps/docs/tribes/introduction.html
 %%T%%/webapps/docs/tribes/setup.html
@@ -547,7 +544,6 @@
 %%T%%/webapps/host-manager/META-INF/context.xml
 %%T%%/webapps/host-manager/WEB-INF/web.xml
 %%T%%/webapps/host-manager/manager.xml
-%%T%%/webapps/host-manager/images/Thumbs.db
 %%T%%/webapps/host-manager/images/add.gif
 %%T%%/webapps/host-manager/images/asf-logo.gif
 %%T%%/webapps/host-manager/images/code.gif
--- tomcat6.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nemoliu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Sep 12 01:20:23 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127306 
Responsible-Changed-From-To: nemoliu->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Dec 8 06:51:52 UTC 2008 
Responsible-Changed-Why:  
Maintainer was reset. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127306 
State-Changed-From-To: open->closed 
State-Changed-By: stefan 
State-Changed-When: Fri Dec 12 13:21:38 UTC 2008 
State-Changed-Why:  
Maintainer has returned and updated the port in the meantime. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127306 
>Unformatted:
