security/bastillion: update to 3.12.00

This update contains an incompatible DB change, please read UPDATING
*before* updating.

5 files changed, 110 insertions, 37 deletions

diff --git a/UPDATING b/UPDATING
index 22c7045e387f..bdfe77255cd9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20211223:
+  AFFECTS: users of security/bastillion
+  AUTHOR: netchild@FreeBSD.org
+
+  This update contains an incompatible DB change. Either recreate your
+  DB (rm /usr/local/jetty_bastillion/bastillion/WEB-INF/classes/keydb/bastillion.*
+  and restart) by hand, or export the old DB while the old version is
+  installed and import the data into a new DB. See
+    https://github.com/bastillion-io/Bastillion/issues/405
+  for details.
+
 20211220:
   AFFECTS: users of devel/notcurses
   AUTHOR: nickblack@linux.com
diff --git a/security/bastillion/Makefile b/security/bastillion/Makefile
index a32b87e39179..8be20720b61d 100644
--- a/security/bastillion/Makefile
+++ b/security/bastillion/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=		bastillion
 DISTVERSIONPREFIX=	jetty-v
-DISTVERSION=		3.11_01
+DISTVERSION=		3.12_00
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			${PORTNAME}-upgrade-3.08.00.jar
 PORTREVISION=		0
diff --git a/security/bastillion/distinfo b/security/bastillion/distinfo
index 565346732d6c..d14e00567684 100644
--- a/security/bastillion/distinfo
+++ b/security/bastillion/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1639726206
-SHA256 (bastillion-jetty-v3.11_01.tar.gz) = 7ffec5373b6698ebedfa1228b6f0caea482e313cb2bdb9758b5607765c4626b9
-SIZE (bastillion-jetty-v3.11_01.tar.gz) = 19785024
+TIMESTAMP = 1640073876
+SHA256 (bastillion-jetty-v3.12_00.tar.gz) = 312084367414a18ab9febb3d2e338a8cce2849dfb9e28709831febf2f30e0bb0
+SIZE (bastillion-jetty-v3.12_00.tar.gz) = 20364656
 SHA256 (bastillion-upgrade-3.08.00.jar) = 8d18adc90d258b9a9de5e5865c9f632c563d0557ad9458b9f1082ede15ed074b
 SIZE (bastillion-upgrade-3.08.00.jar) = 3557485
diff --git a/security/bastillion/files/pkg-message.in b/security/bastillion/files/pkg-message.in
index 6a26a0f95ae1..59c81da651e0 100644
--- a/security/bastillion/files/pkg-message.in
+++ b/security/bastillion/files/pkg-message.in
@@ -25,4 +25,16 @@ as someone else than admin, you forgot to upgrade it):
     java -jar %%PREFIX%%/jetty_bastillion/upgrade/bastillion-upgrade-3.08.00.jar %%PREFIX%%/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties
 EOT
 }
+{
+  type: upgrade
+  maximum_version: "3.12.00"
+  message: <<EOT
+The update to 3.12.00 contains an incompatible DB change. Either recreate your
+DB (rm %%PREFIX%%/jetty_bastillion/bastillion/WEB-INF/classes/keydb/bastillion.*
+and restart) by hand, or export the old DB while the old version is
+installed and import the data into a new DB. See
+  https://github.com/bastillion-io/Bastillion/issues/405
+for details.
+EOT
+}
 ]
diff --git a/security/bastillion/pkg-plist b/security/bastillion/pkg-plist
index 1e08cfe1b98e..5fd21603516a 100644
--- a/security/bastillion/pkg-plist
+++ b/security/bastillion/pkg-plist
@@ -76,58 +76,108 @@ jetty_bastillion/bastillion/WEB-INF/jetty-env.xml
 jetty_bastillion/bastillion/WEB-INF/lib/attoparser-2.0.5.RELEASE.jar
 jetty_bastillion/bastillion/WEB-INF/lib/commons-codec-1.15.jar
 jetty_bastillion/bastillion/WEB-INF/lib/commons-configuration-1.10.jar
-jetty_bastillion/bastillion/WEB-INF/lib/commons-dbcp2-2.8.0.jar
+jetty_bastillion/bastillion/WEB-INF/lib/commons-dbcp2-2.9.0.jar
 jetty_bastillion/bastillion/WEB-INF/lib/commons-fileupload-1.4.jar
 jetty_bastillion/bastillion/WEB-INF/lib/commons-io-2.2.jar
 jetty_bastillion/bastillion/WEB-INF/lib/commons-lang-2.6.jar
 jetty_bastillion/bastillion/WEB-INF/lib/commons-lang3-3.12.0.jar
 jetty_bastillion/bastillion/WEB-INF/lib/commons-logging-1.2.jar
