net-im/ejabberd: Update to 23.10

4 files changed, 27 insertions, 22 deletions

diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 0babfb5af65b..f52020d6c6d7 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ejabberd
-PORTVERSION=	23.04
-PORTREVISION=	1
+PORTVERSION=	23.10
 CATEGORIES=	net-im
 
 MAINTAINER=	ashish@FreeBSD.org
@@ -101,7 +100,7 @@ EIMP_VER=	1.0.22
 EJABBERD_PO_VER=	0.0.0
 EPAM_VER=	1.0.14
 EREDIS_VER=	1.2.0
-ESIP_VER=	1.0.49
+ESIP_VER=	1.0.50
 EZLIB_VER=	1.0.12
 FAST_TLS_VER=	1.1.16
 FAST_XML_VER=	1.1.49
@@ -112,16 +111,16 @@ JOSE_VER=	1.11.5
 LUERL_VER=	1.0
 MQTREE_VER=	1.0.15
 P1_ACME_VER=	1.0.22
-P1_MYSQL_VER=	1.0.21
+P1_MYSQL_VER=	1.0.22
 P1_OAUTH2_VER=	0.6.11
-P1_PGSQL_VER=	1.1.22
+P1_PGSQL_VER=	1.1.23
 P1_UTILS_VER=	1.0.25
 PKIX_VER=	1.0.9
 SQLITE3_VER=	1.1.14
 STRINGPREP_VER=	1.0.29
-STUN_VER=	1.2.7
+STUN_VER=	1.2.10
 UNICODE_UTIL_COMPAT_VER=	0.4.1
-XMPP_VER=	1.6.2
+XMPP_VER=	1.7.0
 YCONF_VER=	1.0.15
 
 OPTIONS_SUB=		yes
diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo
index 2ab3b129f0bc..49d40dcdeff0 100644
--- a/net-im/ejabberd/distinfo
+++ b/net-im/ejabberd/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1682091678
-SHA256 (processone-ejabberd-23.04_GH0.tar.gz) = 6ff1d41a1ff6261a0c846193647d8ec143e82142859bf1cfdc62299022ceb2ad
-SIZE (processone-ejabberd-23.04_GH0.tar.gz) = 2581686
+TIMESTAMP = 1697666307
+SHA256 (processone-ejabberd-23.10_GH0.tar.gz) = 0d6e7f0d82d91cda89e2575d99a83507413da2ffde39b2151804947a2a0fa258
+SIZE (processone-ejabberd-23.10_GH0.tar.gz) = 2615643
 SHA256 (processone-p1_utils-1.0.25_GH0.tar.gz) = c62f93ab5ea8d9251d9acda2abf576352d50f4a3299972549180a5387656746a
 SIZE (processone-p1_utils-1.0.25_GH0.tar.gz) = 47802
 SHA256 (processone-cache_tab-1.0.30_GH0.tar.gz) = c506d2aa2e59f1e0086ce32234618189d557a767312179cc1c8df19754131ca2
@@ -11,8 +11,8 @@ SHA256 (processone-stringprep-1.0.29_GH0.tar.gz) = b07daf2148829d513caf2931d4635
 SIZE (processone-stringprep-1.0.29_GH0.tar.gz) = 100076
 SHA256 (processone-fast_xml-1.1.49_GH0.tar.gz) = 02bcdb0a4350080a10b52de85c11de982e5f7cf2150f5b1b888f7a95ccb31265
 SIZE (processone-fast_xml-1.1.49_GH0.tar.gz) = 108442
-SHA256 (processone-xmpp-1.6.2_GH0.tar.gz) = c227e3a32af4973308120aa726b945c2d3ab7187d47343fe65eb30e95bade0b0
-SIZE (processone-xmpp-1.6.2_GH0.tar.gz) = 564980
+SHA256 (processone-xmpp-1.7.0_GH0.tar.gz) = 99ed35a6d299d368bbc7c5e7630f55f1a0d209af19f76bd24c20ea212d73dd30
+SIZE (processone-xmpp-1.7.0_GH0.tar.gz) = 610868
 SHA256 (processone-fast_yaml-1.0.36_GH0.tar.gz) = 6794470ef35fb3985c4e9aa0ed8d3a0b44e7a5c7bf4c5a1efbeca42060db6806
 SIZE (processone-fast_yaml-1.0.36_GH0.tar.gz) = 60410
 SHA256 (davisp-jiffy-1.1.1_GH0.tar.gz) = a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8
@@ -41,19 +41,19 @@ SHA256 (benoitc-unicode_util_compat-0.4.1_GH0.tar.gz) = daca2a0d9469b6d8b766f721
 SIZE (benoitc-unicode_util_compat-0.4.1_GH0.tar.gz) = 416975
 SHA256 (rvirding-luerl-v1.0_GH0.tar.gz) = b84672c703b3e098e03ed1baa7806388e173f6a289516269a02cff65dd1c66b1
 SIZE (rvirding-luerl-v1.0_GH0.tar.gz) = 120855
