net-im/openfire: Update to 4.7.1

ChangeLog: http://download.igniterealtime.org/openfire/docs/4.7.1/changelog.html

PR:	262166
Reported by:	nikita@druba.su (maintainer)
MFH:	2022Q1	many bugfixes

(cherry picked from commit 7c493994345313a59c1d17f7f682543300718b2b)

3 files changed, 68 insertions, 59 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 8a85cb5dba49..953ec94479bb 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	openfire
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.6.5
+DISTVERSION=	4.7.1
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 
@@ -25,11 +25,11 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 
 USE_RC_SUBR=	${PORTNAME}
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_ARCH=	yes
 SUB_FILES+=	pkg-message
 
 INSTALL_WRKSRC=	${WRKSRC}/distribution/target/distribution-base/
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 VARLOG=		/var/log/${PORTNAME}
 VARDB=		/var/db/${PORTNAME}
 USERS=		${PORTNAME}
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 60a023b22319..4be29f2650bf 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1639904801
-SHA256 (FreeBSD-openfire-4.6.5-maven-repository.tar.gz) = 45ad81374644afa5f1c72115353a060e7a0afd41eb7c88ea4c3fdc92a185862c
-SIZE (FreeBSD-openfire-4.6.5-maven-repository.tar.gz) = 253194114
-SHA256 (igniterealtime-Openfire-v4.6.5_GH0.tar.gz) = 4857e79fc14c4d0f2ac126a1e3b63e065275eb9360e249f3dac068d3fada91fe
-SIZE (igniterealtime-Openfire-v4.6.5_GH0.tar.gz) = 6771039
+TIMESTAMP = 1645673248
+SHA256 (igniterealtime-Openfire-v4.7.1_GH0.tar.gz) = bcd6873a6f7ec737dd47d6f26827af91098b57bd8dea2646fc86ba87a62cdfa5
+SIZE (igniterealtime-Openfire-v4.7.1_GH0.tar.gz) = 7402687
+SHA256 (FreeBSD-openfire-4.7.1-maven-repository.tar.gz) = aacf7de250f00dabb81d2baa41c4200226b5f04e2fac6627499a89fff2fed232
+SIZE (FreeBSD-openfire-4.7.1-maven-repository.tar.gz) = 256306557
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index 05b6e5ecee7d..7fa5df3dbdcf 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -12,6 +12,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/database-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/database.html
 %%PORTDOCS%%%%DOCSDIR%%/db-integration-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/docker.html
 %%PORTDOCS%%%%DOCSDIR%%/ide-vscode-setup.html
 %%PORTDOCS%%%%DOCSDIR%%/images/VSCode-1.png
 %%PORTDOCS%%%%DOCSDIR%%/images/VSCode-2.png
@@ -27,6 +28,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/launcher.png
 %%PORTDOCS%%%%DOCSDIR%%/images/setup_ldap.png
 %%PORTDOCS%%%%DOCSDIR%%/images/sitemesh.png
+%%PORTDOCS%%%%DOCSDIR%%/images/spark_debug.png
 %%PORTDOCS%%%%DOCSDIR%%/images/windows_service.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install-guide.html
@@ -47,34 +49,33 @@
 %%PORTDOCS%%%%DOCSDIR%%/upgrade-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/wildfire-ent-3_2_0-upgrade.html
 %%PORTDOCS%%%%DOCSDIR%%/wildfire-openfire-upgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/working-with-openfire.html
 %%DATADIR%%/conf
 %%DATADIR%%/embedded-db
-%%DATADIR%%/lib/FastInfoset-1.2.16.jar
 %%DATADIR%%/lib/activation-1.1.jar
-%%DATADIR%%/lib/ant-1.10.9.jar
-%%DATADIR%%/lib/ant-launcher-1.10.9.jar
 %%DATADIR%%/lib/apache-el-8.5.54.jar
 %%DATADIR%%/lib/apache-jsp-8.5.54.jar
