ports@, Here an update of net/ejabberd to 24.12.
Notable changes from port side: it drops one patch. Changes: https://www.process-one.net/blog/ejabberd-24-12/ To upgrade a cluster, a user needs pkg_add -u and rcctl restart. Ok? Index: net/ejabberd/Makefile =================================================================== RCS file: /home/cvs/ports/net/ejabberd/Makefile,v diff -u -p -r1.56 Makefile --- net/ejabberd/Makefile 15 Dec 2024 22:27:18 -0000 1.56 +++ net/ejabberd/Makefile 19 Dec 2024 15:10:17 -0000 @@ -1,7 +1,6 @@ COMMENT = robust, ubiquitous and massively scalable messaging platform -V = 24.10 -REVISION = 4 +V = 24.12 DIST_TUPLE += github processone ejabberd ${V} . CATEGORIES = net Index: net/ejabberd/distinfo =================================================================== RCS file: /home/cvs/ports/net/ejabberd/distinfo,v diff -u -p -r1.15 distinfo --- net/ejabberd/distinfo 25 Nov 2024 08:36:16 -0000 1.15 +++ net/ejabberd/distinfo 19 Dec 2024 15:17:17 -0000 @@ -2,23 +2,23 @@ SHA256 (hex_modules/base64url-1.0.1.tar) SHA256 (hex_modules/cache_tab-1.0.31.tar) = hYK2CkoJskfvhjVbqeB/zp4R7cA0WndckXH5cccrY1E= SHA256 (hex_modules/eimp-1.0.23.tar) = kHx4ACPLKJPk/Evb5qTwLDVZE4Yqxn8OzCZgXoFrYoo= SHA256 (hex_modules/epam-1.0.14.tar) = LzRJ5yiFpypsKoQ/VhrdD8L3DXoh9hRWkwpUdHPU2Yk= -SHA256 (hex_modules/eredis-1.2.0.tar) = 2bWr7ywsirqPMqoBggPgs9yLEVd3OyVKsdTCACMX8eE= +SHA256 (hex_modules/eredis-1.7.1.tar) = fCtUxWb+1V/u8zQcp5sBAKY0j9PxYhhLftURjSWMPME= SHA256 (hex_modules/esip-1.0.56.tar) = nvNmDO+TtiP3No3NXHn05wQ1hjGQnm3UZOM1N4gV2h8= SHA256 (hex_modules/ezlib-1.0.13.tar) = nuYqs/jtVaD9EalWn8uORYaD+VV1QXJyGSsGnwkqv7s= SHA256 (hex_modules/fast_tls-1.1.22.tar) = 5ld5rvt6sVxHVSMP74B35ofSDMWjmEpZdPn2V+jiSFs= -SHA256 (hex_modules/fast_xml-1.1.53.tar) = UGQzbW82Pu5Ql6pdxc7Ztn8FFS8ua4Ug/VDSaMKrg5w= +SHA256 (hex_modules/fast_xml-1.1.55.tar) = g/PiOngO1fVnzexzlT8GyVuDjXCdv6hrWamKjSPJn4U= SHA256 (hex_modules/fast_yaml-1.0.37.tar) = jehochv34hckFPfTFI7eDzySK0lkVc1iXdXEQpUVp2k= SHA256 (hex_modules/hex_core-0.10.1.tar) = /TkVLTQrf9TOP4A6x/CEtg0byb8T5wfjXb3OJm+7ZfA= SHA256 (hex_modules/idna-6.0.0.tar) = S90wXrZOGLAnOGSSBpXLGNeiAh8xoRucX7zZolP5NuI= SHA256 (hex_modules/jiffy-1.1.1.tar) = YuHwWBw8GcM6clx4HfqIQQ2L/xu6/DiFolUihrR4XEw= SHA256 (hex_modules/jose-1.11.10.tar) = DWzTb/i6F02ykUj8EStYQhhraKkM6fwrPsOv52WT5hQ= SHA256 (hex_modules/lager-3.9.1.tar) = P1m6daBKmeXxi/kcifRtzlNvg8bLQV/ibm51pivvN9w= -SHA256 (hex_modules/luerl-1.2.0.tar) = nK/U9glP8PWp0nj9gdYNPgJsggvftsrNSxvZCfIbUl0= +SHA256 (hex_modules/luerl-1.2.3.tar) = G0udDKXX0oDR0nh6al7p9aISZBtiv/kVVrqlOAXfOu0= SHA256 (hex_modules/mqtree-1.0.17.tar) = X+i3z4+8R4PQ/OuUZUrCu/MkKljNA5fSSd7YrgIb4qM= SHA256 (hex_modules/p1_acme-1.0.24.tar) = 8UUdcGWV75l6scoXFi3axY+HSsl+MVpfrb48+iYUgAI= SHA256 (hex_modules/p1_mysql-1.0.24.tar) = 8FiGX2Qlf1B6LGpa/zabE3XbyzCz1CWNrU8bPq/7ZV8= SHA256 (hex_modules/p1_oauth2-0.6.14.tar) = H9OsR05Dci2dWofG34029pjth697uBy7tmNhRR2Zro8= -SHA256 (hex_modules/p1_pgsql-1.1.26.tar) = hfIw21MDMxBrih+eXVrwMubD3SO0MuA9aOnSkBOm3Pw= +SHA256 (hex_modules/p1_pgsql-1.1.29.tar) = pv9Y6LF0mT84ldo+piEan50MVNGm4ouzIdo7PNaLOME= SHA256 (hex_modules/p1_utils-1.0.26.tar) = 0DeejBFWuYvWT4Epwd4CL8yk8v23SGznO/DtLDN2sEw= SHA256 (hex_modules/pc-1.15.0.tar) = TA+tT2Q3yuNT1RfaIY/ng0e4/6RLmBeIdJTKquVFlbM= SHA256 (hex_modules/pkix-1.0.10.tar) = 4CFk+DCUyxJMQbGrKJiKYV1Uua3DhXXwDxmll6OsXQ4= @@ -29,30 +29,30 @@ SHA256 (hex_modules/stringprep-1.0.30.ta SHA256 (hex_modules/stun-1.2.15.tar) = 9tilQaKf0T8s5li2dsDMZhJiuW4EW1Le8WRLdevA7e8= SHA256 (hex_modules/unicode_util_compat-0.7.0.tar) = Je7m1n32GWDPanlCOVZlmbCeF+Zo03ACR7xJhjgVJSE= SHA256 (hex_modules/verl-1.1.1.tar) = CSXlHNkqCovicXZbAkMLLiz/isMO8k0SO9DVhRHo+xg= -SHA256 (hex_modules/xmpp-1.9.0.tar) = wbkb50qalQOvpnZvdWR3UWkg/7/uoMJgwvoXE1X1PCc= -SHA256 (hex_modules/yconf-1.0.16.tar) = 6UeBMnPzhxHHsuWo5KzJpRx7voVPdEo0X2AwCzhYbIk= -SHA256 (processone-ejabberd-24.10.tar.gz) = 4mDedvx1NUzTAsryKB5RFP3REg1PovTSTdsXhdxD40M= +SHA256 (hex_modules/xmpp-1.9.1.tar) = 0rFDGvbkwaTIv5DK8MwRzesEe4MjuH6dfkgm1JEyddw= +SHA256 (hex_modules/yconf-1.0.17.tar) = 3SiSkjJBRJpGzIRXuewPsUAwcAc1pYhZVWd8c1w0GiU= +SHA256 (processone-ejabberd-24.12.tar.gz) = IrFaub6PCsS3paekjNWcKCyH8XsDgBe5YMFc/TFGifI= SIZE (hex_modules/base64url-1.0.1.tar) = 7168 SIZE (hex_modules/cache_tab-1.0.31.tar) = 23552 SIZE (hex_modules/eimp-1.0.23.tar) = 59392 SIZE (hex_modules/epam-1.0.14.tar) = 48640 -SIZE (hex_modules/eredis-1.2.0.tar) = 25088 +SIZE (hex_modules/eredis-1.7.1.tar) = 34816 SIZE (hex_modules/esip-1.0.56.tar) = 81408 SIZE (hex_modules/ezlib-1.0.13.tar) = 48128 SIZE (hex_modules/fast_tls-1.1.22.tar) = 79872 -SIZE (hex_modules/fast_xml-1.1.53.tar) = 96256 +SIZE (hex_modules/fast_xml-1.1.55.tar) = 96256 SIZE (hex_modules/fast_yaml-1.0.37.tar) = 55296 SIZE (hex_modules/hex_core-0.10.1.tar) = 83968 SIZE (hex_modules/idna-6.0.0.tar) = 177664 SIZE (hex_modules/jiffy-1.1.1.tar) = 1682944 SIZE (hex_modules/jose-1.11.10.tar) = 193024 SIZE (hex_modules/lager-3.9.1.tar) = 105984 -SIZE (hex_modules/luerl-1.2.0.tar) = 251392 +SIZE (hex_modules/luerl-1.2.3.tar) = 252416 SIZE (hex_modules/mqtree-1.0.17.tar) = 29696 SIZE (hex_modules/p1_acme-1.0.24.tar) = 26112 SIZE (hex_modules/p1_mysql-1.0.24.tar) = 29696 SIZE (hex_modules/p1_oauth2-0.6.14.tar) = 18432 -SIZE (hex_modules/p1_pgsql-1.1.26.tar) = 24576 +SIZE (hex_modules/p1_pgsql-1.1.29.tar) = 24576 SIZE (hex_modules/p1_utils-1.0.26.tar) = 45056 SIZE (hex_modules/pc-1.15.0.tar) = 18944 SIZE (hex_modules/pkix-1.0.10.tar) = 147968 @@ -63,6 +63,6 @@ SIZE (hex_modules/stringprep-1.0.30.tar) SIZE (hex_modules/stun-1.2.15.tar) = 43520 SIZE (hex_modules/unicode_util_compat-0.7.0.tar) = 104960 SIZE (hex_modules/verl-1.1.1.tar) = 15360 -SIZE (hex_modules/xmpp-1.9.0.tar) = 376832 -SIZE (hex_modules/yconf-1.0.16.tar) = 21504 -SIZE (processone-ejabberd-24.10.tar.gz) = 2532726 +SIZE (hex_modules/xmpp-1.9.1.tar) = 381440 +SIZE (hex_modules/yconf-1.0.17.tar) = 22016 +SIZE (processone-ejabberd-24.12.tar.gz) = 2544618 Index: net/ejabberd/modules.inc =================================================================== RCS file: /home/cvs/ports/net/ejabberd/modules.inc,v diff -u -p -r1.1 modules.inc --- net/ejabberd/modules.inc 25 Nov 2024 08:36:16 -0000 1.1 +++ net/ejabberd/modules.inc 19 Dec 2024 15:17:01 -0000 @@ -9,27 +9,27 @@ MODERL_MODULES = base64url 1.0.1 \ cache_tab 1.0.31 \ eimp 1.0.23 \ epam 1.0.14 \ - eredis 1.2.0 \ + eredis 1.7.1 \ esip 1.0.56 \ ezlib 1.0.13 \ fast_tls 1.1.22 \ - fast_xml 1.1.53 \ + fast_xml 1.1.55 \ fast_yaml 1.0.37 \ idna 6.0.0 \ jiffy 1.1.1 \ jose 1.11.10 \ lager 3.9.1 \ - luerl 1.2.0 \ + luerl 1.2.3 \ mqtree 1.0.17 \ p1_acme 1.0.24 \ p1_mysql 1.0.24 \ p1_oauth2 0.6.14 \ - p1_pgsql 1.1.26 \ + p1_pgsql 1.1.29 \ p1_utils 1.0.26 \ pkix 1.0.10 \ sqlite3 1.1.15 \ stringprep 1.0.30 \ stun 1.2.15 \ unicode_util_compat 0.7.0 \ - xmpp 1.9.0 \ - yconf 1.0.16 + xmpp 1.9.1 \ + yconf 1.0.17 Index: net/ejabberd/patches/patch-Makefile_in =================================================================== RCS file: /home/cvs/ports/net/ejabberd/patches/patch-Makefile_in,v diff -u -p -r1.1 patch-Makefile_in --- net/ejabberd/patches/patch-Makefile_in 25 Nov 2024 08:36:16 -0000 1.1 +++ net/ejabberd/patches/patch-Makefile_in 19 Dec 2024 15:20:26 -0000 @@ -1,7 +1,7 @@ Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -80,7 +80,7 @@ SQLDIR = $(PRIVDIR)/sql +@@ -81,7 +81,7 @@ SQLDIR = $(PRIVDIR)/sql LUADIR = $(PRIVDIR)/lua # /var/lib/ejabberd/ Index: net/ejabberd/patches/patch-ejabberd_yml_example =================================================================== RCS file: /home/cvs/ports/net/ejabberd/patches/patch-ejabberd_yml_example,v diff -u -p -r1.1 patch-ejabberd_yml_example --- net/ejabberd/patches/patch-ejabberd_yml_example 25 Nov 2024 08:36:16 -0000 1.1 +++ net/ejabberd/patches/patch-ejabberd_yml_example 19 Dec 2024 15:20:26 -0000 @@ -47,7 +47,7 @@ Index: ejabberd.yml.example /admin: ejabberd_web_admin /.well-known/acme-challenge: ejabberd_acme - - port: 3478 + port: 5478 - ip: "::" + ip: "0.0.0.0" transport: udp Index: net/ejabberd/patches/patch-src_mod_s2s_bidi_erl =================================================================== RCS file: net/ejabberd/patches/patch-src_mod_s2s_bidi_erl diff -N net/ejabberd/patches/patch-src_mod_s2s_bidi_erl --- net/ejabberd/patches/patch-src_mod_s2s_bidi_erl 25 Nov 2024 08:36:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -https://github.com/processone/ejabberd/issues/4300 - -Index: src/mod_s2s_bidi.erl ---- src/mod_s2s_bidi.erl.orig -+++ src/mod_s2s_bidi.erl -@@ -84,10 +84,14 @@ s2s_out_unauthenticated_features(#{db_verify := _} = S - s2s_out_unauthenticated_features(State, #stream_features{} = Pkt) -> - try xmpp:try_subtag(Pkt, #s2s_bidi{}) of - #s2s_bidi{} -> -- ejabberd_s2s_out:send(State#{bidi_enabled => true}, #s2s_bidi{}) -+ ejabberd_s2s_out:send(State#{bidi_enabled => true}, #s2s_bidi{}); -+ _ -> -+ State - catch _:{xmpp_codec, _Why} -> - State -- end. -+ end; -+s2s_out_unauthenticated_features(State, _Pkt) -> -+ State. - - s2s_out_packet(#{bidi_enabled := true, ip := {IP, _}} = State, Pkt0) - when ?is_stanza(Pkt0) -> Index: net/ejabberd/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/net/ejabberd/pkg/PLIST,v diff -u -p -r1.20 PLIST --- net/ejabberd/pkg/PLIST 11 Dec 2024 22:16:30 -0000 1.20 +++ net/ejabberd/pkg/PLIST 19 Dec 2024 15:25:07 -0000 @@ -141,6 +141,9 @@ lib/ejabberd/ejabberd-${V}/ebin/mod_anno lib/ejabberd/ejabberd-${V}/ebin/mod_announce_mnesia.beam lib/ejabberd/ejabberd-${V}/ebin/mod_announce_opt.beam lib/ejabberd/ejabberd-${V}/ebin/mod_announce_sql.beam +lib/ejabberd/ejabberd-${V}/ebin/mod_auth_fast.beam +lib/ejabberd/ejabberd-${V}/ebin/mod_auth_fast_mnesia.beam +lib/ejabberd/ejabberd-${V}/ebin/mod_auth_fast_opt.beam lib/ejabberd/ejabberd-${V}/ebin/mod_avatar.beam lib/ejabberd/ejabberd-${V}/ebin/mod_avatar_opt.beam lib/ejabberd/ejabberd-${V}/ebin/mod_block_strangers.beam @@ -422,20 +425,16 @@ lib/ejabberd/ejabberd-${V}/priv/sql/lite lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ebin/ lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ebin/basho_bench_driver_eredis.beam -lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ebin/basho_bench_driver_erldis.beam lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ebin/eredis.app lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ebin/eredis.beam lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ebin/eredis_client.beam lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ebin/eredis_parser.beam +lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ebin/eredis_sentinel.beam lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ebin/eredis_sub.beam lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/ebin/eredis_sub_client.beam lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/include/ lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/include/eredis.hrl lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/include/eredis_sub.hrl -lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/priv/ -lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/priv/basho_bench_eredis.config -lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/priv/basho_bench_eredis_pipeline.config -lib/ejabberd/eredis-${MODERL_MODULE_eredis_VERSION}/priv/basho_bench_erldis.config lib/ejabberd/esip-${MODERL_MODULE_esip_VERSION}/ lib/ejabberd/esip-${MODERL_MODULE_esip_VERSION}/ebin/ lib/ejabberd/esip-${MODERL_MODULE_esip_VERSION}/ebin/esip.app @@ -866,6 +865,7 @@ lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_V lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xep0430.beam lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xep0440.beam lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xep0480.beam +lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xep0484.beam lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xmpp.app lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xmpp.beam lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xmpp_codec.beam @@ -875,6 +875,7 @@ lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_V lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xmpp_sasl.beam lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xmpp_sasl_anonymous.beam lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xmpp_sasl_digest.beam +lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xmpp_sasl_fast.beam lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xmpp_sasl_oauth.beam lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xmpp_sasl_plain.beam lib/ejabberd/xmpp-${MODERL_MODULE_xmpp_VERSION}/ebin/xmpp_sasl_scram.beam -- wbr, Kirill
