[pkgsrc/pkgsrc-2009Q4]: pkgsrc/www/apache-tomcat6 Pullup ticket #2979 - reque...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e70048976ee6
branches:  pkgsrc-2009Q4
changeset: 569224:e70048976ee6
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Jan 28 15:05:19 2010 +0000

description:
Pullup ticket #2979 - requested by spz
apache-tomcat6: security update

Revisions pulled up:
- www/apache-tomcat6/MESSAGE                    1.1
- www/apache-tomcat6/Makefile                   1.5
- www/apache-tomcat6/distinfo                   1.3
---
Module Name:    pkgsrc
Committed By:   spz
Date:           Thu Jan 28 12:16:45 UTC 2010

Modified Files:
        pkgsrc/www/apache-tomcat6: Makefile distinfo
Added Files:
        pkgsrc/www/apache-tomcat6: MESSAGE

Log Message:
update to the fresh release
The changelog from 6.0.20 to 6.0.24 is quite lengthy, please refer to
http://tomcat.apache.org/tomcat-6.0-doc/changelog.html for details

fixes CVE-2009-2693, CVE-2009-2901 and CVE-2009-2902

diffstat:

 www/apache-tomcat6/MESSAGE  |  8 ++++++++
 www/apache-tomcat6/Makefile |  4 ++--
 www/apache-tomcat6/distinfo |  8 ++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r cf4e690ffefe -r e70048976ee6 www/apache-tomcat6/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache-tomcat6/MESSAGE        Thu Jan 28 15:05:19 2010 +0000
@@ -0,0 +1,8 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.2.2 2010/01/28 15:05:19 tron Exp $
+
+The ${PREFIX}/share/tomcat/webapps directory will be mercilessly mangled
+in updates, so pick a different directory for your own local appBase
+(in ${PREFIX}/share/tomcat/conf/server.xml). You have been warned. :)
+
+===========================================================================
diff -r cf4e690ffefe -r e70048976ee6 www/apache-tomcat6/Makefile
--- a/www/apache-tomcat6/Makefile       Thu Jan 28 10:17:18 2010 +0000
+++ b/www/apache-tomcat6/Makefile       Thu Jan 28 15:05:19 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/11/30 15:00:50 joerg Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2010/01/28 15:05:19 tron Exp $
 #
 
 DISTNAME=      apache-tomcat-${TOMCAT_VER}
@@ -22,7 +22,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-TOMCAT_VER=            6.0.20
+TOMCAT_VER=            6.0.24
 TOMCAT_HOME=           ${PREFIX}/share/tomcat
 EGDIR=                 ${PREFIX}/share/examples/tomcat
 DOCDIR=                        ${PREFIX}/share/doc/tomcat
diff -r cf4e690ffefe -r e70048976ee6 www/apache-tomcat6/distinfo
--- a/www/apache-tomcat6/distinfo       Thu Jan 28 10:17:18 2010 +0000
+++ b/www/apache-tomcat6/distinfo       Thu Jan 28 15:05:19 2010 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/06/06 17:34:08 adrianp Exp $
+$NetBSD: distinfo,v 1.2.6.1 2010/01/28 15:05:19 tron Exp $
 
-SHA1 (apache-tomcat-6.0.20.tar.gz) = 4f9d2650d1e4a5a7d053f78b73c2509e64ae6dfc
-RMD160 (apache-tomcat-6.0.20.tar.gz) = e075b3fdce115843ed2c50b52cb05dd38a15ea0e
-Size (apache-tomcat-6.0.20.tar.gz) = 5998298 bytes
+SHA1 (apache-tomcat-6.0.24.tar.gz) = 545d06211e5fe1b09240cd891937ad36fd70bfc4
+RMD160 (apache-tomcat-6.0.24.tar.gz) = 3a4519d9ca0606747f54acf6085bfe0281f148e6
+Size (apache-tomcat-6.0.24.tar.gz) = 6104116 bytes