-%%DATADIR%%/lib/apache-jsp-9.4.35.v20201120.jar
-%%DATADIR%%/lib/asm-9.0.jar
-%%DATADIR%%/lib/asm-analysis-9.0.jar
-%%DATADIR%%/lib/asm-commons-9.0.jar
-%%DATADIR%%/lib/asm-tree-9.0.jar
-%%DATADIR%%/lib/bcpg-jdk15on-1.68.jar
-%%DATADIR%%/lib/bcpkix-jdk15on-1.68.jar
-%%DATADIR%%/lib/bcprov-jdk15on-1.68.jar
+%%DATADIR%%/lib/apache-jsp-9.4.43.v20210629.jar
+%%DATADIR%%/lib/asm-9.1.jar
+%%DATADIR%%/lib/asm-analysis-9.1.jar
+%%DATADIR%%/lib/asm-commons-9.1.jar
+%%DATADIR%%/lib/asm-tree-9.1.jar
+%%DATADIR%%/lib/bcpg-jdk15on-1.70.jar
+%%DATADIR%%/lib/bcpkix-jdk15on-1.70.jar
+%%DATADIR%%/lib/bcprov-jdk15on-1.70.jar
+%%DATADIR%%/lib/bcutil-jdk15on-1.70.jar
 %%DATADIR%%/lib/caffeine-2.7.0.jar
 %%DATADIR%%/lib/checker-qual-3.5.0.jar
 %%DATADIR%%/lib/common-image-3.5.jar
 %%DATADIR%%/lib/common-io-3.5.jar
 %%DATADIR%%/lib/common-lang-3.5.jar
-%%DATADIR%%/lib/commons-codec-1.12.jar
-%%DATADIR%%/lib/commons-dbcp2-2.6.0.jar
+%%DATADIR%%/lib/commons-codec-1.15.jar
+%%DATADIR%%/lib/commons-dbcp2-2.9.0.jar
 %%DATADIR%%/lib/commons-fileupload-1.4.jar
-%%DATADIR%%/lib/commons-io-2.7.jar
+%%DATADIR%%/lib/commons-io-2.2.jar
 %%DATADIR%%/lib/commons-lang3-3.9.jar
 %%DATADIR%%/lib/commons-logging-1.2.jar
-%%DATADIR%%/lib/commons-pool2-2.6.2.jar
+%%DATADIR%%/lib/commons-pool2-2.9.0.jar
 %%DATADIR%%/lib/commons-text-1.6.jar
 %%DATADIR%%/lib/dom4j-2.1.3.jar
 %%DATADIR%%/lib/dwr-3.0.2-RELEASE.jar
@@ -85,43 +86,44 @@
 %%DATADIR%%/lib/hsqldb-2.4.1.jar
 %%DATADIR%%/lib/httpclient-4.5.13.jar
 %%DATADIR%%/lib/httpcore-4.4.13.jar
-%%DATADIR%%/lib/i18n-4.6.5.jar
+%%DATADIR%%/lib/i18n-4.7.1.jar
 %%DATADIR%%/lib/imageio-bmp-3.5.jar
 %%DATADIR%%/lib/imageio-core-3.5.jar
-%%DATADIR%%/lib/istack-commons-runtime-3.0.8.jar
+%%DATADIR%%/lib/istack-commons-runtime-3.0.11.jar
 %%DATADIR%%/lib/j2objc-annotations-1.3.jar
-%%DATADIR%%/lib/jakarta.activation-api-1.2.1.jar
-%%DATADIR%%/lib/jakarta.xml.bind-api-2.3.2.jar
+%%DATADIR%%/lib/jakarta.activation-1.2.2.jar
+%%DATADIR%%/lib/jakarta.xml.bind-api-2.3.3.jar
+%%DATADIR%%/lib/jansi-1.18.jar
 %%DATADIR%%/lib/javassist-3.24.1-GA.jar
 %%DATADIR%%/lib/javax.activation-api-1.2.0.jar
 %%DATADIR%%/lib/javax.annotation-api-1.3.2.jar
 %%DATADIR%%/lib/javax.mail-1.6.2.jar
 %%DATADIR%%/lib/javax.servlet-api-3.1.0.jar
 %%DATADIR%%/lib/jaxb-api-2.3.1.jar
-%%DATADIR%%/lib/jaxb-runtime-2.3.2.jar
+%%DATADIR%%/lib/jaxb-runtime-2.3.3.jar
 %%DATADIR%%/lib/jaxen-1.2.0.jar
 %%DATADIR%%/lib/jcip-annotations-1.0.jar
-%%DATADIR%%/lib/jcl-over-slf4j-1.7.30.jar
+%%DATADIR%%/lib/jcl-over-slf4j-1.7.36.jar
 %%DATADIR%%/lib/jdom2-2.0.6.jar
-%%DATADIR%%/lib/jetty-annotations-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-client-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-continuation-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-http-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-io-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-jmx-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-jndi-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-plus-9.4.35.v20201120.jar
+%%DATADIR%%/lib/jetty-annotations-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-client-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-continuation-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-http-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-io-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-jmx-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-jndi-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-plus-9.4.43.v20210629.jar
 %%DATADIR%%/lib/jetty-schemas-3.1.2.jar
