thomas: server/imapd Makefile,1.33,1.34 kolab.patch,1.35,1.36

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv20511/imapd

Modified Files:
	Makefile kolab.patch 
Log Message:
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)


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile	11 Mar 2008 15:58:35 -0000	1.33
+++ Makefile	10 Apr 2008 17:31:05 -0000	1.34
@@ -17,7 +17,7 @@
 PACKAGE=imapd
 VERSION=2.3.11
 RELEASE=20080101
-KOLABRELEASE=20080101_kolab2
+KOLABRELEASE=20080101_kolab3
 
 PATCHES=$(KOLABCVSDIR)/timsieved-starttls-sendcaps.patch \
 	$(KOLABCVSDIR)/imapd.patch.group

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- kolab.patch	11 Mar 2008 16:02:38 -0000	1.35
+++ kolab.patch	10 Apr 2008 17:31:05 -0000	1.36
@@ -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