rpms/ejabberd/F-8 ejabberd-ejabberdctl_fix.diff, NONE, 1.1 import.log, NONE, 1.1 ejabberd.spec, 1.18, 1.19

[Peter Lemenkov (peter)]

Author: peter

Update of /cvs/extras/rpms/ejabberd/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18512/F-8

Modified Files:
	ejabberd.spec 
Added Files:
	ejabberd-ejabberdctl_fix.diff import.log 
Log Message:
fixed BZ# 439583, 452326, 451554

ejabberd-ejabberdctl_fix.diff:

--- NEW FILE ejabberd-ejabberdctl_fix.diff ---
--- src/ejabberdctl.template	2008-05-20 14:22:03.000000000 +0400
+++ src/ejabberdctl.template	2008-06-22 19:41:03.000000000 +0400
@@ -9,12 +9,13 @@
 
 # define default environment variables
 NODE=ejabberd
-HOST=localhost
+HOST=`hostname | cut -d. -f1`
 ERLANG_NODE=$NODE@$HOST
-ROOTDIR=@rootdir@
+ROOTDIR=
+MAINDIR=
 EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg
 LOGS_DIR=$ROOTDIR/var/log/ejabberd/
-EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE
+EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/spool
 
 # read custom configuration
 CONFIG=$ROOTDIR/etc/ejabberd/ejabberdctl.cfg
@@ -42,10 +43,10 @@
 ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES"
 
 # define additional environment variables
-EJABBERD_EBIN=$ROOTDIR/var/lib/ejabberd/ebin
-EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs
-EJABBERD_SO_PATH=$ROOTDIR/var/lib/ejabberd/priv/lib
-EJABBERD_BIN_PATH=$ROOTDIR/var/lib/ejabberd/priv/bin
+EJABBERD_EBIN=$MAINDIR/ebin
+EJABBERD_MSGS_PATH=$MAINDIR/priv/msgs
+EJABBERD_SO_PATH=$MAINDIR/priv/lib
+EJABBERD_BIN_PATH=$MAINDIR/priv/bin
 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 @@
 # common control function
 ctl ()
 {
+    /sbin/runuser -s /bin/bash - ejabberd -c " \
     erl \
       $NAME ejabberdctl \
       -noinput \
       -pa $EJABBERD_EBIN \
-      -s ejabberd_ctl -extra $ERLANG_NODE $@
+      -s ejabberd_ctl -extra $ERLANG_NODE $@ \
+      "
     result=$?
     case $result in
     0) :;;


--- NEW FILE import.log ---
ejabberd-2_0_1-3_fc9:F-8:ejabberd-2.0.1-3.fc9.src.rpm:1214151206


Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/F-8/ejabberd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ejabberd.spec	29 May 2008 14:49:21 -0000	1.18
+++ ejabberd.spec	22 Jun 2008 16:14:00 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -24,6 +24,8 @@
 
 # Fedora-specific stuff - fixing paths
 Patch1: ejabberd-build.patch
+# BZ# 439583, 452326, 451554
+Patch2: ejabberd-ejabberdctl_fix.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -83,6 +85,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p0 -b .fix_paths
+%patch2 -p0 -b .fix_user
 dos2unix src/odbc/mssql.sql
 
 cp %{S:4} src
@@ -133,13 +136,7 @@
 %{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 
 # BZ# 439583
-%{__perl} -pi -e 's!ROOTDIR=\/usr!ROOTDIR=!g' %{buildroot}%{_sbindir}/ejabberdctl
-%{__perl} -pi -e 's!/var/lib/ejabberd/db/\$NODE!/var/lib/ejabberd/spool!g' %{buildroot}%{_sbindir}/ejabberdctl
-%{__perl} -pi -e 's!/var/lib/ejabberd/ebin!%{_libdir}/ejabberd/ebin!g' %{buildroot}%{_sbindir}/ejabberdctl
-%{__perl} -pi -e 's!/var/lib/ejabberd/priv/msgs!%{_libdir}/ejabberd/priv/msgs!g' %{buildroot}%{_sbindir}/ejabberdctl
-%{__perl} -pi -e 's!/var/lib/ejabberd/priv/lib!%{_libdir}/ejabberd/priv/lib!g' %{buildroot}%{_sbindir}/ejabberdctl
-%{__perl} -pi -e 's!/var/lib/ejabberd/priv/bin!%{_libdir}/ejabberd/priv/bin!g' %{buildroot}%{_sbindir}/ejabberdctl
-%{__perl} -pi -e 's!HOME=\$ROOTDIR/var/lib/ejabberd!HOME=%{_libdir}/ejabberd!g' %{buildroot}%{_sbindir}/ejabberdctl
+%{__perl} -pi -e 's!MAINDIR=!MAINDIR=%{_libdir}/ejabberd!g' %{buildroot}%{_sbindir}/ejabberdctl
 
 %clean
 rm -rf %{buildroot}
@@ -186,6 +183,9 @@
 %endif
 
 %changelog
+* Sun Jun 22 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-3
+-Fixed BZ# 439583, 452326, 451554
+
 * Thu May 29 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.1-2
 - Fixed BZ# 439583