Hello community,

here is the log from the commit of package claws-mail for openSUSE:Factory 
checked in at 2013-04-26 07:11:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/claws-mail (Old)
 and      /work/SRC/openSUSE:Factory/.claws-mail.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "claws-mail", Maintainer is "nadvor...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/claws-mail/claws-mail.changes    2012-11-24 
20:46:46.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.claws-mail.new/claws-mail.changes       
2013-04-26 07:11:44.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Apr 24 11:07:42 UTC 2013 - mrueck...@suse.de
+
+- pulled 2 patches from upstream to fix crash with unknown
+  encodings: (bnc#816881)
+  claws-mail-3.9.0_205b490083a141586c390bd985a3e22e99ea137d.patch
+  claws-mail-3.9.0_06e09c818f9455537e82e8395d658e0be336f873.patch
+
+-------------------------------------------------------------------

New:
----
  claws-mail-3.9.0_06e09c818f9455537e82e8395d658e0be336f873.patch
  claws-mail-3.9.0_205b490083a141586c390bd985a3e22e99ea137d.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ claws-mail.spec ++++++
--- /var/tmp/diff_new_pack.SrdKjs/_old  2013-04-26 07:11:54.000000000 +0200
+++ /var/tmp/diff_new_pack.SrdKjs/_new  2013-04-26 07:11:54.000000000 +0200
@@ -30,6 +30,10 @@
 Group:          Productivity/Networking/Email/Clients
 Source0:        
http://downloads.sourceforge.net/project/sylpheed-claws/Claws%20Mail/3.8.1/%{name}-%{version}.tar.bz2
 Patch0:         claws-mail-python.diff
+# PATCH-FIX-UPSTREAM 
claws-mail-3.9.0_205b490083a141586c390bd985a3e22e99ea137d.patch bnc#816881 
da...@opensu.se
+Patch1:         claws-mail-3.9.0_205b490083a141586c390bd985a3e22e99ea137d.patch
+# PATCH-FIX-UPSTREAM 
claws-mail-3.9.0_06e09c818f9455537e82e8395d658e0be336f873.patch bnc#816881 
da...@opensu.se
+Patch2:         claws-mail-3.9.0_06e09c818f9455537e82e8395d658e0be336f873.patch
 BuildRequires:  NetworkManager-devel
 BuildRequires:  compface
 BuildRequires:  db-devel
@@ -105,6 +109,8 @@
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2 -p1
 
 %build
 %configure \

++++++ claws-mail-3.9.0_06e09c818f9455537e82e8395d658e0be336f873.patch ++++++
commit 06e09c818f9455537e82e8395d658e0be336f873
Author: Paul <p...@claws-mail.org>
Date:   Wed Apr 24 10:19:48 2013 +0100

    further fix to bug #2862, 'Segmentation fault when replying to a message 
where the "code conversion" fails'

diff --git a/src/procmime.c b/src/procmime.c
index 5796741..2fe223b 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -798,17 +798,16 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
        } else if (mimeinfo->type == MIMETYPE_TEXT) {
                while (SC_FGETS(buf, sizeof(buf), tmpfp) != NULL) {
                        str = conv_codeset_strdup(buf, src_codeset, CS_UTF_8);
+                       if (!str)
+                               str =  conv_codeset_strdup(buf, 
conv_get_locale_charset_str(), CS_UTF_8);
                        if (str) {
-                               if ((scan_ret = scan_callback(str, cb_data)) == 
TRUE) {
-                                       g_free(str);
-                                       break;
-                               }
-                               g_free(str);
-                       } else {
+                               if ((scan_ret = scan_callback(str, cb_data)) == 
TRUE) {
+                                       g_free(str);
+                                       break;
+                               }
+                               g_free(str);    
+                       } else
                                conv_fail = TRUE;
-                               if ((scan_ret = scan_callback(str, cb_data)) == 
TRUE)
-                                       break;
-                       }
                }
        }
 
++++++ claws-mail-3.9.0_205b490083a141586c390bd985a3e22e99ea137d.patch ++++++
--- src/codeconv.h.orig 2013-01-21 15:59:17.000000000 +0000
+++ src/codeconv.h      2013-01-21 16:18:39.000000000 +0000
@@ -168,6 +168,7 @@
 #define CS_WINDOWS_874         "Windows-874"
 #define CS_GEORGIAN_PS         "GEORGIAN-PS"
 #define CS_TCVN5712_1          "TCVN5712-1"
+#define CS_X_VIET_VPS          "X-VIET-VPS"
 
 #define C_INTERNAL             C_UTF_8
 #define CS_INTERNAL            CS_UTF_8
--- src/procmime.c.orig 2013-01-21 15:59:12.000000000 +0000
+++ src/procmime.c      2013-01-21 16:22:26.000000000 +0000
@@ -768,6 +768,8 @@
                src_codeset = CS_GB18030;
        else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, 
CS_GB2312))
                src_codeset = CS_GB18030;
+       else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, 
CS_X_VIET_VPS))
+               src_codeset = CS_WINDOWS_874;
 
        if (mimeinfo->type == MIMETYPE_TEXT && 
!g_ascii_strcasecmp(mimeinfo->subtype, "html")) {
                SC_HTMLParser *parser;
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to