rpms/ejabberd/F-12 .cvsignore, 1.16, 1.17 ejabberd-ejabberdctl_fix.diff, 1.8, 1.9 ejabberd.spec, 1.49, 1.50 import.log, 1.17, 1.18 sources, 1.18, 1.19

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1491/F-12

Modified Files:
	.cvsignore ejabberd-ejabberdctl_fix.diff ejabberd.spec 
	import.log sources 
Log Message:
Ver. 2.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	24 Dec 2009 12:08:44 -0000	1.16
+++ .cvsignore	25 Jan 2010 12:46:12 -0000	1.17
@@ -1 +1 @@
-ejabberd-2.1.1.tar.gz
+ejabberd-2.1.2.tar.gz

ejabberd-ejabberdctl_fix.diff:
 ejabberdctl.template |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ejabberd-ejabberdctl_fix.diff	10 Dec 2009 19:09:42 -0000	1.8
+++ ejabberd-ejabberdctl_fix.diff	25 Jan 2010 12:46:12 -0000	1.9
@@ -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


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ejabberd.spec	24 Dec 2009 12:08:44 -0000	1.49
+++ ejabberd.spec	25 Jan 2010 12:46:12 -0000	1.50
@@ -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 at gmail.com> 2.1.2-1
+- Ver. 2.1.2
+
 * Thu Dec 24 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.1-1
 - Ver. 2.1.1
 - Dropped patches 9,11,12,13 (accepted upstream)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- import.log	24 Dec 2009 12:08:44 -0000	1.17
+++ import.log	25 Jan 2010 12:46:12 -0000	1.18
@@ -15,3 +15,4 @@ ejabberd-2_0_5-10_fc11:F-12:ejabberd-2.0
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	24 Dec 2009 12:08:45 -0000	1.18
+++ sources	25 Jan 2010 12:46:12 -0000	1.19
@@ -1 +1 @@
-8a2b9925fc2790d0594a8d3b37183537  ejabberd-2.1.1.tar.gz
+9102802ae19312c26f85ceb977b519aa  ejabberd-2.1.2.tar.gz