summaryrefslogtreecommitdiff
path: root/imapd
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2008-04-10 17:31:05 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2008-04-10 17:31:05 (GMT)
commit53c9337e85ec38e47e9e1b3b705ae7e8261281d2 (patch)
tree5bc01d894db8b288c4e3ff1514cf23bb8f099690 /imapd
parent7762f6182d54cdcd50fa4ed9728dddfe5752f71f (diff)
downloadserver-53c9337e85ec38e47e9e1b3b705ae7e8261281d2.tar.gz
imapd: Send changed version string 'kolab-nocaps' if "with_kolab_nocaps = yes".
IMAP clients can use this to determine the behavior after sending STARTTLS. See kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls)
Diffstat (limited to 'imapd')
-rw-r--r--imapd/Makefile2
-rw-r--r--imapd/kolab.patch18
2 files changed, 16 insertions, 4 deletions
diff --git a/imapd/Makefile b/imapd/Makefile
index 8553f84..96511d6 100644
--- a/imapd/Makefile
+++ b/imapd/Makefile
@@ -17,7 +17,7 @@ endif
PACKAGE=imapd
VERSION=2.3.11
RELEASE=20080101
-KOLABRELEASE=20080101_kolab2
+KOLABRELEASE=20080101_kolab3
PATCHES=$(KOLABCVSDIR)/timsieved-starttls-sendcaps.patch \
$(KOLABCVSDIR)/imapd.patch.group
diff --git a/imapd/kolab.patch b/imapd/kolab.patch
index 9071c89..2581039 100644
--- a/imapd/kolab.patch
+++ b/imapd/kolab.patch
@@ -1,11 +1,11 @@
--- imapd.spec.orig 2008-01-01 15:31:56.000000000 +0100
-+++ imapd.spec 2008-03-11 17:00:23.964783000 +0100
++++ imapd.spec 2008-04-10 19:23:09.194783000 +0200
@@ -32,7 +32,7 @@
Group: Mail
License: BSD
Version: 2.3.11
-Release: 20080101
-+Release: 20080101_kolab2
++Release: 20080101_kolab3
# package options
%option with_fsl yes
@@ -37,7 +37,19 @@
# add optional DRAC file support
%if "%{with_drac}" == "yes"
%{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -410,9 +417,6 @@
+@@ -286,7 +293,11 @@
+ %if "%{with_nntp}" == "yes"
+ --enable-nntp \
+ %endif
++%if "%{with_kolab_nocaps}" == "yes"
++ --with-extraident=kolab-nocaps \
++%else
+ --with-extraident=openpkg \
++%endif
+ --without-krb
+
+ # build program
+@@ -410,9 +421,6 @@
# before erase, stop service and remove log and temporary files
if [ $1 -eq 0 ]; then
%{l_rc} imapd stop 2>/dev/null