[gentoo-commits] gentoo-x86 commit in dev-libs/gmime/files: gmime-2.6.18-custom-headers.patch gmime-2.6.18-close-reference.patch gmime-2.6.18-code-cleanup.patch gmime-2.6.18-mutexes-earlier.patch

[Pacho Ramos (pacho)]

pacho       13/10/02 19:23:58

  Added:                gmime-2.6.18-custom-headers.patch
                        gmime-2.6.18-close-reference.patch
                        gmime-2.6.18-code-cleanup.patch
                        gmime-2.6.18-mutexes-earlier.patch
  Log:
  Apply upstream fixes, also solving problems with pan (#486776 by Duncan), drop old.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.1                  dev-libs/gmime/files/gmime-2.6.18-custom-headers.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gmime/files/gmime-2.6.18-custom-headers.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gmime/files/gmime-2.6.18-custom-headers.patch?rev=1.1&content-type=text/plain

Index: gmime-2.6.18-custom-headers.patch
===================================================================
From a248cc044c6ad55505939363aa858c930867a014 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@×××××.org>
Date: Sun, 29 Sep 2013 17:23:30 +0000
Subject: Implemented custom header writer for References

2013-09-29  Jeffrey Stedfast  <fejj@×××××.org>

	* gmime/gmime-message.c (write_references): Custom writer for
	References headers so that individual msgid tokens do not get
	folded. Fixes bug #709031.
---
diff --git a/ChangeLog b/ChangeLog
index c0e414f..79587b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
[phone]  Jeffrey Stedfast  <fejj@×××××.org>
+
+	* gmime/gmime-message.c (write_references): Custom writer for
+	References headers so that individual msgid tokens do not get
+	folded. Fixes bug #709031.
+
 2013-09-26  Jeffrey Stedfast  <fejj@×××××.org>
 
 	* gmime/gmime.c (g_mime_init): Initialize the mutexes
diff --git a/gmime/gmime-message.c b/gmime/gmime-message.c
index 1b92577..170116b 100644
--- a/gmime/gmime-message.c
+++ b/gmime/gmime-message.c
@@ -67,7 +67,8 @@ static char *message_get_headers (GMimeObject *object);
 static ssize_t message_write_to_stream (GMimeObject *object, GMimeStream *stream);
 static void message_encode (GMimeObject *object, GMimeEncodingConstraint constraint);
 
-static ssize_t write_structured (GMimeStream *stream, const char *name, const char *value);
+/*static ssize_t write_structured (GMimeStream *stream, const char *name, const char *value);*/
+static ssize_t write_references (GMimeStream *stream, const char *name, const char *value);
 static ssize_t write_addrspec (GMimeStream *stream, const char *name, const char *value);
 static ssize_t write_received (GMimeStream *stream, const char *name, const char *value);
 static ssize_t write_subject (GMimeStream *stream, const char *name, const char *value);
@@ -233,7 +234,7 @@ g_mime_message_init (GMimeMessage *message, GMimeMessageClass *klass)
 	g_mime_header_list_register_writer (headers, "Subject", write_subject);
 	g_mime_header_list_register_writer (headers, "Received", write_received);
 	g_mime_header_list_register_writer (headers, "Message-Id", write_msgid);
-	g_mime_header_list_register_writer (headers, "References", write_structured);
+	g_mime_header_list_register_writer (headers, "References", write_references);
 }
 
 static void
@@ -618,12 +619,54 @@ write_subject (GMimeStream *stream, const char *name, const char *value)
 static ssize_t
 write_msgid (GMimeStream *stream, const char *name, const char *value)
 {
-	/* we don't want to wrap the Message-Id header - seems to
+	/* Note: we don't want to wrap the Message-Id header - seems to
 	   break a lot of clients (and servers) */
 	return g_mime_stream_printf (stream, "%s: %s\n", name, value);
 }
 
 static ssize_t
+write_references (GMimeStream *stream, const char *name, const char *value)
+{
+	GMimeReferences *references, *reference;
+	ssize_t nwritten;
+	GString *folded;
+	size_t len, n;
+	
+	/* Note: we don't want to break in the middle of msgid tokens as
+	   it seems to break a lot of clients (and servers) */
+	references = g_mime_references_decode (value);
+	folded = g_string_new (name);
+	g_string_append_len (folded, ": ", 2);
+	len = folded->len;
+	
+	reference = references;
+	while (reference != NULL) {
+		n = strlen (reference->msgid);
+		if (len > 1 && len + n + 1 >= GMIME_FOLD_LEN) {
+			g_string_append_len (folded, "\n\t", 2);
+			len = 1;
+		} else {
+			g_string_append_len (folded, " ", 1);
+			len++;
+		}
+		
+		g_string_append_len (folded, reference->msgid, n);
+		len += n;
+		
+		reference = reference->next;
+	}
+	
+	g_mime_references_clear (&references);
+	
+	g_string_append_len (folded, "\n", 1);
+	nwritten = g_mime_stream_write (stream, folded->str, folded->len);
+	g_string_free (folded, TRUE);
+	
+	return nwritten;
+}
+
+#if 0
+static ssize_t
 write_structured (GMimeStream *stream, const char *name, const char *value)
 {
 	char *folded;
@@ -635,6 +678,7 @@ write_structured (GMimeStream *stream, const char *name, const char *value)
 	
 	return n;
 }
+#endif
 
 static ssize_t
 write_addrspec (GMimeStream *stream, const char *name, const char *value)
--
cgit v0.9.2



1.1                  dev-libs/gmime/files/gmime-2.6.18-close-reference.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gmime/files/gmime-2.6.18-close-reference.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gmime/files/gmime-2.6.18-close-reference.patch?rev=1.1&content-type=text/plain

Index: gmime-2.6.18-close-reference.patch
===================================================================
From 1373f11f9b3ecdbfb58a70a742506f3f6d5c57d8 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@×××××.org>
Date: Sun, 29 Sep 2013 17:34:25 +0000
Subject: Oops, eclose each reference msgid token between '<' and '>'

