rpms/dovecot/F-10 dovecot-1.1-default-settings.patch,1.4,1.5

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	dovecot-1.1-default-settings.patch 
Log Message:
trim patches


dovecot-1.1-default-settings.patch:

Index: dovecot-1.1-default-settings.patch
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/dovecot-1.1-default-settings.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dovecot-1.1-default-settings.patch	27 Jan 2009 12:52:19 -0000	1.4
+++ dovecot-1.1-default-settings.patch	22 May 2009 11:11:03 -0000	1.5
@@ -1,14 +1,15 @@
-diff -up dovecot-1.1.8/dovecot-example.conf.default-settings dovecot-1.1.8/dovecot-example.conf
---- dovecot-1.1.8/dovecot-example.conf.default-settings	2009-01-13 19:34:30.390937820 +0100
-+++ dovecot-1.1.8/dovecot-example.conf	2009-01-13 19:37:00.217687707 +0100
-@@ -10,17 +10,14 @@
+diff -up dovecot-1.1.15/dovecot-example.conf.default-settings dovecot-1.1.15/dovecot-example.conf
+--- dovecot-1.1.15/dovecot-example.conf.default-settings	2009-05-22 13:03:21.917918093 +0200
++++ dovecot-1.1.15/dovecot-example.conf	2009-05-22 13:06:12.132543772 +0200
+@@ -10,18 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
  # Default values are shown for each setting, it's not required to uncomment
--# any of the lines. Exception to this are paths, they're just examples with
--# the real defaults being based on configure options. The paths listed here
--# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
--# --with-ssldir=/etc/ssl
+-# those. These are exceptions to this though: No sections (e.g. namespace {})
+-# or plugin settings are added by default, they're listed only as examples.
+-# Paths are also just examples with the real defaults being based on configure
+-# options. The paths listed here are for configure --prefix=/usr
+-# --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl
 +# any of the lines.
  
  # Base directory where to store runtime data.
@@ -21,7 +22,7 @@ diff -up dovecot-1.1.8/dovecot-example.c
  
  # A space separated list of IP or host addresses where to listen in for
  # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-@@ -42,13 +39,13 @@
+@@ -43,13 +39,13 @@
  #     listen = *:12000
  #     ..
  #   }
@@ -37,7 +38,7 @@ diff -up dovecot-1.1.8/dovecot-example.c
  
  # Should all IMAP and POP3 processes be killed when Dovecot master process
  # shuts down. Setting this to "no" means that Dovecot can be upgraded without
-@@ -95,8 +92,8 @@
+@@ -96,8 +92,8 @@
  # dropping root privileges, so keep the key file unreadable by anyone but
  # root. Included doc/mkcert.sh can be used to easily generate self-signed
  # certificate, just make sure to update the domains in dovecot-openssl.cnf
@@ -48,7 +49,7 @@ diff -up dovecot-1.1.8/dovecot-example.c
  
  # If key file is password protected, give the password here. Alternatively
  # give it when starting dovecot with -p parameter. Since this file is often
-@@ -452,7 +449,7 @@
+@@ -453,7 +449,7 @@
  # locking methods as well. Some operating systems don't allow using some of
  # them simultaneously.
  #mbox_read_locks = fcntl
@@ -57,9 +58,9 @@ diff -up dovecot-1.1.8/dovecot-example.c
  
  # Maximum time in seconds to wait for lock (all of them) before aborting.
  #mbox_lock_timeout = 300
-diff -up dovecot-1.1.8/src/master/master-settings.c.default-settings dovecot-1.1.8/src/master/master-settings.c
---- dovecot-1.1.8/src/master/master-settings.c.default-settings	2009-01-13 19:34:30.408937169 +0100
-+++ dovecot-1.1.8/src/master/master-settings.c	2009-01-13 19:34:30.419937312 +0100
+diff -up dovecot-1.1.15/src/master/master-settings.c.default-settings dovecot-1.1.15/src/master/master-settings.c
+--- dovecot-1.1.15/src/master/master-settings.c.default-settings	2009-05-22 13:03:21.933542907 +0200
++++ dovecot-1.1.15/src/master/master-settings.c	2009-05-22 13:03:21.941699847 +0200
 @@ -178,8 +178,8 @@ struct settings default_settings = {
  	MEMBER(syslog_facility) "mail",