Marcus Rückert 2018-07-13 17:14:16 +00:00 committed by Git OBS Bridge
parent 7c0285ed97
commit 165abf0980
5 changed files with 38 additions and 5 deletions

23
2338.patch Normal file
View File

@ -0,0 +1,23 @@
From 58f2b7c2beec64d543d62b94f57efe304f68bb75 Mon Sep 17 00:00:00 2001
From: Igor Ippolitov <iippolitov@gmail.com>
Date: Thu, 12 Jul 2018 16:32:51 +0300
Subject: [PATCH] fix email address parsing: ebraces should increase till
matched with obraces
---
src/libmime/email_addr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libmime/email_addr.c b/src/libmime/email_addr.c
index a0ad9ac19..50c293b35 100644
--- a/src/libmime/email_addr.c
+++ b/src/libmime/email_addr.c
@@ -372,7 +372,7 @@ rspamd_email_address_from_mime (rspamd_mempool_t *pool,
obraces ++;
}
else if (*p == ')') {
- ebraces --;
+ ebraces ++;
}
if (obraces == ebraces) {

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:439ffe62996375ce2f9a42ecf3cd8dd7b91f76d877d0322ed2c8d7b81f3413a1
size 4652878

3
rspamd-1.7.8.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d8ce172fbe4c2e0cb4fedfc3c38bb92710de40f2e8659fb7445d03d558229af5
size 4542955

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jul 13 16:42:32 UTC 2018 - mrueckert@suse.de
- updated version to 1.7.8
https://github.com/vstakhov/rspamd/releases/tag/1.7.7
https://github.com/vstakhov/rspamd/releases/tag/1.7.8
- added https://github.com/vstakhov/rspamd/pull/2338.patch
-------------------------------------------------------------------
Fri Jul 13 16:37:41 UTC 2018 - mrueckert@suse.de

View File

@ -77,7 +77,7 @@
%global _wwwdir /srv/www/webapps
Name: rspamd
Version: 1.7.6
Version: 1.7.8
Release: 0
License: Apache-2.0
Summary: Spam filtering system
@ -85,6 +85,7 @@ Url: https://rspamd.com/
Group: Productivity/Networking/Email/Utilities
Source0: https://github.com/vstakhov/rspamd/archive/%{version}/%{name}-%{version}.tar.gz
Source1: rspamd.conf
Patch: https://github.com/vstakhov/rspamd/pull/2338.patch
BuildRequires: cmake
BuildRequires: curl-devel
@ -743,6 +744,7 @@ install -p -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/rspamd/
%{_datadir}/rspamd/lib/rspamadm/fuzzy_stat.lua
%{_datadir}/rspamd/lib/rspamadm/grep.lua
%{_datadir}/rspamd/lib/rspamadm/keypair.lua
%{_datadir}/rspamd/lib/rspamadm/mime.lua
%{_datadir}/rspamd/lib/rspamadm/rescore.lua
%{_datadir}/rspamd/lib/rspamadm/stat_convert.lua
@ -811,7 +813,6 @@ install -p -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/rspamd/
%dir %{_wwwdir}/%{name}/js
%{_wwwdir}/%{name}/js/main.js
%{_wwwdir}/%{name}/js/require.js
%dir %{_wwwdir}/%{name}/js/app
%{_wwwdir}/%{name}/js/app/config.js
@ -831,4 +832,5 @@ install -p -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/rspamd/
%{_wwwdir}/%{name}/js/lib/footable.min.js
%{_wwwdir}/%{name}/js/lib/humanize.min.js
%{_wwwdir}/%{name}/js/lib/jquery-3.3.1.min.js
%{_wwwdir}/%{name}/js/lib/require.min.js
%{_wwwdir}/%{name}/js/lib/visibility.min.js