-jetty_bastillion/bastillion/WEB-INF/lib/commons-pool2-2.8.1.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.6.jar
-jetty_bastillion/bastillion/WEB-INF/lib/h2-1.4.200.jar
+jetty_bastillion/bastillion/WEB-INF/lib/gson-2.8.9.jar
+jetty_bastillion/bastillion/WEB-INF/lib/h2-2.0.202.jar
 jetty_bastillion/bastillion/WEB-INF/lib/javassist-3.20.0-GA.jar
-jetty_bastillion/bastillion/WEB-INF/lib/jsch-0.1.55.jar
-jetty_bastillion/bastillion/WEB-INF/lib/lmvc-1.08.00.jar
+jetty_bastillion/bastillion/WEB-INF/lib/jsch-0.1.71.jar
+jetty_bastillion/bastillion/WEB-INF/lib/lmvc-1.09.00.jar
 jetty_bastillion/bastillion/WEB-INF/lib/log4j-api-2.16.0.jar
 jetty_bastillion/bastillion/WEB-INF/lib/log4j-core-2.16.0.jar
 jetty_bastillion/bastillion/WEB-INF/lib/log4j-slf4j-impl-2.16.0.jar
 jetty_bastillion/bastillion/WEB-INF/lib/ognl-3.1.26.jar
 jetty_bastillion/bastillion/WEB-INF/lib/slf4j-api-1.8.0-beta4.jar
+jetty_bastillion/bastillion/WEB-INF/lib/slf4j-jdk14-1.8.0-beta4.jar
 jetty_bastillion/bastillion/WEB-INF/lib/thymeleaf-3.0.14.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/css/bootstrap.css
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-icons_222222_256x240.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-icons_2e83ff_256x240.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-icons_454545_256x240.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-icons_888888_256x240.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/images/ui-icons_cd0a0a_256x240.png
-jetty_bastillion/bastillion/_res/css/jquery-ui/jquery-ui.css
-jetty_bastillion/bastillion/_res/css/xterm.css
-jetty_bastillion/bastillion/_res/fonts/glyphicons-halflings-regular.eot
-jetty_bastillion/bastillion/_res/fonts/glyphicons-halflings-regular.svg
-jetty_bastillion/bastillion/_res/fonts/glyphicons-halflings-regular.ttf
-jetty_bastillion/bastillion/_res/fonts/glyphicons-halflings-regular.woff
-jetty_bastillion/bastillion/_res/fonts/glyphicons-halflings-regular.woff2
 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/js/bootstrap.js
-jetty_bastillion/bastillion/_res/js/jquery-3.5.1.js
-jetty_bastillion/bastillion/_res/js/jquery-ui.js
-jetty_bastillion/bastillion/_res/js/jquery.floatThead.js
-jetty_bastillion/bastillion/_res/js/tty/addons/fit/xterm-addon-fit.js
-jetty_bastillion/bastillion/_res/js/tty/addons/fit/xterm-addon-fit.js.map
-jetty_bastillion/bastillion/_res/js/tty/xterm.js
-jetty_bastillion/bastillion/_res/js/tty/xterm.js.map
+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.min.css
+jetty_bastillion/bastillion/_res/node/css/bootstrap.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
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/base.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/button.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/checkboxradio.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/controlgroup.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/core.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/datepicker.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/dialog.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/draggable.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/images/ui-icons_444444_256x240.png
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/images/ui-icons_555555_256x240.png
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/images/ui-icons_777620_256x240.png
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/images/ui-icons_777777_256x240.png
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/images/ui-icons_cc0000_256x240.png
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/images/ui-icons_ffffff_256x240.png
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/menu.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/progressbar.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/resizable.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/selectable.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/selectmenu.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/slider.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/sortable.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/spinner.css
+jetty_bastillion/bastillion/_res/node/css/jquery-ui/tabs.css
+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/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
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/effect.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/focusable.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/form-reset-mixin.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/form.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/ie.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/jquery-patch.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/jquery-var-for-color.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/keycode.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/labels.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/plugin.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/position.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/safe-active-element.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/safe-blur.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/scroll-parent.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/tabbable.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/unique-id.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/version.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/widget.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/widgets/draggable.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/widgets/droppable.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/widgets/mouse.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/widgets/resizable.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/widgets/selectable.js
+jetty_bastillion/bastillion/_res/node/js/jquery-ui/widgets/sortable.js
+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
+jetty_bastillion/bastillion/_res/node/js/xterm.js
+jetty_bastillion/bastillion/_res/node/js/xterm.js.map
 jetty_bastillion/bastillion/admin/menu.html
 jetty_bastillion/bastillion/admin/secure_shell.html
 jetty_bastillion/bastillion/admin/two-factor_otp.html