rpms/ejabberd/F-10 ejabberd-decrease_buffers_in_mod_proxy65.patch, NONE, 1.1 ejabberd-fixed_delays_in_s2s.patch, NONE, 1.1 ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff, NONE, 1.1 ejabberd-turn_off_error_messages_in_mod_caps.patch, NONE, 1.1 ejabberd.logrotate, 1.3, 1.4 ejabberd.spec, 1.37, 1.38 import.log, 1.12, 1.13

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25123/F-10

Modified Files:
	ejabberd.logrotate ejabberd.spec import.log 
Added Files:
	ejabberd-decrease_buffers_in_mod_proxy65.patch 
	ejabberd-fixed_delays_in_s2s.patch 
	ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff 
	ejabberd-turn_off_error_messages_in_mod_caps.patch 
Log Message:
Fixed couple of possible issues and added several patches from Debian

ejabberd-decrease_buffers_in_mod_proxy65.patch:
 mod_proxy65_stream.erl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ejabberd-decrease_buffers_in_mod_proxy65.patch ---
Patch by Evgeniy Khramtsov decreases proxy65 buffer sizes (size 65535 is known
to confuse users with tight shapers).

Index: src/mod_proxy65/mod_proxy65_stream.erl
===================================================================
--- src/mod_proxy65/mod_proxy65_stream.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/mod_proxy65/mod_proxy65_stream.erl	2009-04-05 22:51:20.000000000 +0200
@@ -89,8 +89,8 @@
     process_flag(trap_exit, true),
     AuthType = gen_mod:get_opt(auth_type, Opts, anonymous),
     Shaper = gen_mod:get_opt(shaper, Opts, none),
