Wed Oct 25 14:18:47 2017 UTC ()
Update to 8.5.23

Changelog:
    A fix for CVE-2017-12617.
    Stricter validation of the HTTP Host header.
    Add ExtractingRoot, a new WebResourceRoot implementation that extracts JARs to the work directory for improved performance when deploying packed WAR files.
    Added support for the OpenSSL SSL_CONF API. To support this the minimum required Tomcat Native version is 1.2.14.


(ryoon)
diff -r1.3 -r1.4 pkgsrc/www/apache-tomcat85/Makefile
diff -r1.3 -r1.4 pkgsrc/www/apache-tomcat85/distinfo

cvs diff -r1.3 -r1.4 pkgsrc/www/apache-tomcat85/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat85/Makefile 2017/08/15 01:50:45 1.3
+++ pkgsrc/www/apache-tomcat85/Makefile 2017/10/25 14:18:47 1.4
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.3 2017/08/15 01:50:45 ryoon Exp $ 1# $NetBSD: Makefile,v 1.4 2017/10/25 14:18:47 ryoon Exp $
2# 2#
3 3
4DISTNAME= apache-tomcat-${TOMCAT_VER} 4DISTNAME= apache-tomcat-${TOMCAT_VER}
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-8/v${TOMCAT_VER}/bin/} 6MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-8/v${TOMCAT_VER}/bin/}
7 7
8MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= http://tomcat.apache.org/ 9HOMEPAGE= http://tomcat.apache.org/
10COMMENT= Implementation of Java Servlet and JavaServer Pages technologies 10COMMENT= Implementation of Java Servlet and JavaServer Pages technologies
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13CONFLICTS+= jakarta-tomcat55-[0-9]* 13CONFLICTS+= jakarta-tomcat55-[0-9]*
14CONFLICTS+= jakarta-tomcat-[0-9]* 14CONFLICTS+= jakarta-tomcat-[0-9]*
15 15
16NO_BUILD= yes 16NO_BUILD= yes
17USE_LANGUAGES= # none 17USE_LANGUAGES= # none
18USE_JAVA= run 18USE_JAVA= run
19USE_JAVA2= 7 19USE_JAVA2= 7
20USE_TOOLS+= pax 20USE_TOOLS+= pax
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24TOMCAT_VER= 8.5.20 24TOMCAT_VER= 8.5.23
25TOMCAT_HOME= ${PREFIX}/share/tomcat 25TOMCAT_HOME= ${PREFIX}/share/tomcat
26EGDIR= ${PREFIX}/share/examples/tomcat 26EGDIR= ${PREFIX}/share/examples/tomcat
27DOCDIR= ${PREFIX}/share/doc/tomcat 27DOCDIR= ${PREFIX}/share/doc/tomcat
28RCD_SCRIPTS= tomcat 28RCD_SCRIPTS= tomcat
29SMF_NAME= tomcat 29SMF_NAME= tomcat
30TOMCAT_USER?= tomcat 30TOMCAT_USER?= tomcat
31TOMCAT_GROUP?= tomcat 31TOMCAT_GROUP?= tomcat
32PKG_GROUPS= ${TOMCAT_GROUP} 32PKG_GROUPS= ${TOMCAT_GROUP}
33PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP} 33PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP}
34PKG_GROUPS_VARS+= TOMCAT_GROUP 34PKG_GROUPS_VARS+= TOMCAT_GROUP
35PKG_USERS_VARS+= TOMCAT_USER 35PKG_USERS_VARS+= TOMCAT_USER
36PKG_HOME.tomcat= ${TOMCAT_HOME} 36PKG_HOME.tomcat= ${TOMCAT_HOME}
37PKG_SHELL.tomcat= ${SH} 37PKG_SHELL.tomcat= ${SH}

cvs diff -r1.3 -r1.4 pkgsrc/www/apache-tomcat85/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat85/distinfo 2017/08/15 01:50:45 1.3
+++ pkgsrc/www/apache-tomcat85/distinfo 2017/10/25 14:18:47 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.3 2017/08/15 01:50:45 ryoon Exp $ 1$NetBSD: distinfo,v 1.4 2017/10/25 14:18:47 ryoon Exp $
2 2
3SHA1 (apache-tomcat-8.5.20.tar.gz) = e0c8b5f2c5ac4bea302d50101cac46b57947a920 3SHA1 (apache-tomcat-8.5.23.tar.gz) = 1ba27c1bb86ab9c8404e98068800f90bd662523c
4RMD160 (apache-tomcat-8.5.20.tar.gz) = fc705cb89a54aa33189fc7338d6e9e8447bdec10 4RMD160 (apache-tomcat-8.5.23.tar.gz) = 9a1bf8477fb430a7c76af8c1da7a197ca0f079f2
5SHA512 (apache-tomcat-8.5.20.tar.gz) = 6948e52ba6bb66254cb322d50d5432d56b6f3cf99c23f8ab0ff756d2934862be90560f49f594995f672a9211ba684a0267fae3ae67eb6831f11da1b5924117d3 5SHA512 (apache-tomcat-8.5.23.tar.gz) = 93666bd46fd0bfb984503cd1adadc84bbfd3f9b74702940c7fe80369281c671bf5cff3a3da9526da6581fdad0290b928d0d855474a9d74fc1bdeffe3950b11b7
6Size (apache-tomcat-8.5.20.tar.gz) = 9433364 bytes 6Size (apache-tomcat-8.5.23.tar.gz) = 9472492 bytes