add tomcat-10.0.16

www/tomcat/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2020/05/20 16:00:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2022/01/25 11:12:26 sthen Exp $
 
      SUBDIR =
-     SUBDIR += v7
      SUBDIR += v8
      SUBDIR += v9
+     SUBDIR += v10
 
 .include <bsd.port.subdir.mk>

www/tomcat/v10/Makefile

@@ -0,0 +1,10 @@
+# $OpenBSD: Makefile,v 1.1 2022/01/25 11:12:26 sthen Exp $
+
+COMMENT-main =	Java servlet 5.0 and Java server pages 3.0 server
+PKGSPEC-main =	tomcat->=10,<11
+
+MAJ_VER =	10
+MIN_VER =	0
+MICRO_VER =	16
+
+.include <bsd.port.mk>

www/tomcat/v10/distinfo

@@ -0,0 +1,4 @@
+SHA256 (apache-tomcat-10.0.16-fulldocs.tar.gz) = kmlWn9EcwVvoHyiZpfb6LyDtqv1MOYI24x7ULp4Zy4g=
+SHA256 (apache-tomcat-10.0.16.tar.gz) = STH3T4tWTZN6lbivykOhh7lEicKh+k0XVRrLbMotUFE=
+SIZE (apache-tomcat-10.0.16-fulldocs.tar.gz) = 9665198
+SIZE (apache-tomcat-10.0.16.tar.gz) = 11906902

www/tomcat/v10/patches/patch-conf_server_xml

@@ -0,0 +1,38 @@
+$OpenBSD: patch-conf_server_xml,v 1.1 2022/01/25 11:12:26 sthen Exp $
+
+Index: conf/server.xml
+--- conf/server.xml.orig
++++ conf/server.xml
+@@ -65,12 +65,12 @@
+          AJP  Connector: /docs/config/ajp.html
+          Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+     -->
+-    <Connector port="8080" protocol="HTTP/1.1"
++    <Connector address="0.0.0.0" port="8080" protocol="HTTP/1.1"
+                connectionTimeout="20000"
+                redirectPort="8443" />
+     <!-- A "Connector" using the shared thread pool-->
+     <!--
+-    <Connector executor="tomcatThreadPool"
++    <Connector executor="tomcatThreadPool" address="0.0.0.0"
+                port="8080" protocol="HTTP/1.1"
+                connectionTimeout="20000"
+                redirectPort="8443" />
+@@ -83,7 +83,7 @@
+          the SSLImplementation selected. JSSE style configuration is used below.
+     -->
+     <!--
+-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
++    <Connector address="0.0.0.0" port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+                maxThreads="150" SSLEnabled="true">
+         <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+         <SSLHostConfig>
+@@ -130,7 +130,7 @@
+                resourceName="UserDatabase"/>
+       </Realm>
+ 
+-      <Host name="localhost"  appBase="webapps"
++      <Host name="localhost"  appBase="${CATALINA_BASE}/webapps"
+             unpackWARs="true" autoDeploy="true">
+ 
+         <!-- SingleSignOn valve, share authentication between web applications

www/tomcat/v10/pkg/DESCR-examples

@@ -0,0 +1 @@
+Example web applications and full documentation for Tomcat.

www/tomcat/v10/pkg/DESCR-main

@@ -0,0 +1,7 @@
+Tomcat 10 is a Servlet/JSP container that implements the Servlet 5.0
+and JavaServer Pages 3.0 specifications from the Java Community
+Process. Tomcat includes many additional features that make it a
+useful platform for developing and deploying web applications and
+web services.  Tomcat can be run as a standalone web server with
+Servlet and JSP support, or using Apache HTTP Server as its web
+server via the mod_jk Apache module (the www/mod_jk package).

www/tomcat/v10/pkg/PLIST-main

