thomas: server/patches/cyrus-imapd/cyrus-imapd-2.3.11 timsieved-starttls-sendcaps.patch, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Fri Feb 1 19:26:14 CET 2008


Author: thomas

Update of /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.11
In directory doto:/tmp/cvs-serv24681

Modified Files:
	timsieved-starttls-sendcaps.patch 
Log Message:
Removed CVS keywords.
After checking in this patch our CVS modifies them, so the patch does not apply cleanly.


Index: timsieved-starttls-sendcaps.patch
===================================================================
RCS file: /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/timsieved-starttls-sendcaps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- timsieved-starttls-sendcaps.patch	1 Feb 2008 18:07:11 -0000	1.1
+++ timsieved-starttls-sendcaps.patch	1 Feb 2008 18:26:12 -0000	1.2
@@ -1,4 +1,5 @@
 This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45
+(minus the CVS keywords)
 
 It should be reverse-applied with patch -p2 -R to work around the kontact
 behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends
@@ -7,15 +8,6 @@
 
 --- src/cyrus/timsieved/parser.c	2007/11/26 20:23:06	1.44
 +++ src/cyrus/timsieved/parser.c	2007/12/10 14:47:08	1.45
-@@ -1,7 +1,7 @@
- /* parser.c -- parser used by timsieved
-  * Tim Martin
-  * 9/21/99
-- * $Id$
-+ * $Id$
-  */
- /*
-  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
 @@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea
  
      starttls_done = 1;





More information about the commits mailing list