Upgrade rspamd to 1.4.1

[Bartosz Kuzma <bartosz.kuzma%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Bartosz Kuzma <bartosz.kuzma%gmail.com@localhost>
Pushed By:	bartosz.kuzma
Date:		Thu Feb 16 06:45:29 2017 +0100
Changeset:	e6e17f5b6a68730843e3a891d4d401b8d027318c

Modified Files:
	rspamd13/Makefile
	rspamd13/PLIST
	rspamd13/distinfo
	rspamd13/patches/patch-src__CMakeLists.txt

Log Message:
Upgrade rspamd to 1.4.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e6e17f5b6a68730843e3a891d4d401b8d027318c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rspamd13/Makefile                          |  4 +++-
 rspamd13/PLIST                             | 26 ++++++++++++++++++++++++++
 rspamd13/distinfo                          | 10 +++++-----
 rspamd13/patches/patch-src__CMakeLists.txt |  4 ++--
 4 files changed, 36 insertions(+), 8 deletions(-)

diffs:
diff --git a/rspamd13/Makefile b/rspamd13/Makefile
index 68e9a67996..aaff7cbf72 100644
--- a/rspamd13/Makefile
+++ b/rspamd13/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	rspamd-1.3.5
+DISTNAME=	rspamd-1.4.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rspamd.com/downloads/
 EXTRACT_SUFX=	.tar.xz
@@ -17,6 +17,8 @@ USE_TOOLS+=	perl pkg-config
 USE_LANGUAGES=	c99
 BUILD_DEFS+=	VARBASE
 
+LUA_VERSIONS_ACCEPTED=	53
+
 CPPFLAGS.SunOS+=	-D__EXTENSIONS__
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd
 TEST_TARGET=	run-test
diff --git a/rspamd13/PLIST b/rspamd13/PLIST
index c97bb297ee..effbcc458c 100644
--- a/rspamd13/PLIST
+++ b/rspamd13/PLIST
@@ -15,24 +15,29 @@ share/examples/rspamd/common.conf
 share/examples/rspamd/composites.conf
 share/examples/rspamd/dmarc_whitelist.inc
 share/examples/rspamd/logging.inc
+share/examples/rspamd/maillist.inc
 share/examples/rspamd/metrics.conf
+share/examples/rspamd/mid.inc
 share/examples/rspamd/mime_types.inc
 share/examples/rspamd/modules.conf
 share/examples/rspamd/modules.d/chartable.conf
 share/examples/rspamd/modules.d/dkim.conf
 share/examples/rspamd/modules.d/dmarc.conf
 share/examples/rspamd/modules.d/emails.conf
+share/examples/rspamd/modules.d/fann_redis.conf
 share/examples/rspamd/modules.d/forged_recipients.conf
 share/examples/rspamd/modules.d/fuzzy_check.conf
 share/examples/rspamd/modules.d/hfilter.conf
 share/examples/rspamd/modules.d/ip_score.conf
 share/examples/rspamd/modules.d/maillist.conf
+share/examples/rspamd/modules.d/mid.conf
 share/examples/rspamd/modules.d/mime_types.conf
 share/examples/rspamd/modules.d/multimap.conf
 share/examples/rspamd/modules.d/once_received.conf
 share/examples/rspamd/modules.d/phishing.conf
 share/examples/rspamd/modules.d/ratelimit.conf
 share/examples/rspamd/modules.d/rbl.conf
+share/examples/rspamd/modules.d/redis.conf
 share/examples/rspamd/modules.d/regexp.conf
 share/examples/rspamd/modules.d/rspamd_update.conf
 share/examples/rspamd/modules.d/spf.conf
@@ -50,10 +55,15 @@ share/examples/rspamd/worker-controller.inc
 share/examples/rspamd/worker-fuzzy.inc
 share/examples/rspamd/worker-normal.inc
 share/rspamd/effective_tld_names.dat
+share/rspamd/lua/antivirus.lua
 share/rspamd/lua/asn.lua
+share/rspamd/lua/clickhouse.lua
 share/rspamd/lua/dcc.lua
 share/rspamd/lua/dmarc.lua
+share/rspamd/lua/dynamic_conf.lua
 share/rspamd/lua/emails.lua
+share/rspamd/lua/fann_classifier.lua
+share/rspamd/lua/fann_redis.lua
 share/rspamd/lua/fann_scores.lua
 share/rspamd/lua/forged_recipients.lua
 share/rspamd/lua/fun.lua
@@ -61,8 +71,12 @@ share/rspamd/lua/greylist.lua
 share/rspamd/lua/hfilter.lua
 share/rspamd/lua/ip_score.lua
 share/rspamd/lua/maillist.lua
+share/rspamd/lua/metadata_exporter.lua
+share/rspamd/lua/metric_exporter.lua
+share/rspamd/lua/mid.lua
 share/rspamd/lua/mime_types.lua
 share/rspamd/lua/multimap.lua
+share/rspamd/lua/mx_check.lua
 share/rspamd/lua/once_received.lua
 share/rspamd/lua/phishing.lua
 share/rspamd/lua/ratelimit.lua
@@ -76,30 +90,42 @@ share/rspamd/lua/whitelist.lua
 share/rspamd/rules/forwarding.lua
 share/rspamd/rules/html.lua
 share/rspamd/rules/http_headers.lua
+share/rspamd/rules/mid.lua
 share/rspamd/rules/misc.lua
+share/rspamd/rules/regexp/compromised_hosts.lua
 share/rspamd/rules/regexp/drugs.lua
 share/rspamd/rules/regexp/fraud.lua
 share/rspamd/rules/regexp/headers.lua
 share/rspamd/rules/regexp/lotto.lua
+share/rspamd/rules/regexp/misc.lua
 share/rspamd/rules/regexp/upstream_spam_filters.lua
 share/rspamd/rules/rspamd.classifiers.lua
 share/rspamd/rules/rspamd.lua
 share/rspamd/www/README.md
+share/rspamd/www/css/bootstrap.min.css
 share/rspamd/www/css/d3evolution.css
 share/rspamd/www/css/datatables.min.css
 share/rspamd/www/css/glyphicons-halflings-regular.woff
 share/rspamd/www/css/glyphicons-halflings-regular.woff2
 share/rspamd/www/css/rspamd.css
 share/rspamd/www/favicon.ico
+share/rspamd/www/fonts/glyphicons-halflings-regular.ttf
+share/rspamd/www/fonts/glyphicons-halflings-regular.woff
+share/rspamd/www/fonts/glyphicons-halflings-regular.woff2
 share/rspamd/www/img/asc.png
 share/rspamd/www/img/desc.png
+share/rspamd/www/img/rspamd_logo_navbar.png
 share/rspamd/www/img/spinner.gif
 share/rspamd/www/img/spinner.png
 share/rspamd/www/index.html
+share/rspamd/www/js/bootstrap.min.js
+share/rspamd/www/js/d3.min.js
 share/rspamd/www/js/d3evolution.min.js
 share/rspamd/www/js/d3pie.min.js
 share/rspamd/www/js/datatables.min.js
 share/rspamd/www/js/humanize.min.js
+share/rspamd/www/js/jquery-3.1.1.min.js
+share/rspamd/www/js/jquery.cookie.min.js
 share/rspamd/www/js/rspamd.js
 share/rspamd/www/plugins.txt
 share/rspamd/www/react-index.html
diff --git a/rspamd13/distinfo b/rspamd13/distinfo
index b897afc512..231b5f5b76 100644
--- a/rspamd13/distinfo
+++ b/rspamd13/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.7 2015/11/03 23:27:19 agc Exp $
 
-SHA1 (rspamd-1.3.5.tar.xz) = 3471af33cd8a40aa85e53167f376acf59716e07e
-RMD160 (rspamd-1.3.5.tar.xz) = 9c6933cff9fd136602b40b70c3b2576f36697e59
-SHA512 (rspamd-1.3.5.tar.xz) = 6d7223c6be6e49296a5228d3d05a5f8dfd4a4002df9d247740bce75f2f652a01d86c30456b8475d08d529d2787aa30191713961ffc82c380c00612cae371b61c
-Size (rspamd-1.3.5.tar.xz) = 1483044 bytes
+SHA1 (rspamd-1.4.1.tar.xz) = 5d2e709c493dd24e528ba2d66e24235ca570afaf
+RMD160 (rspamd-1.4.1.tar.xz) = bd9284281cd8a91f7e2bc0a234b4317d22c8146f
+SHA512 (rspamd-1.4.1.tar.xz) = bc3be3f20a9692a5d188d9a254ad459dba4ca01ae3c917689943be7eed85e17ab638e0d0b9f4dd574864b4f39eb7a728b7b0ecf3088727a92dfb99a2df4a5a6d
+Size (rspamd-1.4.1.tar.xz) = 1779492 bytes
 SHA1 (patch-CMakeLists.txt) = 81b847220b8c8736b13209fb5bedf0020a8d7acf
-SHA1 (patch-src__CMakeLists.txt) = 418b2b3d549b8448020c445b9e94febdb8713a3f
+SHA1 (patch-src__CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a
diff --git a/rspamd13/patches/patch-src__CMakeLists.txt b/rspamd13/patches/patch-src__CMakeLists.txt
index 5ea61dd521..c615a53945 100644
--- a/rspamd13/patches/patch-src__CMakeLists.txt
+++ b/rspamd13/patches/patch-src__CMakeLists.txt
@@ -2,11 +2,11 @@ $NetBSD$
 
 Add librt to link line for shm_open().
 
---- src/CMakeLists.txt.orig	2016-08-25 12:14:57.000000000 +0000
+--- src/CMakeLists.txt.orig	2016-10-17 14:30:59.000000000 +0000
 +++ src/CMakeLists.txt
 @@ -141,6 +141,9 @@ TARGET_LINK_LIBRARIES(rspamd-server rspa
- TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
  TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
  
 +# for shm_open
 +TARGET_LINK_LIBRARIES(rspamd-server rt)