From 21412c669877463badf6dac98dc2333db36121f5 Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@fedoraproject.org>
Date: Thu, 6 Jan 2005 17:40:02 +0000
Subject: [PATCH] fix bug #133618, remove LITERAL+ from capability string

---
 dovecot-0.99-no-literal-plus-capability.patch | 27 +++++++++++++++++++
 dovecot.spec                                  |  7 ++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 dovecot-0.99-no-literal-plus-capability.patch

diff --git a/dovecot-0.99-no-literal-plus-capability.patch b/dovecot-0.99-no-literal-plus-capability.patch
new file mode 100644
index 0000000..36a6048
--- /dev/null
+++ b/dovecot-0.99-no-literal-plus-capability.patch
@@ -0,0 +1,27 @@
+This fixes bug #133618, it should be fixed in dovecot 1.0 so don't apply
+this patch to 1.0 or greater
+
+diff -u -r dovecot-0.99.11.orig/configure dovecot-0.99.11/configure
+--- dovecot-0.99.11.orig/configure	2004-09-04 05:20:26.000000000 -0400
++++ dovecot-0.99.11/configure	2005-01-06 12:20:30.000000000 -0500
+@@ -28933,7 +28933,7 @@
+ 
+ 
+ 
+-capability="IMAP4rev1 SORT THREAD=REFERENCES MULTIAPPEND UNSELECT LITERAL+ IDLE CHILDREN LISTEXT LIST-SUBSCRIBED NAMESPACE"
++capability="IMAP4rev1 SORT THREAD=REFERENCES MULTIAPPEND UNSELECT IDLE CHILDREN LISTEXT LIST-SUBSCRIBED NAMESPACE"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define CAPABILITY_STRING "$capability"
+diff -u -r dovecot-0.99.11.orig/configure.in dovecot-0.99.11/configure.in
+--- dovecot-0.99.11.orig/configure.in	2004-09-04 05:20:19.000000000 -0400
++++ dovecot-0.99.11/configure.in	2005-01-06 12:20:09.000000000 -0500
+@@ -1141,7 +1148,7 @@
+ dnl ** capabilities
+ dnl **
+ 
+-capability="IMAP4rev1 SORT THREAD=REFERENCES MULTIAPPEND UNSELECT LITERAL+ IDLE CHILDREN LISTEXT LIST-SUBSCRIBED NAMESPACE"
++capability="IMAP4rev1 SORT THREAD=REFERENCES MULTIAPPEND UNSELECT IDLE CHILDREN LISTEXT LIST-SUBSCRIBED NAMESPACE"
+ AC_DEFINE_UNQUOTED(CAPABILITY_STRING, "$capability", IMAP capabilities)
+ 
+ CFLAGS="$CFLAGS $EXTRA_CFLAGS"
diff --git a/dovecot.spec b/dovecot.spec
index 29a938f..06336b2 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Version: 0.99.11
-Release: 9.devel
+Release: 10.devel
 License: LGPL
 Group: System Environment/Daemons
 Source: %{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ Source5: migrate-users
 Source6: perfect_maildir.pl
 Patch100: dovecot-conf.patch
 Patch101: dovecot-configfile.patch
+Patch102: dovecot-0.99-no-literal-plus-capability.patch
 
 # Patches 500+ from upstream fixes
 URL: http://dovecot.procontrol.fi/
@@ -44,6 +45,7 @@ in either of maildir or mbox formats.
 %patch100 -p1 -b .config
 cp $RPM_BUILD_DIR/${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}/dovecot-example.conf $RPM_BUILD_DIR/${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}/dovecot.conf
 %patch101 -p1 -b .configfile
+%patch102 -p1 -b .no-literal-plus-capability
 
 %build
 rm -f ./configure
@@ -145,6 +147,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan  6 2005 John Dennis <jdennis@redhat.com> 0.99.11-10.devel
+- fix bug #133618, removed LITERAL+ capability from capability string
+
 * Wed Jan  5 2005 John Dennis <jdennis@redhat.com> 0.99.11-9.devel
 - fix bug #134325, stop dovecot during installation