rpms/ejabberd/devel ejabberd-ejabberdctl_fix.diff, 1.5, 1.6 ejabberd.init, 1.7, 1.8 ejabberd.spec, 1.40, 1.41 import.log, 1.11, 1.12

Peter Lemenkov peter at fedoraproject.org
Tue Aug 25 19:36:29 UTC 2009 

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13665/devel

Modified Files:
	ejabberd-ejabberdctl_fix.diff ejabberd.init ejabberd.spec 
	import.log 
Log Message:
Fix for bz# 502361

ejabberd-ejabberdctl_fix.diff:
 ejabberdctl.template |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ejabberd-ejabberdctl_fix.diff	2 Oct 2008 05:28:56 -0000	1.5
+++ ejabberd-ejabberdctl_fix.diff	25 Aug 2009 19:36:29 -0000	1.6
@@ -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) :;;


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ejabberd.init	26 Jan 2009 16:42:58 -0000	1.7
+++ ejabberd.init	25 Aug 2009 19:36:29 -0000	1.8
@@ -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}"


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- ejabberd.spec	21 Aug 2009 13:12:35 -0000	1.40
+++ ejabberd.spec	25 Aug 2009 19:36:29 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.5
-Release:        5%{?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
@@ -56,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
@@ -114,7 +114,7 @@ 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
 dos2unix src/odbc/mssql.sql
@@ -218,6 +218,9 @@ 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)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.5-5
 - rebuilt with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log	21 Apr 2009 09:03:57 -0000	1.11
+++ import.log	25 Aug 2009 19:36:29 -0000	1.12
@@ -9,3 +9,4 @@ ejabberd-2_0_4-1_fc10:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-1_fc10:HEAD:ejabberd-2.0.5-1.fc10.src.rpm:1238789339
 ejabberd-2_0_5-2_fc10:HEAD:ejabberd-2.0.5-2.fc10.src.rpm:1238819481
 ejabberd-2_0_5-3_fc10:HEAD:ejabberd-2.0.5-3.fc10.src.rpm:1240304532
+ejabberd-2_0_5-6_fc11:HEAD:ejabberd-2.0.5-6.fc11.src.rpm:1251228870

More information about the fedora-extras-commits mailing list