summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Natalenko2017-07-13 22:38:42 +0200
committerOleksandr Natalenko2017-07-13 22:38:42 +0200
commitb2fe09efe6b41855f4b1a45de87bd9e171178c77 (patch)
treed974e8a538d2ee29bbb69154cd64ac77ac5cafcd
parent4593815d7942a46d9ebf76947134a524a07ebcbf (diff)
downloadaur-b2fe09efe6b41855f4b1a45de87bd9e171178c77.tar.gz
update to v1.6.2-4
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--fixes-1.6.2.diff20
3 files changed, 25 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 61610a837f3c..eddde4753f62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Jul 12 16:26:06 UTC 2017
+# Thu Jul 13 20:38:27 UTC 2017
pkgbase = rspamd
pkgdesc = Fast, free and open-source spam filtering system.
pkgver = 1.6.2
- pkgrel = 3
+ pkgrel = 4
url = https://rspamd.com
install = rspamd.install
arch = x86_64
@@ -89,7 +89,7 @@ pkgbase = rspamd
sha256sums = 815e709e018d5cb0fcc6153c67f4809f77de5599341ad62c97bc56b90a6660fb
sha256sums = f89edae5436a3c14e58210fb5c1d5bdd2f8a6f98c03dbc150ea9ff1a3fcfe441
sha256sums = 59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f
- sha256sums = af27419ad519a5c6931109a564b4f337be38e258969ade7d910fe7db5d1d0270
+ sha256sums = 983f45276e2eeb40d2cc813a29d484e16464af1941b1ddf2ee46af630bb8e4c8
pkgname = rspamd
diff --git a/PKGBUILD b/PKGBUILD
index 7d2e026972fa..9778ca7c8b02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Former maintainer: Andrew Lewis <nerf@judo.za.org>
pkgname=rspamd
pkgver=1.6.2
-pkgrel=3
+pkgrel=4
epoch=
pkgdesc="Fast, free and open-source spam filtering system."
arch=('x86_64' 'i686')
@@ -86,7 +86,7 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vstakhov/${pkgname}/arc
sha256sums=('815e709e018d5cb0fcc6153c67f4809f77de5599341ad62c97bc56b90a6660fb'
'f89edae5436a3c14e58210fb5c1d5bdd2f8a6f98c03dbc150ea9ff1a3fcfe441'
'59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f'
- 'af27419ad519a5c6931109a564b4f337be38e258969ade7d910fe7db5d1d0270')
+ '983f45276e2eeb40d2cc813a29d484e16464af1941b1ddf2ee46af630bb8e4c8')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/fixes-1.6.2.diff b/fixes-1.6.2.diff
index f10550d31c76..9a37ebc15d43 100644
--- a/fixes-1.6.2.diff
+++ b/fixes-1.6.2.diff
@@ -136,6 +136,26 @@ index 85eea48df..7c88928eb 100644
if transp_rate > 0.1 then
return true,(transp_rate * 2.0),arg
end
+diff --git a/src/libmime/mime_parser.c b/src/libmime/mime_parser.c
+index ab83c09ac..0c293f9a6 100644
+--- a/src/libmime/mime_parser.c
++++ b/src/libmime/mime_parser.c
+@@ -280,11 +280,12 @@ rspamd_mime_part_get_cte (struct rspamd_task *task,
+ else {
+ for (i = 0; i < hdrs_cte->len; i ++) {
+ gsize hlen;
++ gchar lc_buf[128];
+
+ hdr = g_ptr_array_index (hdrs_cte, i);
+- hlen = strlen (hdr->value);
+- rspamd_str_lc (hdr->value, hlen);
+- cte = rspamd_mime_parse_cte (hdr->value, hlen);
++ hlen = rspamd_snprintf (lc_buf, sizeof (lc_buf), "%s", hdr->value);
++ rspamd_str_lc (lc_buf, hlen);
++ cte = rspamd_mime_parse_cte (lc_buf, hlen);
+
+ if (cte != RSPAMD_CTE_UNKNOWN) {
+ part->cte = cte;
diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c
index ef2adfe81..2e98d64fd 100644
--- a/src/lua/lua_util.c