update to v1.5.7-2

3 files changed, 90 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9c18eaac421..f4e4dd1990cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue May  2 17:09:04 UTC 2017
+# Tue May  9 08:42:38 UTC 2017
 pkgbase = rspamd
 	pkgdesc = Fast, free and open-source spam filtering system.
 	pkgver = 1.5.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://rspamd.com
 	install = rspamd.install
 	arch = x86_64
@@ -90,7 +90,7 @@ pkgbase = rspamd
 	sha256sums = 73d18b129a072e35c74c9a440abdd0985fa15696d308a5e23736ec007432fd70
 	sha256sums = f89edae5436a3c14e58210fb5c1d5bdd2f8a6f98c03dbc150ea9ff1a3fcfe441
 	sha256sums = 59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f
-	sha256sums = f23e040f5b25b0fff7f1fd26a29ea1e95352219b81c20a28d3ef066311503232
+	sha256sums = 3bc8d5668cd1a28f53055ca7d46becb0e0e3121b95b4b9c6bea24e884ce7a310
 
 pkgname = rspamd
 
diff --git a/PKGBUILD b/PKGBUILD
index 36f8cc9cad97..166a6dd0d4ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Former maintainer: Andrew Lewis <nerf@judo.za.org>
 pkgname=rspamd
 pkgver=1.5.7
-pkgrel=1
+pkgrel=2
 epoch=
 pkgdesc="Fast, free and open-source spam filtering system."
 arch=('x86_64' 'i686' 'mips64el')
@@ -85,7 +85,7 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vstakhov/${pkgname}/arc
 sha256sums=('73d18b129a072e35c74c9a440abdd0985fa15696d308a5e23736ec007432fd70'
             'f89edae5436a3c14e58210fb5c1d5bdd2f8a6f98c03dbc150ea9ff1a3fcfe441'
             '59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f'
-            'f23e040f5b25b0fff7f1fd26a29ea1e95352219b81c20a28d3ef066311503232')
+            '3bc8d5668cd1a28f53055ca7d46becb0e0e3121b95b4b9c6bea24e884ce7a310')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/fixes-1.5.7.diff b/fixes-1.5.7.diff
index 127ef31d63cb..3ddbcd14da88 100644
--- a/fixes-1.5.7.diff
+++ b/fixes-1.5.7.diff
@@ -1,8 +1,44 @@
 diff --git a/src/libutil/map.c b/src/libutil/map.c
-index 57c84e37..97a98279 100644
+index 57c84e37..e67e0f6f 100644
 --- a/src/libutil/map.c
 +++ b/src/libutil/map.c
-@@ -2290,7 +2290,7 @@ rspamd_re_map_insert_helper (gpointer st, gconstpointer key, gconstpointer value
+@@ -717,6 +717,7 @@ rspamd_map_periodic_dtor (struct map_periodic_cbdata *periodic)
+ 
+ 	map = periodic->map;
+ 	msg_debug_map ("periodic dtor %p", periodic);
++	event_del (&periodic->ev);
+ 
+ 	if (periodic->need_modify) {
+ 		/* We are done */
+@@ -770,20 +771,20 @@ rspamd_map_schedule_periodic (struct rspamd_map *map,
+ 	REF_INIT_RETAIN (cbd, rspamd_map_periodic_dtor);
+ 
+ 	if (initial) {
+-		evtimer_set (&map->ev, rspamd_map_periodic_callback, cbd);
+-		event_base_set (map->ev_base, &map->ev);
++		evtimer_set (&cbd->ev, rspamd_map_periodic_callback, cbd);
++		event_base_set (map->ev_base, &cbd->ev);
+ 	}
+ 	else {
+-		evtimer_del (&map->ev);
+-		evtimer_set (&map->ev, rspamd_map_periodic_callback, cbd);
+-		event_base_set (map->ev_base, &map->ev);
++		evtimer_set (&cbd->ev, rspamd_map_periodic_callback, cbd);
++		event_base_set (map->ev_base, &cbd->ev);
+ 	}
+ 
+ 	jittered_sec = rspamd_time_jitter (timeout, 0);
+-	msg_debug_map ("schedule new periodic event %p in %.2f seconds", cbd, jittered_sec);
++	msg_debug_map ("schedule new periodic event %p in %.2f seconds",
++			cbd, jittered_sec);
+ 	double_to_tv (jittered_sec, &map->tv);
+ 
+-	evtimer_add (&map->ev, &map->tv);
++	evtimer_add (&cbd->ev, &map->tv);
+ }
+ 
+ static void
+@@ -2290,7 +2291,7 @@ rspamd_re_map_insert_helper (gpointer st, gconstpointer key, gconstpointer value
  	}
  #else
  	if (pcre_flags & PCRE_FLAG(UTF)) {
@@ -11,3 +47,50 @@ index 57c84e37..97a98279 100644
  	}
  #endif
  
+diff --git a/src/libutil/map_private.h b/src/libutil/map_private.h
+index 9e24695b..4f00c3db 100644
+--- a/src/libutil/map_private.h
++++ b/src/libutil/map_private.h
+@@ -79,7 +79,6 @@ struct rspamd_map {
+ 	gchar *description;
+ 	gchar *name;
+ 	guint32 id;
+-	struct event ev;
+ 	struct timeval tv;
+ 	gdouble poll_timeout;
+ 	/* Shared lock for temporary disabling of map reading (e.g. when this map is written by UI) */
+@@ -123,6 +122,7 @@ enum rspamd_map_http_stage {
+ struct map_periodic_cbdata {
+ 	struct rspamd_map *map;
+ 	struct map_cb_data cbdata;
++	struct event ev;
+ 	gboolean need_modify;
+ 	gboolean errored;
+ 	guint cur_backend;
+diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
+index 2240ac53..dbf88e54 100644
+--- a/src/plugins/fuzzy_check.c
++++ b/src/plugins/fuzzy_check.c
+@@ -2396,7 +2396,8 @@ fuzzy_generate_commands (struct rspamd_task *task, struct fuzzy_rule *rule,
+ #endif
+ end:
+ 	if (res->len == 0) {
+-		g_ptr_array_free (res, FALSE);
++		g_ptr_array_free (res, TRUE);
++
+ 		return NULL;
+ 	}
+ 
+diff --git a/src/plugins/lua/dkim_signing.lua b/src/plugins/lua/dkim_signing.lua
+index 4843146a..974f2278 100644
+--- a/src/plugins/lua/dkim_signing.lua
++++ b/src/plugins/lua/dkim_signing.lua
+@@ -79,7 +79,7 @@ local function dkim_signing_cb(task)
+     return false
+   end
+   local hfrom = task:get_from('mime')
+-  if not settings.allow_hdrfrom_multiple and hfrom[2] then
++  if not settings.allow_hdrfrom_multiple and (hfrom or E)[2] then
+     rspamd_logger.debugm(N, task, 'multiple header from not allowed')
+     return false
+   end