Updated to 3.13.1 + patch for CVE-2015-8708

.abf.yml

@@ -2,6 +2,7 @@ removed_sources:
   claws-mail-3.11.0.tar.xz: 1fc919e7d4357408a04131c4195878ea920de4f0
   claws-mail-3.11.1.tar.xz: b0c07906043f7a3ec726c7a96d6dcfc3c148b9cc
   claws-mail-3.12.0.tar.xz: f28f62de97a80d32bb875aef83f901c903fe324b
-sources:
   claws-mail-3.13.0.tar.xz: 87d329ad507e88ebe60730c3f099fda0ba7886bc
+sources:
+  claws-mail-3.13.1.tar.xz: a40ce184245f467b2eb6d1ca4249f797d84b12d6
   claws-mail_ru.gmo.tar.gz: f659a0ac80aee14482b967292bdff984939f9037

claws-mail-3.13.0-ru-i18n.patch

@@ -1,24 +0,0 @@
-diff -Naur claws-mail-3.13.0.orig/configure claws-mail-3.13.0/configure
---- claws-mail-3.13.0.orig/configure	2015-10-15 11:52:08.604907268 +0300
-+++ claws-mail-3.13.0/configure	2015-10-15 11:52:35.098909056 +0300
-@@ -14870,7 +14870,7 @@
- 
- LIBS=$syl_save_LIBS
- 
--ALL_LINGUAS="bg ca cs de en_GB eo es fi fr he hu it lt nb nl pt_BR sk sv zh_TW"
-+ALL_LINGUAS="bg ca cs de en_GB eo es fi fr he hu it lt nb nl pt_BR ru sk sv zh_TW"
- GETTEXT_PACKAGE=claws-mail
- 
- 
-diff -Naur claws-mail-3.13.0.orig/configure.ac claws-mail-3.13.0/configure.ac
---- claws-mail-3.13.0.orig/configure.ac	2015-10-15 11:52:08.613907268 +0300
-+++ claws-mail-3.13.0/configure.ac	2015-10-15 11:52:46.985909858 +0300
-@@ -206,7 +206,7 @@
- LIBS=$syl_save_LIBS
- 
- dnl for gettext
--ALL_LINGUAS="bg ca cs de en_GB eo es fi fr he hu it lt nb nl pt_BR sk sv zh_TW"
-+ALL_LINGUAS="bg ca cs de en_GB eo es fi fr he hu it lt nb nl pt_BR ru sk sv zh_TW"
- GETTEXT_PACKAGE=claws-mail
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])

claws-mail-3.13.1-CVE-2015-8708.patch

@@ -0,0 +1,23 @@
+From: Paul <paul@claws-mail.org>
+Date: Tue, 22 Dec 2015 11:17:02 +0000 (+0000)
+Subject: fix bug 3584, 'After 3.13.1, characters in some Japanese codec are never correctly... 
+X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=e3ffcb455e0376053451ce968e6c71ef37708222
+
+fix bug 3584, 'After 3.13.1, characters in some Japanese codec are never correctly converted to internal ones'
+
+Thanks to honda@math.sci.hokudai.ac.jp
+---
+
+diff --git a/src/codeconv.c b/src/codeconv.c
+index 39e259f..f0ed616 100644
+--- a/src/codeconv.c
++++ b/src/codeconv.c
+@@ -158,7 +158,7 @@ static gint conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+ 	gchar *out = outbuf;
+ 	JISState state = JIS_ASCII;
+ 
+-	while (*in != '\0' && (out - outbuf) > outlen - 3) {
++	while (*in != '\0' && (out - outbuf) < outlen - 3) {
+ 		if (*in == ESC) {
+ 			in++;
+ 			if (*in == '$') {

claws-mail.spec

@@ -8,18 +8,18 @@
 
 Summary:	The user-friendly, lightweight and fast GTK2 based email client
 Name:		claws-mail
-Version:	3.13.0
+Version:	3.13.1
-Release:	2
+Release:	1
 Epoch:		1
 License:	GPLv3+
 Group:		Networking/Mail
 Url:		http://www.claws-mail.org
 Source0:	http://www.claws-mail.org/download.php?file=releases/%{name}-%{version}.tar.xz
-# From claws-mail Git
-Source1:	claws-mail_ru.gmo.tar.gz
 # from Debian
 Patch0:		claws-mail-3.13.0-trashed-read.patch
-Patch1:		claws-mail-3.13.0-ru-i18n.patch
+# From upstream git:
+# http://git.claws-mail.org/?p=claws.git;a=commitdiff;h=e3ffcb455e0376053451ce968e6c71ef37708222
+Patch1:         claws-mail-3.13.1-CVE-2015-8708.patch
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	docbook-utils
@@ -625,10 +625,6 @@ or received.
 %patch0 -p1
 %patch1 -p1
 
-pushd po
-tar -xvzf %{SOURCE1}
-popd
-
 %build
 %configure2_5x \
 	--enable-appdata \