rpms/dovecot/F-11 dovecot-1.1-default-settings.patch, 1.8, 1.9 dovecot.spec, 1.130, 1.131

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	dovecot-1.1-default-settings.patch dovecot.spec 
Log Message:
update to 1.2.0 original sieve


dovecot-1.1-default-settings.patch:

Index: dovecot-1.1-default-settings.patch
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot-1.1-default-settings.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dovecot-1.1-default-settings.patch	2 Jul 2009 09:18:40 -0000	1.8
+++ dovecot-1.1-default-settings.patch	7 Jul 2009 07:15:27 -0000	1.9
@@ -1,6 +1,6 @@
-diff -up dovecot-1.2.0/dovecot-example.conf.default-settings dovecot-1.2.0/dovecot-example.conf
---- dovecot-1.2.0/dovecot-example.conf.default-settings	2009-06-18 09:37:43.000000000 +0200
-+++ dovecot-1.2.0/dovecot-example.conf	2009-07-02 11:08:41.764015626 +0200
+diff -up dovecot-1.2.rc5/dovecot-example.conf.default-settings dovecot-1.2.rc5/dovecot-example.conf
+--- dovecot-1.2.rc5/dovecot-example.conf.default-settings	2009-06-18 07:57:44.749562312 +0200
++++ dovecot-1.2.rc5/dovecot-example.conf	2009-06-18 07:59:15.923499117 +0200
 @@ -10,18 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
@@ -15,15 +15,15 @@ diff -up dovecot-1.2.0/dovecot-example.c
  # Base directory where to store runtime data.
  #base_dir = /var/run/dovecot/
  
- # Protocols we want to be serving: imap imaps pop3 pop3s
+ # Protocols we want to be serving: imap imaps pop3 pop3s managesieve
  # If you only want to use dovecot-auth, you can set this to "none".
 -#protocols = imap imaps
 +#protocols = imap imaps pop3 pop3s
  
  # A space separated list of IP or host addresses where to listen in for
  # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-@@ -39,13 +35,13 @@
- #     listen = *:10100
+@@ -43,13 +39,13 @@
+ #     listen = *:12000
  #     ..
  #   }
 -#listen = *
@@ -38,7 +38,7 @@ diff -up dovecot-1.2.0/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
-@@ -92,8 +88,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
@@ -49,7 +49,7 @@ diff -up dovecot-1.2.0/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
-@@ -482,7 +478,7 @@
+@@ -486,7 +482,7 @@
  # locking methods as well. Some operating systems don't allow using some of
  # them simultaneously.
  #mbox_read_locks = fcntl
@@ -58,9 +58,9 @@ diff -up dovecot-1.2.0/dovecot-example.c
  
  # Maximum time in seconds to wait for lock (all of them) before aborting.
  #mbox_lock_timeout = 300
-diff -up dovecot-1.2.0/src/master/master-settings.c.default-settings dovecot-1.2.0/src/master/master-settings.c
---- dovecot-1.2.0/src/master/master-settings.c.default-settings	2009-06-30 17:18:39.000000000 +0200
-+++ dovecot-1.2.0/src/master/master-settings.c	2009-07-02 11:05:21.101078306 +0200
+diff -up dovecot-1.2.rc5/src/master/master-settings.c.default-settings dovecot-1.2.rc5/src/master/master-settings.c
+--- dovecot-1.2.rc5/src/master/master-settings.c.default-settings	2009-06-18 07:57:44.764499091 +0200
++++ dovecot-1.2.rc5/src/master/master-settings.c	2009-06-18 07:57:44.774499405 +0200
 @@ -178,8 +178,8 @@ struct settings default_settings = {
  	MEMBER(syslog_facility) "mail",
  


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- dovecot.spec	2 Jul 2009 09:18:40 -0000	1.130
+++ dovecot.spec	7 Jul 2009 07:15:27 -0000	1.131
@@ -14,8 +14,8 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define sieve_version 0.1.6
-%define sieve_name dovecot-1.2-sieve
+%define sieve_version 1.1.6
+%define sieve_name dovecot-sieve
 %define managesieve_version 0.11.5
 #define managesieve_name dovecot-%{version}-managesieve
 %define managesieve_name dovecot-1.2-managesieve
@@ -33,7 +33,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}.rc5-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.rc5-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch