[Pkg-citadel-commit] r177 - in citadel: tags/7.37-6/debian/patches trunk/debian trunk/debian/patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-11-07 11:56:13 +0000 (Fri, 07 Nov 2008)
New Revision: 177

Modified:
   citadel/tags/7.37-6/debian/patches/r6718_fix_sieve_header_hickup.diff
   citadel/trunk/debian/changelog
   citadel/trunk/debian/patches/r6718_fix_sieve_header_hickup.diff
Log:
Re-diffed patch



Modified: citadel/tags/7.37-6/debian/patches/r6718_fix_sieve_header_hickup.diff
===================================================================
--- citadel/tags/7.37-6/debian/patches/r6718_fix_sieve_header_hickup.diff	2008-11-07 11:29:18 UTC (rev 176)
+++ citadel/tags/7.37-6/debian/patches/r6718_fix_sieve_header_hickup.diff	2008-11-07 11:56:13 UTC (rev 177)
@@ -1,8 +1,7 @@
-Index: msgbase.c
-===================================================================
---- msgbase.c	(revision 6717)
-+++ msgbase.c	(revision 6718)
-@@ -1593,6 +1593,31 @@
+diff -ruNap citadel-7.37.orig/msgbase.c citadel-7.37/msgbase.c
+--- citadel-7.37.orig/msgbase.c	2008-06-19 21:16:57.000000000 +0200
++++ citadel-7.37/msgbase.c	2008-11-07 12:37:42.000000000 +0100
+@@ -1568,6 +1568,31 @@ char *qp_encode_email_addrs(char *source
  }
  
  
@@ -34,7 +33,7 @@
  /*
   * Get a message off disk.  (returns om_* values found in msgbase.h)
   */
-@@ -1792,8 +1817,10 @@
+@@ -1768,8 +1793,10 @@ int CtdlOutputPreLoadedMsg(
  					safestrncpy(suser, mptr, sizeof suser);
  				}
  				else if (i == 'Y') {
@@ -46,34 +45,18 @@
  					cprintf("CC: %s%s", mptr, nl);
  				}
  				else if (i == 'P') {
-@@ -1824,13 +1851,16 @@
+@@ -1799,12 +1826,14 @@ 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) {
+ 						if ((flags & QP_EADDR) != 0) 
  							mptr = qp_encode_email_addrs(mptr);
-+						}
 +						sanitize_truncated_recipient(mptr);
- 						cprintf("To: %s", mptr);
- 						cprintf("%s", nl);
+ 						cprintf("To: %s%s", mptr, nl);
  					}
-Index: modules/sieve/serv_sieve.c
-===================================================================
---- modules/sieve/serv_sieve.c	(revision 6717)
-+++ 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);
- 	
+ 				}

Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog	2008-11-07 11:29:18 UTC (rev 176)
+++ citadel/trunk/debian/changelog	2008-11-07 11:56:13 UTC (rev 177)
@@ -1,7 +1,6 @@
 citadel (7.38-1) unstable; urgency=high
 
   [ Wilfried Goesgens ]
-  * [r6718] add upstream prepatch; long to: headerlines would choke sieve on parsing
   * [r6609] add upsttream prepatch; CtdlSetSeen() where if the target room
     was not the currently selected room, the list of seen/unseen
     or answered/unanswered messages could become corrupted.
@@ -14,6 +13,14 @@
 
  -- Michael Meskes <meskes at debian.org>  Mon, 06 Oct 2008 14:21:00 +0200
 
+citadel (7.37-6) unstable; urgency=low
+
+    [ Wilfried Goesgens ]
+  * [r6718] add upstream prepatch; long to: headerlines would choke sieve on
+    parsing, closes: #503346
+
+ -- Michael Meskes <meskes at debian.org>  Fri, 07 Nov 2008 12:26:44 +0100
+
 citadel (7.37-5) unstable; urgency=medium
 
   * Do not change /etc/services, closes: #475539

Modified: citadel/trunk/debian/patches/r6718_fix_sieve_header_hickup.diff
===================================================================
--- citadel/trunk/debian/patches/r6718_fix_sieve_header_hickup.diff	2008-11-07 11:29:18 UTC (rev 176)
+++ citadel/trunk/debian/patches/r6718_fix_sieve_header_hickup.diff	2008-11-07 11:56:13 UTC (rev 177)
@@ -1,7 +1,5 @@
-Index: msgbase.c
-===================================================================
---- msgbase.c	(revision 6717)
-+++ msgbase.c	(revision 6718)
+--- 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 @@
  }
  
@@ -64,10 +62,8 @@
  						cprintf("To: %s", mptr);
  						cprintf("%s", nl);
  					}
-Index: modules/sieve/serv_sieve.c
-===================================================================
---- modules/sieve/serv_sieve.c	(revision 6717)
-+++ modules/sieve/serv_sieve.c	(revision 6718)
+--- 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 @@
  	}