-%%DATADIR%%/lib/jetty-security-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-server-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-servlet-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-servlets-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-util-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-util-ajax-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-webapp-9.4.35.v20201120.jar
-%%DATADIR%%/lib/jetty-xml-9.4.35.v20201120.jar
+%%DATADIR%%/lib/jetty-security-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-server-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-servlet-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-servlets-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-util-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-util-ajax-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-webapp-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jetty-xml-9.4.43.v20210629.jar
 %%DATADIR%%/lib/jmdns-1.0.jar
-%%DATADIR%%/lib/jsmpp-2.3.7.jar
+%%DATADIR%%/lib/jsmpp-2.3.10.jar
 %%DATADIR%%/lib/jsr305-3.0.2.jar
 %%DATADIR%%/lib/jtds-1.3.1.jar
 %%DATADIR%%/lib/jzlib-1.1.3.jar
@@ -136,28 +138,27 @@
 %%DATADIR%%/lib/mina-integration-beans-2.1.3.jar
 %%DATADIR%%/lib/mina-integration-jmx-2.1.3.jar
 %%DATADIR%%/lib/mina-integration-ognl-2.1.3.jar
-%%DATADIR%%/lib/mssql-jdbc-7.2.2.jre8.jar
-%%DATADIR%%/lib/mysql-connector-java-8.0.21.jar
+%%DATADIR%%/lib/mssql-jdbc-7.4.1.jre8.jar
+%%DATADIR%%/lib/mysql-connector-java-8.0.28.jar
 %%DATADIR%%/lib/ognl-3.2.10.jar
-%%DATADIR%%/lib/postgresql-42.2.14.jar
+%%DATADIR%%/lib/postgresql-42.3.3.jar
 %%DATADIR%%/lib/protobuf-java-3.11.4.jar
-%%DATADIR%%/lib/rome-1.12.0.jar
-%%DATADIR%%/lib/rome-utils-1.12.0.jar
+%%DATADIR%%/lib/rome-1.15.0.jar
+%%DATADIR%%/lib/rome-utils-1.15.0.jar
 %%DATADIR%%/lib/shaj-0.5.jar
 %%DATADIR%%/lib/sitemesh-2.4.2.jar
-%%DATADIR%%/lib/slf4j-api-1.7.30.jar
+%%DATADIR%%/lib/slf4j-api-1.7.36.jar
 %%DATADIR%%/lib/startup.jar
-%%DATADIR%%/lib/stax-ex-1.8.1.jar
 %%DATADIR%%/lib/taglibs-standard-impl-1.2.5.jar
 %%DATADIR%%/lib/taglibs-standard-spec-1.2.5.jar
 %%DATADIR%%/lib/tinder-2.0.0.jar
-%%DATADIR%%/lib/txw2-2.3.2.jar
-%%DATADIR%%/lib/websocket-api-9.4.35.v20201120.jar
-%%DATADIR%%/lib/websocket-client-9.4.35.v20201120.jar
-%%DATADIR%%/lib/websocket-common-9.4.35.v20201120.jar
-%%DATADIR%%/lib/websocket-server-9.4.35.v20201120.jar
-%%DATADIR%%/lib/websocket-servlet-9.4.35.v20201120.jar
-%%DATADIR%%/lib/xmppserver-4.6.5.jar
+%%DATADIR%%/lib/txw2-2.3.3.jar
+%%DATADIR%%/lib/websocket-api-9.4.43.v20210629.jar
+%%DATADIR%%/lib/websocket-client-9.4.43.v20210629.jar
+%%DATADIR%%/lib/websocket-common-9.4.43.v20210629.jar
+%%DATADIR%%/lib/websocket-server-9.4.43.v20210629.jar
+%%DATADIR%%/lib/websocket-servlet-9.4.43.v20210629.jar
+%%DATADIR%%/lib/xmppserver-4.7.1.jar
 %%DATADIR%%/lib/xpp3-1.1.4c.jar
 %%DATADIR%%/logs
 %%DATADIR%%/plugins/admin/plugin.xml
@@ -243,6 +244,7 @@
 %%DATADIR%%/plugins/admin/webapp/images/mark-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/msn-gray.gif
 %%DATADIR%%/plugins/admin/webapp/images/msn.gif
+%%DATADIR%%/plugins/admin/webapp/images/orange-dash_16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/outgoing_32x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/page-background_new.gif
 %%DATADIR%%/plugins/admin/webapp/images/percent-bar-left.gif
@@ -513,6 +515,13 @@
 %%DATADIR%%/resources/database/upgrade/32/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/32/openfire_sqlserver.sql
 %%DATADIR%%/resources/database/upgrade/32/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/33/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/33/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/33/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/33/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/33/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/33/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/33/openfire_sybase.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_db2.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_mysql.sql