%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -39,7 +39,8 @@
-export([init/3, terminate/2, options/0, features/0,
create_node_permission/6, create_node/2, delete_node/1,
purge_node/2, subscribe_node/8, unsubscribe_node/4,
- publish_item/7, delete_item/4, remove_extra_items/3,
+ publish_item/7, delete_item/4,
+ remove_extra_items/2, remove_extra_items/3, remove_expired_items/2,
get_entity_affiliations/2, get_node_affiliations/1,
get_affiliation/2, set_affiliation/3,
get_entity_subscriptions/2, get_node_subscriptions/1,
@@ -375,7 +376,8 @@ publish_item(Nidx, Publisher, PublishModel, MaxItems, ItemId, Payload,
or (Subscribed == true)) ->
{error, xmpp:err_forbidden()};
true ->
- if MaxItems > 0 ->
+ if MaxItems > 0;
+ MaxItems == unlimited ->
Now = erlang:timestamp(),
case get_item(Nidx, ItemId) of
{result, #pubsub_item{creation = {_, GenKey}} = OldItem} ->
@@ -402,6 +404,16 @@ publish_item(Nidx, Publisher, PublishModel, MaxItems, ItemId, Payload,
end
end.
+remove_extra_items(Nidx, MaxItems) ->
+ {result, States} = get_states(Nidx),
+ Records = States ++ mnesia:read({pubsub_orphan, Nidx}),
+ ItemIds = lists:flatmap(fun(#pubsub_state{items = Is}) ->
+ Is;
+ (#pubsub_orphan{items = Is}) ->
+ Is
+ end, Records),
+ remove_extra_items(Nidx, MaxItems, ItemIds).
+
%% @doc This function is used to remove extra items, most notably when the
%% maximum number of items has been reached.
%% This function is used internally by the core PubSub module, as no
@@ -420,6 +432,22 @@ remove_extra_items(Nidx, MaxItems, ItemIds) ->
del_items(Nidx, OldItems),
{result, {NewItems, OldItems}}.
+remove_expired_items(_Nidx, infinity) ->
+ {result, []};
+remove_expired_items(Nidx, Seconds) ->
+ Items = mnesia:index_read(pubsub_item, Nidx, #pubsub_item.nodeidx),
+ ExpT = misc:usec_to_now(
+ erlang:system_time(microsecond) - (Seconds * 1000000)),
+ ExpItems = lists:filtermap(
+ fun(#pubsub_item{itemid = {ItemId, _},
+ modification = {ModT, _}}) when ModT < ExpT ->
+ {true, ItemId};
+ (#pubsub_item{}) ->
+ false
+ end, Items),
+ del_items(Nidx, ExpItems),
+ {result, ExpItems}.
+
%% @doc
Triggers item deletion.
%% Default plugin: The user performing the deletion must be the node owner
%% or a publisher, or PublishModel being open.
@@ -945,15 +973,12 @@ rsm_page(Count, Index, Offset, Items) ->
last = Last}.
encode_stamp(Stamp) ->
- case catch xmpp_util:decode_timestamp(Stamp) of
- {MS,S,US} -> {MS,S,US};
- _ -> Stamp
+ try xmpp_util:decode_timestamp(Stamp)
+ catch _:{bad_timestamp, _} ->
+ Stamp % We should return a proper error to the client instead.
end.
decode_stamp(Stamp) ->
- case catch xmpp_util:encode_timestamp(Stamp) of
- TimeStamp when is_binary(TimeStamp) -> TimeStamp;
- _ -> Stamp
- end.
+ xmpp_util:encode_timestamp(Stamp).
transform({pubsub_state, {Id, Nidx}, Is, A, Ss}) ->
{pubsub_state, {Id, Nidx}, Nidx, Is, A, Ss};
diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl
index 1e197a51d..a4142cb10 100644
--- a/src/node_flat_sql.erl
+++ b/src/node_flat_sql.erl
@@ -5,7 +5,7 @@
%%% Created : 1 Dec 2007 by Christophe Romain
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -40,9 +40,10 @@
-include("translate.hrl").
-export([init/3, terminate/2, options/0, features/0,
- create_node_permission/6, create_node/2, delete_node/1,
- purge_node/2, subscribe_node/8, unsubscribe_node/4,
- publish_item/7, delete_item/4, remove_extra_items/3,
+ create_node_permission/6, create_node/2, delete_node/1, purge_node/2,
+ subscribe_node/8, unsubscribe_node/4,
+ publish_item/7, delete_item/4,
+ remove_extra_items/2, remove_extra_items/3, remove_expired_items/2,
get_entity_affiliations/2, get_node_affiliations/1,
get_affiliation/2, set_affiliation/3,
get_entity_subscriptions/2, get_node_subscriptions/1,
@@ -247,7 +248,8 @@ publish_item(Nidx, Publisher, PublishModel, MaxItems, ItemId, Payload,
or (Subscribed == true)) ->
{error, xmpp:err_forbidden()};
true ->
- if MaxItems > 0 ->
+ if MaxItems > 0;
+ MaxItems == unlimited ->
Now = erlang:timestamp(),
case get_item(Nidx, ItemId) of
{result, #pubsub_item{creation = {_, GenKey}} = OldItem} ->
@@ -258,20 +260,23 @@ publish_item(Nidx, Publisher, PublishModel, MaxItems, ItemId, Payload,
{result, _} ->
{error, xmpp:err_forbidden()};
_ ->
- Items = [ItemId | itemids(Nidx, GenKey)],
- {result, {_NI, OI}} = remove_extra_items(Nidx, MaxItems, Items),
+ OldIds = maybe_remove_extra_items(Nidx, MaxItems,
+ GenKey, ItemId),
set_item(#pubsub_item{
itemid = {ItemId, Nidx},
creation = {Now, GenKey},
modification = {Now, SubKey},
payload = Payload}),
- {result, {default, broadcast, OI}}
+ {result, {default, broadcast, OldIds}}
end;
true ->
{result, {default, broadcast, []}}
end
end.
+remove_extra_items(Nidx, MaxItems) ->
+ remove_extra_items(Nidx, MaxItems, itemids(Nidx)).
+
remove_extra_items(_Nidx, unlimited, ItemIds) ->
{result, {ItemIds, []}};
remove_extra_items(Nidx, MaxItems, ItemIds) ->
@@ -280,6 +285,23 @@ remove_extra_items(Nidx, MaxItems, ItemIds) ->
del_items(Nidx, OldItems),
{result, {NewItems, OldItems}}.
+remove_expired_items(_Nidx, infinity) ->
+ {result, []};
+remove_expired_items(Nidx, Seconds) ->
+ ExpT = encode_now(
+ misc:usec_to_now(
+ erlang:system_time(microsecond) - (Seconds * 1000000))),
+ case ejabberd_sql:sql_query_t(
+ ?SQL("select @(itemid)s from pubsub_item where nodeid=%(Nidx)d "
+ "and creation < %(ExpT)s")) of
+ {selected, RItems} ->
+ ItemIds = [ItemId || {ItemId} <- RItems],
+ del_items(Nidx, ItemIds),
+ {result, ItemIds};
+ _ ->
+ {result, []}
+ end.
+
delete_item(Nidx, Publisher, PublishModel, ItemId) ->
SubKey = jid:tolower(Publisher),
GenKey = jid:remove_resource(SubKey),
@@ -862,6 +884,18 @@ first_in_list(Pred, [H | T]) ->
_ -> first_in_list(Pred, T)
end.
+itemids(Nidx) ->
+ case catch
+ ejabberd_sql:sql_query_t(
+ ?SQL("select @(itemid)s from pubsub_item where "
+ "nodeid=%(Nidx)d order by modification desc"))
+ of
+ {selected, RItems} ->
+ [ItemId || {ItemId} <- RItems];
+ _ ->
+ []
+ end.
+
itemids(Nidx, {_U, _S, _R} = JID) ->
SJID = encode_jid(JID),
SJIDLike = <<(encode_jid_like(JID))/binary, "/%">>,
@@ -933,6 +967,16 @@ update_subscription(Nidx, JID, Subscription) ->
"-affiliation='n'"
]).
+-spec maybe_remove_extra_items(mod_pubsub:nodeIdx(),
+ non_neg_integer() | unlimited, ljid(),
+ mod_pubsub:itemId()) -> [mod_pubsub:itemId()].
+maybe_remove_extra_items(_Nidx, unlimited, _GenKey, _ItemId) ->
+ [];
+maybe_remove_extra_items(Nidx, MaxItems, GenKey, ItemId) ->
+ ItemIds = [ItemId | itemids(Nidx, GenKey)],
+ {result, {_NewIds, OldIds}} = remove_extra_items(Nidx, MaxItems, ItemIds),
+ OldIds.
+
-spec decode_jid(SJID :: binary()) -> ljid().
decode_jid(SJID) ->
jid:tolower(jid:decode(SJID)).
@@ -1037,15 +1081,14 @@ rsm_page(Count, Index, Offset, Items) ->
last = Last}.
encode_stamp(Stamp) ->
- case catch xmpp_util:decode_timestamp(Stamp) of
- {MS,S,US} -> encode_now({MS,S,US});
- _ -> Stamp
+ try xmpp_util:decode_timestamp(Stamp) of
+ Now ->
+ encode_now(Now)
+ catch _:{bad_timestamp, _} ->
+ Stamp % We should return a proper error to the client instead.
end.
decode_stamp(Stamp) ->
- case catch xmpp_util:encode_timestamp(decode_now(Stamp)) of
- TimeStamp when is_binary(TimeStamp) -> TimeStamp;
- _ -> Stamp
- end.
+ xmpp_util:encode_timestamp(decode_now(Stamp)).
encode_now({T1, T2, T3}) ->
<<(misc:i2l(T1, 6))/binary, ":",
diff --git a/src/node_pep.erl b/src/node_pep.erl
index 58c3050a0..c52db1b3e 100644
--- a/src/node_pep.erl
+++ b/src/node_pep.erl
@@ -5,7 +5,7 @@
%%% Created : 1 Dec 2007 by Christophe Romain
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -35,7 +35,8 @@
-export([init/3, terminate/2, options/0, features/0,
create_node_permission/6, create_node/2, delete_node/1,
purge_node/2, subscribe_node/8, unsubscribe_node/4,
- publish_item/7, delete_item/4, remove_extra_items/3,
+ publish_item/7, delete_item/4,
+ remove_extra_items/2, remove_extra_items/3, remove_expired_items/2,
get_entity_affiliations/2, get_node_affiliations/1,
get_affiliation/2, set_affiliation/3,
get_entity_subscriptions/2, get_node_subscriptions/1,
@@ -80,10 +81,12 @@ features() ->
[<<"create-nodes">>,
<<"auto-create">>,
<<"auto-subscribe">>,
+ <<"config-node">>,
<<"delete-nodes">>,
<<"delete-items">>,
<<"filtered-notifications">>,
<<"modify-affiliations">>,
+ <<"multi-items">>,
<<"outcast-affiliation">>,
<<"persistent-items">>,
<<"publish">>,
@@ -135,9 +138,15 @@ publish_item(Nidx, Publisher, Model, MaxItems, ItemId, Payload, PubOpts) ->
node_flat:publish_item(Nidx, Publisher, Model, MaxItems, ItemId,
Payload, PubOpts).
+remove_extra_items(Nidx, MaxItems) ->
+ node_flat:remove_extra_items(Nidx, MaxItems).
+
remove_extra_items(Nidx, MaxItems, ItemIds) ->
node_flat:remove_extra_items(Nidx, MaxItems, ItemIds).
+remove_expired_items(Nidx, Seconds) ->
+ node_flat:remove_expired_items(Nidx, Seconds).
+
delete_item(Nidx, Publisher, PublishModel, ItemId) ->
node_flat:delete_item(Nidx, Publisher, PublishModel, ItemId).
diff --git a/src/node_pep_sql.erl b/src/node_pep_sql.erl
index 7b21aa901..1d1a632f2 100644
--- a/src/node_pep_sql.erl
+++ b/src/node_pep_sql.erl
@@ -5,7 +5,7 @@
%%% Created : 1 Dec 2007 by Christophe Romain
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -37,7 +37,8 @@
-export([init/3, terminate/2, options/0, features/0,
create_node_permission/6, create_node/2, delete_node/1,
purge_node/2, subscribe_node/8, unsubscribe_node/4,
- publish_item/7, delete_item/4, remove_extra_items/3,
+ publish_item/7, delete_item/4,
+ remove_extra_items/2, remove_extra_items/3, remove_expired_items/2,
get_entity_affiliations/2, get_node_affiliations/1,
get_affiliation/2, set_affiliation/3,
get_entity_subscriptions/2, get_node_subscriptions/1,
@@ -92,9 +93,15 @@ publish_item(Nidx, Publisher, Model, MaxItems, ItemId, Payload, PubOpts) ->
node_flat_sql:publish_item(Nidx, Publisher, Model, MaxItems, ItemId,
Payload, PubOpts).
+remove_extra_items(Nidx, MaxItems) ->
+ node_flat_sql:remove_extra_items(Nidx, MaxItems).
+
remove_extra_items(Nidx, MaxItems, ItemIds) ->
node_flat_sql:remove_extra_items(Nidx, MaxItems, ItemIds).
+remove_expired_items(Nidx, Seconds) ->
+ node_flat_sql:remove_expired_items(Nidx, Seconds).
+
delete_item(Nidx, Publisher, PublishModel, ItemId) ->
node_flat_sql:delete_item(Nidx, Publisher, PublishModel, ItemId).
diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl
index fe15f3323..df6e9cb60 100644
--- a/src/nodetree_tree.erl
+++ b/src/nodetree_tree.erl
@@ -5,7 +5,7 @@
%%% Created : 1 Dec 2007 by Christophe Romain
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -46,7 +46,8 @@
-export([init/3, terminate/2, options/0, set_node/1,
get_node/3, get_node/2, get_node/1, get_nodes/2,
- get_nodes/1, get_parentnodes/3, get_parentnodes_tree/3,
+ get_nodes/1, get_all_nodes/1,
+ get_parentnodes/3, get_parentnodes_tree/3,
get_subnodes/3, get_subnodes_tree/3, create_node/6,
delete_node/2]).
@@ -98,6 +99,14 @@ get_nodes(Host, Limit) ->
{Nodes, _} -> Nodes
end.
+get_all_nodes({_U, _S, _R} = Owner) ->
+ Host = jid:tolower(jid:remove_resource(Owner)),
+ mnesia:match_object(#pubsub_node{nodeid = {Host, '_'}, _ = '_'});
+get_all_nodes(Host) ->
+ mnesia:match_object(#pubsub_node{nodeid = {Host, '_'}, _ = '_'})
+ ++ mnesia:match_object(#pubsub_node{nodeid = {{'_', Host, '_'}, '_'},
+ _ = '_'}).
+
get_parentnodes(Host, Node, _From) ->
case catch mnesia:read({pubsub_node, {Host, Node}}) of
[Record] when is_record(Record, pubsub_node) ->
diff --git a/src/nodetree_tree_sql.erl b/src/nodetree_tree_sql.erl
index d68355202..6c3419948 100644
--- a/src/nodetree_tree_sql.erl
+++ b/src/nodetree_tree_sql.erl
@@ -5,7 +5,7 @@
%%% Created : 1 Dec 2007 by Christophe Romain
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -45,7 +45,8 @@
-export([init/3, terminate/2, options/0, set_node/1,
get_node/3, get_node/2, get_node/1, get_nodes/2,
- get_nodes/1, get_parentnodes/3, get_parentnodes_tree/3,
+ get_nodes/1, get_all_nodes/1,
+ get_parentnodes/3, get_parentnodes_tree/3,
get_subnodes/3, get_subnodes_tree/3, create_node/6,
delete_node/2]).
@@ -165,6 +166,34 @@ get_nodes(Host, Limit) ->
[]
end.
+get_all_nodes({_U, _S, _R} = JID) ->
+ SubKey = jid:tolower(JID),
+ GenKey = jid:remove_resource(SubKey),
+ EncKey = node_flat_sql:encode_jid(GenKey),
+ Pattern = <<(node_flat_sql:encode_jid_like(GenKey))/binary, "/%">>,
+ case ejabberd_sql:sql_query_t(
+ ?SQL("select @(node)s, @(parent)s, @(plugin)s, @(nodeid)d "
+ "from pubsub_node where host=%(EncKey)s "
+ "or host like %(Pattern)s %ESCAPE")) of
+ {selected, RItems} ->
+ [raw_to_node(GenKey, Item) || Item <- RItems];
+ _ ->
+ []
+ end;
+get_all_nodes(Host) ->
+ Pattern1 = <<"%@", Host/binary>>,
+ Pattern2 = <<"%@", Host/binary, "/%">>,
+ case ejabberd_sql:sql_query_t(
+ ?SQL("select @(node)s, @(parent)s, @(plugin)s, @(nodeid)d "
+ "from pubsub_node where host=%(Host)s "
+ "or host like %(Pattern1)s "
+ "or host like %(Pattern2)s %ESCAPE")) of
+ {selected, RItems} ->
+ [raw_to_node(Host, Item) || Item <- RItems];
+ _ ->
+ []
+ end.
+
get_parentnodes(Host, Node, _From) ->
case get_node(Host, Node) of
Record when is_record(Record, pubsub_node) ->
diff --git a/src/nodetree_virtual.erl b/src/nodetree_virtual.erl
index 9cf7a80ca..988c0334c 100644
--- a/src/nodetree_virtual.erl
+++ b/src/nodetree_virtual.erl
@@ -5,7 +5,7 @@
%%% Created : 1 Dec 2007 by Christophe Romain
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -38,7 +38,8 @@
-export([init/3, terminate/2, options/0, set_node/1,
get_node/3, get_node/2, get_node/1, get_nodes/2,
- get_nodes/1, get_parentnodes/3, get_parentnodes_tree/3,
+ get_nodes/1, get_all_nodes/1,
+ get_parentnodes/3, get_parentnodes_tree/3,
get_subnodes/3, get_subnodes_tree/3, create_node/6,
delete_node/2]).
@@ -71,6 +72,9 @@ get_nodes(Host) ->
get_nodes(_Host, _Limit) ->
[].
+get_all_nodes(_Host) ->
+ [].
+
get_parentnodes(_Host, _Node, _From) ->
[].
diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl
index 3992a4034..df7dedc9b 100644
--- a/src/prosody2ejabberd.erl
+++ b/src/prosody2ejabberd.erl
@@ -4,7 +4,7 @@
%%% Created : 20 Jan 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -118,7 +118,7 @@ eval_file(Path) ->
case luerl:eval(NewData, State1) of
{ok, _} = Res ->
Res;
- {error, Why} = Err ->
+ {error, Why, _} = Err ->
?ERROR_MSG("Failed to eval ~ts: ~p", [Path, Why]),
Err
end;
@@ -130,7 +130,7 @@ eval_file(Path) ->
maybe_get_scram_auth(Data) ->
case proplists:get_value(<<"iteration_count">>, Data, no_ic) of
- IC when is_float(IC) -> %% A float like 4096.0 is read
+ IC when is_number(IC) ->
#scram{
storedkey = misc:hex_to_base64(proplists:get_value(<<"stored_key">>, Data, <<"">>)),
serverkey = misc:hex_to_base64(proplists:get_value(<<"server_key">>, Data, <<"">>)),
diff --git a/src/proxy_protocol.erl b/src/proxy_protocol.erl
index 146135a69..5716fe2e6 100644
--- a/src/proxy_protocol.erl
+++ b/src/proxy_protocol.erl
@@ -5,7 +5,7 @@
%%% Created : 27 Nov 2018 by Paweł Chmielowski
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/pubsub_db_sql.erl b/src/pubsub_db_sql.erl
index 6c1e3b162..99c758d43 100644
--- a/src/pubsub_db_sql.erl
+++ b/src/pubsub_db_sql.erl
@@ -5,7 +5,7 @@
%%% Created : 7 Aug 2009 by Pablo Polvorin
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/pubsub_index.erl b/src/pubsub_index.erl
index 5b8d17e95..370fa1967 100644
--- a/src/pubsub_index.erl
+++ b/src/pubsub_index.erl
@@ -5,7 +5,7 @@
%%% Created : 30 Apr 2009 by Christophe Romain
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/pubsub_migrate.erl b/src/pubsub_migrate.erl
index 35fa87b90..9436ca133 100644
--- a/src/pubsub_migrate.erl
+++ b/src/pubsub_migrate.erl
@@ -5,7 +5,7 @@
%%% Created : 26 Jul 2014 by Christophe Romain
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl
index 92d6d314d..0b212d21c 100644
--- a/src/pubsub_subscription.erl
+++ b/src/pubsub_subscription.erl
@@ -5,7 +5,7 @@
%%% Created : 29 May 2009 by Brian Cully
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/pubsub_subscription_sql.erl b/src/pubsub_subscription_sql.erl
index c36934f50..1b5257891 100644
--- a/src/pubsub_subscription_sql.erl
+++ b/src/pubsub_subscription_sql.erl
@@ -6,7 +6,7 @@
%%% Created : 7 Aug 2009 by Pablo Polvorin
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/rest.erl b/src/rest.erl
index d724352f2..58e424700 100644
--- a/src/rest.erl
+++ b/src/rest.erl
@@ -5,7 +5,7 @@
%%% Created : 16 Oct 2014 by Christophe Romain
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -191,13 +191,26 @@ base_url(Server, Path) ->
_ -> Url
end.
+-ifdef(HAVE_URI_STRING).
+uri_hack(Str) ->
+ case uri_string:normalize("%25") of
+ "%" -> % This hack around bug in httpc >21 <23.2
+ binary:replace(Str, <<"%25">>, <<"%2525">>, [global]);
+ _ -> Str
+ end.
+-else.
+uri_hack(Str) ->
+ Str.
+-endif.
+
url(Url, []) ->
Url;
url(Url, Params) ->
L = [<<"&", (iolist_to_binary(Key))/binary, "=",
(misc:url_encode(Value))/binary>>
|| {Key, Value} <- Params],
- <<$&, Encoded/binary>> = iolist_to_binary(L),
+ <<$&, Encoded0/binary>> = iolist_to_binary(L),
+ Encoded = uri_hack(Encoded0),
<>.
url(Server, Path, Params) ->
case binary:split(base_url(Server, Path), <<"?">>) of
diff --git a/src/str.erl b/src/str.erl
index a12d2640e..cc7957f97 100644
--- a/src/str.erl
+++ b/src/str.erl
@@ -5,7 +5,7 @@
%%% Created : 23 Feb 2012 by Evgeniy Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/translate.erl b/src/translate.erl
index f2ca7c759..b0034588a 100644
--- a/src/translate.erl
+++ b/src/translate.erl
@@ -5,7 +5,7 @@
%%% Created : 6 Jan 2003 by Alexey Shchepin
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/win32_dns.erl b/src/win32_dns.erl
index 76b347e45..bd65cdc36 100644
--- a/src/win32_dns.erl
+++ b/src/win32_dns.erl
@@ -5,7 +5,7 @@
%%% Created : 5 Mar 2009 by Geoff Cant
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/announce_tests.erl b/test/announce_tests.erl
index 4b685cb3c..e1258629b 100644
--- a/test/announce_tests.erl
+++ b/test/announce_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 16 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/carbons_tests.erl b/test/carbons_tests.erl
index a6cde55c1..e1717be90 100644
--- a/test/carbons_tests.erl
+++ b/test/carbons_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 16 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/csi_tests.erl b/test/csi_tests.erl
index a2fb413fb..f1f39b49d 100644
--- a/test/csi_tests.erl
+++ b/test/csi_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 16 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index bf837d269..10b6aff69 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -3,7 +3,7 @@
%%% Created : 2 Jun 2013 by Evgeniy Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -76,7 +76,7 @@ init_per_group(Group, Config) ->
%% All backends enabled
do_init_per_group(Group, Config);
Backends ->
- %% Skipped backends that were not explicitely enabled
+ %% Skipped backends that were not explicitly enabled
case lists:member(Group, Backends) of
true ->
do_init_per_group(Group, Config);
diff --git a/test/ejabberd_SUITE_data/openssl.cnf b/test/ejabberd_SUITE_data/openssl.cnf
index 594653b79..7003c68fc 100644
--- a/test/ejabberd_SUITE_data/openssl.cnf
+++ b/test/ejabberd_SUITE_data/openssl.cnf
@@ -39,7 +39,7 @@ certs = $dir/certs # Where the issued certs are kept
crl_dir = $dir/crl # Where the issued crl are kept
database = $dir/index.txt # database index file.
#unique_subject = no # Set to 'no' to allow creation of
- # several ctificates with same subject.
+ # several certificates with same subject.
new_certs_dir = $dir/newcerts # default place for new certs.
certificate = $dir/cacert.pem # The CA certificate
@@ -50,7 +50,7 @@ crl = $dir/crl.pem # The current CRL
private_key = $dir/private/cakey.pem# The private key
RANDFILE = $dir/private/.rand # private random number file
-x509_extensions = usr_cert # The extentions to add to the cert
+x509_extensions = usr_cert # The extensions to add to the cert
# Comment out the following two lines for the "traditional"
# (and highly broken) format.
@@ -102,7 +102,7 @@ default_bits = 1024
default_keyfile = privkey.pem
distinguished_name = req_distinguished_name
attributes = req_attributes
-x509_extensions = v3_ca # The extentions to add to the self signed cert
+x509_extensions = v3_ca # The extensions to add to the self signed cert
# Passwords for private keys if not present they will be prompted for
# input_password = secret
diff --git a/test/elixir-config/config_test.exs b/test/elixir-config/config_test.exs
index c359c49c3..8970e02e6 100644
--- a/test/elixir-config/config_test.exs
+++ b/test/elixir-config/config_test.exs
@@ -47,7 +47,7 @@ defmodule Ejabberd.ConfigTest do
assert is_function(register_hook.fun)
end
- # TODO: When enalbed, this test causes the evaluation of a different config file, so
+ # TODO: When enabled, this test causes the evaluation of a different config file, so
# the other tests, that uses the store, are compromised because the data is different.
# So, until a good way is found, this test should remain disabed.
#
diff --git a/test/example_tests.erl b/test/example_tests.erl
index a8fe50ad0..dab5836d7 100644
--- a/test/example_tests.erl
+++ b/test/example_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 16 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/jidprep_tests.erl b/test/jidprep_tests.erl
index 72bf312ae..efe7f711c 100644
--- a/test/jidprep_tests.erl
+++ b/test/jidprep_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 11 Sep 2019 by Holger Weiss
%%%
%%%
-%%% ejabberd, Copyright (C) 2019-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2019-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/ldap_srv.erl b/test/ldap_srv.erl
index 966c08a1d..63d91f6c7 100644
--- a/test/ldap_srv.erl
+++ b/test/ldap_srv.erl
@@ -3,7 +3,7 @@
%%% Created : 21 Jun 2013 by Evgeniy Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/mam_tests.erl b/test/mam_tests.erl
index 0de380351..ed7bbe97d 100644
--- a/test/mam_tests.erl
+++ b/test/mam_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 14 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -454,7 +454,7 @@ recv_archived_messages(Config, From, To, QID, Range) ->
MyJID = my_jid(Config),
lists:foreach(
fun(N) ->
- ct:comment("Retreiving ~pth message in range ~p",
+ ct:comment("Retrieving ~pth message in range ~p",
[N, Range]),
Body = xmpp:mk_text(integer_to_binary(N)),
#message{to = MyJID,
diff --git a/test/muc_tests.erl b/test/muc_tests.erl
index ea3fd1c74..f050e72ca 100644
--- a/test/muc_tests.erl
+++ b/test/muc_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 15 Oct 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -191,7 +191,7 @@ service_disco_items(Config) ->
service_vcard(Config) ->
MUC = muc_jid(Config),
- ct:comment("Retreiving vCard from ~s", [jid:encode(MUC)]),
+ ct:comment("Retrieving vCard from ~s", [jid:encode(MUC)]),
VCard = mod_muc_opt:vcard(?config(server, Config)),
#iq{type = result, sub_els = [VCard]} =
send_recv(Config, #iq{type = get, to = MUC, sub_els = [#vcard_temp{}]}),
@@ -1474,7 +1474,7 @@ config_voice_request_interval_slave(Config) ->
denied = get_event(Config),
ct:comment("Requesting voice again"),
send(Config, #message{to = Room, sub_els = [X]}),
- ct:comment("Receving voice request error because we're sending to fast"),
+ ct:comment("Receiving voice request error because we're sending to fast"),
#message{from = Room, type = error} = Err = recv_message(Config),
#stanza_error{reason = 'resource-constraint'} = xmpp:get_error(Err),
ct:comment("Waiting for 5 seconds"),
@@ -1872,7 +1872,7 @@ set_vcard(Config, VCard) ->
get_vcard(Config) ->
Room = muc_room_jid(Config),
- ct:comment("Retreiving vCard from ~s", [jid:encode(Room)]),
+ ct:comment("Retrieving vCard from ~s", [jid:encode(Room)]),
case send_recv(Config, #iq{type = get, to = Room,
sub_els = [#vcard_temp{}]}) of
#iq{type = result, sub_els = [VCard]} ->
diff --git a/test/offline_tests.erl b/test/offline_tests.erl
index 1021c86e8..5ffe50def 100644
--- a/test/offline_tests.erl
+++ b/test/offline_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 7 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -489,6 +489,14 @@ wait_for_complete(Config, N) ->
end
end, error, [0, 100, 200, 2000, 5000, 10000]).
+xevent_stored(#message{body = [], subject = []}, _) -> false;
+xevent_stored(#message{type = T}, _) when T /= chat, T /= normal -> false;
+xevent_stored(_, #xevent{id = undefined}) -> true;
+xevent_stored(_, #xevent{offline = true}) -> true;
+xevent_stored(_, #xevent{delivered = true}) -> true;
+xevent_stored(_, #xevent{displayed = true}) -> true;
+xevent_stored(_, _) -> false.
+
message_iterator(Config) ->
ServerJID = server_jid(Config),
ChatStates = [[#chatstate{type = composing}]],
@@ -511,8 +519,14 @@ message_iterator(Config) ->
fun(#message{type = error}) -> true;
(#message{type = groupchat}) -> false;
(#message{sub_els = [#hint{type = store}|_]}) when MamEnabled -> true;
+ (#message{sub_els = [#hint{type = 'no-store'}|_]}) -> false;
(#message{sub_els = [#offline{}|_]}) when not MamEnabled -> false;
- (#message{sub_els = [_, #xevent{id = I}]}) when I /= undefined, not MamEnabled -> false;
+ (#message{sub_els = [#hint{type = store}, #xevent{} = Event | _]} = Msg) when not MamEnabled ->
+ xevent_stored(Msg#message{body = body, type = chat}, Event);
+ (#message{sub_els = [#xevent{} = Event]} = Msg) when not MamEnabled ->
+ xevent_stored(Msg, Event);
+ (#message{sub_els = [_, #xevent{} = Event | _]} = Msg) when not MamEnabled ->
+ xevent_stored(Msg, Event);
(#message{sub_els = [#xevent{id = I}]}) when I /= undefined, not MamEnabled -> false;
(#message{sub_els = [#hint{type = store}|_]}) -> true;
(#message{sub_els = [#hint{type = 'no-store'}|_]}) -> false;
diff --git a/test/privacy_tests.erl b/test/privacy_tests.erl
index f24893b16..39526e5b1 100644
--- a/test/privacy_tests.erl
+++ b/test/privacy_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 18 Oct 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/private_tests.erl b/test/private_tests.erl
index e17932946..fd961b8b8 100644
--- a/test/private_tests.erl
+++ b/test/private_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 23 Nov 2018 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/proxy65_tests.erl b/test/proxy65_tests.erl
index 618252eb0..0a75f820e 100644
--- a/test/proxy65_tests.erl
+++ b/test/proxy65_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 16 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -48,7 +48,7 @@ feature_enabled(Config) ->
service_vcard(Config) ->
JID = proxy_jid(Config),
- ct:comment("Retreiving vCard from ~s", [jid:encode(JID)]),
+ ct:comment("Retrieving vCard from ~s", [jid:encode(JID)]),
VCard = mod_proxy65_opt:vcard(?config(server, Config)),
#iq{type = result, sub_els = [VCard]} =
send_recv(Config, #iq{type = get, to = JID, sub_els = [#vcard_temp{}]}),
diff --git a/test/pubsub_tests.erl b/test/pubsub_tests.erl
index 2bca35173..043545422 100644
--- a/test/pubsub_tests.erl
+++ b/test/pubsub_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 16 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -87,7 +87,7 @@ test_features(Config) ->
test_vcard(Config) ->
JID = pubsub_jid(Config),
- ct:comment("Retreiving vCard from ~s", [jid:encode(JID)]),
+ ct:comment("Retrieving vCard from ~s", [jid:encode(JID)]),
VCard = mod_pubsub_opt:vcard(?config(server, Config)),
#iq{type = result, sub_els = [VCard]} =
send_recv(Config, #iq{type = get, to = JID, sub_els = [#vcard_temp{}]}),
diff --git a/test/push_tests.erl b/test/push_tests.erl
index 2b367cba8..553f90968 100644
--- a/test/push_tests.erl
+++ b/test/push_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 15 Jul 2017 by Holger Weiss
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/replaced_tests.erl b/test/replaced_tests.erl
index 9a172107e..5f3224aea 100644
--- a/test/replaced_tests.erl
+++ b/test/replaced_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 16 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/roster_tests.erl b/test/roster_tests.erl
index a3b6009c9..f8d1999e6 100644
--- a/test/roster_tests.erl
+++ b/test/roster_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 22 Oct 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -224,13 +224,21 @@ get_items(Config, Version) ->
sub_els = [#roster_query{ver = Version}]}) of
#iq{type = result,
sub_els = [#roster_query{ver = NewVersion, items = Items}]} ->
- {NewVersion, Items};
+ {NewVersion, normalize_items(Items)};
#iq{type = result, sub_els = []} ->
{empty, []};
#iq{type = error} = Err ->
xmpp:get_error(Err)
end.
+normalize_items(Items) ->
+ Items2 =
+ lists:map(
+ fun(I) ->
+ I#roster_item{groups = lists:sort(I#roster_item.groups)}
+ end, Items),
+ lists:sort(Items2).
+
get_item(Config, JID) ->
case get_items(Config) of
{_Ver, Items} when is_list(Items) ->
diff --git a/test/sm_tests.erl b/test/sm_tests.erl
index 81fe39ed0..8e87c642a 100644
--- a/test/sm_tests.erl
+++ b/test/sm_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 16 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/stundisco_tests.erl b/test/stundisco_tests.erl
index f80652df4..65569ead8 100644
--- a/test/stundisco_tests.erl
+++ b/test/stundisco_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 22 Apr 2020 by Holger Weiss
%%%
%%%
-%%% ejabberd, Copyright (C) 2020-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2020-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/suite.erl b/test/suite.erl
index de7d64873..7669e4fe4 100644
--- a/test/suite.erl
+++ b/test/suite.erl
@@ -3,7 +3,7 @@
%%% Created : 27 Jun 2013 by Evgeniy Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/test/upload_tests.erl b/test/upload_tests.erl
index 434d7be11..3a5885111 100644
--- a/test/upload_tests.erl
+++ b/test/upload_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 17 May 2018 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -55,7 +55,7 @@ feature_enabled(Config) ->
service_vcard(Config) ->
Upload = upload_jid(Config),
- ct:comment("Retreiving vCard from ~s", [jid:encode(Upload)]),
+ ct:comment("Retrieving vCard from ~s", [jid:encode(Upload)]),
VCard = mod_http_upload_opt:vcard(?config(server, Config)),
#iq{type = result, sub_els = [VCard]} =
send_recv(Config, #iq{type = get, to = Upload, sub_els = [#vcard_temp{}]}),
diff --git a/test/vcard_tests.erl b/test/vcard_tests.erl
index 8e16f7ac0..791a2265c 100644
--- a/test/vcard_tests.erl
+++ b/test/vcard_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 16 Nov 2016 by Evgeny Khramtsov
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -90,7 +90,7 @@ get_set(Config) ->
service_vcard(Config) ->
JID = server_jid(Config),
- ct:comment("Retreiving vCard from ~s", [jid:encode(JID)]),
+ ct:comment("Retrieving vCard from ~s", [jid:encode(JID)]),
VCard = mod_vcard_opt:vcard(?config(server, Config)),
#iq{type = result, sub_els = [VCard]} =
send_recv(Config, #iq{type = get, to = JID, sub_els = [#vcard_temp{}]}),
diff --git a/test/webadmin_tests.erl b/test/webadmin_tests.erl
index 53a670d4e..34e2c1b86 100644
--- a/test/webadmin_tests.erl
+++ b/test/webadmin_tests.erl
@@ -3,7 +3,7 @@
%%% Created : 23 Mar 2020 by Pawel Chmielowski
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/tools/captcha-ng.sh b/tools/captcha-ng.sh
index cbcb95407..bb57385c4 100755
--- a/tools/captcha-ng.sh
+++ b/tools/captcha-ng.sh
@@ -42,7 +42,8 @@ INTRUDER()
{
NUMBERS=$(echo "$INPUT" | grep -o . | tr '\n' ' ')
SORTED_UNIQ_NUM=$(echo "${NUMBERS[@]}" | sort -u | tr '\n' ' ')
-RANDOM_DIGITS=$(echo 123456789 | grep -o . | sort -R | tr '\n' ' ')
+SORT_RANDOM_CMD="$( ( echo x|sort -R >&/dev/null && echo "sort -R" ) || ( echo x|shuf >&/dev/null && echo shuf ) || echo cat)"
+RANDOM_DIGITS=$(echo 123456789 | grep -o . | eval "$SORT_RANDOM_CMD" | tr '\n' ' ')
INTRUDER=-1
for i in $RANDOM_DIGITS
diff --git a/tools/captcha.sh b/tools/captcha.sh
index 9fa4a52c4..7885858a2 100755
--- a/tools/captcha.sh
+++ b/tools/captcha.sh
@@ -15,69 +15,62 @@
INPUT=$1
-if test -n ${BASH_VERSION:-''} ; then
- get_random ()
- {
- R=$RANDOM
- }
-else
- for n in `od -A n -t u2 -N 48 /dev/urandom`; do RL="$RL$n "; done
- get_random ()
- {
- R=${RL%% *}
- RL=${RL#* }
- }
-fi
+for n in $(od -A n -t u2 -N 48 /dev/urandom); do RL="$RL$n "; done
+get_random ()
+{
+ R=${RL%% *}
+ RL=${RL#* }
+}
get_random
-WAVE1_AMPLITUDE=$((2 + $R % 5))
+WAVE1_AMPLITUDE=$((2 + R % 5))
get_random
-WAVE1_LENGTH=$((50 + $R % 25))
+WAVE1_LENGTH=$((50 + R % 25))
get_random
-WAVE2_AMPLITUDE=$((2 + $R % 5))
+WAVE2_AMPLITUDE=$((2 + R % 5))
get_random
-WAVE2_LENGTH=$((50 + $R % 25))
+WAVE2_LENGTH=$((50 + R % 25))
get_random
-WAVE3_AMPLITUDE=$((2 + $R % 5))
+WAVE3_AMPLITUDE=$((2 + R % 5))
get_random
-WAVE3_LENGTH=$((50 + $R % 25))
+WAVE3_LENGTH=$((50 + R % 25))
get_random
-W1_LINE_START_Y=$((10 + $R % 40))
+W1_LINE_START_Y=$((10 + R % 40))
get_random
-W1_LINE_STOP_Y=$((10 + $R % 40))
+W1_LINE_STOP_Y=$((10 + R % 40))
get_random
-W2_LINE_START_Y=$((10 + $R % 40))
+W2_LINE_START_Y=$((10 + R % 40))
get_random
-W2_LINE_STOP_Y=$((10 + $R % 40))
+W2_LINE_STOP_Y=$((10 + R % 40))
get_random
-W3_LINE_START_Y=$((10 + $R % 40))
+W3_LINE_START_Y=$((10 + R % 40))
get_random
-W3_LINE_STOP_Y=$((10 + $R % 40))
+W3_LINE_STOP_Y=$((10 + R % 40))
get_random
-B1_LINE_START_Y=$(($R % 40))
+B1_LINE_START_Y=$((R % 40))
get_random
-B1_LINE_STOP_Y=$(($R % 40))
+B1_LINE_STOP_Y=$((R % 40))
get_random
-B2_LINE_START_Y=$(($R % 40))
+B2_LINE_START_Y=$((R % 40))
get_random
-B2_LINE_STOP_Y=$(($R % 40))
-#B3_LINE_START_Y=$(($R % 40))
-#B3_LINE_STOP_Y=$(($R % 40))
+B2_LINE_STOP_Y=$((R % 40))
+#B3_LINE_START_Y=$((R % 40))
+#B3_LINE_STOP_Y=$((R % 40))
get_random
-B1_LINE_START_X=$(($R % 20))
+B1_LINE_START_X=$((R % 20))
get_random
-B1_LINE_STOP_X=$((100 + $R % 40))
+B1_LINE_STOP_X=$((100 + R % 40))
get_random
-B2_LINE_START_X=$(($R % 20))
+B2_LINE_START_X=$((R % 20))
get_random
-B2_LINE_STOP_X=$((100 + $R % 40))
-#B3_LINE_START_X=$(($R % 20))
-#B3_LINE_STOP_X=$((100 + $R % 40))
+B2_LINE_STOP_X=$((100 + R % 40))
+#B3_LINE_START_X=$((R % 20))
+#B3_LINE_STOP_X=$((100 + R % 40))
get_random
-ROLL_X=$(($R % 40))
+ROLL_X=$((R % 40))
convert -size 180x60 xc:none -pointsize 40 \
\( -clone 0 -fill white \
diff --git a/tools/make-binaries b/tools/make-binaries
new file mode 100755
index 000000000..20749da11
--- /dev/null
+++ b/tools/make-binaries
@@ -0,0 +1,886 @@
+#!/bin/sh
+
+# Build portable binary release tarballs for Linux/x64 and Linux/arm64.
+#
+# Author: Holger Weiss .
+#
+# Copyright (c) 2022 ProcessOne, SARL.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+set -u
+
+export PATH='/usr/local/bin:/usr/bin:/bin'
+
+myself=${0##*/}
+
+info()
+{
+ echo "$myself: $*"
+}
+
+error()
+{
+ echo >&2 "$myself: $*"
+}
+
+usage()
+{
+ echo >&2 "Usage: $myself"
+ exit 2
+}
+
+mix_version()
+{
+ # Mix insists on SemVer format.
+ local vsn="$(printf '%s' "$1" | sed 's/\.0/./')"
+
+ case $vsn in
+ *.*.*) printf '%s' "$vsn" ;;
+ *.*) printf '%s.0' "$vsn" ;;
+ esac
+}
+
+if ! [ -e 'mix.exs' ] || ! [ -e "tools/$myself" ]
+then
+ error "Please call this script from the repository's root directory."
+ exit 2
+elif [ $# -ne 0 ]
+then
+ usage
+fi
+
+rel_name='ejabberd'
+rel_vsn=$(git describe --tags | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]')
+mix_vsn=$(mix_version "$rel_vsn")
+crosstool_vsn='1.25.0'
+termcap_vsn='1.3.1'
+expat_vsn='2.4.9'
+zlib_vsn='1.2.12'
+yaml_vsn='0.2.5'
+ssl_vsn='1.1.1q'
+otp_vsn='24.3.4.5'
+elixir_vsn='1.14.0'
+pam_vsn='1.5.2'
+png_vsn='1.6.38'
+jpeg_vsn='9e'
+webp_vsn='1.2.4'
+gd_vsn='2.3.3'
+odbc_vsn='2.3.11'
+sqlite_vsn='3390300'
+root_dir="${BUILD_DIR:-$HOME/build}"
+bootstrap_dir="$root_dir/bootstrap"
+ct_prefix_dir="$root_dir/x-tools"
+build_dir="$root_dir/$rel_name"
+crosstool_dir="crosstool-ng-$crosstool_vsn"
+termcap_dir="termcap-$termcap_vsn"
+expat_dir="expat-$expat_vsn"
+zlib_dir="zlib-$zlib_vsn"
+yaml_dir="yaml-$yaml_vsn"
+ssl_dir="openssl-$ssl_vsn"
+otp_dir="otp_src_$otp_vsn"
+elixir_dir="elixir-$elixir_vsn"
+pam_dir="Linux-PAM-$pam_vsn"
+png_dir="libpng-$png_vsn"
+jpeg_dir="jpeg-$jpeg_vsn"
+webp_dir="libwebp-$webp_vsn"
+gd_dir="libgd-$gd_vsn"
+odbc_dir="unixODBC-$odbc_vsn"
+sqlite_dir="sqlite-autoconf-$sqlite_vsn"
+crosstool_tar="$crosstool_dir.tar.xz"
+termcap_tar="$termcap_dir.tar.gz"
+expat_tar="$expat_dir.tar.gz"
+zlib_tar="$zlib_dir.tar.gz"
+yaml_tar="$yaml_dir.tar.gz"
+ssl_tar="$ssl_dir.tar.gz"
+otp_tar="$otp_dir.tar.gz"
+elixir_tar="v$elixir_vsn.tar.gz"
+pam_tar="$pam_dir.tar.xz"
+png_tar="$png_dir.tar.gz"
+jpeg_tar="jpegsrc.v$jpeg_vsn.tar.gz"
+webp_tar="$webp_dir.tar.gz"
+gd_tar="$gd_dir.tar.gz"
+sqlite_tar="$sqlite_dir.tar.gz"
+odbc_tar="$odbc_dir.tar.gz"
+rel_tar="$rel_name-$mix_vsn.tar.gz"
+ct_jobs=$(nproc)
+src_dir="$root_dir/src"
+platform='x86_64-pc-linux-gnu'
+targets='x86_64-linux-gnu aarch64-linux-gnu'
+build_start=$(date '+%F %T')
+have_current_deps='false'
+dep_vsns_file="$build_dir/.dep_vsns"
+dep_vsns=''
+deps='crosstool
+ termcap
+ expat
+ zlib
+ yaml
+ ssl
+ otp
+ elixir
+ pam
+ png
+ jpeg
+ webp
+ gd
+ odbc
+ sqlite'
+
+umask 022
+
+#' Try to find a browser for checking dependency versions.
+have_browser()
+{
+ for browser in 'lynx' 'links' 'elinks'
+ do
+ $browser -dump 'https://ejabberd.im/' >'/dev/null' && return 0
+ done
+ return 1
+}
+#.
+
+#' Check whether the given dependency version is up-to-date.
+check_vsn()
+{
+ local name="$1"
+ local our_vsn="$2"
+ local src_url="$3"
+ local reg_exp="$4"
+ local cur_vsn=$($browser -dump "$src_url" |
+ sed -n "s/.*$reg_exp.*/\\1/p" |
+ head -1)
+
+ if [ "$our_vsn" = "$cur_vsn" ]
+ then
+ return 0
+ else
+ error "Current $name version is: $cur_vsn"
+ error "But our $name version is: $our_vsn"
+ error "Update $0 or set CHECK_DEPS=false"
+ exit 1
+ fi
+}
+#.
+
+#' Check whether our dependency versions are up-to-date.
+check_configured_dep_vsns()
+{
+ check_vsn 'OpenSSL' "$ssl_vsn" \
+ 'https://www.openssl.org/source/' \
+ 'openssl-\(1\.[0-9][0-9a-z.]*\)\.tar\.gz'
+ check_vsn 'LibYAML' "$yaml_vsn" \
+ 'https://pyyaml.org/wiki/LibYAML' \
+ 'yaml-\([0-9][0-9.]*\)\.tar\.gz'
+ check_vsn 'zlib' "$zlib_vsn" \
+ 'https://zlib.net/' \
+ 'zlib-\([1-9][0-9.]*\)\.tar\.gz'
+ check_vsn 'Expat' "$expat_vsn" \
+ 'https://github.com/libexpat/libexpat/releases' \
+ '[0-9]\]\([1-9][0-9.]*\)'
+ check_vsn 'Termcap' "$termcap_vsn" \
+ 'https://ftp.gnu.org/gnu/termcap/' \
+ 'termcap-\([1-9][0-9.]*\)\.tar\.gz'
+ check_vsn 'SQLite' "$sqlite_vsn" \
+ 'https://www.sqlite.org/download.html' \
+ 'sqlite-autoconf-\([1-9][0-9]*\)\.tar\.gz'
+ check_vsn 'ODBC' "$odbc_vsn" \
+ 'http://www.unixodbc.org/download.html' \
+ 'unixODBC-\([1-9][0-9.]*\)\.tar\.gz'
+ check_vsn 'Linux-PAM' "$pam_vsn" \
+ 'https://github.com/linux-pam/linux-pam/releases' \
+ '[0-9]\]Linux-PAM \([1-9][0-9.]*\)'
+ check_vsn 'libpng' "$png_vsn" \
+ 'http://www.libpng.org/pub/png/libpng.html' \
+ 'libpng-\([1-9][0-9.]*\)\.tar\.gz'
+ check_vsn 'JPEG' "$jpeg_vsn" \
+ 'https://www.ijg.org' \
+ 'jpegsrc.v\([1-9][0-9a-z]*\)\.tar\.gz'
+ check_vsn 'WebP' "$webp_vsn" \
+ 'https://developers.google.com/speed/webp/download' \
+ 'libwebp-\([1-9][0-9.]*\)\.tar\.gz'
+ check_vsn 'LibGD' "$gd_vsn" \
+ 'https://github.com/libgd/libgd/releases' \
+ 'gd-\([1-9][0-9.]*\)'
+ check_vsn 'Elixir' "$elixir_vsn" \
+ 'https://elixir-lang.org/install.html' \
+ 'v\([1-9][0-9.]*\)\.tar\.gz'
+}
+#.
+
+#' Check whether existing dependencies are up-to-date.
+check_built_dep_vsns()
+{
+ for dep in $deps
+ do
+ eval dep_vsns=\"\$dep_vsns\$${dep}_vsn\"
+ done
+
+ if [ -e "$dep_vsns_file" ]
+ then
+ if [ "$dep_vsns" = "$(cat "$dep_vsns_file")" ]
+ then have_current_deps='true'
+ fi
+ rm "$dep_vsns_file"
+ fi
+}
+#.
+
+#' Save built dependency versions.
+save_built_dep_vsns()
+{
+ echo "$dep_vsns" >"$dep_vsns_file"
+}
+#.
+
+#' Create common part of Crosstool-NG configuration file.
+create_common_config()
+{
+ local file="$1"
+
+ cat >"$file" <<-'EOF'
+ CT_CONFIG_VERSION="4"
+ CT_DOWNLOAD_AGENT_CURL=y
+ CT_OMIT_TARGET_VENDOR=y
+ CT_CC_LANG_CXX=y
+ CT_ARCH_64=y
+ CT_KERNEL_LINUX=y
+ CT_LINUX_V_3_16=y
+ CT_GLIBC_V_2_17=y
+ CT_GLIBC_KERNEL_VERSION_NONE=y
+ EOF
+}
+#.
+
+#' Create Crosstool-NG configuration file for x64.
+create_x64_config()
+{
+ local file="$1"
+
+ create_common_config "$file"
+
+ cat >>"$file" <<-'EOF'
+ CT_ARCH_X86=y
+ EOF
+}
+#.
+
+#' Create Crosstool-NG configuration file for arm64.
+create_arm64_config()
+{
+ local file="$1"
+
+ create_common_config "$file"
+
+ cat >>"$file" <<-'EOF'
+ CT_ARCH_ARM=y
+ EOF
+}
+#.
+
+#' Return our name for the given platform.
+arch_name()
+{
+ local target="$1"
+
+ case $target in
+ x86_64*)
+ printf 'x64'
+ ;;
+ aarch64*)
+ printf 'arm64'
+ ;;
+ *)
+ error "Unsupported target platform: $target"
+ exit 1
+ ;;
+ esac
+}
+#.
+
+#' Add native Erlang/OTP "bin" directory to PATH (for bootstrapping and Mix).
+add_otp_path()
+{
+ local mode="$1"
+ local prefix="$2"
+
+ if [ "$mode" = 'native' ]
+ then native_otp_bin="$prefix/bin"
+ fi
+ export PATH="$native_otp_bin:$PATH"
+}
+#.
+
+#' Create and populate /opt/ejabberd directory.
+create_data_dir()
+{
+ local code_dir="$1"
+ local data_dir="$2"
+
+ mkdir "$data_dir" "$data_dir/database" "$data_dir/logs"
+ mv "$code_dir/conf" "$data_dir"
+ chmod 'o-rwx' "$data_dir/"*
+ curl -o "$data_dir/conf/cacert.pem" 'https://curl.se/ca/cacert.pem'
+ sed -i '/^loglevel:/a\
+\
+ca_file: /opt/ejabberd/conf/cacert.pem\
+\
+certfiles:\
+ - /opt/ejabberd/conf/server.pem' "$data_dir/conf/$rel_name.yml"
+}
+#.
+
+#' Add systemd unit and init script.
+add_systemd_unit()
+{
+ local code_dir="$1"
+
+ sed -e "s|@ctlscriptpath@|/opt/$rel_name-$rel_vsn/bin|g" \
+ -e "s|@installuser@|$rel_name|g" 'ejabberd.service.template' \
+ >"$code_dir/bin/ejabberd.service"
+ sed -e "s|@ctlscriptpath@|/opt/$rel_name-$rel_vsn/bin|g" \
+ -e "s|@installuser@|$rel_name|g" 'ejabberd.init.template' \
+ >"$code_dir/bin/ejabberd.init"
+ chmod '+x' "$code_dir/bin/ejabberd.init"
+}
+#.
+
+#' Add CAPTCHA script(s).
+add_captcha_script()
+{
+ local code_dir="$1"
+
+ cp -p 'tools/captcha'*'.sh' "$code_dir/lib"
+}
+#.
+
+#' Use our VT100 to avoid depending on Terminfo, adjust options/paths.
+edit_ejabberdctl()
+{
+ local code_dir="$1"
+
+ sed -i \
+ -e "2iexport TERM='internal'" \
+ -e '/ERL_OPTIONS=/d' \
+ -e 's|^ERLANG_NODE=ejabberd$|ERLANG_NODE=ejabberd@localhost|' \
+ -e 's|_DIR:=".*}/|_DIR:="/opt/ejabberd/|' \
+ -e 's|/database|/database/$ERLANG_NODE|' \
+ "$code_dir/bin/${rel_name}ctl"
+}
+#.
+
+#' Delete unused files and directories, just to save some space.
+remove_unused_files()
+{
+ local code_dir="$1"
+
+ # Remove shared object file used only in test suite:
+ find "$code_dir/lib" -name 'otp_test_engine.so' -delete
+
+ # Remove shared object files of statically linked NIFs:
+ find "$code_dir/lib/crypto-"* "$code_dir/lib/asn1-"* \
+ '(' -name 'asn1rt_nif.so' -o \
+ -name 'crypto.so' -o \
+ -name 'lib' -o \
+ -name 'priv' ')' \
+ -delete
+
+ # Remove unused ERTS binaries (see systools_make:erts_binary_filter/0):
+ find "$code_dir/erts-"*'/bin' \
+ '(' -name 'ct_run' -o \
+ -name 'dialyzer' -o \
+ -name 'erlc' -o \
+ -name 'typer' -o \
+ -name 'yielding_c_fun' ')' \
+ -delete
+
+ # Remove unused Mix stuff:
+ find "$code_dir/bin" -name 'ejabberd' -delete
+ find "$code_dir/releases" -name 'COOKIE' -delete
+}
+#.
+
+#' Strip ERTS binaries, shared objects, and BEAM files.
+strip_files()
+{
+ local code_dir="$1"
+ local strip_cmd="$2"
+
+ find "$code_dir/lib" \
+ -type f \
+ -name '*.so' \
+ -exec "$strip_cmd" -s '{}' '+'
+ find "$code_dir/erts-"*'/bin' "$code_dir/lib/"*'/priv/bin' \
+ -type f \
+ -perm '-u+x' \
+ -exec "$strip_cmd" -s '{}' '+' 2>'/dev/null' || :
+ erl -noinput -eval \
+ "{ok, _} = beam_lib:strip_release('$code_dir'), halt()"
+}
+#.
+
+#' Build toochain for a given target.
+build_toolchain()
+{
+ local target="$1"
+ local prefix="$2"
+ local arch=$(arch_name "$target")
+
+ if [ -d "$prefix" ]
+ then
+ info "Using existing toolchain in $prefix ..."
+ else
+ if ! [ -x "$bootstrap_dir/bin/ct-ng" ]
+ then
+ info "Extracting Crosstool-NG $crosstool_vsn ..."
+ cd "$src_dir"
+ tar -xJf "$crosstool_tar"
+ cd "$OLDPWD"
+
+ info "Building Crosstool-NG $crosstool_vsn ..."
+ cd "$src_dir/$crosstool_dir"
+ ./configure --prefix="$bootstrap_dir"
+ make
+ make install
+ cd "$OLDPWD"
+ fi
+
+ info "Building toolchain for $arch ..."
+ cd "$root_dir"
+ create_${arch}_config 'defconfig'
+ ct-ng defconfig
+ ct-ng build CT_PREFIX="$ct_prefix_dir" CT_JOBS="$ct_jobs"
+ rm -rf '.config' '.build' 'build.log'
+ cd "$OLDPWD"
+ fi
+}
+#.
+
+#' Build target dependencies.
+build_deps()
+{
+ local mode="$1"
+ local target="$2"
+ local prefix="$3"
+ local arch="$(arch_name "$target")"
+ local target_src_dir="$prefix/src"
+ local saved_path="$PATH"
+
+ if [ "$mode" = 'cross' ]
+ then configure="./configure --host=$target --build=$platform"
+ else configure='./configure'
+ fi
+
+ mkdir "$prefix"
+
+ info 'Extracting dependencies ...'
+ mkdir "$target_src_dir"
+ cd "$target_src_dir"
+ tar -xzf "$src_dir/$termcap_tar"
+ tar -xzf "$src_dir/$sqlite_tar"
+ tar -xzf "$src_dir/$odbc_tar"
+ tar -xzf "$src_dir/$expat_tar"
+ tar -xzf "$src_dir/$zlib_tar"
+ tar -xzf "$src_dir/$yaml_tar"
+ tar -xzf "$src_dir/$ssl_tar"
+ tar -xzf "$src_dir/$otp_tar"
+ tar -xzf "$src_dir/$elixir_tar"
+ tar -xzf "$src_dir/$png_tar"
+ tar -xzf "$src_dir/$jpeg_tar"
+ tar -xzf "$src_dir/$webp_tar"
+ tar -xzf "$src_dir/$gd_tar"
+ tar -xJf "$src_dir/$pam_tar"
+ cd "$OLDPWD"
+
+ info "Building Termcap $termcap_vsn for $arch ..."
+ cd "$target_src_dir/$termcap_dir"
+ $configure --prefix="$prefix"
+ cat >'config.h' <<-'EOF'
+ #ifndef CONFIG_H
+ #define CONFIG_H
+ #define INTERNAL_TERMINAL "internal:\\\n" \
+ "\t:am:bs:ms:xn:xo:\\\n" \
+ "\t:co#80:it#8:li#24:vt#3:\\\n" \
+ "\t:@8=\\EOM:DO=\\E[%dB:K1=\\EOq:K2=\\EOr:K3=\\EOs:K4=\\EOp:K5=\\EOn:\\\n" \
+ "\t:LE=\\E[%dD:RA=\\E[?7l:RI=\\E[%dC:SA=\\E[?7h:UP=\\E[%dA:\\\n" \
+ "\t:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\\\n" \
+ "\t:ae=^O:as=^N:bl=^G:cb=\\E[1K:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:\\\n" \
+ "\t:cm=\\E[%i%d;%dH:cr=^M:cs=\\E[%i%d;%dr:ct=\\E[3g:do=^J:\\\n" \
+ "\t:eA=\\E(B\\E)0:ho=\\E[H:k0=\\EOy:k1=\\EOP:k2=\\EOQ:k3=\\EOR:\\\n" \
+ "\t:k4=\\EOS:k5=\\EOt:k6=\\EOu:k7=\\EOv:k8=\\EOl:k9=\\EOw:k;=\\EOx:\\\n" \
+ "\t:kb=^H:kd=\\EOB:ke=\\E[?1l\\E>:kl=\\EOD:kr=\\EOC:ks=\\E[?1h\\E=:\\\n" \
+ "\t:ku=\\EOA:le=^H:mb=\\E[5m:md=\\E[1m:me=\\E[m\\017:mr=\\E[7m:\\\n" \
+ "\t:nd=\\E[C:rc=\\E8:rs=\\E>\\E[?3l\\E[?4l\\E[?5l\\E[?7h\\E[?8h:\\\n" \
+ "\t:..sa=\\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\\016%e\\017%;:\\\n" \
+ "\t:sc=\\E7:se=\\E[m:sf=^J:so=\\E[7m:sr=\\EM:st=\\EH:ta=^I:ue=\\E[m:\\\n" \
+ "\t:up=\\E[A:us=\\E[4m:"
+ #endif
+ EOF
+ make CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H=1"
+ make install
+ cd "$OLDPWD"
+
+ info "Building zlib $zlib_vsn for $arch ..."
+ cd "$target_src_dir/$zlib_dir"
+ CFLAGS="$CFLAGS -O3 -fPIC" ./configure --prefix="$prefix" --static
+ make
+ make install
+ cd "$OLDPWD"
+
+ info "Building OpenSSL $ssl_vsn for $arch ..."
+ cd "$target_src_dir/$ssl_dir"
+ CFLAGS="$CFLAGS -O3 -fPIC" ./Configure no-shared no-ui-console \
+ --prefix="$prefix" \
+ --openssldir="$prefix" \
+ "linux-${target%-linux-gnu}"
+ make build_libs
+ make install_dev
+ cd "$OLDPWD"
+
+ info "Building Expat $expat_vsn for $arch ..."
+ cd "$target_src_dir/$expat_dir"
+ $configure --prefix="$prefix" --enable-static --disable-shared \
+ --without-docbook \
+ CFLAGS="$CFLAGS -O3 -fPIC"
+ make
+ make install
+ cd "$OLDPWD"
+
+ info "Building LibYAML $yaml_vsn for $arch ..."
+ cd "$target_src_dir/$yaml_dir"
+ $configure --prefix="$prefix" --enable-static --disable-shared \
+ CFLAGS="$CFLAGS -O3 -fPIC"
+ make
+ make install
+ cd "$OLDPWD"
+
+ info "Building SQLite $sqlite_vsn for $arch ..."
+ cd "$target_src_dir/$sqlite_dir"
+ $configure --prefix="$prefix" --enable-static --disable-shared \
+ CFLAGS="$CFLAGS -O3 -fPIC"
+ make
+ make install
+ cd "$OLDPWD"
+
+ info "Building ODBC $odbc_vsn for $arch ..."
+ cd "$target_src_dir/$odbc_dir"
+ $configure --prefix="$prefix" --enable-static --disable-shared \
+ CFLAGS="$CFLAGS -O3 -fPIC"
+ make
+ make install
+ cd "$OLDPWD"
+
+ info "Building Linux-PAM $pam_vsn for $arch ..."
+ cd "$target_src_dir/$pam_dir"
+ $configure --prefix="$prefix" --includedir="$prefix/include/security" \
+ --enable-static --disable-shared --disable-doc --enable-db=no \
+ CFLAGS="$CFLAGS -O3 -fPIC"
+ make
+ make install
+ cd "$OLDPWD"
+
+ info "Building libpng $png_vsn for $arch ..."
+ cd "$target_src_dir/$png_dir"
+ $configure --prefix="$prefix" --enable-static --disable-shared \
+ CFLAGS="$CFLAGS -O3 -fPIC"
+ make
+ make install
+ cd "$OLDPWD"
+
+ info "Building JPEG $jpeg_vsn for $arch ..."
+ cd "$target_src_dir/$jpeg_dir"
+ $configure --prefix="$prefix" --enable-static --disable-shared \
+ CFLAGS="$CFLAGS -O3 -fPIC"
+ make
+ make install
+ cd "$OLDPWD"
+
+ info "Building WebP $webp_vsn for $arch ..."
+ cd "$target_src_dir/$webp_dir"
+ $configure --prefix="$prefix" --enable-static --disable-shared \
+ CFLAGS="$CFLAGS -O3 -fPIC"
+ make
+ make install
+ cd "$OLDPWD"
+
+ info "Building LibGD $gd_vsn for $arch ..."
+ cd "$target_src_dir/$gd_dir"
+ $configure --prefix="$prefix" --enable-static --disable-shared \
+ --with-zlib="$prefix" \
+ --with-webp="$prefix" \
+ --with-jpeg="$prefix" \
+ --with-png="$prefix" \
+ --without-avif \
+ --without-fontconfig \
+ --without-freetype \
+ --without-heif \
+ --without-libiconv-prefix \
+ --without-liq \
+ --without-raqm \
+ --without-tiff \
+ --without-x \
+ --without-xpm \
+ CFLAGS="$CFLAGS -O3 -fPIC"
+ make
+ make install
+ cd "$OLDPWD"
+
+ info "Building Erlang/OTP $otp_vsn for $arch ..."
+ if [ "$mode" = 'cross' ]
+ then
+ add_otp_path "$mode" "$prefix"
+ export erl_xcomp_sysroot="$prefix"
+ fi
+ cd "$target_src_dir/$otp_dir"
+ # Don't link against libnsl: https://github.com/erlang/otp/pull/5558
+ sed -i -e '/LIBS="-lnsl/d' -e '/LIBS="-lsocket/d' \
+ 'lib/erl_interface/configure'
+ # The additional CFLAGS/LIBS below are required by --enable-static-nifs.
+ # The "-ldl" flag specifically is only needed for ODBC, though.
+ $configure \
+ --prefix="$prefix" \
+ --with-ssl="$prefix" \
+ --with-odbc="$prefix" \
+ --without-javac \
+ --disable-dynamic-ssl-lib \
+ --enable-static-nifs \
+ CFLAGS="$CFLAGS -Wl,-L$prefix/lib" \
+ LIBS='-lcrypto -ldl'
+ make
+ make install
+ if [ "$mode" = 'native' ]
+ then add_otp_path "$mode" "$prefix"
+ else unset erl_xcomp_sysroot
+ fi
+ cd "$OLDPWD"
+
+ info "Building Elixir $elixir_vsn for $arch ..."
+ cd "$target_src_dir/$elixir_dir"
+ make install PREFIX="$prefix"
+ cd "$OLDPWD"
+
+ export PATH="$saved_path"
+}
+#.
+
+#' Build the actual release.
+build_rel()
+{
+ local mode="$1"
+ local target="$2"
+ local prefix="$3"
+ local arch="$(arch_name "$target")"
+ local rel_dir="$PWD/_build/prod"
+ local target_data_dir="$prefix/$rel_name"
+ local target_dst_dir="$prefix/$rel_name-$rel_vsn"
+ local target_dst_tar="$rel_name-$rel_vsn-linux-$arch.tar.gz"
+ local saved_path="$PATH"
+
+ #
+ # The "$ct_prefix_dir/$target/$target/bin" directory contains cross
+ # compilation tools without "$target-" prefix. We add it to the PATH,
+ # just in case tools are called without prefix somewhere. However, we
+ # try to use the prefixed tools everywhere, so it should be possible to
+ # omit this directory from the path if desired. See also:
+ #
+ # https://stackoverflow.com/a/24243789
+ #
+ export PATH="$ct_prefix_dir/$target/bin:$ct_prefix_dir/$target/$target/bin:$PATH"
+ export CC="$target-gcc"
+ export CXX="$target-g++"
+ export CPP="$target-cpp"
+ export LD="$target-ld"
+ export AS="$target-as"
+ export AR="$target-ar"
+ export NM="$target-nm"
+ export RANLIB="$target-ranlib"
+ export OBJCOPY="$target-objcopy"
+ export STRIP="$target-strip"
+ export CPPFLAGS="-I$prefix/include"
+ export CFLAGS="-g0 -O2 -pipe -fomit-frame-pointer -static-libgcc $CPPFLAGS"
+ export CXXFLAGS="$CFLAGS -static-libstdc++"
+ export LDFLAGS="-L$prefix/lib -static-libgcc -static-libstdc++"
+ export ERL_COMPILER_OPTIONS='[deterministic, no_debug_info]'
+
+ if [ "$mode" = 'cross' ]
+ then configure="./configure --host=$target --build=$platform"
+ else configure='./configure'
+ fi
+
+ if [ $have_current_deps = false ]
+ then build_deps "$mode" "$target" "$prefix"
+ fi
+
+ add_otp_path "$mode" "$prefix"
+
+ if [ "$mode" = 'native' ] # In order to only do this once.
+ then
+ info "Fetching Mix dependencies"
+ mix local.hex --force
+ mix local.rebar --force
+ fi
+
+ info "Removing old $rel_name builds"
+ rm -rf '_build' 'deps'
+
+ info "Building $rel_name $rel_vsn for $arch ..."
+ ./autogen.sh
+ eimp_cflags='-fcommon'
+ eimp_libs='-lwebp -ljpeg -lpng -lz -lm'
+ export CC="$CC -Wl,-ldl" # Required by (statically linking) epam.
+ export LIBS="$eimp_libs -lcrypto -lpthread -ldl"
+ export CFLAGS="$CFLAGS $eimp_cflags"
+ export LDFLAGS="$LDFLAGS $eimp_libs"
+ if [ "$mode" = 'cross' ]
+ then
+ # Hand over --host/--build to configure scripts of dependencies.
+ export host_alias="$target"
+ export build_alias="$platform"
+ fi
+ # The cache variable makes cross compilation work.
+ ac_cv_erlang_root_dir="$prefix/lib/erlang" $configure \
+ --with-rebar='mix' \
+ --with-sqlite3="$prefix" \
+ --enable-user="$rel_name" \
+ --enable-all \
+ --disable-erlang-version-check
+ make deps
+ sed -i 's/ *-lstdc++//g' 'deps/'*'/rebar.config'* # Link statically.
+ if [ "$mode" = 'cross' ]
+ then
+ ln -s "$prefix/lib/erlang" 'lib/erlang'
+ erts_dir=$(ls -1d 'lib/erlang/erts-'*)
+ ei_inc="$prefix/lib/erlang/lib/erl_interface-"*'/include'
+ ei_lib="$prefix/lib/erlang/lib/erl_interface-"*'/lib'
+ export LDLIBS='-lpthread'
+ export ERL_EI_INCLUDE_DIR=$(ls -1d $ei_inc)
+ export ERL_EI_LIBDIR=$(ls -1d $ei_lib)
+ sed -i "/include_executables/a\\
+ include_erts: \"$erts_dir\"," 'mix.exs'
+ fi
+ make rel
+ if [ "$mode" = 'cross' ]
+ then
+ sed -i '/include_erts/d' 'mix.exs'
+ rm 'lib/erlang'
+ unset LDLIBS ERL_EI_INCLUDE_DIR ERL_EI_LIBDIR
+ unset host_alias build_alias
+ fi
+
+ info "Putting together $rel_name $rel_vsn archive for $arch ..."
+ mkdir "$target_dst_dir"
+ tar -C "$target_dst_dir" -xzf "$rel_dir/$rel_tar"
+ create_data_dir "$target_dst_dir" "$target_data_dir"
+ add_systemd_unit "$target_dst_dir"
+ add_captcha_script "$target_dst_dir"
+ edit_ejabberdctl "$target_dst_dir"
+ remove_unused_files "$target_dst_dir"
+ strip_files "$target_dst_dir" "$STRIP"
+ tar -C "$prefix" --owner="$rel_name" --group="$rel_name" -cf - \
+ "$rel_name" "$rel_name-$rel_vsn" | gzip -9 >"$target_dst_tar"
+ rm -rf "$target_dst_dir" "$target_data_dir"
+
+ info "Created $target_dst_tar successfully."
+
+ unset CC CXX CPP LD AS AR NM RANLIB OBJCOPY STRIP
+ unset CFLAGS CXXFLAGS LDFLAGS LIBS ERL_COMPILER_OPTIONS
+ export PATH="$saved_path"
+}
+#.
+
+if [ "${CHECK_DEPS:-true}" = 'true' ]
+then
+ if have_browser
+ then
+ check_configured_dep_vsns
+ else
+ error 'Cannot check dependency versions.'
+ error 'Install a browser or set CHECK_DEPS=false'
+ exit 1
+ fi
+else
+ info "Won't check dependency versions."
+fi
+
+if ! mkdir -p "$root_dir"
+then
+ error 'Set BUILD_DIR to a usable build directory path.'
+ exit 1
+fi
+
+check_built_dep_vsns
+
+info 'Removing old bootstrap tools ...'
+rm -rf "$bootstrap_dir"
+mkdir "$bootstrap_dir"
+
+if [ $have_current_deps = true ]
+then
+ info 'Dependencies are up-to-date ...'
+else
+ # Keep existing toolchains but rebuild everything else.
+ info 'Removing old builds ...'
+ rm -rf "$build_dir"
+ mkdir "$build_dir"
+
+ info 'Removing old source ...'
+ rm -rf "$src_dir"
+ mkdir "$src_dir"
+
+ info 'Downloading dependencies ...'
+ cd "$src_dir"
+ curl -LO "http://crosstool-ng.org/download/crosstool-ng/$crosstool_tar"
+ curl -LO "https://ftp.gnu.org/gnu/termcap/$termcap_tar"
+ curl -LO "https://github.com/libexpat/libexpat/releases/download/R_$(printf '%s' "$expat_vsn" | sed 's/\./_/g')/$expat_tar"
+ curl -LO "https://zlib.net/$zlib_tar"
+ curl -LO "https://pyyaml.org/download/libyaml/$yaml_tar"
+ curl -LO "https://www.openssl.org/source/$ssl_tar"
+ curl -LO "https://github.com/erlang/otp/releases/download/OTP-$otp_vsn/$otp_tar"
+ curl -LO "https://github.com/elixir-lang/elixir/archive/v$elixir_vsn.tar.gz"
+ curl -LO "https://github.com/linux-pam/linux-pam/releases/download/v$pam_vsn/$pam_tar"
+ curl -LO "https://download.sourceforge.net/libpng/$png_tar"
+ curl -LO "https://www.ijg.org/files/$jpeg_tar"
+ curl -LO "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$webp_tar"
+ curl -LO "https://github.com/libgd/libgd/releases/download/gd-$gd_vsn/$gd_tar"
+ curl -LO "http://www.unixodbc.org/$odbc_tar"
+ curl -LO "https://www.sqlite.org/$(date '+%Y')/$sqlite_tar" \
+ || curl -LO "https://www.sqlite.org/$(date -d '1 year ago' '+%Y')/$sqlite_tar" \
+ || curl -LO "https://www.sqlite.org/$(date -d '2 years ago' '+%Y')/$sqlite_tar"
+ cd "$OLDPWD"
+fi
+
+mkdir "$bootstrap_dir/bin"
+export PATH="$bootstrap_dir/bin:$PATH" # For ct-ng.
+export LC_ALL='C.UTF-8' # Elixir insists on a UTF-8 environment.
+
+for target in $targets
+do
+ prefix="$build_dir/$(arch_name "$target")"
+ toolchain_dir="$ct_prefix_dir/$target"
+
+ if [ "$(uname -m)-linux-gnu" = "$target" ]
+ then mode='native'
+ else mode='cross'
+ fi
+ build_toolchain "$target" "$toolchain_dir"
+ build_rel "$mode" "$target" "$prefix"
+done
+
+save_built_dep_vsns
+
+info "Build started: $build_start"
+info "Build ended: $(date '+%F %T')"
+
+# vim:set foldmarker=#',#. foldmethod=marker:
diff --git a/tools/make-installers b/tools/make-installers
new file mode 100755
index 000000000..d54a90bd8
--- /dev/null
+++ b/tools/make-installers
@@ -0,0 +1,369 @@
+#!/bin/sh
+
+# Build installers for Linux/x64 and Linux/arm64.
+#
+# Author: Holger Weiss .
+#
+# Copyright (c) 2022 ProcessOne, SARL.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+set -u
+
+myself=${0##*/}
+architectures='x64 arm64'
+iteration=1
+
+usage()
+{
+ echo >&2 "Usage: $myself [-i ]"
+ exit 2
+}
+
+while getopts i: opt
+do
+ case $opt in
+ i)
+ iteration="$OPTARG"
+ ;;
+ \?)
+ usage
+ ;;
+ esac
+done
+shift $((OPTIND - 1))
+
+if ! [ -e 'mix.exs' ] || ! [ -e "tools/$myself" ]
+then
+ echo >&2 "Please call this script from the repository's root directory."
+ exit 2
+elif [ $# -ne 0 ]
+then
+ usage
+fi
+if type 'makeself' >'/dev/null'
+then makeself='makeself'
+elif type 'makeself.sh' >'/dev/null'
+then makeself='makeself.sh'
+else
+ echo >&2 'This script requires makeself: https://makeself.io'
+ exit 1
+fi
+
+rel_name='ejabberd'
+rel_vsn=$(git describe --tags | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]')
+home_url='https://www.ejabberd.im'
+doc_url='https://docs.ejabberd.im'
+upgrade_url="$doc_url/admin/upgrade/#specific-version-upgrade-notes"
+admin_url="$doc_url/admin/installation/#administration-account"
+default_code_dir="/opt/$rel_name-$rel_vsn"
+default_data_dir="/opt/$rel_name"
+tmp_dir=$(mktemp -d "/tmp/.$rel_name.XXXXXX")
+
+trap 'rm -rf "$tmp_dir"' INT TERM EXIT
+umask 022
+
+create_help_file()
+{
+ local file="$1"
+
+ cat >"$file" <<-EOF
+ This is the $rel_name $rel_vsn-$iteration installer for linux-$arch
+
+ Visit:
+ $home_url
+
+ ejabberd documentation site:
+ $doc_url
+
+ EOF
+}
+
+create_setup_script()
+{
+ local dir="$1"
+
+ cat >"$dir/setup" <<-EOF
+ #!/bin/sh
+
+ set -e
+ set -u
+
+ export PATH='/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin'
+
+ user_agrees()
+ {
+ local question="\$*"
+
+ if [ -t 0 ]
+ then
+ read -p "\$question (y/n) [n] " response
+ case "\$response" in
+ [Yy]|[Yy][Ee][Ss])
+ return 0
+ ;;
+ [Nn]|[Nn][Oo]|'')
+ return 1
+ ;;
+ *)
+ echo 'Please respond with "yes" or "no".'
+ user_agrees "\$question"
+ ;;
+ esac
+ else # Assume 'yes' if not running interactively.
+ return 0
+ fi
+ }
+
+ if [ \$(id -u) = 0 ]
+ then
+ is_superuser=true
+ else
+ is_superuser=false
+ echo "Running without superuser privileges (installer wasn't invoked"
+ echo 'with "sudo"), cannot perform system-wide installation this way.'
+ if ! user_agrees 'Continue anyway?'
+ then
+ echo 'Aborting installation.'
+ exit 1
+ fi
+ fi
+
+ if [ \$is_superuser = true ]
+ then
+ code_dir='$default_code_dir'
+ data_dir='$default_data_dir'
+ user_name='$rel_name'
+ group_name='$rel_name'
+ elif user_agrees "Install $rel_name below \$HOME/opt?"
+ then
+ code_dir="\$HOME/opt/$rel_name-$rel_vsn"
+ data_dir="\$HOME/opt/$rel_name"
+ user_name="\$(id -u -n)"
+ group_name="\$(id -g -n)"
+ else
+ read -p 'Installation prefix: ' prefix
+ if printf '%s' "\$prefix" | grep -q '^/'
+ then
+ code_dir="\$prefix/$rel_name-$rel_vsn"
+ data_dir="\$prefix/$rel_name"
+ user_name="\$(id -u -n)"
+ group_name="\$(id -g -n)"
+ else
+ echo >&2 'Prefix must be specified as an absolute path.'
+ echo >&2 'Aborting installation.'
+ exit 1
+ fi
+ fi
+
+ prefix="\$(dirname "\$code_dir")"
+ conf_dir="\$data_dir/conf"
+ pem_file="\$conf_dir/server.pem"
+ uninstall_file="\$code_dir/uninstall.txt"
+
+ if [ -e '/run/systemd/system' ]
+ then is_systemd=true
+ else is_systemd=false
+ fi
+ if [ -e "\$data_dir" ]
+ then is_upgrade=true
+ else is_upgrade=false
+ fi
+ if id -u "\$user_name" >'/dev/null' 2>&1
+ then user_exists=true
+ else user_exists=false
+ fi
+
+ echo
+ echo 'The following installation paths will be used:'
+ echo "- \$code_dir"
+ if [ \$is_upgrade = true ]
+ then echo "- \$data_dir (existing files won't be modified)"
+ else echo "- \$data_dir (for configuration, database, and log files)"
+ fi
+ if [ \$is_superuser = true ]
+ then
+ if [ \$is_systemd = true ]
+ then
+ echo '- /etc/systemd/system/$rel_name.service'
+ if [ \$is_upgrade = false ]
+ then echo 'The $rel_name service is going to be enabled and started.'
+ fi
+ fi
+ if [ \$user_exists = false ]
+ then echo 'The $rel_name user is going to be created.'
+ fi
+ fi
+ if ! user_agrees 'Install $rel_name $rel_vsn now?'
+ then
+ echo 'Aborting installation.'
+ exit 1
+ fi
+ echo
+
+ if [ \$user_exists = false ] && [ \$is_superuser = true ]
+ then useradd -r -d "\$data_dir" "\$user_name"
+ fi
+
+ host=\$(hostname --fqdn 2>'/dev/null' || :)
+ if [ -z "\$host" ]
+ then host='localhost'
+ fi
+
+ mkdir -p "\$prefix"
+ tar -cf - '$rel_name' | tar --skip-old-files -C "\$prefix" -xf -
+ tar -cf - '$rel_name-$rel_vsn' | tar -C "\$prefix" -xf -
+
+ if [ \$is_superuser = true ]
+ then
+ if [ \$is_upgrade = false ]
+ then chown -R -h "\$user_name:\$group_name" "\$data_dir"
+ fi
+ chown -R -h "\$(id -u -n):\$group_name" "\$code_dir"
+ chmod -R g+rX "\$code_dir"
+ chmod '4750' "\$code_dir/lib/epam-"*'/priv/bin/epam'
+ else
+ sed -i "s/^INSTALLUSER=.*/INSTALLUSER=\"\$user_name\"/" \
+ "\$code_dir/bin/${rel_name}ctl"
+ sed -i "s/^USER=.*/USER=\$user_name/" \
+ "\$code_dir/bin/$rel_name.init"
+ sed -i \
+ -e "s/^User=.*/User=\$user_name/" \
+ -e "s/^Group=.*/Group=\$group_name/" \
+ "\$code_dir/bin/$rel_name.service"
+ fi
+ if [ "\$code_dir" != '$default_code_dir' ]
+ then
+ sed -i "s|$default_code_dir|\$code_dir|g" \
+ "\$code_dir/bin/${rel_name}ctl" \
+ "\$code_dir/bin/$rel_name.init" \
+ "\$code_dir/bin/$rel_name.service"
+ fi
+ if [ "\$data_dir" != '$default_data_dir' ]
+ then
+ sed -i "s|$default_data_dir|\$data_dir|g" \
+ "\$code_dir/bin/${rel_name}ctl" \
+ "\$code_dir/bin/$rel_name.init" \
+ "\$code_dir/bin/$rel_name.service" \
+ "\$data_dir/conf/$rel_name.yml" \
+ "\$data_dir/conf/${rel_name}ctl.cfg"
+ fi
+
+ if [ \$is_upgrade = false ]
+ then
+ sed -i "s/ - localhost$/ - \$host/" "\$conf_dir/$rel_name.yml"
+ openssl req -x509 \
+ -batch \
+ -nodes \
+ -newkey rsa:4096 \
+ -keyout "\$pem_file" \
+ -out "\$pem_file" \
+ -days 3650 \
+ -subj "/CN=\$host" >'/dev/null' 2>&1 || :
+ if ! [ -e "\$pem_file" ]
+ then
+ echo 'Failed to create a TLS certificate for $rel_name.' >&2
+ elif [ \$is_superuser = true ]
+ then
+ chown "\$user_name:\$group_name" "\$pem_file"
+ fi
+ fi
+
+ case \$is_systemd,\$is_superuser in
+ true,true)
+ cp "\$code_dir/bin/$rel_name.service" '/etc/systemd/system/'
+ systemctl -q daemon-reload
+ if [ \$is_upgrade = false ]
+ then systemctl -q --now enable '$rel_name'
+ fi
+ ;;
+ true,false)
+ echo 'You might want to install a systemd unit (see the'
+ echo "\$code_dir/bin directory for an example)."
+ ;;
+ false,*)
+ echo 'You might want to install an init script (see the'
+ echo "\$code_dir/bin directory for an example)."
+ ;;
+ esac
+
+ echo
+ echo '$rel_name $rel_vsn has been installed successfully.'
+ echo
+
+ cat >"\$uninstall_file" <<-_EOF
+ # To uninstall $rel_name, first remove the service. If you're using systemd:
+ systemctl --now disable $rel_name
+ rm -f /etc/systemd/system/$rel_name.service
+
+ # Remove the binary files:
+ rm -rf \$code_dir
+
+ # If you want to remove your configuration, database and logs:
+ rm -rf \$data_dir
+ _EOF
+ if [ \$is_superuser = true ]
+ then
+ cat >>"\$uninstall_file" <<-_EOF
+
+ # To remove the user running $rel_name:
+ userdel \$user_name
+ _EOF
+ fi
+
+ if [ \$is_upgrade = false ]
+ then
+ if [ \$is_systemd = true ] && [ \$is_superuser = true ]
+ then
+ echo 'Now you can check $rel_name is running correctly:'
+ echo ' systemctl status $rel_name'
+ echo
+ fi
+ echo 'Next you may want to edit $rel_name.yml to set up hosts,'
+ echo 'register an account and grant it admin rigts, see:'
+ echo
+ echo '$admin_url'
+ else
+ echo 'Please check the following web site for upgrade notes:'
+ echo
+ echo '$upgrade_url'
+ echo
+ if [ \$is_systemd = true ] && [ \$is_superuser = true ]
+ then
+ echo 'If everything looks fine, restart the $rel_name service:'
+ echo ' systemctl restart $rel_name'
+ else
+ echo 'If everything looks fine, restart the $rel_name service.'
+ fi
+ fi
+ EOF
+ chmod +x "$dir/setup"
+}
+
+for arch in $architectures
+do
+ tar_name="$rel_name-$rel_vsn-linux-$arch.tar.gz"
+ installer_name="$rel_name-$rel_vsn-$iteration-linux-$arch.run"
+
+ test -e "$tar_name" || tools/make-binaries
+ echo "$myself: Putting together installer for $arch ..."
+ tar -C "$tmp_dir" -xzpf "$tar_name"
+ create_help_file "$tmp_dir/help.txt"
+ create_setup_script "$tmp_dir"
+ "$makeself" --help-header "$tmp_dir/help.txt" \
+ "$tmp_dir" "$installer_name" "$rel_name $rel_vsn" './setup'
+ find "$tmp_dir" -mindepth 1 -delete
+done
+echo "$myself: Created installers successfully."
diff --git a/tools/make-packages b/tools/make-packages
new file mode 100755
index 000000000..3b3388ae8
--- /dev/null
+++ b/tools/make-packages
@@ -0,0 +1,240 @@
+#!/bin/sh
+
+# Build DEB and RPM packages for Linux/x64 and Linux/arm64.
+#
+# Author: Holger Weiss .
+#
+# Copyright (c) 2022 ProcessOne, SARL.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+set -u
+
+myself=${0##*/}
+architectures='x64 arm64'
+iteration=1
+
+usage()
+{
+ echo >&2 "Usage: $myself [-i ]"
+ exit 2
+}
+
+while getopts i: opt
+do
+ case $opt in
+ i)
+ iteration="$OPTARG"
+ ;;
+ \?)
+ usage
+ ;;
+ esac
+done
+shift $((OPTIND - 1))
+
+if ! [ -e 'mix.exs' ] || ! [ -e "tools/$myself" ]
+then
+ echo >&2 "Please call this script from the repository's root directory."
+ exit 2
+elif [ $# -ne 0 ]
+then
+ usage
+fi
+if ! type fpm >'/dev/null'
+then
+ echo >&2 'This script requires fpm: https://fpm.readthedocs.io'
+ exit 1
+fi
+
+rel_name='ejabberd'
+rel_vsn=$(git describe --tags | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]')
+conf_dir="/opt/$rel_name/conf"
+pem_file="$conf_dir/server.pem"
+tmp_dir=$(mktemp -d "/tmp/.$myself.XXXXXX")
+
+trap 'rm -rf "$tmp_dir"' INT TERM EXIT
+umask 022
+
+create_scripts()
+{
+ local dir="$1"
+
+ cat >"$dir/before-install" <<-EOF
+ if ! getent group '$rel_name' >'/dev/null'
+ then groupadd -r '$rel_name'
+ fi
+ if ! getent passwd '$rel_name' >'/dev/null'
+ then useradd -r -m -d '/opt/$rel_name' -g '$rel_name' '$rel_name'
+ fi
+ if ! [ -e '$pem_file' ]
+ then
+ if ! [ -e '/opt/$rel_name' ] # Huh?
+ then install -o '$rel_name' -g '$rel_name' -m 750 -d '/opt/$rel_name'
+ fi
+ if ! [ -e '$conf_dir' ]
+ then install -o '$rel_name' -g '$rel_name' -m 750 -d '$conf_dir'
+ fi
+ host=\$(hostname --fqdn 2>'/dev/null' || :)
+ if [ -z "\$host" ]
+ then host='localhost'
+ fi
+ openssl req -x509 \
+ -batch \
+ -nodes \
+ -newkey rsa:4096 \
+ -keyout '$pem_file' \
+ -out '$pem_file' \
+ -days 3650 \
+ -subj "/CN=\$host" >'/dev/null' 2>&1 || :
+ if [ -e '$pem_file' ]
+ then chown '$rel_name:$rel_name' '$pem_file'
+ else echo 'Failed to create a TLS certificate for ejabberd.' >&2
+ fi
+ fi
+ if ! [ -e '/opt/$rel_name/database' ]
+ then install -o '$rel_name' -g '$rel_name' -m 750 -d '/opt/$rel_name/database'
+ fi
+ if ! [ -e '/opt/$rel_name/logs' ]
+ then install -o '$rel_name' -g '$rel_name' -m 750 -d '/opt/$rel_name/logs'
+ fi
+ EOF
+
+ cat >"$dir/after-install" <<-EOF
+ host=\$(hostname --fqdn 2>'/dev/null' || :)
+ if [ -n "\$host" ]
+ then sed -i "s/ - localhost$/ - \$host/" '$conf_dir/$rel_name.yml'
+ fi
+ chown 'root:$rel_name' '/opt/$rel_name-$rel_vsn/lib/epam-'*'/priv/bin/epam'
+ chmod '4750' '/opt/$rel_name-$rel_vsn/lib/epam-'*'/priv/bin/epam'
+ chown -R -h '$rel_name:$rel_name' '/opt/$rel_name'
+ chmod 'o-rwx' '/opt/$rel_name/'*
+ EOF
+
+ cat >"$dir/after-upgrade" <<-EOF
+ chown 'root:$rel_name' '/opt/$rel_name-$rel_vsn/lib/epam-'*'/priv/bin/epam'
+ chmod '4750' '/opt/$rel_name-$rel_vsn/lib/epam-'*'/priv/bin/epam'
+ EOF
+
+ cat >"$dir/after-remove" <<-EOF
+ rm -f '/opt/$rel_name/.erlang.cookie'
+ if getent passwd '$rel_name' >'/dev/null'
+ then userdel '$rel_name'
+ fi
+ if getent group '$rel_name' >'/dev/null'
+ then groupdel '$rel_name'
+ fi
+ EOF
+}
+
+package_architecture()
+{
+ local target="$1"
+ local host_target="$(uname -m)-$target"
+
+ case $host_target in
+ x86_64-x64)
+ printf 'native'
+ ;;
+ x86_64-arm64)
+ printf 'arm64'
+ ;;
+ *)
+ echo >&2 "Unsupported host/target combination: $host_target"
+ exit 1
+ ;;
+ esac
+}
+
+make_package()
+{
+ local output_type="$1"
+ local architecture="$(package_architecture "$2")"
+ local work_dir="$3"
+ local include_dirs="$4"
+
+ cd "$work_dir" # FPM's "--chdir" option doesn't work (as I'd expect).
+ fpm --output-type "$output_type" \
+ --input-type 'dir' \
+ --name "$rel_name" \
+ --version "$rel_vsn" \
+ --iteration "$iteration" \
+ --license 'GPL-2+' \
+ --category 'net' \
+ --provides 'stun-server' \
+ --provides 'turn-server' \
+ --provides 'xmpp-server' \
+ --no-depends \
+ --no-auto-depends \
+ --deb-maintainerscripts-force-errorchecks \
+ --deb-systemd-enable \
+ --deb-systemd-auto-start \
+ --deb-systemd "./$rel_name.service" \
+ --deb-init "./$rel_name" \
+ --rpm-init "./$rel_name" \
+ --config-files "$conf_dir" \
+ --directories "/opt/$rel_name" \
+ --directories "/opt/$rel_name-$rel_vsn" \
+ --architecture "$architecture" \
+ --maintainer 'ejabberd Maintainers ' \
+ --vendor 'ProcessOne, SARL' \
+ --description 'Robust and scalable XMPP/MQTT/SIP server.' \
+ --url 'https://ejabberd.im' \
+ --before-install './before-install' \
+ --after-install './after-install' \
+ --before-upgrade './before-install' \
+ --after-upgrade './after-upgrade' \
+ --after-remove './after-remove' \
+ $include_dirs
+ cd "$OLDPWD"
+}
+
+for arch in $architectures
+do
+ tar_name="$rel_name-$rel_vsn-linux-$arch.tar.gz"
+ arch_dir="$tmp_dir/$arch"
+ opt_dir="$arch_dir/opt"
+ etc_dir="$arch_dir/etc"
+ bin_dir="$arch_dir/usr/sbin"
+ dst_dir="$opt_dir/$rel_name-$rel_vsn"
+
+ test -e "$tar_name" || tools/make-binaries
+
+ echo "$myself: Putting together DEB and RPM packages for $arch ..."
+
+ mkdir -p "$opt_dir" "$bin_dir"
+ tar -C "$opt_dir" -xzf "$tar_name"
+
+ cat >"$bin_dir/${rel_name}ctl" <<-EOF
+ #!/bin/sh
+ exec '/opt/$rel_name-$rel_vsn/bin/${rel_name}ctl' "\$@"
+ EOF
+ chmod +x "$bin_dir/${rel_name}ctl"
+
+ mkdir -p "$etc_dir/systemd/system"
+ mv "$dst_dir/bin/$rel_name.service" "$etc_dir/systemd/system"
+ mv "$dst_dir/bin/$rel_name.init" "$arch_dir/$rel_name"
+ sed -i \
+ "s|opt/$rel_name-$rel_vsn/bin/${rel_name}ctl|usr/sbin/${rel_name}ctl|g" \
+ "$etc_dir/systemd/system/$rel_name.service" "$arch_dir/$rel_name"
+
+ create_scripts "$arch_dir"
+ make_package 'rpm' "$arch" "$arch_dir" './opt ./usr ./etc'
+ mv "$etc_dir/systemd/system/$rel_name.service" "$arch_dir"
+ rm -r "$etc_dir"
+ make_package 'deb' "$arch" "$arch_dir" './opt ./usr'
+ mv "$arch_dir/$rel_name"?$rel_vsn*.??? .
+done
+echo "$myself: Created DEB and RPM packages successfully."
diff --git a/tools/opt_types.sh b/tools/opt_types.sh
index 8de6d8945..71d69a5d4 100755
--- a/tools/opt_types.sh
+++ b/tools/opt_types.sh
@@ -483,8 +483,12 @@ options_required([Form]) ->
proplists:get_value(required, Opts, []).
format_file(Path, Form) ->
+ Line = case erl_syntax:get_pos(Form) of
+ {L, _} -> L;
+ L -> L
+ end,
filename:rootname(filename:basename(Path)) ++ ".erl:" ++
- integer_to_list(erl_syntax:get_pos(Form)).
+ integer_to_list(Line).
module(Path) ->
list_to_atom(filename:rootname(filename:basename(Path))).
@@ -524,6 +528,8 @@ fold_opt(File, Fun, Acc, AbsCode) ->
Fun(File, {#state.defaults, Form}, Acc1);
{attribute, {spec, {spec, {{options, 0}, Spec}}}} ->
Fun(File, {#state.specs, hd(Spec)}, Acc1);
+ {attribute, {spec, {{options, 0}, Spec}}} ->
+ Fun(File, {#state.specs, hd(Spec)}, Acc1);
_ ->
Acc1
end
@@ -539,6 +545,8 @@ fold_mod_opt(File, Fun, Acc, AbsCode) ->
Fun(File, {#state.mod_defaults, Form}, Acc1);
{attribute, {spec, {spec, {{mod_options, 1}, Spec}}}} ->
Fun(File, {#state.mod_specs, hd(Spec)}, Acc1);
+ {attribute, {spec, {{mod_options, 1}, Spec}}} ->
+ Fun(File, {#state.mod_specs, hd(Spec)}, Acc1);
_ ->
Acc1
end
@@ -572,6 +580,8 @@ is_behaviour(AbsCode, Mod) ->
{attribute, {Attr, {_, Mod}}}
when Attr == behaviour orelse Attr == behavior ->
true;
+ {attribute, {behaviour, Mod}} ->
+ true;
_ ->
false
end
diff --git a/tools/update-deps-releases.pl b/tools/update-deps-releases.pl
index 4f7e55972..b450bd69b 100755
--- a/tools/update-deps-releases.pl
+++ b/tools/update-deps-releases.pl
@@ -413,7 +413,7 @@ while (1) {
my $cmd = show_commands($old_deps ? (U => "Update dependency") : (),
$changed_deps ? (T => "Tag new release") : (),
@operations ? (A => "Apply changes") : (),
- R => "Refresh repositiories",
+ R => "Refresh repositories",
H => "What release to Hex",
E => "Exit");
last if $cmd eq "E";
diff --git a/tools/xml_compress_gen.erl b/tools/xml_compress_gen.erl
index 5b43c5925..157e6cc8a 100644
--- a/tools/xml_compress_gen.erl
+++ b/tools/xml_compress_gen.erl
@@ -4,7 +4,7 @@
%% Created : 14 Sep 2018 Pawel Chmielowski
%%
%%
-%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%
%% This program is free software; you can redistribute it and/or
%% modify it under the terms of the GNU General Public License as
diff --git a/vars.config.in b/vars.config.in
index 9b3ac7585..e80e49782 100644
--- a/vars.config.in
+++ b/vars.config.in
@@ -1,6 +1,6 @@
%%%----------------------------------------------------------------------
%%%
-%%% ejabberd, Copyright (C) 2002-2021 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2022 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -21,7 +21,6 @@
%% Macros
{roster_gateway_workaround, @roster_gateway_workaround@}.
{full_xml, @full_xml@}.
-{db_type, @db_type@}.
{debug, @debug@}.
{new_sql_schema, @new_sql_schema@}.
@@ -30,6 +29,7 @@
%% Dependencies
{odbc, @odbc@}.
+{mssql, @mssql@}.
{mysql, @mysql@}.
{pgsql, @pgsql@}.
{sqlite, @sqlite@}.
@@ -51,13 +51,19 @@
{release, true}.
{release_dir, "${SCRIPT_DIR%/*}"}.
{sysconfdir, "{{release_dir}}/etc"}.
+{erts_dir, "{{release_dir}}/erts-${ERTS_VSN#erts-}"}.
{installuser, "@INSTALLUSER@"}.
-{erl, "{{release_dir}}/{{erts_vsn}}/bin/erl"}.
-{epmd, "{{release_dir}}/{{erts_vsn}}/bin/epmd"}.
+{erl, "{{erts_dir}}/bin/erl"}.
+{epmd, "{{erts_dir}}/bin/epmd"}.
{localstatedir, "{{release_dir}}/var"}.
{libdir, "{{release_dir}}/lib"}.
{docdir, "{{release_dir}}/doc"}.
+%% OTP release
+{config_dir, "{{release_dir}}/conf"}.
+{logs_dir, "{{release_dir}}/logs"}.
+{spool_dir, "{{release_dir}}/database"}.
+
{latest_deps, @latest_deps@}.
{system_deps, @system_deps@}.
+
+
+ 
+
+ 
+
+ 
+