update to v1.5.9

4 files changed, 103 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d959fd67541..21f9d1b63fac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed May 24 18:04:08 UTC 2017
+# Tue Jun  6 16:11:58 UTC 2017
 pkgbase = rspamd
 	pkgdesc = Fast, free and open-source spam filtering system.
-	pkgver = 1.5.8
+	pkgver = 1.5.9
 	pkgrel = 2
 	url = https://rspamd.com
 	install = rspamd.install
@@ -83,14 +83,14 @@ pkgbase = rspamd
 	backup = etc/rspamd/worker-controller.inc
 	backup = etc/rspamd/worker-fuzzy.inc
 	backup = etc/rspamd/worker-normal.inc
-	source = rspamd-1.5.8.tar.gz::https://github.com/vstakhov/rspamd/archive/1.5.8.tar.gz
+	source = rspamd-1.5.9.tar.gz::https://github.com/vstakhov/rspamd/archive/1.5.9.tar.gz
 	source = rspamd.tmpfile
 	source = rspamd.sysuser
-	source = fixes-1.5.8.diff
-	sha256sums = 1c414396e02df52b3a31914cad51a4ca8f9947af619db7221b98c9aa04907668
+	source = fixes-1.5.9.diff
+	sha256sums = 864705c09733257449ffc52740f380c1edeb56bb4be6e0ad0a8ab8c0cdf6cbe6
 	sha256sums = f89edae5436a3c14e58210fb5c1d5bdd2f8a6f98c03dbc150ea9ff1a3fcfe441
 	sha256sums = 59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f
-	sha256sums = b235caf3312156b2939d87cdadd8f6fc60aa328f600117672fbf2d466de95560
+	sha256sums = cfcb82cc1833bf1db6501ed78d62ba68b51bcd9087db139e393121b50f6d557d
 
 pkgname = rspamd
 
diff --git a/PKGBUILD b/PKGBUILD
index 7a7b670c9627..cb1442c97499 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Oleksandr Natalenko <oleksandr@natalenko.name>
 # Former maintainer: Andrew Lewis <nerf@judo.za.org>
 pkgname=rspamd
-pkgver=1.5.8
+pkgver=1.5.9
 pkgrel=2
 epoch=
 pkgdesc="Fast, free and open-source spam filtering system."
@@ -82,10 +82,10 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vstakhov/${pkgname}/arc
 		"fixes-${pkgver}.diff"
 		)
 
