[Pkg-citadel-commit] r185 - citadel/trunk/debian/patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-11-30 16:30:33 +0000 (Sun, 30 Nov 2008)
New Revision: 185

Modified:
   citadel/trunk/debian/patches/r6718_fix_sieve_header_hickup.diff
Log:
Rediffed



Modified: citadel/trunk/debian/patches/r6718_fix_sieve_header_hickup.diff
===================================================================
--- citadel/trunk/debian/patches/r6718_fix_sieve_header_hickup.diff	2008-11-30 16:16:15 UTC (rev 184)
+++ citadel/trunk/debian/patches/r6718_fix_sieve_header_hickup.diff	2008-11-30 16:30:33 UTC (rev 185)
@@ -1,6 +1,7 @@
---- citadel-7.37.orig/msgbase.c 2008-06-19 21:16:57.000000000 +0200
-+++ citadel-7.37/msgbase.c      2008-08-28 15:05:06.000000000 +0200
-@@ -1593,6 +1593,31 @@
+diff -ruNap citadel-7.38.orig/msgbase.c citadel-7.38/msgbase.c
+--- citadel-7.38.orig/msgbase.c	2008-09-13 06:07:31.000000000 +0200
++++ citadel-7.38/msgbase.c	2008-11-30 17:28:19.000000000 +0100
+@@ -1568,6 +1568,31 @@ char *qp_encode_email_addrs(char *source
  }
  
  
@@ -32,7 +33,7 @@
  /*
   * Get a message off disk.  (returns om_* values found in msgbase.h)
   */
-@@ -1792,8 +1817,10 @@
+@@ -1769,8 +1794,10 @@ int CtdlOutputPreLoadedMsg(
  					safestrncpy(suser, mptr, sizeof suser);
  				}
  				else if (i == 'Y') {
@@ -44,32 +45,11 @@
  					cprintf("CC: %s%s", mptr, nl);
  				}
  				else if (i == 'P') {
-@@ -1824,13 +1851,16 @@
+@@ -1803,6 +1830,7 @@ int CtdlOutputPreLoadedMsg(
  				{
  					if (haschar(mptr, '@') == 0)
  					{
 +						sanitize_truncated_recipient(mptr);
- 						cprintf("To: %s@%s", mptr, config.c_fqdn);
- 						cprintf("%s", nl);
+ 						cprintf("To: %s@%s%s", mptr, config.c_fqdn, nl);
  					}
  					else
- 					{
--						if ((flags & QP_EADDR) != 0) 
-+						if ((flags & QP_EADDR) != 0) {
- 							mptr = qp_encode_email_addrs(mptr);
-+						}
-+						sanitize_truncated_recipient(mptr);
- 						cprintf("To: %s", mptr);
- 						cprintf("%s", nl);
- 					}
---- citadel-7.37.orig/modules/sieve/serv_sieve.c	(revision 6717)
-+++ citadel-7.37/modules/sieve/serv_sieve.c	(revision 6718)
-@@ -640,7 +640,7 @@
- 	}
- 
- 
--	CtdlLogPrintf(CTDL_DEBUG, "HEADERS-------\n%s\n", my.rfc822headers);
-+	CtdlLogPrintf(CTDL_DEBUG, "HEADERS-------\n%s\n", my.rfc822headers);
- 
- 	sieve2_setvalue_string(sieve2_context, "allheaders", my.rfc822headers);
-