security/bastillion: update to 3.14.0

3 files changed, 81 insertions, 69 deletions

diff --git a/security/bastillion/Makefile b/security/bastillion/Makefile
index 65f6ee60cf6f..60f9d95678ef 100644
--- a/security/bastillion/Makefile
+++ b/security/bastillion/Makefile
@@ -2,12 +2,13 @@
 
 PORTNAME=		bastillion
 DISTVERSIONPREFIX=	jetty-v
-DISTVERSION=		3.13_00
+DISTVERSION=		3.14_00
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			${PORTNAME}-upgrade-4.00.01.jar
 PORTREVISION=		0
 CATEGORIES=		security www java
-MASTER_SITES=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/
+#MASTER_SITES=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/
+MASTER_SITES=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v3.14.0/
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Web-based SSH console
diff --git a/security/bastillion/distinfo b/security/bastillion/distinfo
index dd42a74d7d07..0bf9d457390c 100644
--- a/security/bastillion/distinfo
+++ b/security/bastillion/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1641810868
-SHA256 (bastillion-jetty-v3.13_00.tar.gz) = 5d4d668c1f30e1ea90234d962c4d6cfed1c581ff5c417aeca627c5ff7bee3931
-SIZE (bastillion-jetty-v3.13_00.tar.gz) = 20514662
+TIMESTAMP = 1644825984
+SHA256 (bastillion-jetty-v3.14_00.tar.gz) = 187d933dcf97236e5d9332dd986338d2909aeb0e1221e4b672273c0ad4d50048
+SIZE (bastillion-jetty-v3.14_00.tar.gz) = 20744503
 SHA256 (bastillion-upgrade-4.00.01.jar) = 1960bf8ba7a27314be1e3dfcd03fd9a97d43883a39a335e018db6606c6b84e49
 SIZE (bastillion-upgrade-4.00.01.jar) = 4493492
diff --git a/security/bastillion/pkg-plist b/security/bastillion/pkg-plist
index 18c626895d88..c4defd3593db 100644
--- a/security/bastillion/pkg-plist
+++ b/security/bastillion/pkg-plist
@@ -4,6 +4,9 @@
 @dir(www,www,755) /var/run/%%APP_NAME%%
 jetty_bastillion/README.TXT
 jetty_bastillion/VERSION.txt
+jetty_bastillion/bastillion/META-INF/MANIFEST.MF
+jetty_bastillion/bastillion/META-INF/maven/io.bastillion/bastillion/pom.properties
+jetty_bastillion/bastillion/META-INF/maven/io.bastillion/bastillion/pom.xml
 jetty_bastillion/bastillion/WEB-INF/classes/VERSION.txt
 jetty_bastillion/bastillion/WEB-INF/classes/io/bastillion/common/db/DBInitServlet.class
 jetty_bastillion/bastillion/WEB-INF/classes/io/bastillion/common/filter/AuthFilter.class
@@ -85,30 +88,38 @@ jetty_bastillion/bastillion/WEB-INF/lib/commons-logging-1.2.jar
 jetty_bastillion/bastillion/WEB-INF/lib/commons-pool2-2.10.0.jar
 jetty_bastillion/bastillion/WEB-INF/lib/core-3.4.1.jar
 jetty_bastillion/bastillion/WEB-INF/lib/gson-2.8.9.jar
-jetty_bastillion/bastillion/WEB-INF/lib/h2-2.0.206.jar
+jetty_bastillion/bastillion/WEB-INF/lib/h2-2.1.210.jar
 jetty_bastillion/bastillion/WEB-INF/lib/javassist-3.20.0-GA.jar
-jetty_bastillion/bastillion/WEB-INF/lib/jsch-0.1.72.jar
-jetty_bastillion/bastillion/WEB-INF/lib/lmvc-1.09.01.jar
+jetty_bastillion/bastillion/WEB-INF/lib/jsch-0.2.0.jar
+jetty_bastillion/bastillion/WEB-INF/lib/lmvc-1.10.4.jar
 jetty_bastillion/bastillion/WEB-INF/lib/log4j-api-2.17.1.jar
 jetty_bastillion/bastillion/WEB-INF/lib/log4j-core-2.17.1.jar
 jetty_bastillion/bastillion/WEB-INF/lib/log4j-slf4j-impl-2.17.1.jar
 jetty_bastillion/bastillion/WEB-INF/lib/ognl-3.1.26.jar