-SHA256 (processone-p1_mysql-1.0.21_GH0.tar.gz) = ee669e2f114087f6623723297cbfe39b9b176c245e55373bc4554183453f94f9
-SIZE (processone-p1_mysql-1.0.21_GH0.tar.gz) = 26334
+SHA256 (processone-p1_mysql-1.0.22_GH0.tar.gz) = dfc34af189ba15c3c101042f20b7ef354d8f7b6140ba15cd2130f0b95cdff827
+SIZE (processone-p1_mysql-1.0.22_GH0.tar.gz) = 29314
 SHA256 (processone-epam-1.0.14_GH0.tar.gz) = 0e375557cf7ba670b626d0b1691b0257c2e68a4509bb72bf14ae8f8b7a30b3c3
 SIZE (processone-epam-1.0.14_GH0.tar.gz) = 49229
-SHA256 (processone-p1_pgsql-1.1.22_GH0.tar.gz) = 5911b82789dc2f2be6aeceb39c43eadc53703b9707eeba6e4d8b425f42a370eb
-SIZE (processone-p1_pgsql-1.1.22_GH0.tar.gz) = 27243
+SHA256 (processone-p1_pgsql-1.1.23_GH0.tar.gz) = 93afb56cdd80caf26adae328b9c571d1ea2f575e261e628604b19a65db7ee9ed
+SIZE (processone-p1_pgsql-1.1.23_GH0.tar.gz) = 27255
 SHA256 (wooga-eredis-v1.2.0_GH0.tar.gz) = 31a2e61d8d5a9631bda6e72e74abd6042292a39323acb6df94c050a41eb1f1a3
 SIZE (wooga-eredis-v1.2.0_GH0.tar.gz) = 28568
-SHA256 (processone-esip-1.0.49_GH0.tar.gz) = 895a143fc90f0222649d103dd524def7fed6665c52600c2bba61e9f69d132372
-SIZE (processone-esip-1.0.49_GH0.tar.gz) = 91250
+SHA256 (processone-esip-1.0.50_GH0.tar.gz) = 925b4345cd7d7cdc350be3dfa51cd12192a9937ca05463eec48a6f0f9b92fc55
+SIZE (processone-esip-1.0.50_GH0.tar.gz) = 91245
 SHA256 (processone-erlang-sqlite3-1.1.14_GH0.tar.gz) = 7f7234b86e8a06474f41a4618419e2706e0cc23f55bc5f72e9a7ba0fde3d5618
 SIZE (processone-erlang-sqlite3-1.1.14_GH0.tar.gz) = 1715677
-SHA256 (processone-stun-1.2.7_GH0.tar.gz) = d7e9d3d591a88a91abf053c068f7152495e37d17f4c9ac58992c544d6f8f5e86
-SIZE (processone-stun-1.2.7_GH0.tar.gz) = 42155
+SHA256 (processone-stun-1.2.10_GH0.tar.gz) = 18aaa35566dcdc6933d57843fbd52d773e75cec535722ccf70f6fc446376542d
+SIZE (processone-stun-1.2.10_GH0.tar.gz) = 42518
 SHA256 (processone-ejabberd-po-e909d88_GH0.tar.gz) = 400fdfacd6dc75bd21c84a60b74266df8049267228ec9fc62c0ba0f445d35226
 SIZE (processone-ejabberd-po-e909d88_GH0.tar.gz) = 649749
diff --git a/net-im/ejabberd/files/patch-configure.ac b/net-im/ejabberd/files/patch-configure.ac
index 949e5bf8743c..bb20c7301af9 100644
--- a/net-im/ejabberd/files/patch-configure.ac
+++ b/net-im/ejabberd/files/patch-configure.ac
@@ -4,8 +4,8 @@
  # Process this file with autoconf to produce a configure script.
  
  AC_PREREQ(2.59)
--AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 23.04` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
+-AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 23.10` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
 +AC_INIT(ejabberd, %%PORTVERSION%%, [ejabberd@process-one.net], [ejabberd])
- REQUIRE_ERLANG_MIN="8.3 (Erlang/OTP 19.3)"
+ REQUIRE_ERLANG_MIN="9.0.5 (Erlang/OTP 20.0)"
  REQUIRE_ERLANG_MAX="100.0.0 (No Max)"
  
diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist
index 79b5b8e8b3db..792e906aa134 100644
--- a/net-im/ejabberd/pkg-plist
+++ b/net-im/ejabberd/pkg-plist
@@ -72,6 +72,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm_redis.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sql.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sql_schema.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sql_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sql_pt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_stun.beam
@@ -176,6 +177,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_ws.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_occupantid.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_admin.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_admin_opt.beam
@@ -587,6 +589,7 @@
 %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql.beam
 %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql_app.beam
 %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql_auth.beam
+%%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql_bin.beam
 %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql_conn.beam
 %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql_sup.beam
 %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/include/p1_mysql.hrl
@@ -763,9 +766,11 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0363.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0369.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0377.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0402.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0403.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0405.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0417.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0421.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0422.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0424.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0425.beam
@@ -846,6 +851,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/js/muc.js
 %%REDIS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/lua/redis_sm.lua
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ar.msg
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/bg.msg
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ca.msg
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/cs.msg
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/de.msg