-sha256sums=('1c414396e02df52b3a31914cad51a4ca8f9947af619db7221b98c9aa04907668'
+sha256sums=('864705c09733257449ffc52740f380c1edeb56bb4be6e0ad0a8ab8c0cdf6cbe6'
             'f89edae5436a3c14e58210fb5c1d5bdd2f8a6f98c03dbc150ea9ff1a3fcfe441'
             '59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f'
-            'b235caf3312156b2939d87cdadd8f6fc60aa328f600117672fbf2d466de95560')
+            'cfcb82cc1833bf1db6501ed78d62ba68b51bcd9087db139e393121b50f6d557d')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/fixes-1.5.8.diff b/fixes-1.5.8.diff
deleted file mode 100644
index f70d5c47e684..000000000000
--- a/fixes-1.5.8.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/libutil/addr.c b/src/libutil/addr.c
-index 54988cf4..6253dc16 100644
---- a/src/libutil/addr.c
-+++ b/src/libutil/addr.c
-@@ -280,6 +280,11 @@ rspamd_accept_from_socket (gint sock, rspamd_inet_addr_t **target,
- 						sizeof (struct in6_addr));
- 			}
- 		}
-+		else {
-+			addr = rspamd_inet_addr_create (AF_INET6);
-+			memcpy (&addr->u.in.addr.s6.sin6_addr, &su.s6.sin6_addr,
-+					sizeof (struct in6_addr));
-+		}
- 
- 	}
- 	else {
-@@ -287,8 +292,6 @@ rspamd_accept_from_socket (gint sock, rspamd_inet_addr_t **target,
- 		addr->slen = len;
- 
- 		if (addr->af == AF_UNIX) {
--			addr->u.un = g_slice_alloc0 (sizeof (*addr->u.un));
--			/* Get name from the listening socket */
- 			len = sizeof (su);
- 
- 			if (getsockname (sock, &su.sa, &len) != -1) {
diff --git a/fixes-1.5.9.diff b/fixes-1.5.9.diff
new file mode 100644
index 000000000000..7966b1caf609
--- /dev/null
+++ b/fixes-1.5.9.diff
@@ -0,0 +1,94 @@
+diff --git a/src/libserver/spf.c b/src/libserver/spf.c
+index fdd4a5136..d985695fc 100644
+--- a/src/libserver/spf.c
++++ b/src/libserver/spf.c
+@@ -1386,7 +1386,7 @@ reverse_spf_ip (gchar *ip, gint len)
+ }
+ 
+ static const gchar *
+-expand_spf_macro (struct spf_record *rec,
++expand_spf_macro (struct spf_record *rec, struct spf_resolved_element *resolved,
+ 		const gchar *begin)
+ {
+ 	const gchar *p;
+@@ -1396,13 +1396,11 @@ expand_spf_macro (struct spf_record *rec,
+ 	gchar ip_buf[INET6_ADDRSTRLEN];
+ 	gboolean need_expand = FALSE;
+ 	struct rspamd_task *task;
+-	struct spf_resolved_element *resolved;
+ 
+ 	g_assert (rec != NULL);
+ 	g_assert (begin != NULL);
+ 
+ 	task = rec->task;
+-	resolved = g_ptr_array_index (rec->resolved, rec->resolved->len - 1);
+ 	p = begin;
+ 	/* Calculate length */
+ 	while (*p) {
+@@ -1594,8 +1592,14 @@ expand_spf_macro (struct spf_record *rec,
+ 						c += len;
+ 						break;
+ 					case 'v':
+-						len = sizeof ("in-addr") - 1;
+-						memcpy (c, "in-addr", len);
++						if (rspamd_inet_address_get_af (task->from_addr) == AF_INET) {
++							len = sizeof ("in-addr") - 1;
++							memcpy (c, "in-addr", len);
++						}
++						else {
++							len = sizeof ("ip6") - 1;
++							memcpy (c, "ip6", len);
++						}
+ 						c += len;
+ 						break;
+ 					case 'h':
+@@ -1606,6 +1610,11 @@ expand_spf_macro (struct spf_record *rec,
+ 								memcpy (c, tmp + 1, len);
+ 								c += len;
+ 							}
++							else {
++								len = strlen (task->helo);
++								memcpy (c, task->helo, len);
++								c += len;
++							}
+ 						}
+ 						break;
+ 					default:
+@@ -1671,7 +1680,7 @@ parse_spf_record (struct spf_record *rec, struct spf_resolved_element *resolved,
+ 	}
+ 
+ 	task = rec->task;
+-	begin = expand_spf_macro (rec, elt);
++	begin = expand_spf_macro (rec, resolved, elt);
+ 	addr = rspamd_spf_new_addr (rec, resolved, begin);
+ 	g_assert (addr != NULL);
+ 	t = g_ascii_tolower (addr->spf_string[0]);
+diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
+index 75f4091b8..f5471eee4 100644
+--- a/src/plugins/fuzzy_check.c
++++ b/src/plugins/fuzzy_check.c
+@@ -944,7 +944,7 @@ fuzzy_check_module_config (struct rspamd_config *cfg)
+ 		fuzzy_module_ctx->text_multiplier = ucl_object_todouble (value);
+ 	}
+ 	else {
+-		fuzzy_module_ctx->text_multiplier = 0.5;
++		fuzzy_module_ctx->text_multiplier = 2.0;
+ 	}
+ 
+ 	if ((value =
+@@ -2319,11 +2319,12 @@ fuzzy_generate_commands (struct rspamd_task *task, struct fuzzy_rule *rule,
+ 			/* Check length of part */
+ 			fac = fuzzy_module_ctx->text_multiplier * part->content->len;
+ 			if ((double)fuzzy_module_ctx->min_bytes > fac) {
+-				msg_info_task ("<%s>, part is shorter than %d bytes (%.0f * %.2f bytes), "
++				msg_info_task ("<%s>, part is shorter than %d bytes: %.0f "
++						"(%d * %.2f bytes), "
+ 						"skip fuzzy check",
+ 						task->message_id, fuzzy_module_ctx->min_bytes, fac,
+-						fuzzy_module_ctx->text_multiplier,
+-						part->content->len);
++						part->content->len,
++						fuzzy_module_ctx->text_multiplier);
+ 				continue;
+ 			}
+