@@ -0,0 +1,179 @@
+@comment $OpenBSD: PLIST-main,v 1.1 2022/01/25 11:12:26 sthen Exp $
+@option is-branch
+@newgroup _tomcat:526
+@newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin
+@extraunexec rm -rf ${CATALINA_BASE}/logs/* ${CATALINA_BASE}/work/*
+@rcscript ${RCDIR}/tomcat
+@owner _tomcat
+@group _tomcat
+@sample ${CONFDIR}/
+@owner
+@group
+share/doc/pkg-readmes/${PKGSTEM}
+share/examples/tomcat/
+share/examples/tomcat/catalina.policy
+@owner _tomcat
+@group _tomcat
+@sample ${CONFDIR}/catalina.policy
+@owner
+@group
+share/examples/tomcat/catalina.properties
+@owner _tomcat
+@group _tomcat
+@sample ${CONFDIR}/catalina.properties
+@owner
+@group
+share/examples/tomcat/context.xml
+@owner _tomcat
+@group _tomcat
+@sample ${CONFDIR}/context.xml
+@owner
+@group
+share/examples/tomcat/host-manager.xml
+share/examples/tomcat/jaspic-providers.xml
+@owner _tomcat
+@group _tomcat
+@sample ${CONFDIR}/jaspic-providers.xml
+@owner
+@group
+share/examples/tomcat/jaspic-providers.xsd
+share/examples/tomcat/logging.properties
+@owner _tomcat
+@group _tomcat
+@sample ${CONFDIR}/logging.properties
+@owner
+@group
+share/examples/tomcat/manager.xml
+share/examples/tomcat/server.xml
+@owner _tomcat
+@group _tomcat
+@sample ${CONFDIR}/server.xml
+@owner
+@group
+share/examples/tomcat/tomcat-users.xml
+@mode 600
+@owner _tomcat
+@group _tomcat
+@sample ${CONFDIR}/tomcat-users.xml
+@mode
+@owner
+@group
+share/examples/tomcat/tomcat-users.xsd
+share/examples/tomcat/web.xml
+@owner _tomcat
+@group _tomcat
+@sample ${CONFDIR}/web.xml
+@owner
+@group
+tomcat/
+tomcat/BUILDING.txt
+tomcat/CONTRIBUTING.md
+tomcat/LICENSE
+tomcat/NOTICE
+tomcat/README.md
+tomcat/RELEASE-NOTES
+tomcat/RUNNING.txt
+tomcat/bin/
+tomcat/bin/bootstrap.jar
+tomcat/bin/catalina-tasks.xml
+tomcat/bin/catalina.sh
+tomcat/bin/ciphers.sh
+tomcat/bin/commons-daemon-native.tar.gz
+tomcat/bin/commons-daemon.jar
+tomcat/bin/configtest.sh
+tomcat/bin/daemon.sh
+tomcat/bin/digest.sh
+tomcat/bin/makebase.sh
+tomcat/bin/migrate.sh
+tomcat/bin/setclasspath.sh
+tomcat/bin/shutdown.sh
+tomcat/bin/startup.sh
+tomcat/bin/tomcat-juli.jar
+tomcat/bin/tomcat-native.tar.gz
+tomcat/bin/tool-wrapper.sh
+tomcat/bin/version.sh
+tomcat/lib/
+tomcat/lib/annotations-api.jar
+tomcat/lib/catalina-ant.jar
+tomcat/lib/catalina-ha.jar
+tomcat/lib/catalina-ssi.jar
+tomcat/lib/catalina-storeconfig.jar
+tomcat/lib/catalina-tribes.jar
+tomcat/lib/catalina.jar
+tomcat/lib/ecj-4.20.jar
+tomcat/lib/el-api.jar
+tomcat/lib/jakartaee-migration-1.0.0-shaded.jar
+tomcat/lib/jasper-el.jar
+tomcat/lib/jasper.jar
+tomcat/lib/jaspic-api.jar
+tomcat/lib/jsp-api.jar
+tomcat/lib/servlet-api.jar
+tomcat/lib/tomcat-api.jar
+tomcat/lib/tomcat-coyote.jar
+tomcat/lib/tomcat-dbcp.jar
+tomcat/lib/tomcat-i18n-cs.jar
+tomcat/lib/tomcat-i18n-de.jar
+tomcat/lib/tomcat-i18n-es.jar
+tomcat/lib/tomcat-i18n-fr.jar
+tomcat/lib/tomcat-i18n-ja.jar
+tomcat/lib/tomcat-i18n-ko.jar
+tomcat/lib/tomcat-i18n-pt-BR.jar
+tomcat/lib/tomcat-i18n-ru.jar
+tomcat/lib/tomcat-i18n-zh-CN.jar
+tomcat/lib/tomcat-jdbc.jar
+tomcat/lib/tomcat-jni.jar
+tomcat/lib/tomcat-util-scan.jar
+tomcat/lib/tomcat-util.jar
+tomcat/lib/tomcat-websocket.jar
+tomcat/lib/websocket-api.jar
+tomcat/webapps/
+tomcat/webapps/host-manager/
+tomcat/webapps/host-manager/META-INF/
+tomcat/webapps/host-manager/META-INF/context.xml
+tomcat/webapps/host-manager/WEB-INF/
+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/css/
+tomcat/webapps/host-manager/css/manager.css
+tomcat/webapps/host-manager/images/
+tomcat/webapps/host-manager/images/asf-logo.svg
+tomcat/webapps/host-manager/images/tomcat.svg
+tomcat/webapps/host-manager/index.jsp
+tomcat/webapps/manager/
+tomcat/webapps/manager/META-INF/
+tomcat/webapps/manager/META-INF/context.xml
+tomcat/webapps/manager/WEB-INF/
+tomcat/webapps/manager/WEB-INF/jsp/
+tomcat/webapps/manager/WEB-INF/jsp/401.jsp
+tomcat/webapps/manager/WEB-INF/jsp/403.jsp
+tomcat/webapps/manager/WEB-INF/jsp/404.jsp
+tomcat/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
+tomcat/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
+tomcat/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
+tomcat/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+tomcat/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+tomcat/webapps/manager/WEB-INF/web.xml
+tomcat/webapps/manager/css/
+tomcat/webapps/manager/css/manager.css
+tomcat/webapps/manager/images/
+tomcat/webapps/manager/images/asf-logo.svg
+tomcat/webapps/manager/images/tomcat.svg
+tomcat/webapps/manager/index.jsp
+tomcat/webapps/manager/status.xsd
+tomcat/webapps/manager/xform.xsl
+@owner _tomcat
+@group _tomcat
+@sample ${CATALINA_BASE}/
+@sample ${CATALINA_BASE}/logs/
+@sample ${CATALINA_BASE}/shared/
+@sample ${CATALINA_BASE}/shared/classes/
+@sample ${CATALINA_BASE}/shared/lib/
+@sample ${CATALINA_BASE}/temp/
+@sample ${CATALINA_BASE}/webapps/
+@sample ${CATALINA_BASE}/work/
+@exec if [ ! -e ${CATALINA_BASE}/conf ]; then ln -sf ${CONFDIR} ${CATALINA_BASE}/conf; fi
+@unexec if [ -h ${CATALINA_BASE}/conf ]; then rm ${CATALINA_BASE}/conf; fi

www/tomcat/v10/pkg/README-main

@@ -0,0 +1,35 @@
+$OpenBSD: README-main,v 1.1 2022/01/25 11:12:26 sthen Exp $
+
++-----------------------------------------------------------------------
+| Running ${PKGSTEM} on OpenBSD
++-----------------------------------------------------------------------
+
+The tomcat package does not install the example webapps and
+documentation.  You must supply your own webapps and configuration or
+install the tomcat-examples package for the example webapps and
+documentation. Sample config files for the host-manager and manager
+webapps can be found in ${TRUEPREFIX}/share/examples/tomcat.
+
+The tomcat-examples package includes the examples, full documentation
+and the localhost config files for the host-manager and manager webapps.
+
+The packages are structured this way to facilitate maintaining a server
+which normally would not contain the examples and documentation webapp.
+
+Tomcat on OpenBSD uses the `${SYSCONFDIR}/tomcat' directory for its
+configuration files. `$CATALINA_BASE' is `${CATALINA_BASE}'. All files
+contained within these directories should be owned by the _tomcat user.
+
+If you want Tomcat to serve on privileged ports (e.g. 80), redirect all
+tcp traffic to port 80 to Tomcat's default listener port 8080 using a
+pf.conf(5) rule like:
+
+   pass in quick on $NIC proto tcp to port 80 rdr-to 127.0.0.1 port 8080
+
+or use relayd(8) to forward the connection.
+
+If you are upgrading and use database drivers, don't forget to copy them
+into ${TRUEPREFIX}/tomcat/lib. You must also delete any work files in
+`${CATALINA_BASE}/work' unless you are reinstalling the same full
+version of Tomcat. When upgrading from older major versions of Tomcat,
+config files in ${SYSCONFDIR}/tomcat should be updated as well.

www/tomcat/v10/pkg/tomcat.rc

@@ -0,0 +1,29 @@
+#!/bin/ksh
+#
+# $OpenBSD: tomcat.rc,v 1.1 2022/01/25 11:12:26 sthen Exp $
+
+daemon="${TRUEPREFIX}/tomcat/bin/catalina.sh"
+daemon_flags="-server"
+daemon_user="_tomcat"
+
+. /etc/rc.d/rc.subr
+
+pexp="$(${LOCALBASE}/bin/javaPathHelper -c tomcat) .*-Dcatalina.base=${CATALINA_BASE}.*org.apache.catalina.startup.Bootstrap.*"
+
+rc_reload=NO
+
+rc_start() {
+        ${rcexec} \
+	    "CATALINA_BASE=\"${CATALINA_BASE}\" \
+	    CATALINA_OPTS=\"${daemon_flags}\" \
+	    JAVA_HOME=\"$(${LOCALBASE}/bin/javaPathHelper -h tomcat)\" ${daemon} start"
+}
+
+rc_stop() {
+	CATALINA_BASE="${CATALINA_BASE}" \
+	CATALINA_OPTS="${daemon_flags}" \
+	    JAVA_HOME="$(${LOCALBASE}/bin/javaPathHelper -h tomcat)" \
+	    ${daemon} stop
+}
+
+rc_cmd $1