Date: Fri, 21 Apr 2023 16:08:33 GMT From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 86fe596da3c6 - main - net-im/ejabberd: Update to 23.04 Message-ID: <202304211608.33LG8XhW000139@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=86fe596da3c6cf46d0b3b61095a07f306792add3 commit 86fe596da3c6cf46d0b3b61095a07f306792add3 Author: Ashish SHUKLA <ashish@FreeBSD.org> AuthorDate: 2023-04-21 15:55:56 +0000 Commit: Ashish SHUKLA <ashish@FreeBSD.org> CommitDate: 2023-04-21 16:06:50 +0000 net-im/ejabberd: Update to 23.04 - Updated description to say XMPP [0] - Build in SQLite by default [0] - Use reload_config for reload command as ejabberd natively supports hot-reloading configurations [0] Pull Request: <https://github.com/freebsd/freebsd-ports/pull/170>; [0] Co-authored-by: Jonathan Davies <jpds@protonmail.com> --- net-im/ejabberd/Makefile | 11 +++++------ net-im/ejabberd/distinfo | 16 +++++++--------- net-im/ejabberd/files/ejabberd.in | 2 +- net-im/ejabberd/files/patch-configure.ac | 2 +- net-im/ejabberd/pkg-plist | 6 ++++++ 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index 052f72c409c1..51db456b0003 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -1,10 +1,9 @@ PORTNAME= ejabberd -PORTVERSION= 23.01 -PORTREVISION= 1 +PORTVERSION= 23.04 CATEGORIES= net-im MAINTAINER= ashish@FreeBSD.org -COMMENT= Free and Open Source distributed fault-tolerant Jabber server +COMMENT= Free and Open Source distributed fault-tolerant XMPP server WWW= https://www.ejabberd.im/ LICENSE= GPLv2 @@ -55,7 +54,7 @@ GH_TUPLE= processone:p1_utils:${P1_UTILS_VER}:p1_utils/deps/p1_utils \ OPTIONS_DEFINE= ODBC PAM DOCS LUA MYSQL PGSQL REDIS SIP SQLITE \ STUN TOOLS FULLXML -OPTIONS_DEFAULT=STUN +OPTIONS_DEFAULT=SQLITE STUN EJABBERD_LIBDIR=lib/erlang/lib MAKE_ENV= PORTVERSION=${PORTVERSION} @@ -114,14 +113,14 @@ MQTREE_VER= 1.0.15 P1_ACME_VER= 1.0.22 P1_MYSQL_VER= 1.0.21 P1_OAUTH2_VER= 0.6.11 -P1_PGSQL_VER= 1.1.20 +P1_PGSQL_VER= 1.1.22 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 UNICODE_UTIL_COMPAT_VER= 0.4.1 -XMPP_VER= 1.6.1 +XMPP_VER= 1.6.2 YCONF_VER= 1.0.15 OPTIONS_SUB= yes diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo index 1b61b737dc73..2ab3b129f0bc 100644 --- a/net-im/ejabberd/distinfo +++ b/net-im/ejabberd/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1674159662 -SHA256 (processone-ejabberd-23.01_GH0.tar.gz) = 2b83fe036bbf1db8a76b86f718ff13df098fa10c62bfcf06b81e0a64e6f6f9c0 -SIZE (processone-ejabberd-23.01_GH0.tar.gz) = 2569272 +TIMESTAMP = 1682091678 +SHA256 (processone-ejabberd-23.04_GH0.tar.gz) = 6ff1d41a1ff6261a0c846193647d8ec143e82142859bf1cfdc62299022ceb2ad +SIZE (processone-ejabberd-23.04_GH0.tar.gz) = 2581686 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,16 +11,14 @@ 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.1_GH0.tar.gz) = 3ac425d7a8ccbfd0db1ad9c69d4380b5b9500b72eb02de163774df6638c4471d -SIZE (processone-xmpp-1.6.1_GH0.tar.gz) = 561740 +SHA256 (processone-xmpp-1.6.2_GH0.tar.gz) = c227e3a32af4973308120aa726b945c2d3ab7187d47343fe65eb30e95bade0b0 +SIZE (processone-xmpp-1.6.2_GH0.tar.gz) = 564980 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 SIZE (davisp-jiffy-1.1.1_GH0.tar.gz) = 1674571 SHA256 (processone-p1_oauth2-0.6.11_GH0.tar.gz) = 2a33d96ab007b77759f48613a65794351569e7d2d800700b71e50448eed0e3b8 SIZE (processone-p1_oauth2-0.6.11_GH0.tar.gz) = 214437 -SHA256 (potatosalad-erlang-libsodium-2.0.0_GH0.tar.gz) = 72cadb57abb74b64cb10590a5882a27fc3f594e64d62c9e1f4483d8834f3f18f -SIZE (potatosalad-erlang-libsodium-2.0.0_GH0.tar.gz) = 2592590 SHA256 (potatosalad-erlang-jose-1.11.5_GH0.tar.gz) = 2186b93ad20d386e6db9f673c135c48568a55de42b5a1d839518c65509af4ea5 SIZE (potatosalad-erlang-jose-1.11.5_GH0.tar.gz) = 327036 SHA256 (processone-eimp-1.0.22_GH0.tar.gz) = 7023b86bc7cf3551fd876a1361ceb2443bdf1c1be9f98a4d9a9a90eda3353b51 @@ -47,8 +45,8 @@ SHA256 (processone-p1_mysql-1.0.21_GH0.tar.gz) = ee669e2f114087f6623723297cbfe39 SIZE (processone-p1_mysql-1.0.21_GH0.tar.gz) = 26334 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.20_GH0.tar.gz) = 4b20e8cd04b7f5f701636bc407a820abda804c667638bcb2420c0525452dd2b1 -SIZE (processone-p1_pgsql-1.1.20_GH0.tar.gz) = 27195 +SHA256 (processone-p1_pgsql-1.1.22_GH0.tar.gz) = 5911b82789dc2f2be6aeceb39c43eadc53703b9707eeba6e4d8b425f42a370eb +SIZE (processone-p1_pgsql-1.1.22_GH0.tar.gz) = 27243 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 diff --git a/net-im/ejabberd/files/ejabberd.in b/net-im/ejabberd/files/ejabberd.in index 2ee18c0a32ed..388114ac13ef 100644 --- a/net-im/ejabberd/files/ejabberd.in +++ b/net-im/ejabberd/files/ejabberd.in @@ -68,7 +68,7 @@ ejabberd_reload() { echo "Restarting $name." if ejabberd_checkstatus; then - su $EJABBERDUSER -c "env ERL_EPMD_ADDRESS=\"${ejabberd_epmd_address}\" $EJABBERDCTL --node $ejabberd_node restart" + su $EJABBERDUSER -c "env ERL_EPMD_ADDRESS=\"${ejabberd_epmd_address}\" $EJABBERDCTL --node $ejabberd_node reload_config" else ejabberd_start fi diff --git a/net-im/ejabberd/files/patch-configure.ac b/net-im/ejabberd/files/patch-configure.ac index b7e3431c65b7..949e5bf8743c 100644 --- a/net-im/ejabberd/files/patch-configure.ac +++ b/net-im/ejabberd/files/patch-configure.ac @@ -4,7 +4,7 @@ # 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.01` | 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.04` | 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_MAX="100.0.0 (No Max)" diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist index 15d522b0eb36..79b5b8e8b3db 100644 --- a/net-im/ejabberd/pkg-plist +++ b/net-im/ejabberd/pkg-plist @@ -183,6 +183,8 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_log_opt.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_mnesia.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_room.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_rtbl.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_rtbl_opt.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_sql.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_sup.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_multicast.beam @@ -764,6 +766,9 @@ %%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/xep0422.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0424.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0425.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0430.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp.app %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp.beam @@ -872,6 +877,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/lite.sql %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/lite.new.sql %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/mssql.sql +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/mssql.new.sql %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/mysql.new.sql %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/mysql.old-to-new.sql %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/mysql.sql
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304211608.33LG8XhW000139>