[SVN] r647 - in /trunk/cyrus-imapd-2.2.13/debian: changelog patches/0020-upstream-client-literal-prefix.dpatch patches/00list

[debian at incase.de]

Author: sven
Date: Tue Oct  3 20:59:22 2006
New Revision: 647

URL: https://mail.incase.de/viewcvs?rev=647&root=cyrus22&view=rev
Log:
Add a small upstream patch to imtest

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=647&root=cyrus22&r1=646&r2=647&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Tue Oct  3 20:59:22 2006
@@ -14,6 +14,7 @@
     from IMAP::Admin perl module (Closes: #389597)
   * Update dutch debconf translation (Closes: #389783)
   * Fix a problem with repeated builds from the same tree.
+  * Add upstream patch to imtest.c prefixing raw client responses with C:
 
   [ Henrique de Moraes Holschuh ]
   * Update pt_BR debconf translation
@@ -23,7 +24,7 @@
   * Fix mistake in init script, ! check_status instead of !check_status.
     Thanks to Farzad FARID
 
- -- Sven Mueller <sven at debian.org>  Tue,  3 Oct 2006 18:23:35 +0200
+ -- Sven Mueller <sven at debian.org>  Tue,  3 Oct 2006 20:56:06 +0200
 
 cyrus-imapd-2.2 (2.2.13-7) unstable; urgency=low
 

Added: trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch?rev=647&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch Tue Oct  3 20:59:22 2006
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0020-upstream-client-literal-prefix.dpatch by Sven Mueller <sven at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream patch: Prefix client responses by C:
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imtest/imtest.c /tmp/dpep.GMHaSr/cyrus-imapd-2.2.13/imtest/imtest.c
+--- cyrus-imapd-2.2.13/imtest/imtest.c	2006-10-03 20:48:22.000000000 +0200
++++ /tmp/dpep.GMHaSr/cyrus-imapd-2.2.13/imtest/imtest.c	2006-10-03 20:55:16.098628728 +0200
+@@ -1,7 +1,7 @@
+ /* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client
+  * Ken Murchison (multi-protocol implementation)
+  * Tim Martin (SASL implementation)
+- * $Id: imtest.c,v 1.108 2006/05/25 15:23:07 murch Exp $
++ * $Id: imtest.c,v 1.109 2006/08/30 16:58:49 murch Exp $
+  *
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+@@ -1083,7 +1083,8 @@
+ 
+ 	    /* send to server */
+ 	    if (sendliteral) {
+-		printf("{%d+}\r\n", inbase64len);
++		printf("%s{%d+}\r\n",
++		       initial_response ? "" : "C: ", inbase64len);
+ 		prot_printf(pout, "{%d+}\r\n", inbase64len);
+ 		prot_flush(pout);
+ 	    }

Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=647&root=cyrus22&r1=646&r2=647&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Tue Oct  3 20:59:22 2006
@@ -17,6 +17,7 @@
 0017-upstream-no-body-empty-string-instead-of-null.dpatch
 0018-upstream-ntohl-instead-of-htonl.dpatch
 0019-upstream-sieve_allowreferrals.dpatch
+0020-upstream-client-literal-prefix.dpatch
 0090-fix-casts.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch