rpms/cyrus-imapd/F-12 cyrus-imapd.init, 1.4, 1.5 cyrus-imapd.spec, 1.63, 1.64

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3631

Modified Files:
	cyrus-imapd.init cyrus-imapd.spec 
Log Message:
* Fri Nov 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-5
- fix sourcing of /etc/sysconfig/cyrus-imapd (#533320)



Index: cyrus-imapd.init
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-12/cyrus-imapd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cyrus-imapd.init	9 Oct 2009 12:17:12 -0000	1.4
+++ cyrus-imapd.init	6 Nov 2009 13:25:02 -0000	1.5
@@ -20,8 +20,8 @@ lockfile=/var/lock/subsys/cyrus-imapd
 pidfile=/var/run/cyrus-master.pid
 prog="cyrus-imapd"
 
-if [ -f /etc/sysconfig/dovecot ]; then
-    . /etc/sysconfig/dovecot
+if [ -f /etc/sysconfig/$prog ]; then
+    . /etc/sysconfig/$prog
 fi
 
 # check if the config files are present


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-12/cyrus-imapd.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- cyrus-imapd.spec	5 Nov 2009 13:37:47 -0000	1.63
+++ cyrus-imapd.spec	6 Nov 2009 13:25:02 -0000	1.64
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -736,6 +736,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Nov 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-5
+- fix sourcing of /etc/sysconfig/cyrus-imapd (#533320)
+
 * Thu Nov 05 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-4
 - do not fill logs with mail (de)compression messages (#528093)
 
@@ -748,7 +751,7 @@ fi
 * Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-1
 - fix buffer overflow in cyrus sieve (CVE-2009-3235)
 
--* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.14-6
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.14-6
 - use password-auth common PAM configuration instead of system-auth
 
 * Mon Sep 07 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-5