From b71fd616894fcc04525db549b509216ef3c3b21e Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Thu, 17 Sep 2009 15:08:17 +0000
Subject: [PATCH] updated to 1.2.5

---
 .cvsignore   |  2 +-
 dovecot.init |  6 +++++-
 dovecot.spec | 22 +++++++++++++++++-----
 sources      |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 2d1f363..90cf3b8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-dovecot-1.2.4.tar.gz
+dovecot-1.2.5.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
 dovecot-1.2.4-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz
diff --git a/dovecot.init b/dovecot.init
index dfd4d7f..e694da0 100755
--- a/dovecot.init
+++ b/dovecot.init
@@ -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,6 +98,7 @@ case "$1" in
 	;;
   *)
 	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|status}"
+	[ $1 = 'usage' ] && exit 0
 	exit 2
 esac
 
diff --git a/dovecot.spec b/dovecot.spec
index 5edf90b..31f00b6 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,8 +1,8 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.4
-Release: 3%{?dist}
+Version: 1.2.5
+Release: 1%{?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-%{version}-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.4-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -355,7 +355,7 @@ fi
 %doc %{docdir}-%{version}
 %config(noreplace) %{_sysconfdir}/dovecot.conf
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dovecot
-%{_initrddir}/dovecot
+%{_initddir}/dovecot
 %config(noreplace) %{_sysconfdir}/pam.d/dovecot
 %dir %{ssldir}
 %dir %{ssldir}/certs
@@ -368,7 +368,6 @@ fi
 %{_sbindir}/dovecotpw
 %attr(0755,root,dovecot) %dir /var/run/dovecot
 %attr(0750,root,dovecot) %dir /var/run/dovecot/login
-#%attr(0755,root,dovecot) %{_libexecdir}/%{name}/mkcert.sh
 %attr(0750,dovecot,dovecot) %dir /var/lib/dovecot
 
 %if %{build_sieve}
@@ -435,6 +434,19 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Michal Hlavinka <mhlavink@redhat.com> - 1:1.2.5-1
+- updated to dovecot 1.2.5
+- Authentication: DIGEST-MD5 and RPA mechanisms no longer require
+  user's login realm to be listed in auth_realms. It only made
+  configuration more difficult without really providing extra security.
+- zlib plugin: Don't allow clients to save compressed data directly.
+  This prevents users from exploiting (most of the) potential security
+  holes in zlib/bzlib.
+- fix index file handling that could have caused an assert-crash
+- IMAP: Fixes to QRESYNC extension.
+- deliver: Don't send rejects to any messages that have Auto-Submitted
+  header. This avoids emails loops.
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz@redhat.com> - 1:1.2.4-3
 - use password-auth common PAM configuration instead of system-auth
 
diff --git a/sources b/sources
index 619f697..f049c58 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-3e5717d13e3d6b32d3f4b809df397dbf  dovecot-1.2.4.tar.gz
+8b057903d6a527dac964b51c5638c625  dovecot-1.2.5.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
 6dd2ef2d46b3b63238237455558a14e1  dovecot-1.2.4-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz