From c0e67cca6843564ab3fa5264315a7afa67a5866c Mon Sep 17 00:00:00 2001
From: ghen <ghen@pkgsrc.org>
Date: Thu, 22 Nov 2007 21:19:13 +0000
Subject: Pullup ticket 2231 - requested by adrianp security update for
 apache-tomcat

- pkgsrc/www/apache-tomcat55/Makefile			1.12
- pkgsrc/www/apache-tomcat55/PLIST			1.4
- pkgsrc/www/apache-tomcat55/distinfo			1.5

   Module Name:	pkgsrc
   Committed By:	adrianp
   Date:		Tue Nov 20 22:13:30 UTC 2007

   Modified Files:
	   pkgsrc/www/apache-tomcat55: Makefile PLIST distinfo

   Log Message:
   Update to 5.5.25
   Fix install permissions to silence checkperms

   In brief:
   Fix WebDAV Servlet so it works correctly with MS clients. (markt)
   Fix XSS security vulnerability (CVE-2007-2450) in the Manager and Host
   Manager. Reported by Daiki Fukumori. (markt)
   Fix NPE when a ResourceLink in context.xml tries to override an
   env-entry in web.xml. (markt)
   Fix XSS security vulnerabilities (CVE-2007-2449) in the examples.
   Reported by Toshiharu Sugiyama. (markt)
   Add some additional mime-type mappings. (markt)
   Ensure JARs in webapps are scanned for TLDs when the Tomcat installation
   path contains spaces. (markt)
   Add link to httpd 2.2 mod_proxy_ajp docs in AJP connector doc. (yoavs)

   For all the details see:
	   http://tomcat.apache.org/tomcat-5.5-doc/changelog.html
---
 www/apache-tomcat55/Makefile | 18 +++++++++---------
 www/apache-tomcat55/PLIST    |  4 ++--
 www/apache-tomcat55/distinfo |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index ebe442f97f5..9f592abe05f 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/04/25 06:14:45 obache Exp $
+# $NetBSD: Makefile,v 1.11.4.1 2007/11/22 21:19:13 ghen Exp $
 
 DISTNAME=	apache-tomcat-${TOMCAT_VERSION}
 CATEGORIES=	www java
@@ -9,7 +9,7 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://tomcat.apache.org/
 COMMENT=	The Apache Project's Java Servlet 2.4 and JSP 2.0 server
 
-TOMCAT_VERSION=	5.5.23
+TOMCAT_VERSION=	5.5.25
 
 USE_JAVA=	run
 # This needs java 1.5 or higher.
@@ -68,13 +68,13 @@ do-install:
 .endfor
 	${INSTALL_DATA_DIR} ${TOMCAT_LIB}
 	${RM} -rf ${WRKSRC}/temp/*
-	@(cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB};		\
-	${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r;	\
-	${FIND} ${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print	\
-		| ${XARGS} ${CHMOD} a+rx;				\
-	${FIND} ${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} a+rx;	\
-	${FIND} ${TOMCAT_LIB} -type f -name \*.bat -print | 		\
-		${XARGS} ${RM} -f)
+	@cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB}
+
+	${FIND} ${TOMCAT_LIB} -type f -name \*.bat -print | ${XARGS} ${RM} -f
+	${FIND} ${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+	${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+	${FIND} ${TOMCAT_LIB} -type f -name \*.sh -print | \
+		${XARGS} ${CHMOD} ${BINMODE}
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache-tomcat55/PLIST b/www/apache-tomcat55/PLIST
index e2078e44b25..d0e1270a421 100644
--- a/www/apache-tomcat55/PLIST
+++ b/www/apache-tomcat55/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/04/25 06:14:45 obache Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2007/11/22 21:19:13 ghen Exp $
 share/examples/rc.d/tomcat
 tomcat/LICENSE
 tomcat/NOTICE
@@ -41,7 +41,7 @@ tomcat/server/lib/catalina-cluster.jar
 tomcat/server/lib/catalina-optional.jar
 tomcat/server/lib/catalina-storeconfig.jar
 tomcat/server/lib/catalina.jar
-tomcat/server/lib/commons-modeler-2.0.jar
+tomcat/server/lib/commons-modeler-2.0.1.jar
 tomcat/server/lib/servlets-cgi.renametojar
 tomcat/server/lib/servlets-default.jar
 tomcat/server/lib/servlets-invoker.jar
diff --git a/www/apache-tomcat55/distinfo b/www/apache-tomcat55/distinfo
index ec2a765c32a..8a176186765 100644
--- a/www/apache-tomcat55/distinfo
+++ b/www/apache-tomcat55/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/04/25 06:14:45 obache Exp $
+$NetBSD: distinfo,v 1.4.4.1 2007/11/22 21:19:14 ghen Exp $
 
-SHA1 (apache-tomcat-5.5.23.tar.gz) = 81a095ccd3c6b03a882b8b91bdfe46a32fa373b5
-RMD160 (apache-tomcat-5.5.23.tar.gz) = 9173e12cf70d741c8b3b73812a3f9c49c7147417
-Size (apache-tomcat-5.5.23.tar.gz) = 5977561 bytes
+SHA1 (apache-tomcat-5.5.25.tar.gz) = a0b45be80eeee7373d5e122245aa7bdc4f56b601
+RMD160 (apache-tomcat-5.5.25.tar.gz) = 12968c99720f8241b1bc9296c31b8099498075a5
+Size (apache-tomcat-5.5.25.tar.gz) = 6034852 bytes
-- 
cgit v1.2.3