src_double-conversion_strtod.cc b/net-im/ejabberd/files/patch-deps_jiffy_c__src_double-conversion_strtod.cc index 520b3c05724b..6efd5485d7dc 100644 --- a/net-im/ejabberd/files/patch-deps_jiffy_c__src_double-conversion_strtod.cc +++ b/net-im/ejabberd/files/patch-deps_jiffy_c__src_double-conversion_strtod.cc @@ -1,4 +1,4 @@ ---- deps/jiffy/c_src/double-conversion/strtod.cc.orig 2020-04-10 09:23:29 UTC +--- deps/jiffy/c_src/double-conversion/strtod.cc.orig 2022-02-23 18:46:15 UTC +++ deps/jiffy/c_src/double-conversion/strtod.cc @@ -38,7 +38,9 @@ namespace double_conversion { // 2^53 = 9007199254740992. @@ -9,20 +9,20 @@ +#endif // 2^64 = 18446744073709551616 > 10^19 static const int kMaxUint64DecimalDigits = 19; - -@@ -55,6 +57,7 @@ static const int kMinDecimalPower = -324; + +@@ -55,6 +57,7 @@ static const uint64_t kMaxUint64 = UINT64_2PART_C(0xFF static const uint64_t kMaxUint64 = UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF); - - + + +#if defined(DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS) static const double exact_powers_of_ten[] = { 1.0, // 10^0 10.0, -@@ -82,6 +85,7 @@ static const double exact_powers_of_ten[] = { +@@ -82,6 +85,7 @@ static const int kExactPowersOfTenSize = ARRAY_SIZE(ex 10000000000000000000000.0 }; static const int kExactPowersOfTenSize = ARRAY_SIZE(exact_powers_of_ten); +#endif - + // Maximum number of significant digits in the decimal representation. // In fact the value is 772 (see conversions.cc), but to give us some margin diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template index cf5c28afc93b..bfb8be9f535f 100644 --- a/net-im/ejabberd/files/patch-ejabberdctl.template +++ b/net-im/ejabberd/files/patch-ejabberdctl.template @@ -1,7 +1,7 @@ ---- ejabberdctl.template.orig 2022-10-30 09:41:25 UTC +--- ejabberdctl.template.orig 2026-04-08 12:29:49 UTC +++ ejabberdctl.template @@ -58,7 +58,7 @@ done - + # define ejabberd variables if not already defined from the command line : "${CONFIG_DIR:="{{config_dir}}"}" -: "${LOGS_DIR:="{{logs_dir}}"}" @@ -9,16 +9,16 @@ : "${EJABBERD_CONFIG_PATH:="$CONFIG_DIR/ejabberd.yml"}" : "${EJABBERDCTL_CONFIG_PATH:="$CONFIG_DIR/ejabberdctl.cfg"}" # Allows passing extra Erlang command-line arguments in vm.args file -@@ -67,7 +67,7 @@ done - [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" +@@ -68,7 +68,7 @@ done [ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG" + [ "$ERLANG_NODE" = "${ERLANG_NODE%@*}" ] && ERLANG_NODE="$ERLANG_NODE@$(hostname -s)" [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s" -: "${SPOOL_DIR:="{{spool_dir}}"}" +: ${SPOOL_DIR:=/var/spool/ejabberd} : "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}" - - # define erl parameters -@@ -84,7 +84,8 @@ fi + + # backward support for old mnesia spool dir path +@@ -92,7 +92,8 @@ fi [ -n "$ERL_DIST_PORT" ] && ERLANG_OPTS="$ERLANG_OPTS -erl_epmd_port $ERL_DIST_PORT -start_epmd false" # if vm.args file exists in config directory, pass it to Erlang VM [ -f "$VMARGS" ] && ERLANG_OPTS="$ERLANG_OPTS -args_file $VMARGS" @@ -27,4 +27,4 @@ +ERL_LIBS=$ERL_LIBS:{{libdir}}/ejabberd/lib ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump ERL_INETRC="$CONFIG_DIR"/inetrc - + diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist index 0b4e9dfd7d60..2d4cd0c7fbc4 100644 --- a/net-im/ejabberd/pkg-plist +++ b/net-im/ejabberd/pkg-plist @@ -177,8 +177,13 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/register_error.html %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/register_success.html %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/roster.html +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/bootstrap/css/bootstrap.min.css +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/bootstrap/js/bootstrap.min.js +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/favicon.png %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/illus-empty.svg +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/invite.css %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/invite.js +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/jquery/jquery.min.js %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/logos/apple_as.svg %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/logos/beagle-im.svg %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/mod_invites/static/logos/conversations.svg @@ -382,9 +387,6 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mqtt.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/pubsub.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/translate.hrl -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/base64url-%%BASE64URL_VER%%/LICENSE.txt -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/base64url-%%BASE64URL_VER%%/ebin/base64url.app -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/base64url-%%BASE64URL_VER%%/ebin/base64url.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/cache_tab-%%CACHE_TAB_VER%%/LICENSE.txt %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/cache_tab-%%CACHE_TAB_VER%%/ebin/cache_tab.app %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/cache_tab-%%CACHE_TAB_VER%%/ebin/cache_tab.beam @@ -448,7 +450,7 @@ %%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/ebin/esip_udp_sup.beam %%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/include/esip.hrl %%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/include/esip_lib.hrl -%%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/priv/lib/esip_drv.so +%%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/priv/lib/esip_codec.so %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/LICENSE.txt %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib.app %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib.beam @@ -764,9 +766,6 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-%%EIMP_VER%%/ebin/eimp_worker.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-%%EIMP_VER%%/priv/bin/eimp %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-%%EIMP_VER%%/LICENSE.txt -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/unicode_util_compat-%%UNICODE_UTIL_COMPAT_VER%%/LICENSE -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/unicode_util_compat-%%UNICODE_UTIL_COMPAT_VER%%/ebin/unicode_util_compat.app -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/unicode_util_compat-%%UNICODE_UTIL_COMPAT_VER%%/ebin/unicode_util_compat.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/LICENSE.txt %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/captcha_form.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/flex_offline.beam