Update to 8.5.32

Changelog:
Tomcat 8.5.32 (markt)
Catalina
	Fix:  Treat the <mapped-name> element of a <env-entry> in web.xml in the same way as the mappedName element of the equivalent @Resource annotation. Both now attempt to set the mappedName property of the resource. (markt)
	Fix:  Correct the processing of resources with <injection-target>s defined in web.xml. First look for a match using JavaBean property names and then, only if a match is not found, look for a match using fields. (markt)
	Fix:  When restoring a saved request with a request body after FORM authentication, ensure that calls to the HttpServletRequest methods getRequestURI(), getQueryString() and getProtocol() are not corrupted by the processing of the saved request body. (markt)
	Fix:  JNDI resources that are defined with injection targets but no value are now treated as if the resource is not defined. (markt)
	Fix:  Ensure that JNDI names used for <lookup-name> entries in web.xml and for lookup elements of @Resource annotations specify a name with an explicit java: namespace. (markt)
	Code:  Refactor the org.apache.naming package to reduce duplicate code. Duplicate code identified by the Simian tool. (markt)
	Fix:  50019: Add support for <lookup-name>. Based on a patch by Gurkan Erdogdu. (markt)
	Add:  51953: Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to allow/deny requests based on IPv4 and/or IPv6 client address where the IP ranges are defined using CIDR notation. Based on a patch by Francis Galiegue. (markt)
	Fix:  62343: Make CORS filter defaults more secure. This is the fix for CVE-2018-8014. (markt)
	Fix:  Ensure that the web application resources implementation does not incorrectly cache results for resources that are only visible as class loader resources. (markt)
	Fix:  Make all loggers associated with Tomcat provided Filters non-static to ensure that log messages are not lost when a web application is reloaded. (markt)
	Fix:  Correct the manifest for the annotations-api.jar. The JAR implements the Common Annotations API 1.2 and the manifest should reflect that. (markt)
	Fix:  Switch to non-static loggers where there is a possibility of a logger becoming associated with a web application class loader causing log messages to be lost if the web application is stopped. (markt)
	Add:  62389: Add the IPv6 loopback address to the default internalProxies regular expression. Patch by Craig Andrews. (markt)
	Fix:  In the RemoteIpValve and RemoteIpFilter, correctly handle the case when the request passes through one or more trustedProxies but no internalProxies. Based on a patch by zhanhb. (markt)
	Fix:  Correct the logic in MBeanFactory.removeConnector() to ensure that the correct Connector is removed when there are multiple Connectors using different addresses but the same port. (markt)
	Fix:  Make JAASRealm mis-configuration more obvious by requiring the authenticated Subject to include at least one Principal of a type specified by userClassNames. (markt)
	Fix:  62476: Use GMT timezone for the value of Expires header as required by HTTP specification (RFC 7231, 7234). (kkolinko)

2 files changed, 7 insertions, 7 deletions

diff --git a/www/apache-tomcat85/Makefile b/www/apache-tomcat85/Makefile
index 4607371e812..357ea68ea97 100644
--- a/www/apache-tomcat85/Makefile
+++ b/www/apache-tomcat85/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/03/23 13:19:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2018/07/25 21:29:25 zafer Exp $
 #
 
 DISTNAME=	apache-tomcat-${TOMCAT_VER}
@@ -21,7 +21,7 @@ USE_TOOLS+=	pax
 
 .include "../../mk/bsd.prefs.mk"
 
-TOMCAT_VER=		8.5.29
+TOMCAT_VER=		8.5.32
 TOMCAT_HOME=		${PREFIX}/share/tomcat
 EGDIR=			${PREFIX}/share/examples/tomcat
 DOCDIR=			${PREFIX}/share/doc/tomcat
diff --git a/www/apache-tomcat85/distinfo b/www/apache-tomcat85/distinfo
index a8aa1a5ac1d..c0ab0aaf9c7 100644
--- a/www/apache-tomcat85/distinfo
+++ b/www/apache-tomcat85/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2018/03/23 13:19:13 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2018/07/25 21:29:25 zafer Exp $
 
-SHA1 (apache-tomcat-8.5.29.tar.gz) = fdc2ac85282af82a494e352c35e33dcfe1dbab6b
-RMD160 (apache-tomcat-8.5.29.tar.gz) = bee9cabd08028014b684a62262d20831b2caa6de
-SHA512 (apache-tomcat-8.5.29.tar.gz) = a7c771524052325a801b96d9553b18406019d1cea5b874e6c0fcbad46856922d97d634af29c53ec540675d43925e6e5b89685fbba4a7051514e7198f25a99297
-Size (apache-tomcat-8.5.29.tar.gz) = 9532698 bytes
+SHA1 (apache-tomcat-8.5.32.tar.gz) = 04bdc935981580ec0b3b08302f5b22f8df508944
+RMD160 (apache-tomcat-8.5.32.tar.gz) = ec1c9d1545f76a2e0c07a5c200408a483de850a8
+SHA512 (apache-tomcat-8.5.32.tar.gz) = fc010f4643cb9996cad3812594190564d0a30be717f659110211414faf8063c61fad1f18134154084ad3ddfbbbdb352fa6686a28fbb6402d3207d4e0a88fa9ce
+Size (apache-tomcat-8.5.32.tar.gz) = 9584807 bytes