rpms/jabberd/devel initscript-close-output.patch, NONE, 1.1 jabberd.spec, 1.30, 1.31

Bernie Innocenti bernie at fedoraproject.org
Tue Mar 31 09:10:41 UTC 2009


Author: bernie

Update of /cvs/pkgs/rpms/jabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9734

Modified Files:
	jabberd.spec 
Added Files:
	initscript-close-output.patch 
Log Message:
* Tue Mar 31 2009 Bernie Innocenti <bernie at codewiz.org> - 2.2.7.1-2
- fix rhbz#349714: jabberd does not close its stdin/stdout/stderr


initscript-close-output.patch:

--- NEW FILE initscript-close-output.patch ---
--- jabberd-2.2.5/tools/jabberd.rc.orig	2009-03-31 10:11:04.460273152 +0200
+++ jabberd-2.2.5/tools/jabberd.rc	2009-03-31 10:12:05.196309538 +0200
@@ -122,7 +122,7 @@ Start ( ) {
 		rm -f /var/lock/subsys/${prog}
 		rm -f ${pidPath}/${prog}.pid
 		args="-c ${confPath}/${prog}.xml"
-		${progsPath}/${prog} ${args} & 2> /dev/null
+		${progsPath}/${prog} ${args} & >/dev/null 2>&1
 		retval=$?
 		if [ ${retval} == 0 ]; then
 			StatusOK


Index: jabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabberd/devel/jabberd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jabberd.spec	26 Feb 2009 07:53:06 -0000	1.30
+++ jabberd.spec	31 Mar 2009 09:10:11 -0000	1.31
@@ -1,12 +1,13 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.2.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.7.1.tar.bz2
 Source1: jabberd
 Source2: jabberd.sysconfig
+Patch0: initscript-close-output.patch
 URL: http://jabberd2.xiaoka.com/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel libidn-devel expat-devel
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %define _sysconfdir /etc/jabberd
@@ -190,6 +192,9 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Tue Mar 31 2009 Bernie Innocenti <bernie at codewiz.org> - 2.2.7.1-2
+- fix rhbz#349714: jabberd does not close its stdin/stdout/stderr
+
 * Thu Feb 26 2009 Adrian Reber <adrian at lisas.de> - 2.2.7.1-1
 - updated to 2.2.7.1
 - "Workaround for buggy Java TLS implementation (affecting OpenFire and GTalk)"




More information about the fedora-extras-commits mailing list