-jetty_bastillion/bastillion/WEB-INF/lib/slf4j-api-1.7.32.jar
-jetty_bastillion/bastillion/WEB-INF/lib/thymeleaf-3.0.14.RELEASE.jar
+jetty_bastillion/bastillion/WEB-INF/lib/slf4j-api-1.7.36.jar
+jetty_bastillion/bastillion/WEB-INF/lib/thymeleaf-3.0.15.RELEASE.jar
 jetty_bastillion/bastillion/WEB-INF/lib/unbescape-1.1.6.RELEASE.jar
 jetty_bastillion/bastillion/WEB-INF/web.xml
 jetty_bastillion/bastillion/_res/css/bastillion.css
 jetty_bastillion/bastillion/_res/inc/errors.html
 jetty_bastillion/bastillion/_res/inc/header.html
 jetty_bastillion/bastillion/_res/inc/navigation.html
-jetty_bastillion/bastillion/_res/node/css/bootstrap-theme.css
-jetty_bastillion/bastillion/_res/node/css/bootstrap-theme.css.map
-jetty_bastillion/bastillion/_res/node/css/bootstrap-theme.min.css
-jetty_bastillion/bastillion/_res/node/css/bootstrap-theme.min.css.map
-jetty_bastillion/bastillion/_res/node/css/bootstrap.css
-jetty_bastillion/bastillion/_res/node/css/bootstrap.css.map
+jetty_bastillion/bastillion/_res/node/css/bootstrap-grid.min.css
+jetty_bastillion/bastillion/_res/node/css/bootstrap-grid.min.css.map
+jetty_bastillion/bastillion/_res/node/css/bootstrap-grid.rtl.min.css
+jetty_bastillion/bastillion/_res/node/css/bootstrap-grid.rtl.min.css.map
+jetty_bastillion/bastillion/_res/node/css/bootstrap-reboot.min.css
+jetty_bastillion/bastillion/_res/node/css/bootstrap-reboot.min.css.map
+jetty_bastillion/bastillion/_res/node/css/bootstrap-reboot.rtl.min.css
+jetty_bastillion/bastillion/_res/node/css/bootstrap-reboot.rtl.min.css.map
+jetty_bastillion/bastillion/_res/node/css/bootstrap-utilities.min.css
+jetty_bastillion/bastillion/_res/node/css/bootstrap-utilities.min.css.map
+jetty_bastillion/bastillion/_res/node/css/bootstrap-utilities.rtl.min.css
+jetty_bastillion/bastillion/_res/node/css/bootstrap-utilities.rtl.min.css.map
 jetty_bastillion/bastillion/_res/node/css/bootstrap.min.css
 jetty_bastillion/bastillion/_res/node/css/bootstrap.min.css.map
+jetty_bastillion/bastillion/_res/node/css/bootstrap.rtl.min.css
+jetty_bastillion/bastillion/_res/node/css/bootstrap.rtl.min.css.map
 jetty_bastillion/bastillion/_res/node/css/jquery-ui/accordion.css
 jetty_bastillion/bastillion/_res/node/css/jquery-ui/all.css
 jetty_bastillion/bastillion/_res/node/css/jquery-ui/autocomplete.css
@@ -140,6 +151,7 @@ jetty_bastillion/bastillion/_res/node/css/jquery-ui/theme.css
 jetty_bastillion/bastillion/_res/node/css/jquery-ui/tooltip.css
 jetty_bastillion/bastillion/_res/node/css/xterm.css
 jetty_bastillion/bastillion/_res/node/js/bootstrap.min.js
+jetty_bastillion/bastillion/_res/node/js/bootstrap.min.js.map
 jetty_bastillion/bastillion/_res/node/js/jquery-ui/core.js
 jetty_bastillion/bastillion/_res/node/js/jquery-ui/data.js
 jetty_bastillion/bastillion/_res/node/js/jquery-ui/disable-selection.js
@@ -171,7 +183,6 @@ jetty_bastillion/bastillion/_res/node/js/jquery.floatThead.min.js
 jetty_bastillion/bastillion/_res/node/js/jquery.min.js
 jetty_bastillion/bastillion/_res/node/js/jquery.min.map
 jetty_bastillion/bastillion/_res/node/js/popper.min.js
