rpms/dovecot/F-11 dovecot-managesieve-trim-rc5-to-rc6.patch, NONE, 1.1 .cvsignore, 1.55, 1.56 dovecot.spec, 1.128, 1.129 sources, 1.58, 1.59

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	.cvsignore dovecot.spec sources 
Added Files:
	dovecot-managesieve-trim-rc5-to-rc6.patch 
Log Message:
updated to 1.2.rc6


dovecot-managesieve-trim-rc5-to-rc6.patch:

--- NEW FILE dovecot-managesieve-trim-rc5-to-rc6.patch ---
diff -up dovecot-1.2.rc6/dovecot-1.2-managesieve-0.11.5/src/managesieve-login/client.c.timeout dovecot-1.2.rc6/dovecot-1.2-managesieve-0.11.5/src/managesieve-login/client.c
--- dovecot-1.2.rc6/dovecot-1.2-managesieve-0.11.5/src/managesieve-login/client.c.timeout	2009-06-24 15:43:09.390512712 +0200
+++ dovecot-1.2.rc6/dovecot-1.2-managesieve-0.11.5/src/managesieve-login/client.c	2009-06-24 15:43:09.432575161 +0200
@@ -44,8 +44,8 @@
    send a "waiting" message. */
 #define AUTH_WAITING_TIMEOUT_MSECS (30*1000)
 
-#if CLIENT_LOGIN_IDLE_TIMEOUT_MSECS >= AUTH_REQUEST_TIMEOUT*1000
-#  error client idle timeout must be smaller than authentication timeout
+#if CLIENT_LOGIN_IDLE_TIMEOUT_MSECS < AUTH_REQUEST_TIMEOUT*1000
+#  error client idle timeout must be larger than authentication timeout
 #endif
 
 const char *login_protocol = "MANAGESIEVE";


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	19 Jun 2009 08:20:48 -0000	1.55
+++ .cvsignore	25 Jun 2009 09:10:30 -0000	1.56
@@ -1,4 +1,4 @@
-dovecot-1.2.rc5.tar.gz
+dovecot-1.2.rc6.tar.gz
 dovecot-1.2-managesieve-0.11.5.tar.gz
 dovecot-1.2.rc5-managesieve-0.11.5.diff.gz
 dovecot-sieve-1.1.6.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- dovecot.spec	19 Jun 2009 08:20:48 -0000	1.128
+++ dovecot.spec	25 Jun 2009 09:10:30 -0000	1.129
@@ -2,8 +2,8 @@ Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
 Version: 1.2
-%define betaver rc5
-Release: 0.%{betaver}.2%{?dist}
+%define betaver rc6
+Release: 0.%{betaver}.1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -32,12 +32,13 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{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}.%{betaver}-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{version}.rc5-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
+Patch4: dovecot-managesieve-trim-rc5-to-rc6.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel
@@ -180,6 +181,8 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 %setup -q -n %{name}-%{version}.%{betaver} -D -T -a 10
 %endif
 
+%patch4 -p1 -b .managesievetrim
+
 %build
 rm -f ./"configure"
 autoreconf -i -f
@@ -429,6 +432,9 @@ fi
 
 
 %changelog
+* Thu Jun 25 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc6.1
+- updated to 1.2.rc6
+
 * Fri Jun 19 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2-0.rc5.2
 - managesieve updated to 0.11.5 for dovecot rc5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	19 Jun 2009 08:20:49 -0000	1.58
+++ sources	25 Jun 2009 09:10:30 -0000	1.59
@@ -1,4 +1,4 @@
-13bbc5579e81070e9713c154bebc05f9  dovecot-1.2.rc5.tar.gz
+6d33021cd7edbf0e7feff058fb0e99ae  dovecot-1.2.rc6.tar.gz
 9b59508d076d96c16e2443e87c308fe4  dovecot-1.2-managesieve-0.11.5.tar.gz
 544c086bd3beaf54eacb9245eae81115  dovecot-1.2.rc5-managesieve-0.11.5.diff.gz
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz