- rel 4; logdb API update to match ejabberd >= 15.06; Thanks to Holger@ejabberd

diff --git a/ejabberd-mod_logdb.patch b/ejabberd-mod_logdb.patch
index 466c5952f2972e824a6bb44cb5fb09a87147bfe9..7e5ae18436c4b0d8a407f1a982b4135e6b3ddcd5 100644 (file)
--- a/ejabberd-mod_logdb.patch
+++ b/ejabberd-mod_logdb.patch
@@ -328,7 +328,7 @@ index 0000000..72f1982
 +% gen_server
 +-export([code_change/3,handle_call/3,handle_cast/2,handle_info/2,init/1,terminate/2]).
 +% hooks
-+-export([send_packet/3, receive_packet/4, remove_user/2]).
++-export([send_packet/4, receive_packet/5, remove_user/2]).
 +-export([get_local_identity/5,
 +         get_local_features/5,
 +         get_local_items/5,
@@ -780,20 +780,20 @@ index 0000000..72f1982
 +    {ok, State}.
 +
 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-+%
 +% ejabberd_hooks callbacks
-+%
 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 +% TODO: change to/from to list as sql stores it as list
-+send_packet(Owner, Peer, P) ->
++send_packet(P, _C2SState, Owner, Peer) ->
 +    VHost = Owner#jid.lserver,
 +    Proc = gen_mod:get_module_proc(VHost, ?PROCNAME),
-+    gen_server:cast(Proc, {addlog, to, Owner, Peer, P}).
++    gen_server:cast(Proc, {addlog, to, Owner, Peer, P}),
++    P.
 +
-+receive_packet(_JID, Peer, Owner, P) ->
++receive_packet(P, _C2SState, _JID, Peer, Owner) ->
 +    VHost = Owner#jid.lserver,
 +    Proc = gen_mod:get_module_proc(VHost, ?PROCNAME),
-+    gen_server:cast(Proc, {addlog, from, Owner, Peer, P}).
++    gen_server:cast(Proc, {addlog, from, Owner, Peer, P}),
++    P.
 +
 +remove_user(User, Server) ->
 +    LUser = jlib:nodeprep(User),

diff --git a/ejabberd.spec b/ejabberd.spec
index e6ac659c9baa173a1a99c16563abf81bbd9e2e9e..cb504dd23719bcae2d2ff215368835782c4d6d4d 100644 (file)
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -8,7 +8,7 @@ Summary:        Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):     Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:          ejabberd
 Version:       15.09
-Release:       3
+Release:       4
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz