[csw-devel] SF.net SVN: gar:[4065] csw/mgar/pkg/dovecot/trunk

[skayser at users.sourceforge.net]

Revision: 4065
          http://gar.svn.sourceforge.net/gar/?rev=4065&view=rev
Author:   skayser
Date:     2009-03-29 18:27:39 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
dovecot: Corrected dovecot_devel package Name

Modified Paths:
--------------
    csw/mgar/pkg/dovecot/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/dovecot/trunk/files/patch-utf8alloc.diff

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2009-03-29 18:24:12 UTC (rev 4064)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2009-03-29 18:27:39 UTC (rev 4065)
@@ -1,3 +1,6 @@
+# TODO:
+# * Bump to 1.1.13, http://hg.dovecot.org/dovecot-1.1/rev/a2013dedbad0
+
 GARNAME = dovecot
 GARVERSION = 1.1.11
 CATEGORIES = server
@@ -13,7 +16,7 @@
 MASTER_SITES = http://dovecot.org/releases/1.1/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
-PACKAGES = CSWdovecot CSWdovecotdevel CSWdovecot-sieve
+PACKAGES = CSWdovecot CSWdovecot-devel CSWdovecot-sieve
 CATALOGNAME_CSWdovecot = dovecot
 CATALOGNAME_CSWdovecotdevel = dovecot_devel
 CATALOGNAME_CSWdovecot-sieve = dovecot_sieve

Added: csw/mgar/pkg/dovecot/trunk/files/patch-utf8alloc.diff
===================================================================
--- csw/mgar/pkg/dovecot/trunk/files/patch-utf8alloc.diff	                        (rev 0)
+++ csw/mgar/pkg/dovecot/trunk/files/patch-utf8alloc.diff	2009-03-29 18:27:39 UTC (rev 4065)
@@ -0,0 +1,44 @@
+
+# HG changeset patch
+# User Timo Sirainen <tss at iki.fi>
+# Date 1238105829 14400
+# Node ID a2013dedbad0b6cda8d7bbef0179758456e885dd
+# Parent 3e5494da8e37bb3253ca23088291330a785253fc
+charset_to_utf8() may have tried to allocate a lot of memory in some conditions.
+
+--- a/src/lib-charset/charset-iconv.c	Wed Mar 25 15:38:36 2009 -0400
++++ b/src/lib-charset/charset-iconv.c	Thu Mar 26 18:17:09 2009 -0400
+@@ -129,8 +129,9 @@ charset_to_utf8(struct charset_translati
+ charset_to_utf8(struct charset_translation *t,
+ 		const unsigned char *src, size_t *src_size, buffer_t *dest)
+ {
++	bool dtcase = (t->flags & CHARSET_FLAG_DECOMP_TITLECASE) != 0;
+ 	enum charset_result result;
+-	size_t pos, used, size;
++	size_t pos, used, size, prev_used = 0;
+ 	bool ret;
+ 
+ 	for (pos = 0;;) {
+@@ -143,11 +144,16 @@ charset_to_utf8(struct charset_translati
+ 			return result;
+ 		}
+ 
+-		/* force buffer to grow */
+-		used = dest->used;
+-		size = buffer_get_size(dest) - used + 1;
+-		(void)buffer_append_space_unsafe(dest, size);
+-		buffer_set_used_size(dest, used);
++		if (!dtcase) {
++			/* force buffer to grow */
++			used = dest->used;
++			size = buffer_get_size(dest) - used + 1;
++			(void)buffer_append_space_unsafe(dest, size);
++			buffer_set_used_size(dest, used);
++		} else {
++			i_assert(dest->used != prev_used);
++			prev_used = dest->used;
++		}
+ 	}
+ }
+ 
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.