-    RecvBuf = gen_mod:get_opt(recbuf, Opts, 65535),
-    SendBuf = gen_mod:get_opt(sndbuf, Opts, 65535),
+    RecvBuf = gen_mod:get_opt(recbuf, Opts, 8192),
+    SendBuf = gen_mod:get_opt(sndbuf, Opts, 8192),
     TRef = erlang:send_after(?WAIT_TIMEOUT, self(), stop),
     inet:setopts(Socket, [{active, true}, {recbuf, RecvBuf}, {sndbuf, SendBuf}]),
     {ok, wait_for_init, #state{host      = Host,

ejabberd-fixed_delays_in_s2s.patch:
 ejabberd_s2s_in.erl  |    2 +-
 ejabberd_s2s_out.erl |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE ejabberd-fixed_delays_in_s2s.patch ---
Patch by Sergei Golovan increases timeouts in S2S and removes horrible 5-minute
delay between remote server connection attempts after a falure (in case of
server is down it would be reasonable, but what happens much more often is a
network split when the delay is inadmissible).

Index: src/ejabberd_s2s_in.erl
===================================================================
--- src/ejabberd_s2s_in.erl	2009-04-01 17:23:52.000000000 +0200
+++ src/ejabberd_s2s_in.erl	2009-04-05 22:51:20.000000000 +0200
@@ -352,7 +352,7 @@
             case {ejabberd_s2s:allow_host(To, From),
                   lists:member(LTo, ejabberd_router:dirty_get_all_domains())} of
                 {true, true} ->
-		    ejabberd_s2s_out:terminate_if_waiting_delay(To, From),
+		    %%ejabberd_s2s_out:terminate_if_waiting_delay(To, From),
 		    ejabberd_s2s_out:start(To, From,
 					   {verify, self(),
 					    Key, StateData#state.streamid}),
Index: src/ejabberd_s2s_out.erl
===================================================================
--- src/ejabberd_s2s_out.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/ejabberd_s2s_out.erl	2009-04-05 22:51:20.000000000 +0200
@@ -93,7 +93,7 @@
 %% Only change this value if you now what your are doing:
 -define(FSMLIMITS,[]).
 %% -define(FSMLIMITS, [{max_queue, 2000}]).
--define(FSMTIMEOUT, 30000).
+-define(FSMTIMEOUT, 60000).
 
 %% We do not block on send anymore.
 -define(TCP_SEND_TIMEOUT, 15000).
@@ -227,8 +227,8 @@
 	{error, _Reason} ->
 	    ?INFO_MSG("s2s connection: ~s -> ~s (remote server not found)",
 		      [StateData#state.myname, StateData#state.server]),
-	    wait_before_reconnect(StateData)
-	    %%{stop, normal, StateData}
+	    %%wait_before_reconnect(StateData)
+	    {stop, normal, StateData}
     end;
 open_socket(stop, StateData) ->
     ?INFO_MSG("s2s connection: ~s -> ~s (stopped in open socket)",

ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff:
 ejabberd.app |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff ---
Index: src/ejabberd.app
===================================================================
--- src/ejabberd.app	2009-04-01 17:23:51.000000000 +0200
+++ src/ejabberd.app	2009-04-05 22:51:20.000000000 +0200
@@ -70,6 +70,7 @@
 	     mod_caps,
 	     mod_configure2,
 	     mod_configure,
+	     mod_ctlextra,
 	     mod_disco,
 	     mod_echo,
 	     mod_http_bind,

ejabberd-turn_off_error_messages_in_mod_caps.patch:
 mod_caps.erl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ejabberd-turn_off_error_messages_in_mod_caps.patch ---
Patch by Sergei Golovan turns unnecessary error messages into debug messages.

Index: src/mod_caps.erl
===================================================================
--- src/mod_caps.erl	2009-04-01 17:23:51.000000000 +0200
+++ src/mod_caps.erl	2009-04-05 22:51:20.000000000 +0200
@@ -301,7 +301,7 @@
 		      end),
 		    gen_server:cast(self(), visit_feature_queries);
 		error ->
-		    ?ERROR_MSG("ID '~s' matches no query", [ID])
+		    ?DEBUG("ID '~s' matches no query", [ID])
 	    end;
 	{error, _} ->
 	    %% XXX: if we get error, we cache empty feature not to probe the client continuously
@@ -315,7 +315,7 @@
 		      end),
 		    gen_server:cast(self(), visit_feature_queries);
 		error ->
-		    ?ERROR_MSG("ID '~s' matches no query", [ID])
+		    ?DEBUG("ID '~s' matches no query", [ID])
 	    end;
 	    %gen_server:cast(self(), visit_feature_queries),
 	    %?DEBUG("Error IQ reponse from ~s:~n~p", [jlib:jid_to_string(From), SubEls]);


Index: ejabberd.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.logrotate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ejabberd.logrotate	24 May 2008 18:16:55 -0000	1.3
+++ ejabberd.logrotate	9 Sep 2009 10:49:04 -0000	1.4
@@ -4,6 +4,6 @@
     create 0640 ejabberd ejabberd
     sharedscripts
     postrotate
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true
+    runuser -s /bin/bash - ejabberd -c "/usr/sbin/ejabberdctl reopen-log" >/dev/null 2>/dev/null || true
     endscript
 }


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ejabberd.spec	25 Aug 2009 19:41:14 -0000	1.37
+++ ejabberd.spec	9 Sep 2009 10:49:04 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -34,6 +34,14 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 # CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
 # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
 Patch4: ejabberd-captcha.patch
+# Mention mod_ctlextra as an ejabberd module
+Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
+# Turn off unnecessary error messages in mod_caps (backport from upstream)
+Patch6: ejabberd-turn_off_error_messages_in_mod_caps.patch
+# Decrease mod_proxy65 send/receive buffers (backport from upstream)
+Patch7: ejabberd-decrease_buffers_in_mod_proxy65.patch
+# fixed delays in s2s connections
+Patch8: ejabberd-fixed_delays_in_s2s.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,8 +92,8 @@ Documentation for ejabberd.
 if [ ! -f ejabberd.pem ]
 then
     echo "Generating SSL certificate /etc/ejabberd/ejabberd.pem..."
-    HOSTNAME=$(hostname -s)
-    DOMAINNAME=$(hostname -d)
+    HOSTNAME=$(hostname -s 2>/dev/null || echo "localhost")
+    DOMAINNAME=$(hostname -d 2>/dev/null || echo "localdomain")
     openssl req -new -x509 -days 365 -nodes -out ejabberd.pem \
                 -keyout ejabberd.pem > /dev/null 2>&1 <<+++
 .
@@ -117,6 +125,11 @@ fi
 %patch2 -p0 -b .fix_ctl
 %patch3 -p0 -b .pam_name
 %patch4 -p1 -b .captcha
+%patch5 -p0 -b .mod_ctlextra
+%patch6 -p0 -b .error_msg
+%patch7 -p0 -b .decrease_buffers
+%patch8 -p0 -b .s2s
+
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -218,12 +231,17 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
-- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-8
+- Fixed possible issue in the config file for logrotate
+- Fixed possible issue while creating dummy certificate
+- Added patches #5,6,7,8 from Debian
 
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
+* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-7
 - rebuilt with new openssl
 
+* Tue Aug 25 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-6
+- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	25 Aug 2009 19:41:14 -0000	1.12
+++ import.log	9 Sep 2009 10:49:04 -0000	1.13
@@ -10,3 +10,4 @@ ejabberd-2_0_5-1_fc10:F-10:ejabberd-2.0.
 ejabberd-2_0_5-2_fc10:F-10:ejabberd-2.0.5-2.fc10.src.rpm:1238819669
 ejabberd-2_0_5-3_fc10:F-10:ejabberd-2.0.5-3.fc10.src.rpm:1240304980
 ejabberd-2_0_5-6_fc11:F-10:ejabberd-2.0.5-6.fc11.src.rpm:1251229162
+ejabberd-2_0_5-8_fc11:F-10:ejabberd-2.0.5-8.fc11.src.rpm:1252493295