-jetty_bastillion/bastillion/_res/node/js/popper.min.js.flow
 jetty_bastillion/bastillion/_res/node/js/popper.min.js.map
 jetty_bastillion/bastillion/_res/node/js/xterm-addon-fit.js
 jetty_bastillion/bastillion/_res/node/js/xterm-addon-fit.js.map
@@ -213,81 +224,81 @@ jetty_bastillion/lib/annotations/asm-commons-9.2.jar
 jetty_bastillion/lib/annotations/asm-tree-9.2.jar
 jetty_bastillion/lib/annotations/javax.annotation-api-1.3.2.jar
 jetty_bastillion/lib/apache-jsp/org.eclipse.jdt.ecj-3.19.0.jar
-jetty_bastillion/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.4.44.v20210927.jar
+jetty_bastillion/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.4.45.v20220203.jar
 jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-el-8.5.70.jar
 jetty_bastillion/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.5.70.jar
 jetty_bastillion/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar
 jetty_bastillion/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar
 jetty_bastillion/lib/ext/.donotdelete
-jetty_bastillion/lib/fcgi/fcgi-client-9.4.44.v20210927.jar
-jetty_bastillion/lib/fcgi/fcgi-server-9.4.44.v20210927.jar
-jetty_bastillion/lib/http2/http2-common-9.4.44.v20210927.jar
-jetty_bastillion/lib/http2/http2-hpack-9.4.44.v20210927.jar
-jetty_bastillion/lib/http2/http2-server-9.4.44.v20210927.jar
-jetty_bastillion/lib/infinispan-common-9.4.44.v20210927.jar
-jetty_bastillion/lib/infinispan-embedded-query-9.4.44.v20210927.jar
-jetty_bastillion/lib/infinispan-remote-query-9.4.44.v20210927.jar
+jetty_bastillion/lib/fcgi/fcgi-client-9.4.45.v20220203.jar
+jetty_bastillion/lib/fcgi/fcgi-server-9.4.45.v20220203.jar
+jetty_bastillion/lib/http2/http2-common-9.4.45.v20220203.jar
+jetty_bastillion/lib/http2/http2-hpack-9.4.45.v20220203.jar
+jetty_bastillion/lib/http2/http2-server-9.4.45.v20220203.jar
+jetty_bastillion/lib/infinispan-common-9.4.45.v20220203.jar
+jetty_bastillion/lib/infinispan-embedded-query-9.4.45.v20220203.jar
+jetty_bastillion/lib/infinispan-remote-query-9.4.45.v20220203.jar
 jetty_bastillion/lib/jaspi/javax.security.auth.message-1.0.0.v201108011116.jar
-jetty_bastillion/lib/jetty-alpn-conscrypt-server-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-alpn-java-server-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-alpn-openjdk8-server-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-alpn-server-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-annotations-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-cdi-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-client-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-continuation-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-deploy-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-gcloud-session-manager-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-hazelcast-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-http-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-io-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-jaas-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-jaspi-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-jmx-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-jndi-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-memcached-sessions-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-nosql-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-openid-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-plus-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-proxy-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-quickstart-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-rewrite-9.4.44.v20210927.jar
+jetty_bastillion/lib/jetty-alpn-conscrypt-server-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-alpn-java-server-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-alpn-openjdk8-server-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-alpn-server-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-annotations-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-cdi-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-client-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-continuation-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-deploy-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-gcloud-session-manager-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-hazelcast-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-http-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-io-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-jaas-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-jaspi-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-jmx-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-jndi-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-memcached-sessions-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-nosql-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-openid-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-plus-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-proxy-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-quickstart-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-rewrite-9.4.45.v20220203.jar
 jetty_bastillion/lib/jetty-schemas-3.1.jar
-jetty_bastillion/lib/jetty-security-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-server-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-servlet-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-servlets-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-unixsocket-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-util-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-util-ajax-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-webapp-9.4.44.v20210927.jar
-jetty_bastillion/lib/jetty-xml-9.4.44.v20210927.jar
+jetty_bastillion/lib/jetty-security-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-server-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-servlet-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-servlets-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-unixsocket-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-util-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-util-ajax-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-webapp-9.4.45.v20220203.jar
+jetty_bastillion/lib/jetty-xml-9.4.45.v20220203.jar
 jetty_bastillion/lib/mail/javax.mail.glassfish-1.4.1.v201005082020.jar
 jetty_bastillion/lib/servlet-api-3.1.jar
 jetty_bastillion/lib/setuid/jetty-setuid-java-1.0.4.jar
 jetty_bastillion/lib/setuid/libsetuid-linux.so
 jetty_bastillion/lib/setuid/libsetuid-osx.so
