Djam/claws-mail
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/claws-mail.git synced 2025-02-23 07:12:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rediff trashed-read patch

Browse source
This commit is contained in:
Denis Silakov 2016-02-20 12:11:57 +03:00
parent e8e666f6b9
commit 012890c948
4 changed files with 7 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -4,6 +4,6 @@ removed_sources:
claws-mail-3.12.0.tar.xz: f28f62de97a80d32bb875aef83f901c903fe324b claws-mail-3.12.0.tar.xz: f28f62de97a80d32bb875aef83f901c903fe324b
claws-mail-3.13.0.tar.xz: 87d329ad507e88ebe60730c3f099fda0ba7886bc claws-mail-3.13.0.tar.xz: 87d329ad507e88ebe60730c3f099fda0ba7886bc
claws-mail-3.13.1.tar.xz: a40ce184245f467b2eb6d1ca4249f797d84b12d6 claws-mail-3.13.1.tar.xz: a40ce184245f467b2eb6d1ca4249f797d84b12d6
claws-mail_ru.gmo.tar.gz: f659a0ac80aee14482b967292bdff984939f9037
sources: sources:
claws-mail-3.13.2.tar.xz: 8d670c30b07ac47ee1772e47f6721f49df77a4a7 claws-mail-3.13.2.tar.xz: 8d670c30b07ac47ee1772e47f6721f49df77a4a7
claws-mail_ru.gmo.tar.gz: f659a0ac80aee14482b967292bdff984939f9037

23
claws-mail-3.13.1-CVE-2015-8708.patch
View file

@ -1,23 +0,0 @@
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 == '$') {

8
claws-mail-3.13.0-trashed-read.patch → claws-mail-3.13.2-trashed-read.patch
View file

@ -1,7 +1,7 @@
diff -Naur claws-mail-3.13.0.orig/src/summaryview.c claws-mail-3.13.0/src/summaryview.c diff -Naur claws-mail-3.13.2.orig/src/summaryview.c claws-mail-3.13.2/src/summaryview.c
--- claws-mail-3.13.0.orig/src/summaryview.c 2015-10-14 23:55:44.671597103 +0300 --- claws-mail-3.13.2.orig/src/summaryview.c 2016-02-20 12:10:33.389668418 +0300
+++ claws-mail-3.13.0/src/summaryview.c 2015-10-14 23:55:44.741597119 +0300 +++ claws-mail-3.13.2/src/summaryview.c 2016-02-20 12:10:39.370668822 +0300
@@ -4651,6 +4651,10 @@ @@ -4657,6 +4657,10 @@
summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE); summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE);
} }
if (!prefs_common.immediate_exec) { if (!prefs_common.immediate_exec) {

8
claws-mail.spec
View file

@ -16,10 +16,7 @@ Group: Networking/Mail
Url: http://www.claws-mail.org Url: http://www.claws-mail.org
Source0: http://www.claws-mail.org/download.php?file=releases/%{name}-%{version}.tar.xz Source0: http://www.claws-mail.org/download.php?file=releases/%{name}-%{version}.tar.xz
# from Debian # from Debian
Patch0: claws-mail-3.13.0-trashed-read.patch Patch0: claws-mail-3.13.2-trashed-read.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: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: docbook-utils BuildRequires: docbook-utils
@ -622,8 +619,7 @@ or received.
%prep %prep
%setup -q %setup -q
#patch0 -p1 %patch0 -p1
#patch1 -p1
%build %build
%configure2_5x \ %configure2_5x \