From 6a3bf7f5678d61989ec7a82b348dad47b777f14f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Aug 25 2009 19:46:25 +0000 Subject: Fix for bz# 502361 --- diff --git a/ejabberd-ejabberdctl_fix.diff b/ejabberd-ejabberdctl_fix.diff index 4fd5087..8c8a27b 100644 --- a/ejabberd-ejabberdctl_fix.diff +++ b/ejabberd-ejabberdctl_fix.diff @@ -1,11 +1,11 @@ ---- src/ejabberdctl.template.fix_user 2008-08-27 13:37:52.000000000 +0400 -+++ src/ejabberdctl.template 2008-10-02 09:24:52.000000000 +0400 +--- src/ejabberdctl.template 2009-04-01 19:23:51.000000000 +0400 ++++ src/ejabberdctl.template 2009-08-25 23:06:19.258685929 +0400 @@ -9,13 +9,14 @@ # define default environment variables NODE=ejabberd -HOST=localhost -+HOST=`hostname -s` ++HOST=`hostname -s 2>/dev/null || echo "localhost"` ERLANG_NODE=$NODE@$HOST ERL=@erl@ -ROOTDIR=@rootdir@ @@ -33,19 +33,50 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log SASL_LOG_PATH=$LOGS_DIR/sasl.log DATETIME=`date "+%Y%m%d-%H%M%S"` -@@ -139,11 +140,13 @@ +@@ -75,14 +76,16 @@ + # start server + start () + { +- $ERL \ ++ ERL_COMMAND="$ERL \ + $NAME $ERLANG_NODE \ + -noinput -detached \ + -pa $EJABBERD_EBIN \ +- -mnesia dir "\"$EJABBERD_DB\"" \ ++ -mnesia dir \\\"$EJABBERD_DB\\\" \ + -s ejabberd \ +- -sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\} \ +- $ERLANG_OPTS $ARGS "$@" ++ -sasl sasl_error_logger \{file,\\\"$SASL_LOG_PATH\\\"\} \ ++ $ERLANG_OPTS $ARGS "$@" \ ++ " ++ /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND" + } + + # attach to server +@@ -105,7 +108,7 @@ + read foo + echo "" + $ERL \ +- $NAME ${NODE}debug \ ++ $NAME debug-${ERLANG_NODE} \ + -remsh $ERLANG_NODE \ + $ERLANG_OPTS $ARGS "$@" + } +@@ -139,11 +142,13 @@ # common control function ctl () { - $ERL \ +- $NAME ejabberdctl \ + ERL_COMMAND="$ERL \ - $NAME ejabberdctl \ ++ $NAME ctl-${ERLANG_NODE} \ -noinput \ -pa $EJABBERD_EBIN \ - -s ejabberd_ctl -extra $ERLANG_NODE $@ + -s ejabberd_ctl -extra $ERLANG_NODE $@ \ + " -+ /sbin/runuser -s /bin/bash - ejabberd -c "$ERL_COMMAND" ++ /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND" result=$? case $result in 0) :;; diff --git a/ejabberd.init b/ejabberd.init index 07fb91c..61edaff 100644 --- a/ejabberd.init +++ b/ejabberd.init @@ -25,23 +25,17 @@ if [ ! "$CONFIG_FILE" ]; then CONFIG_FILE=/etc/ejabberd/ejabberd.cfg fi -node=`hostname -s` - start() { echo -n $"Starting ejabberd: " if [ "$ULIMIT_MAX_FILES" ]; then ulimit -n $ULIMIT_MAX_FILES fi - daemon --user=ejabberd --check=ejabberd \ - "erl" "-pa @libdir@/ejabberd/ebin \ - -sname ejabberd \ - -s ejabberd \ - -ejabberd config \\\"$CONFIG_FILE\\\" \ - log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \ - -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \ - -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \ - -kernel inetrc \\\"/etc/ejabberd/inetrc\\\" \ - -detached" + daemon /usr/sbin/ejabberdctl start + --config $CONFIG_FILE \ + --ctl-config /etc/ejabberd/ejabberdctl.cfg \ + --logs "/var/log/ejabberd" \ + --spool "/var/lib/ejabberd/spool" \ + 2>/dev/null RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ejabberd echo @@ -51,7 +45,7 @@ start() { stop() { # Stop daemons. echo -n "Shutting down ejabberd: " - /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure + daemon /usr/sbin/ejabberdctl stop 2>/dev/null RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd echo @@ -85,7 +79,7 @@ case "$1" in [ -f /var/lock/subsys/ejabberd ] && restart || : ;; status) - /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status" + /usr/sbin/ejabberdctl status ;; *) echo "Usage: ejabberd {start|stop|restart|force-reload|condrestart|try-restart|status}" diff --git a/ejabberd.spec b/ejabberd.spec index 968f7ea..4da6bf6 100644 --- a/ejabberd.spec +++ b/ejabberd.spec @@ -1,6 +1,6 @@ Name: ejabberd Version: 2.0.5 -Release: 2%{?dist} +Release: 6%{?dist} Summary: A distributed, fault-tolerant Jabber/XMPP server Group: Applications/Internet @@ -27,7 +27,7 @@ Source11: ejabberd.pam # Fedora-specific stuff - fixing paths Patch1: ejabberd-build.patch -# BZ# 439583, 452326, 451554, 465196 +# BZ# 439583, 452326, 451554, 465196, 502361 Patch2: ejabberd-ejabberdctl_fix.diff # Use ejabberd as an example for PAM service name Patch3: ejabberd-ejabberd_cfg_pam_name.diff @@ -35,7 +35,6 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.diff # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch Patch4: ejabberd-captcha.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel @@ -57,7 +56,7 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service -#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253 +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253 ExcludeArch: ppc64 %description @@ -115,9 +114,9 @@ fi %prep %setup -q %patch1 -p0 -b .fix_paths -%patch2 -p0 -b .fix_user +%patch2 -p0 -b .fix_ctl %patch3 -p0 -b .pam_name -#%patch4 -p1 -b .captcha +%patch4 -p1 -b .captcha dos2unix src/odbc/mssql.sql cp %{S:4} src @@ -177,8 +176,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql -# tools/captcha.sh +%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg @@ -220,6 +218,18 @@ rm -rf %{buildroot} %endif %changelog +* Tue Aug 25 2009 Peter Lemenkov 2.0.5-6 +- Since now, we using only ejabberdctl in the init-script (bz# 502361) + +* Fri Aug 21 2009 Tomas Mraz - 2.0.5-5 +- rebuilt with new openssl + +* Fri Jul 24 2009 Fedora Release Engineering - 2.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Apr 21 2009 Peter Lemenkov 2.0.5-3 +- CAPTCHA is back - let's test it. + * Sat Apr 4 2009 Peter Lemenkov 2.0.5-2 - Really disable CAPTCHA diff --git a/import.log b/import.log index cfbc82b..2099aea 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ ejabberd-2_0_3-1_fc10:EL-5:ejabberd-2.0.3-1.fc10.src.rpm:1232988681 ejabberd-2_0_4-1_fc10:EL-5:ejabberd-2.0.4-1.fc10.src.rpm:1237117472 ejabberd-2_0_5-1_fc10:EL-5:ejabberd-2.0.5-1.fc10.src.rpm:1238790091 ejabberd-2_0_5-2_fc10:EL-5:ejabberd-2.0.5-2.fc10.src.rpm:1238820305 +ejabberd-2_0_5-6_fc11:EL-5/:ejabberd-2.0.5-6.fc11.src.rpm:1251229535