rpms/dovecot/F-11 .cvsignore, 1.67, 1.68 dovecot.init, 1.6, 1.7 dovecot.spec, 1.143, 1.144 sources, 1.70, 1.71

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4551

Modified Files:
	.cvsignore dovecot.init dovecot.spec sources 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
- fix init script for case when no action was specified



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	6 Oct 2009 10:22:05 -0000	1.67
+++ .cvsignore	9 Oct 2009 19:04:46 -0000	1.68
@@ -1,4 +1,4 @@
 dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.5-managesieve-0.11.9.diff.gz
+dovecot-1.2.6-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz


Index: dovecot.init
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dovecot.init	29 Jul 2008 14:35:20 -0000	1.6
+++ dovecot.init	9 Oct 2009 19:04:46 -0000	1.7
@@ -28,7 +28,7 @@
 # Source function library.
 . /etc/init.d/functions
 
-if [ -f /etc/sysconfig/dovecot ]; then
+if [ -f /etc/sysconfig/dovecot -a $UID -eq 0 ]; then
     . /etc/sysconfig/dovecot
 fi
 
@@ -40,6 +40,7 @@ pidfile="/var/run/dovecot/master.pid"
 lockfile="/var/lock/subsys/dovecot"
 
 start() {
+	[ $UID -eq 0 ] || exit 4
 	[ -x $exec ] || exit 5
 	[ -f $config ] || exit 6
 
@@ -51,6 +52,7 @@ start() {
 }
 
 stop() {
+	[ $UID -eq 0 ] || exit 4
 	echo -n $"Stopping $prog: "
 	killproc -p $pidfile $exec
 	RETVAL=$?
@@ -59,6 +61,7 @@ stop() {
 }
 
 reload() {
+	[ $UID -eq 0 ] || exit 4
 	echo -n $"Reloading $prog: "
 	killproc -p $pidfile $exec -HUP
 	RETVAL=$?
@@ -95,7 +98,8 @@ case "$1" in
 	;;
   *)
 	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|status}"
-	exit 2
+	RETVAL=2
+	[ "$1" = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- dovecot.spec	6 Oct 2009 10:22:05 -0000	1.143
+++ dovecot.spec	9 Oct 2009 19:04:46 -0000	1.144
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -31,7 +31,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.5-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.6-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -434,6 +434,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
+- fix init script for case when no action was specified
+
 * Tue Oct 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-1
 - dovecot updated to 1.2.6
 - Added authtest utility for doing passdb and userdb lookups.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	6 Oct 2009 10:22:05 -0000	1.70
+++ sources	9 Oct 2009 19:04:46 -0000	1.71
@@ -1,4 +1,4 @@
 807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-22639d0bc4ff424282bd3f8fe8db9ab5  dovecot-1.2.5-managesieve-0.11.9.diff.gz
+615d5d1ad843654384ca11cf523c2bbc  dovecot-1.2.6-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz