[rpms/ejabberd] f45: Fix for rhbz #564686

[rpms/ejabberd] f45: Fix for rhbz #564686

[Peter Lemenkov]

A new commit has been pushed.

Repo   : rpms/ejabberd
Branch : f45
Commit : 18843b37ee684a1bf06b4c111797a98b3fdd9704
Author : Peter Lemenkov <peter@fedoraproject.org>
Date   : 2010-03-18T12:08:44+00:00
Stats  : +38/-4 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/ejabberd/c/18843b37ee684a1bf06b4c111797a98b3fdd9704?branch=f45

Log:
Fix for rhbz #564686

---
diff --git a/ejabberd-0010-Change-directory-to-readable-by-everyone-in-order-to.patch b/ejabberd-0010-Change-directory-to-readable-by-everyone-in-order-to.patch
new file mode 100644
index 0000000..67cbddc
--- /dev/null
+++ b/ejabberd-0010-Change-directory-to-readable-by-everyone-in-order-to.patch
@@ -0,0 +1,29 @@
+From b02585f4b006441160cc0afd38293f214f4121c8 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Thu, 18 Mar 2010 14:57:21 +0300
+Subject: [PATCH] Change directory to readable by everyone in order to prevent error
+ messages like "File operation error: eacces" issue. See rhbz #564686.
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ src/ejabberdctl.template |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
+index 69c74d6..11bcac8 100644
+--- a/src/ejabberdctl.template
++++ b/src/ejabberdctl.template
+@@ -351,6 +351,10 @@ wait_for_status()
+     return $status
+ }
+ 
++# In order to prevent issues with "File operation error: eacces."
++# See rhbz #564686.
++cd /
++
+ case $ARGS in
+     ' start') start;;
+     ' debug') debug;;
+-- 
+1.6.6.1
+

diff --git a/ejabberd.init b/ejabberd.init
index 7d91fb0..102b799 100644
--- a/ejabberd.init
+++ b/ejabberd.init
@@ -85,9 +85,6 @@ restart() {
         start
 }
 
-# In order to prevent issues with "File operation error: eacces."
-cd /
-
 # See how we were called.
 case "$1" in
   start)

diff --git a/ejabberd.spec b/ejabberd.spec
index 2bd316c..259f51f 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -12,7 +12,7 @@
 
 Name:           ejabberd
 Version:        2.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -57,6 +57,9 @@ Patch7: ejabberd-0007-Fixed-typo.patch
 Patch8: ejabberd-0008-Quick-fix-for-error-nxdomain.patch
 # Cleanup redundant defines
 Patch9: ejabberd-0009-Replace-MSG-with-DEBUG.patch
+# Fix issue with "File operation error: eacces"
+Patch10:ejabberd-0010-Change-directory-to-readable-by-everyone-in-order-to.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -117,6 +120,7 @@ Documentation for ejabberd.
 %patch7 -p1 -b .gssapi_typo
 %patch8 -p1 -b .nxdomain_fix
 %patch9 -p1 -b .gssapi_cleanup
+%patch10 -p1 -b .fix_access
 
 dos2unix src/odbc/mssql2000.sql
 
@@ -371,6 +375,9 @@ rm -rf %{buildroot}
 %doc doc/yozhikheader.png
 
 %changelog
+* Thu Mar 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.3-4
+- Really fix issue with "File operation error: eacces".
+
 * Thu Mar 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.3-3
 - Relax access rights of /usr/sbin/ejabberdctl (from 0550 to 0755)
 - Invoke symlinked consolehelper instead of /usr/sbin/ejabberdctl

diff --git a/import.log b/import.log
index 8bc9eec..73983a1 100644
--- a/import.log
+++ b/import.log
@@ -20,3 +20,4 @@ ejabberd-2_1_2-2_fc12:HEAD:ejabberd-2.1.2-2.fc12.src.rpm:1264770769
 ejabberd-2_1_3-1_fc12:HEAD:ejabberd-2.1.3-1.fc12.src.rpm:1268409107
 ejabberd-2_1_3-2_fc12:HEAD:ejabberd-2.1.3-2.fc12.src.rpm:1268908062
 ejabberd-2_1_3-3_fc12:HEAD:ejabberd-2.1.3-3.fc12.src.rpm:1268910275
+ejabberd-2_1_3-4_fc12:HEAD:ejabberd-2.1.3-4.fc12.src.rpm:1268914064