rpms/jabberd/F-10 jabberd,1.8,1.9 jabberd.spec,1.26,1.27

[Adrian Reber]

Author: adrian

Update of /cvs/extras/rpms/jabberd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22356

Modified Files:
	jabberd jabberd.spec 
Log Message:
* Tue Mar 31 2009 Adrian Reber <adrian at lisas.de> -2.2.4-3
- backport Bernie's changes to fix #492378
  "jabberd probably does not close its stdin/stdout/stderr"



Index: jabberd
===================================================================
RCS file: /cvs/extras/rpms/jabberd/F-10/jabberd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jabberd	7 Aug 2006 09:45:11 -0000	1.8
+++ jabberd	31 Mar 2009 10:10:57 -0000	1.9
@@ -73,12 +73,12 @@
 		args="-c ${confPath}/${prog}.xml"
 		if [ ${prog} == "c2s" -a ! -z "$C2S_AS_ROOT" ]; then
 			if [ $C2S_AS_ROOT == "yes" ]; then
-				daemon --user root "${progsPath}/${prog} ${args} & 2> /dev/null"
+				daemon --user root "${progsPath}/${prog} ${args} >/dev/null 2>&1 &"
 			else
-				daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+				daemon --user jabber "${progsPath}/${prog} ${args} >/dev/null 2>&1 &"
 			fi
 		else
-			daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+			daemon --user jabber "${progsPath}/${prog} ${args} >/dev/null 2>&1 &"
 		fi
 		retval=$?
 		echo


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/F-10/jabberd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jabberd.spec	30 Mar 2009 17:02:08 -0000	1.26
+++ jabberd.spec	31 Mar 2009 10:10:57 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.2.4
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.4.tar.bz2
@@ -191,6 +191,10 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Tue Mar 31 2009 Adrian Reber <adrian at lisas.de> -2.2.4-3
+- backport Bernie's changes to fix #492378
+  "jabberd probably does not close its stdin/stdout/stderr"
+
 * Mon Mar 30 2009 Dennis Gilmore <dennis at ausil.us> -2.2.4-2.1
 - someone had already tagged -2  so go to -2.1