From 01789f71703ef55ae24e9b95c3654794a708cf17 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Tue, 2 Dec 2008 16:58:17 +0000
Subject: [PATCH] - revert changes from 1:1.1.6-2 and 1:1.1.6-1 - password can
 be stored in different file readable only for root via     !include_try
 directive

---
 dovecot.spec | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/dovecot.spec b/dovecot.spec
index 5446b06..8affaf1 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -2,7 +2,7 @@ Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
 Version: 1.1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -226,7 +226,7 @@ chmod 700 $RPM_BUILD_ROOT/var/run/dovecot/login
 	
 # Install dovecot.conf and dovecot-openssl.cnf
 mkdir -p $RPM_BUILD_ROOT%{ssldir}
-install -p -m640 dovecot-example.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot.conf
+install -p -m644 dovecot-example.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot.conf
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/dovecot-*example.conf # dovecot seems to install this by itself
 install -p -m644 doc/dovecot-openssl.cnf $RPM_BUILD_ROOT%{ssldir}/dovecot-openssl.cnf
 
@@ -307,7 +307,7 @@ fi
 %files -f libs.filelist
 %defattr(-,root,root,-)
 %doc %{docdir}-%{version}
-%attr(0640,root,mail) %config(noreplace) %{_sysconfdir}/dovecot.conf
+%config(noreplace) %{_sysconfdir}/dovecot.conf
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dovecot
 %{_initrddir}/dovecot
 %config(noreplace) %{_sysconfdir}/pam.d/dovecot
@@ -318,19 +318,6 @@ fi
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/certs/dovecot.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/private/dovecot.pem
 %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/checkpassword-reply
-%attr(2755,root,mail) %{_libexecdir}/%{name}/deliver
-%{_libexecdir}/%{name}/dict
-%{_libexecdir}/%{name}/dovecot-auth
-%{_libexecdir}/%{name}/gdbhelper
-%{_libexecdir}/%{name}/idxview
-%{_libexecdir}/%{name}/imap
-%{_libexecdir}/%{name}/imap-login
-%{_libexecdir}/%{name}/logview
-%{_libexecdir}/%{name}/pop3
-%{_libexecdir}/%{name}/pop3-login
-%{_libexecdir}/%{name}/rawlog
-%{_libexecdir}/%{name}/ssl-build-param
 %{_sbindir}/dovecot
 %{_sbindir}/dovecotpw
 %attr(0755,root,dovecot) %dir /var/run/dovecot
@@ -387,6 +374,11 @@ fi
 
 
 %changelog
+* Tue Dec 2 2008 Michal Hlavinka <mhlavink@redhat.com> - 1:1.1.7-2
+- revert changes from 1:1.1.6-2 and 1:1.1.6-1
+- password can be stored in different file readable only for root 
+  via !include_try directive
+
 * Tue Dec 2 2008 Michal Hlavinka <mhlavink@redhat.com> - 1:1.1.7-1
 - update to upstream version 1.1.7