rpms/dovecot/F-9 dovecot-1.0-default-settings-passwd.patch, NONE, 1.1 dovecot.sysconfig, NONE, 1.1 dovecot.init, 1.4, 1.5 dovecot.spec, 1.104, 1.105

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/pkgs/rpms/dovecot/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24667

Modified Files:
	dovecot.init dovecot.spec 
Added Files:
	dovecot-1.0-default-settings-passwd.patch dovecot.sysconfig 
Log Message:
* Tue Jul 29 2008 Dan Horák <dan[at]danny.cz> - 1:1.0.15-11
- final solution for #445200 (put the password into /etc/sysconfig/dovecot)


dovecot-1.0-default-settings-passwd.patch:

--- NEW FILE dovecot-1.0-default-settings-passwd.patch ---
--- dovecot-1.0.15/dovecot-example.conf.passwd	2008-07-29 17:31:37.000000000 +0200
+++ dovecot-1.0.15/dovecot-example.conf	2008-07-29 17:31:55.000000000 +0200
@@ -93,6 +93,8 @@
 
 # If key file is password protected, give the password here. Alternatively
 # give it when starting dovecot with -p parameter.
+# Security note: if you have this config file world readable, then put the
+# password into /etc/sysconfig/dovecot.
 #ssl_key_password =
 
 # File containing trusted SSL certificate authorities. Set this only if you


--- NEW FILE dovecot.sysconfig ---
# Here you can specify the password for your SSL certificates
# so the main config file can be world readable. Other command
# line options can be specified too.
#
#OPTIONS="-p my_certificate_password"


Index: dovecot.init
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-9/dovecot.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dovecot.init	18 Jun 2008 13:15:08 -0000	1.4
+++ dovecot.init	29 Jul 2008 16:21:55 -0000	1.5
@@ -8,6 +8,7 @@
 # description: Dovecot Imap Server
 # processname: dovecot
 # config: /etc/dovecot.conf
+# config: /etc/sysconfig/dovecot
 # pidfile: /var/run/dovecot/master.pid
 
 ### BEGIN INIT INFO
@@ -27,6 +28,10 @@
 # Source function library.
 . /etc/init.d/functions
 
+if [ -f /etc/sysconfig/dovecot ]; then
+    . /etc/sysconfig/dovecot
+fi
+
 RETVAL=0
 prog="Dovecot Imap"
 exec="/usr/sbin/dovecot"
@@ -39,7 +44,7 @@
 	[ -f $config ] || exit 6
 
         echo -n $"Starting $prog: "
-	daemon --pidfile $pidfile $exec
+	daemon --pidfile $pidfile $exec $OPTIONS
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch  $lockfile
 	echo


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-9/dovecot.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- dovecot.spec	1 Jul 2008 19:51:10 -0000	1.104
+++ dovecot.spec	29 Jul 2008 16:21:55 -0000	1.105
@@ -1,7 +1,7 @@
 %define upstream 1.0.15
 %define sieve_upstream 1.0.3
 %define pkg_version 1.0.15
-%define my_release 10
+%define my_release 11
 %define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.3
 %define pkg_sieve_release %{my_release}%{?dist}
@@ -32,13 +32,13 @@
 Source6: perfect_maildir.pl
 Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_upstream}.tar.gz
+Source9: dovecot.sysconfig
 Patch100: dovecot-1.0.rc15-default-settings.patch
 Patch102: dovecot-1.0.rc2-pam-setcred.patch
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch105: dovecot-1.0.rc7-mkcert-paths.patch
 Patch106: dovecot-1.0.rc27-quota-warning.patch
-#Patch107: dovecot-1.1-unicodedata.patch
-#Patch200: dovecot-%{dovecot_hg}.patch
+Patch107: dovecot-1.0-default-settings-passwd.patch
 Patch200: dovecot-1.0.rc32-split.patch
 
 # XXX this patch needs review and forward porting
@@ -182,6 +182,7 @@
 %patch105 -p1 -b .mkcert-paths
 #%patch107 -p1 -b .unicodedata
 %patch106 -p1 -b .quota-warning
+%patch107 -p1 -b .passwd
 %patch200 -p1 -b .split
 #%patch200 -p1 -b .%{dovecot_hg}
 %patch1000 -p1 -b .winbind
@@ -253,6 +254,9 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/dovecot
 
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
+install -p -m 600 %{SOURCE9} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/dovecot
+
 # generate ghost .pem file
 mkdir -p $RPM_BUILD_ROOT/%{ssldir}/certs
 mkdir -p $RPM_BUILD_ROOT/%{ssldir}/private
@@ -366,7 +370,8 @@
 %files -f libs.filelist
 %defattr(-,root,root)
 %doc %{docdir}-%{version}  
-%attr(0640,dovecot,mail) %config(noreplace) %{_sysconfdir}/dovecot.conf
+%config(noreplace) %{_sysconfdir}/dovecot.conf
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dovecot
 %config %{_sysconfdir}/rc.d/init.d/dovecot
 %config(noreplace) %{_sysconfdir}/pam.d/dovecot
 %dir %{ssldir}
@@ -428,6 +433,9 @@
 
 
 %changelog
+* Tue Jul 29 2008 Dan Horák <dan[at]danny.cz> - 1:1.0.15-11
+- final solution for #445200 (put the password into /etc/sysconfig/dovecot)
+
 * Tue Jul  1 2008 Dan Horák <dan[at]danny.cz> - 1:1.0.15-10
 - bump release