---
diff --git a/gmime/gmime-message.c b/gmime/gmime-message.c
index 170116b..b6243fd 100644
--- a/gmime/gmime-message.c
+++ b/gmime/gmime-message.c
@@ -642,16 +642,18 @@ write_references (GMimeStream *stream, const char *name, const char *value)
 	reference = references;
 	while (reference != NULL) {
 		n = strlen (reference->msgid);
-		if (len > 1 && len + n + 1 >= GMIME_FOLD_LEN) {
+		if (len > 1 && len + n + 3 >= GMIME_FOLD_LEN) {
 			g_string_append_len (folded, "\n\t", 2);
 			len = 1;
 		} else {
-			g_string_append_len (folded, " ", 1);
+			g_string_append_c (folded, ' ');
 			len++;
 		}
 		
+		g_string_append_c (folded, '<');
 		g_string_append_len (folded, reference->msgid, n);
-		len += n;
+		g_string_append_c (folded, '>');
+		len += n + 2;
 		
 		reference = reference->next;
 	}
--
cgit v0.9.2



1.1                  dev-libs/gmime/files/gmime-2.6.18-code-cleanup.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gmime/files/gmime-2.6.18-code-cleanup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gmime/files/gmime-2.6.18-code-cleanup.patch?rev=1.1&content-type=text/plain

Index: gmime-2.6.18-code-cleanup.patch
===================================================================
From c9f92d53f591ae4e893fc81ccc49ea9d2f4f168c Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@×××××.org>
Date: Mon, 23 Sep 2013 13:46:06 +0000
Subject: Minor code/comment cleanup

---
diff --git a/gmime/gmime-param.c b/gmime/gmime-param.c
index 4dd98d5..667adf7 100644
--- a/gmime/gmime-param.c
+++ b/gmime/gmime-param.c
@@ -396,7 +396,7 @@ rfc2184_param_charset (const char **in, char **langp)
 	if (langp)
 		*langp = NULL;
 	
-	while (*inptr != '\0' && *inptr != '\'')
+	while (*inptr && *inptr != '\'')
 		inptr++;
 	
 	if (*inptr != '\'')
@@ -408,7 +408,7 @@ rfc2184_param_charset (const char **in, char **langp)
 	charset[len] = '\0';
 	
 	lang = ++inptr;
-	while (*inptr != '\0' && *inptr != '\'')
+	while (*inptr && *inptr != '\'')
 		inptr++;
 	
 	if (*inptr == '\'') {
diff --git a/gmime/gmime-utils.c b/gmime/gmime-utils.c
index ada8faf..41d5639 100644
--- a/gmime/gmime-utils.c
+++ b/gmime/gmime-utils.c
@@ -2743,7 +2743,7 @@ header_fold_tokens (const char *field, const char *value, size_t vlen, rfc2047_t
 					g_string_insert_c (output, tab, '\n');
 					len = (lwsp - tab) + 1;
 				} else if (lwsp != 0) {
-					/* break just before the last lwsp character i*/
+					/* break just before the last lwsp character */
 					g_string_insert_c (output, lwsp, '\n');
 					len = 1;
 				} else if (len > 1) {
@@ -2769,7 +2769,7 @@ header_fold_tokens (const char *field, const char *value, size_t vlen, rfc2047_t
 				g_string_insert_c (output, tab, '\n');
 				len = (lwsp - tab) + 1;
 			} else if (lwsp != 0) {
-				/* break just before the last lwsp character i*/
+				/* break just before the last lwsp character */
 				g_string_insert_c (output, lwsp, '\n');
 				len = 1;
 			} else if (len > 1) {
--
cgit v0.9.2



1.1                  dev-libs/gmime/files/gmime-2.6.18-mutexes-earlier.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gmime/files/gmime-2.6.18-mutexes-earlier.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gmime/files/gmime-2.6.18-mutexes-earlier.patch?rev=1.1&content-type=text/plain

Index: gmime-2.6.18-mutexes-earlier.patch
===================================================================
From bb1c6094e04ce54de52289cd5ba7f9b73694ef1f Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@×××××.org>
Date: Thu, 26 Sep 2013 12:46:10 +0000
Subject: Initialize mutexes earlier in g_mime_init

2013-09-26  Jeffrey Stedfast  <fejj@×××××.org>

	* gmime/gmime.c (g_mime_init): Initialize the mutexes
	earlier. Fixes bug #708818.
---
diff --git a/ChangeLog b/ChangeLog
index 5071304..c0e414f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Jeffrey Stedfast  <fejj@×××××.org>
+
+	* gmime/gmime.c (g_mime_init): Initialize the mutexes
+	earlier. Fixes bug #708818.
+
 2013-09-15  Jeffrey Stedfast  <fejj@×××××.org>
 
 	* README: Bumped version
diff --git a/gmime/gmime.c b/gmime/gmime.c
index 89326a4..80c80f5 100644
--- a/gmime/gmime.c
+++ b/gmime/gmime.c
@@ -132,6 +132,13 @@ g_mime_init (guint32 flags)
 	g_type_init ();
 #endif
 	
+#ifdef G_THREADS_ENABLED
+	g_mutex_init (&G_LOCK_NAME (iconv_cache));
+	g_mutex_init (&G_LOCK_NAME (iconv_utils));
+	g_mutex_init (&G_LOCK_NAME (charset));
+	g_mutex_init (&G_LOCK_NAME (msgid));
+#endif
+	
 	g_mime_charset_map_init ();
 	g_mime_iconv_utils_init ();
 	g_mime_iconv_init ();
@@ -144,13 +151,6 @@ g_mime_init (guint32 flags)
 	gmime_gpgme_error_quark = g_quark_from_static_string ("gmime-gpgme");
 	gmime_error_quark = g_quark_from_static_string ("gmime");
 	
-#ifdef G_THREADS_ENABLED
-	g_mutex_init (&G_LOCK_NAME (iconv_cache));
-	g_mutex_init (&G_LOCK_NAME (iconv_utils));
-	g_mutex_init (&G_LOCK_NAME (charset));
-	g_mutex_init (&G_LOCK_NAME (msgid));
-#endif
-	
 	/* register our GObject types with the GType system */
 	g_mime_crypto_context_get_type ();
 	g_mime_decrypt_result_get_type ();
--
cgit v0.9.2