From 3c431d7c4e6641dd63659f9bbc7e903e5c71f342 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <peter@fedoraproject.org>
Date: Jan 25 2010 12:46:12 +0000
Subject: Ver. 2.1.2


---

diff --git a/.cvsignore b/.cvsignore
index cb7b892..79517e7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ejabberd-2.1.1.tar.gz
+ejabberd-2.1.2.tar.gz
diff --git a/ejabberd-ejabberdctl_fix.diff b/ejabberd-ejabberdctl_fix.diff
index a8542aa..f431415 100644
--- a/ejabberd-ejabberdctl_fix.diff
+++ b/ejabberd-ejabberdctl_fix.diff
@@ -1,5 +1,5 @@
---- src/ejabberdctl.template	2009-11-06 22:53:19.000000000 +0300
-+++ src/ejabberdctl.template	2009-12-10 21:07:28.648659178 +0300
+--- src/ejabberdctl.template~	2010-01-18 16:03:20.000000000 +0300
++++ src/ejabberdctl.template	2010-01-25 15:24:48.967746180 +0300
 @@ -9,10 +9,10 @@
  
  # define default environment variables
@@ -22,15 +22,16 @@
  fi
  if [ "$EJABBERD_DOC_PATH" = "" ] ; then
      EJABBERD_DOC_PATH=@DOCDIR@
-@@ -60,14 +60,14 @@
- EJID=`id -g $INSTALLUSER`
+@@ -62,7 +62,7 @@
  EXEC_CMD="false"
- if [ $ID -eq 0 ] ; then
--	EXEC_CMD="su ${INSTALLUSER} -c"
+ for GID in $GIDS; do
+     if [ $GID -eq 0 ] ; then
+-	EXEC_CMD="su ${INSTALLUSER} -p -c"
 +	EXEC_CMD="/sbin/runuser -s /bin/bash -p ejabberd -c"
- fi
+     fi
+ done
  if [ "$ID" -eq "$EJID" ] ; then
- 	EXEC_CMD="sh -c"
+@@ -70,7 +70,7 @@
  fi
  if [ "$EXEC_CMD" = "false" ] ; then
  	echo "This command can only be run by root or the user $INSTALLUSER" >&2
diff --git a/ejabberd.spec b/ejabberd.spec
index 6ffdd41..63919fb 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -11,7 +11,7 @@
 %endif
 
 Name:           ejabberd
-Version:        2.1.1
+Version:        2.1.2
 Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
@@ -333,6 +333,9 @@ rm -rf %{buildroot}
 %doc doc/yozhikheader.png
 
 %changelog
+* Mon Jan 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.2-1
+- Ver. 2.1.2
+
 * Thu Dec 24 2009 Peter Lemenkov <lemenkov@gmail.com> 2.1.1-1
 - Ver. 2.1.1
 - Dropped patches 9,11,12,13 (accepted upstream)
diff --git a/import.log b/import.log
index d2d198a..fe85831 100644
--- a/import.log
+++ b/import.log
@@ -15,3 +15,4 @@ ejabberd-2_0_5-10_fc11:F-12:ejabberd-2.0.5-10.fc11.src.rpm:1257428464
 ejabberd-2_1_0-1_fc12:F-12:ejabberd-2.1.0-1.fc12.src.rpm:1258790540
 ejabberd-2_1_0-2_fc12:F-12:ejabberd-2.1.0-2.fc12.src.rpm:1260472047
 ejabberd-2_1_1-1_fc12:F-12:ejabberd-2.1.1-1.fc12.src.rpm:1261656365
+ejabberd-2_1_2-1_fc12:F-12:ejabberd-2.1.2-1.fc12.src.rpm:1264423541
diff --git a/sources b/sources
index b5e96a8..d2fe465 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a2b9925fc2790d0594a8d3b37183537  ejabberd-2.1.1.tar.gz
+9102802ae19312c26f85ceb977b519aa  ejabberd-2.1.2.tar.gz