-jetty_bastillion/lib/spring/jetty-spring-9.4.44.v20210927.jar
+jetty_bastillion/lib/spring/jetty-spring-9.4.45.v20220203.jar
 jetty_bastillion/lib/transactions/javax.transaction-api-1.3.jar
-jetty_bastillion/lib/websocket/javax-websocket-client-impl-9.4.44.v20210927.jar
-jetty_bastillion/lib/websocket/javax-websocket-server-impl-9.4.44.v20210927.jar
+jetty_bastillion/lib/websocket/javax-websocket-client-impl-9.4.45.v20220203.jar
+jetty_bastillion/lib/websocket/javax-websocket-server-impl-9.4.45.v20220203.jar
 jetty_bastillion/lib/websocket/javax.websocket-api-1.0.jar
-jetty_bastillion/lib/websocket/websocket-api-9.4.44.v20210927.jar
-jetty_bastillion/lib/websocket/websocket-client-9.4.44.v20210927.jar
-jetty_bastillion/lib/websocket/websocket-common-9.4.44.v20210927.jar
-jetty_bastillion/lib/websocket/websocket-server-9.4.44.v20210927.jar
-jetty_bastillion/lib/websocket/websocket-servlet-9.4.44.v20210927.jar
+jetty_bastillion/lib/websocket/websocket-api-9.4.45.v20220203.jar
+jetty_bastillion/lib/websocket/websocket-client-9.4.45.v20220203.jar
+jetty_bastillion/lib/websocket/websocket-common-9.4.45.v20220203.jar
+jetty_bastillion/lib/websocket/websocket-server-9.4.45.v20220203.jar
+jetty_bastillion/lib/websocket/websocket-servlet-9.4.45.v20220203.jar
 jetty_bastillion/license-eplv10-aslv20.html
 jetty_bastillion/logs/.donotdelete
 jetty_bastillion/modules/.donotdelete
 jetty_bastillion/modules/acceptratelimit.mod
-jetty_bastillion/modules/alpn-impl/alpn-16.mod
 jetty_bastillion/modules/alpn-impl/alpn-available-false.mod
 jetty_bastillion/modules/alpn-impl/alpn-available-true.mod
 jetty_bastillion/modules/alpn.mod
 jetty_bastillion/modules/annotations.mod
 jetty_bastillion/modules/apache-jsp.mod
 jetty_bastillion/modules/apache-jstl.mod
+jetty_bastillion/modules/bytebufferpool-logarithmic.mod
 jetty_bastillion/modules/bytebufferpool.mod
 jetty_bastillion/modules/cdi-decorate.mod
 jetty_bastillion/modules/cdi-spi.mod
@@ -406,7 +417,6 @@ jetty_bastillion/modules/sessions/infinispan/infinispan-common.mod
 jetty_bastillion/modules/sessions/infinispan/remote/infinispan-remote-libs.mod
 jetty_bastillion/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod
 jetty_bastillion/modules/sessions/infinispan/remote/infinispan-remote-serverclasses.mod
-jetty_bastillion/modules/sessions/infinispan/remote/other_proto_marshallers.xml
 jetty_bastillion/modules/sessions/infinispan/remote/resources/hotrod-client.properties
 jetty_bastillion/modules/sessions/jdbc/datasource.mod
 jetty_bastillion/modules/sessions/jdbc/driver.mod
@@ -461,6 +471,7 @@ jetty_bastillion/upgrade/bastillion-upgrade-4.00.01.jar
 %%WWWDIR%%/etc/jetty-acceptratelimit.xml
 %%WWWDIR%%/etc/jetty-alpn.xml
 %%WWWDIR%%/etc/jetty-annotations.xml
+%%WWWDIR%%/etc/jetty-bytebufferpool-logarithmic.xml
 %%WWWDIR%%/etc/jetty-bytebufferpool.xml
 %%WWWDIR%%/etc/jetty-connectionlimit.xml
 %%WWWDIR%%/etc/jetty-customrequestlog.xml