CVS commit: pkgsrc/www/apache-tomcat7

["Juraj Lutter" <otis%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   otis
Date:           Thu Oct 15 16:27:21 UTC 2020

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

Log Message:
www/apache-tomcat7: Update to 7.0.106

Brief changes for 7.0.16:
- Pre-load the CoyoteOutputStream class to prevent a potential
  exception when running under a security manager. Patch provided by Johnathan
  Gilday. (markt)
- Refactor the Default servlet to provide a single method that can be
  overridden (generateETag()) should a custom entity tag format be required.
  (markt)
- Improve the validation of entity tags provided with conditional
  requests. Requests with headers that contain invalid entity tags will be
  rejected with a 400 response code. Improve the matching algorithm used to
  compare entity tags in conditional requests with the entity tag for the
  requested resource. Based on a pull request by Sergey Ponomarev. (markt)
- Deprecate the JDBCRealm. (markt)

Full changelog is available at:
https://tomcat.apache.org/tomcat-7.0-doc/changelog.html

Also CONFLICTS have been adjusted.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/apache-tomcat7/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/apache-tomcat7/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/apache-tomcat7/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/apache-tomcat7/Makefile
diff -u pkgsrc/www/apache-tomcat7/Makefile:1.42 pkgsrc/www/apache-tomcat7/Makefile:1.43
--- pkgsrc/www/apache-tomcat7/Makefile:1.42     Sat Apr 25 22:23:05 2020
+++ pkgsrc/www/apache-tomcat7/Makefile  Thu Oct 15 16:27:21 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2020/04/25 22:23:05 jym Exp $
+# $NetBSD: Makefile,v 1.43 2020/10/15 16:27:21 otis Exp $
 
 DISTNAME=      apache-tomcat-${TOMCAT_VER}
 CATEGORIES=    www
-PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/}
 MASTER_SITES+= https://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VER}/bin/
 
@@ -11,8 +10,11 @@ HOMEPAGE=    https://tomcat.apache.org/
 COMMENT=       Implementation of Java Servlet and JavaServer Pages technologies
 LICENSE=       apache-2.0
 
-CONFLICTS+=    jakarta-tomcat55-[0-9]*
-CONFLICTS+=    jakarta-tomcat-[0-9]*
+CONFLICTS+=    apache-tomcat55-[0-9]*
+CONFLICTS+=    apache-tomcat6-[0-9]*
+CONFLICTS+=    apache-tomcat8-[0-9]*
+CONFLICTS+=    apache-tomcat85-[0-9]*
+CONFLICTS+=    apache-tomcat9-[0-9]*
 
 NO_BUILD=      yes
 USE_LANGUAGES= # none
@@ -22,7 +24,7 @@ USE_TOOLS+=   pax
 
 .include "../../mk/bsd.prefs.mk"
 
-TOMCAT_VER=            7.0.99
+TOMCAT_VER=            7.0.106
 TOMCAT_HOME=           ${PREFIX}/share/tomcat
 EGDIR=                 ${PREFIX}/share/examples/tomcat
 DOCDIR=                        ${PREFIX}/share/doc/tomcat

Index: pkgsrc/www/apache-tomcat7/PLIST
diff -u pkgsrc/www/apache-tomcat7/PLIST:1.23 pkgsrc/www/apache-tomcat7/PLIST:1.24
--- pkgsrc/www/apache-tomcat7/PLIST:1.23        Mon Jan 13 07:37:46 2020
+++ pkgsrc/www/apache-tomcat7/PLIST     Thu Oct 15 16:27:21 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2020/01/13 07:37:46 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.24 2020/10/15 16:27:21 otis Exp $
 share/doc/tomcat/LICENSE
 share/doc/tomcat/NOTICE
 share/doc/tomcat/RELEASE-NOTES
@@ -73,6 +73,7 @@ share/tomcat/webapps/docs/RELEASE-NOTES.
 share/tomcat/webapps/docs/RUNNING.txt
 share/tomcat/webapps/docs/WEB-INF/web.xml
 share/tomcat/webapps/docs/aio.html
+share/tomcat/webapps/docs/annotationapi/index.html
 share/tomcat/webapps/docs/api/index.html
 share/tomcat/webapps/docs/appdev/build.xml.txt
 share/tomcat/webapps/docs/appdev/deployment.html
@@ -144,15 +145,6 @@ share/tomcat/webapps/docs/deployer-howto
 share/tomcat/webapps/docs/developers.html
 share/tomcat/webapps/docs/elapi/index.html
 share/tomcat/webapps/docs/extras.html
-share/tomcat/webapps/docs/funcspecs/fs-admin-apps.html
-share/tomcat/webapps/docs/funcspecs/fs-admin-objects.html
-share/tomcat/webapps/docs/funcspecs/fs-admin-opers.html
-share/tomcat/webapps/docs/funcspecs/fs-default.html
-share/tomcat/webapps/docs/funcspecs/fs-jdbc-realm.html
-share/tomcat/webapps/docs/funcspecs/fs-jndi-realm.html
-share/tomcat/webapps/docs/funcspecs/fs-memory-realm.html
-share/tomcat/webapps/docs/funcspecs/index.html
-share/tomcat/webapps/docs/funcspecs/mbean-names.html
 share/tomcat/webapps/docs/host-manager-howto.html
 share/tomcat/webapps/docs/html-host-manager-howto.html
 share/tomcat/webapps/docs/html-manager-howto.html

Index: pkgsrc/www/apache-tomcat7/distinfo
diff -u pkgsrc/www/apache-tomcat7/distinfo:1.34 pkgsrc/www/apache-tomcat7/distinfo:1.35
--- pkgsrc/www/apache-tomcat7/distinfo:1.34     Mon Jan 13 07:37:46 2020
+++ pkgsrc/www/apache-tomcat7/distinfo  Thu Oct 15 16:27:21 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.34 2020/01/13 07:37:46 ryoon Exp $
+$NetBSD: distinfo,v 1.35 2020/10/15 16:27:21 otis Exp $
 
-SHA1 (apache-tomcat-7.0.99.tar.gz) = ccc5cf61b663242ab0bb1890b5ed0ee6198fc0ba
-RMD160 (apache-tomcat-7.0.99.tar.gz) = ebf5853d684deaa92ce26d4271af208bc221aa8e
-SHA512 (apache-tomcat-7.0.99.tar.gz) = f53fb4fe6e568afe03fcf23043a3125b0c0ad99872146ff150a30333be92e6322b2278bfcfb2cce67112f09c3aa464086442bb8a79280548b179127ed1abbca9
-Size (apache-tomcat-7.0.99.tar.gz) = 9587605 bytes
+SHA1 (apache-tomcat-7.0.106.tar.gz) = 00461ec6db131f6cc730d785b329e37be1661514
+RMD160 (apache-tomcat-7.0.106.tar.gz) = 362abd8caccef9a861ac3fdf23b12761d5046325
+SHA512 (apache-tomcat-7.0.106.tar.gz) = f1fb2f3db9e66e66df120b058c216e72ec30df90abd80feda49773fa35c3c00cb56e4d264803696e1a71591d5cb60fcabf60f37e1774d549642ebe3eb902622d
+Size (apache-tomcat-7.0.106.tar.gz) = 9642456 bytes