From bcdc4b6262447c29b6e42806a6f45d0214d2829a Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 1 Mar 2021 20:40:52 +0000
Subject: [PATCH] update to tomcat-7.0.108

---
 www/tomcat/Makefile.inc          | 6 +-----
 www/tomcat/v7/Makefile           | 4 ++--
 www/tomcat/v7/distinfo           | 8 ++++----
 www/tomcat/v7/pkg/PLIST-examples | 4 ++--
 www/tomcat/v7/pkg/PLIST-main     | 4 ++--
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/www/tomcat/Makefile.inc b/www/tomcat/Makefile.inc
index 1dcd900e8d0..85c83c1e14c 100644
--- a/www/tomcat/Makefile.inc
+++ b/www/tomcat/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.15 2020/12/03 20:58:53 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2021/03/01 20:40:52 sthen Exp $
 
 COMMENT-main ?=	Java servlet and Java server pages server
 COMMENT-examples =example applications and full documentation
@@ -48,11 +48,7 @@ post-extract:
 	@rm -rf ${WRKDIST}/webapps/docs
 	mv ${WRKDIR}/tomcat-${MAJ_VER}.${MIN_VER}-doc ${WRKDIST}/webapps/docs
 
-.if ${MAJ_VER} == 7
-MGR_XML=	${WRKDIST}/webapps/host-manager/manager.xml
-.else
 MGR_XML=	${WRKDIST}/webapps/host-manager/WEB-INF/manager.xml
-.endif
 
 do-install:
 	${INSTALL_DATA_DIR} ${SAMPLEDIR} ${PREFIX}/tomcat{,/webapps} \
diff --git a/www/tomcat/v7/Makefile b/www/tomcat/v7/Makefile
index 92fabe6a34e..e5304dcf444 100644
--- a/www/tomcat/v7/Makefile
+++ b/www/tomcat/v7/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.63 2020/10/13 10:26:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.64 2021/03/01 20:40:52 sthen Exp $
 
 COMMENT-main =	Java servlet 3.0 and Java server pages 2.2 server
 PKGSPEC-main =	tomcat->=7,<8
 
 MAJ_VER =	7
 MIN_VER =	0
-MICRO_VER =	106
+MICRO_VER =	108
 
 .include <bsd.port.mk>
diff --git a/www/tomcat/v7/distinfo b/www/tomcat/v7/distinfo
index b866ddda947..94fbde19618 100644
--- a/www/tomcat/v7/distinfo
+++ b/www/tomcat/v7/distinfo
@@ -1,4 +1,4 @@
-SHA256 (apache-tomcat-7.0.106-fulldocs.tar.gz) = CUg1S/YD9wD4IvwxtTBKbVCUI1ixBfUD5ge5/oCH2lo=
-SHA256 (apache-tomcat-7.0.106.tar.gz) = Uzwkbe8mJN5/ef9u399WldVvcmfdwzc4XC5LUC+WNgY=
-SIZE (apache-tomcat-7.0.106-fulldocs.tar.gz) = 5939179
-SIZE (apache-tomcat-7.0.106.tar.gz) = 9642456
+SHA256 (apache-tomcat-7.0.108-fulldocs.tar.gz) = yGBJt15Tk0VR9DOXVOXZSAdW3FDY63E0W+tyfpcHlZo=
+SHA256 (apache-tomcat-7.0.108.tar.gz) = bb83/kNizxvGiVmtg//qja3dScieonMjh2V3jrIpqmo=
+SIZE (apache-tomcat-7.0.108-fulldocs.tar.gz) = 6408733
+SIZE (apache-tomcat-7.0.108.tar.gz) = 9655294
diff --git a/www/tomcat/v7/pkg/PLIST-examples b/www/tomcat/v7/pkg/PLIST-examples
index 39ddba8de65..5e7940cacef 100644
--- a/www/tomcat/v7/pkg/PLIST-examples
+++ b/www/tomcat/v7/pkg/PLIST-examples
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-examples,v 1.44 2020/10/13 10:26:21 sthen Exp $
+@comment $OpenBSD: PLIST-examples,v 1.45 2021/03/01 20:40:52 sthen Exp $
 @option is-branch
 @owner _tomcat
 @group _tomcat
@@ -1093,6 +1093,7 @@ webapps/docs/api/org/apache/catalina/util/DateTool.html
 webapps/docs/api/org/apache/catalina/util/Enumerator.html
 webapps/docs/api/org/apache/catalina/util/Extension.html
 webapps/docs/api/org/apache/catalina/util/ExtensionValidator.html
+webapps/docs/api/org/apache/catalina/util/FileUtil.html
 webapps/docs/api/org/apache/catalina/util/IOTools.html
 webapps/docs/api/org/apache/catalina/util/InstanceSupport.html
 webapps/docs/api/org/apache/catalina/util/Introspection.html
@@ -1677,7 +1678,6 @@ webapps/docs/api/org/apache/tomcat/JarScannerCallback.html
 webapps/docs/api/org/apache/tomcat/PeriodicEventListener.html
 webapps/docs/api/org/apache/tomcat/buildutil/
 webapps/docs/api/org/apache/tomcat/buildutil/CheckEol.html
-webapps/docs/api/org/apache/tomcat/buildutil/SignCode.html
 webapps/docs/api/org/apache/tomcat/buildutil/Txt2Html.html
 webapps/docs/api/org/apache/tomcat/buildutil/Utils.html
 webapps/docs/api/org/apache/tomcat/buildutil/package-frame.html
diff --git a/www/tomcat/v7/pkg/PLIST-main b/www/tomcat/v7/pkg/PLIST-main
index 41b2dfe2a4a..962fac82ea4 100644
--- a/www/tomcat/v7/pkg/PLIST-main
+++ b/www/tomcat/v7/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.18 2020/03/27 15:59:31 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.19 2021/03/01 20:40:52 sthen Exp $
 @option is-branch
 @newgroup _tomcat:526
 @newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin
@@ -117,6 +117,7 @@ tomcat/webapps/host-manager/WEB-INF/jsp/
 tomcat/webapps/host-manager/WEB-INF/jsp/401.jsp
 tomcat/webapps/host-manager/WEB-INF/jsp/403.jsp
 tomcat/webapps/host-manager/WEB-INF/jsp/404.jsp
+tomcat/webapps/host-manager/WEB-INF/manager.xml
 tomcat/webapps/host-manager/WEB-INF/web.xml
 tomcat/webapps/host-manager/images/
 tomcat/webapps/host-manager/images/add.gif
@@ -129,7 +130,6 @@ tomcat/webapps/host-manager/images/tomcat.gif
 tomcat/webapps/host-manager/images/update.gif
 tomcat/webapps/host-manager/images/void.gif
 tomcat/webapps/host-manager/index.jsp
-tomcat/webapps/host-manager/manager.xml
 tomcat/webapps/manager/
 tomcat/webapps/manager/META-INF/
 tomcat/webapps/manager/META-INF/context.xml