Update rspamd to 0.9.5

0.9.5:
	* Avoid double free when extending HTTP message.
	* Fix double free if multiple classifiers are defined.
	* Fix misprint in spamassassin plugin.
	* Fix cpuid invocation on i386.
	* Fix ownership issues for zero-copy decode.
	* Allow __len metamethod on rspamd{text}.
	* Add base64 decoding lua utility.
	* Fix build on FreeBSD
	* Skip spaces at the beginning of mime messages.
	* DBL_ABUSE_REDIR should not have significant weight.
	* Allow to split by lua_regexp rspamd{text} objects.
	* Allow to specify custom stop pattern for lua_tcp.

0.9.4:
	* Fix critical bugs in tokenization algorithm
	* Write unit tests for tokenization
	* Add documentation for lua_tcp
	* Switch off legacy tokenization by default.
	* Fix critical bugs in words normalization
	* Add lua bindings to tokenizer.
	* Implement storing of HTTP headers inside task
	* Add lua API to accerss HTTP headers data
	* Implemented base64 encoding suitable for MIME
	* Use caseless hash and equal functions for HTTP request headers.
	* Improve debian architectures support (by @dottedmag)

0.9.3:
	* Revert incorrect regexp change that broke the default rules
	* Fix lua_tcp module

0.9.2:
	* Fix error on spawning unique workers.
	* Add preliminary version of generic LUA TCP requests API.
	* Use lua 5.1 if luajit is not available (Arm64, PowerPC, s390x etc)
	* Fix fuzzy mime strings with only type.
	* Improve thunderbird sanity checks.
	* Fix critical bug on matching regular expressions.
	* Make hiredis optional dependency.
	* Fix multiple bugs in daemon reloading

0.9.1:
	* Restore utf8 validation for regular expressions to avoid crashes
	* Fix symbols displaying in the interface
	* Add symbol groups to the interface
	* Fix maps ID parsing in the controller
	* Add multimap and regexp modules documentation
	* Backport fixes from libucl
	* Fix debian package (by @dottedmag)
	* Rework XXH32 invocations

0.9.0:
	* Add support of the fast and secure protocol level encryption:
		- curve25519 is used for key exchange;
		- chacha20/poly1305 cryptobox construction for bulk encryption;
		- zero latency overhead;
		- encrypting and balancing HTTP proxy worker
	* Rework expressions and create new expressions library:
		- aggressive optimizations based on the abstract syntax tree;
		- abstract expressions support (regular expressions, functions, lua modules
		  composites and so on)
		- New comparision and '+' operators support
		- New greedy algorithm to minimize execution time of expressions and
		  all symbols
		- Dynamic expressions benchmark and reoptimizations
	* Many improvements to the LUA API:
		- reworked logger module allowing to do pretty print of the most of lua
		  types (including tables and userdata classes)
		- reworked lua redis and lua HTTP to support more features
		- added opaque type for passing large text chunks without copying
		- new regexp module with many auxiliary functions (e.g. `re:split`)
	* LuaJIT is now the default requirement for rspamd allowing to speed up lua
	  execution by a large margin (however, plain lua is still supported)
	* New plugins:
		- spamassassin rules plugin that allows to load and re-use the most of
		  SA rules natively
		- DMARC plugin that evaluates SPF and DKIM policies to the domain policies
		- many old plugins has been reworked to implement new features and improve
		  stability
	* New aho-corasic trie implementation from @mischasan that allows to load and
	  use hundreds of thousands of patterns with no influence on load
	* Support of PCRE JIT and PCRE JIT fast path modes that significantly improves
	  the performance of regular expressions if supported by PCRE
	* New URLs parser and extractor:
		- removed legacy code that was useless for url finding
		- reworked algorithms of URL parsing for more precise and accurate results
		- added top-level-domains tree from http://publicsuffix.org
		- improved emails parsing
		- removed many phishing false positives due to TLD tree check
	* New statistics infrastructure:
		- created a separate layer of statistic library
		- improved OSB-Bayes by re-weighting tokens according to the original
		  academic paper and `crm114` implementation, which reduced false positives
		  rate significantly
		- created learn cache to avoid double learning of statistics and providing
		  an efficient way to re-learn class for a message
		- created abstract layers for different statistics backends
		- implemented new tokenization algorithms with fast or secure (siphash)
		  hashes to generate statistics features
	* Reworked utf8 tokenization that previously corrupted all UTF8 words (minor
	  incompatibility with old fuzzy hashes with utf-8 symbols)
	* SPF module has been completely rewritten to support complex cases of
	  `include` and `redirect` within SPF records
	* DKIM module now supports multiple signatures
	* Controller passwords can now be stored encrypted by `PBKDF2-HMAC` in the
	  configuration file
	* Many hand-written HTTP clients has been replaced with the common rspamd
	  http module
	* New test framework:
		- import lua `telescope` test framework
		- add unit tests for many rspamd modules and routines
		- create a unit test for each possible bug found
		- use luajit ffi for testing C code
		- added preliminary support of functional testing by creating tasks from lua
	* Randomize hash seed to avoid certain hash tables vulnerabilities
	* Documentation improvements:
		- added documentation for the vast majority of rspamd modules
		- added documentation for rspamd protocol
		- added documentation for the most of rspamd LUA extensions
	* Fixed tonns of bugs and memory leaks
	* Added tonns of minor features

0.8.3:
	* Various critical fixes in distribution (by @dottedmag and @fatalbanana)
	* Fixed bugs in url detector to parse certain patterns
	* Add default host and helo for a client
	* Some sanity checks for tokenizer and classifier
	* Reiterate on systemd support
	* Fix missing symbol registration
	* Add support of spamc compatible output
	* Filter double-dots in rbl.lua validate_dns (by @fatalbanana)
	* Update ucl submodule due to critical bugfix

0.8.2:
	* Create fuzzy db if it does not exist
	* Fix: Centos init script: configtest() (by @AlexeySa)
	* Enable one_shot for RECEIVED_SPAMHAUS_XBL - Fixes #102 (by @fatalbanana)
	* Update Exim patch (by @fatalbanana)
	* Fix processing of unix sockets.
	* Allow applying settings to authenticated users (by @fatalbanana)
	* Make settings priorities work as documented (by @fatalbanana)
	* Fix race condition in symbols planner
	* Add DNSWL_BLOCKED symbol (by @fatalbanana)
	* Make Exim pass usernames to rspamd (by @fatalbanana)
	* Update RBL module (by @fatalbanana):
		- fix indentation;
		- collapse loops;
		- avoid calling for un-needed information;
		- allow disabling RBLs for authenticated users
	* once_received.lua: Fix indentation & add exclusion for authenticated users (by @fatalbanana)
	* hfilter.lua: Add exclusion for authenticated users (by @AlexeySa)
	* Updates to hfilter rules (by @AlexeySa)
	* Set empty <> user or addr for msgs without FROM (by @eneq123)
	* Fix: attempt to index field '?' (a nil value) (by @eneq123)
	* Fix: if not exist Date-header (by @AlexeySa)
	* Add task:get_content() method.
	* rbl.lua: Ignore private IP space (by @fatalbanana)
	* Allow to check radix maps from lua by rspamd{ip}
	* Make local exclusions configurable per-RBL (by @fatalbanana)
	* Add rspamd_config:radix_from_config() (by @fatalbanana)
	* Support emails dnsbl in rbl (by @fatalbanana)
	* Complete rework of url extraction logic
	* Allow customizations for unix sockets. (fixes #182)
	* Set lua path according to rspamd settings.
	* Import lua-functional for plugins stuff.
	* Completely rewrite multimap plugin in functional style.
	* Fix FORGED_MUA_THUNDERBIRD_MSGID (fixes #186)
	* Check IPv6 addresses at dnswl.org and Spamhaus whitelist (by @fatalbanana)
	* Add lowercase utility for utf8 strings.
	* Various fixes to build system
	* Updated debian configuration infrastructure (by @dottedmag)

3 files changed, 27 insertions, 29 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 79f8352e22c..035cb937afd 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2015/04/06 08:17:32 adam Exp $
+# $NetBSD: Makefile,v 1.12 2015/06/05 00:49:35 wiedi Exp $
 
-DISTNAME=	rspamd-0.8.1
-PKGREVISION=	1
+DISTNAME=	rspamd-0.9.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rspamd.com/downloads/
 EXTRACT_SUFX=	.tar.xz
@@ -16,19 +15,22 @@ USE_TOOLS+=	perl pkg-config
 USE_LANGUAGES=	c99
 CPPFLAGS.SunOS+=	-D__EXTENSIONS__
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd
+TEST_TARGET=	run-test
 
 PKG_SYSCONFSUBDIR=	rspamd
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
-CMAKE_ARGS+=    -DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+=    -DCONFDIR:PATH=${EGDIR}
+CMAKE_ARGS+=	-DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
+CMAKE_ARGS+=	-DCONFDIR:PATH=${EGDIR}
+CMAKE_ARGS+=	-DENABLE_LUAJIT=OFF
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/lua
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/lua/regexp
 
 CONF_FILES=	${EGDIR}/2tld.inc ${PKG_SYSCONFDIR}/2tld.inc
+CONF_FILES+=	${EGDIR}/common.conf ${PKG_SYSCONFDIR}/common.conf
 CONF_FILES+=	${EGDIR}/composites.conf ${PKG_SYSCONFDIR}/composites.conf
-CONF_FILES+=	${EGDIR}/logging.conf ${PKG_SYSCONFDIR}/logging.conf
+CONF_FILES+=	${EGDIR}/logging.inc ${PKG_SYSCONFDIR}/logging.inc
 CONF_FILES+=	${EGDIR}/lua/hfilter.lua ${PKG_SYSCONFDIR}/lua/hfilter.lua
 CONF_FILES+=	${EGDIR}/lua/regexp/drugs.lua ${PKG_SYSCONFDIR}/lua/regexp/drugs.lua
 CONF_FILES+=	${EGDIR}/lua/regexp/fraud.lua ${PKG_SYSCONFDIR}/lua/regexp/fraud.lua
@@ -38,11 +40,12 @@ CONF_FILES+=	${EGDIR}/lua/rspamd.classifiers.lua ${PKG_SYSCONFDIR}/lua/rspamd.cl
 CONF_FILES+=	${EGDIR}/lua/rspamd.lua ${PKG_SYSCONFDIR}/lua/rspamd.lua
 CONF_FILES+=	${EGDIR}/metrics.conf ${PKG_SYSCONFDIR}/metrics.conf
 CONF_FILES+=	${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf
-CONF_FILES+=	${EGDIR}/options.conf ${PKG_SYSCONFDIR}/options.conf
+CONF_FILES+=	${EGDIR}/options.inc ${PKG_SYSCONFDIR}/options.inc
 CONF_FILES+=	${EGDIR}/rspamd.conf ${PKG_SYSCONFDIR}/rspamd.conf
 CONF_FILES+=	${EGDIR}/statistic.conf ${PKG_SYSCONFDIR}/statistic.conf
 CONF_FILES+=	${EGDIR}/surbl-whitelist.inc ${PKG_SYSCONFDIR}/surbl-whitelist.inc
-CONF_FILES+=	${EGDIR}/workers.conf ${PKG_SYSCONFDIR}/workers.conf
+CONF_FILES+=	${EGDIR}/worker-controller.inc ${PKG_SYSCONFDIR}/worker-controller.inc
+CONF_FILES+=	${EGDIR}/worker-normal.inc ${PKG_SYSCONFDIR}/worker-normal.inc
 
 post-extract:
 	${FIND} ${WRKSRC}/conf -type d -exec ${CHMOD} ${PKGDIRMODE} {} \;
@@ -53,4 +56,5 @@ post-extract:
 .include "../../mail/gmime/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
+.include "../../databases/hiredis/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST
index 62f9a8d1671..a637aa236c9 100644
--- a/mail/rspamd/PLIST
+++ b/mail/rspamd/PLIST
@@ -1,26 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2015/01/17 17:34:07 wiedi Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/06/05 00:49:35 wiedi Exp $
 bin/rspamc
 bin/rspamc-${PKGVERSION}
 bin/rspamd
 bin/${PKGNAME}
-lib/rspamd/librspamd-cdb.so
-lib/rspamd/librspamd-cdb.so.${PKGVERSION}
-lib/rspamd/librspamd-http-parser.so
-lib/rspamd/librspamd-http-parser.so.${PKGVERSION}
-lib/rspamd/librspamd-lua.so
-lib/rspamd/librspamd-lua.so.${PKGVERSION}
-lib/rspamd/librspamd-mime.so
-lib/rspamd/librspamd-mime.so.${PKGVERSION}
-lib/rspamd/librspamd-server.so
-lib/rspamd/librspamd-server.so.${PKGVERSION}
-lib/rspamd/librspamd-util.so
-lib/rspamd/librspamd-util.so.${PKGVERSION}
-lib/rspamd/librspamdclient.so
+lib/rspamd/librspamd-actrie.so
 man/man1/rspamc.1
 man/man8/rspamd.8
 share/examples/rspamd/2tld.inc
+share/examples/rspamd/common.conf
 share/examples/rspamd/composites.conf
-share/examples/rspamd/logging.conf
+share/examples/rspamd/logging.inc
 share/examples/rspamd/lua/hfilter.lua
 share/examples/rspamd/lua/regexp/drugs.lua
 share/examples/rspamd/lua/regexp/fraud.lua
@@ -30,13 +19,17 @@ share/examples/rspamd/lua/rspamd.classifiers.lua
 share/examples/rspamd/lua/rspamd.lua
 share/examples/rspamd/metrics.conf
 share/examples/rspamd/modules.conf
-share/examples/rspamd/options.conf
+share/examples/rspamd/options.inc
 share/examples/rspamd/rspamd.conf
 share/examples/rspamd/statistic.conf
 share/examples/rspamd/surbl-whitelist.inc
-share/examples/rspamd/workers.conf
+share/examples/rspamd/worker-controller.inc
+share/examples/rspamd/worker-normal.inc
+share/rspamd/effective_tld_names.dat
+share/rspamd/lua/dmarc.lua
 share/rspamd/lua/emails.lua
 share/rspamd/lua/forged_recipients.lua
+share/rspamd/lua/fun.lua
 share/rspamd/lua/ip_score.lua
 share/rspamd/lua/maillist.lua
 share/rspamd/lua/multimap.lua
@@ -45,6 +38,7 @@ share/rspamd/lua/phishing.lua
 share/rspamd/lua/ratelimit.lua
 share/rspamd/lua/rbl.lua
 share/rspamd/lua/settings.lua
+share/rspamd/lua/spamassassin.lua
 share/rspamd/lua/trie.lua
 share/rspamd/www/README.md
 share/rspamd/www/css/rspamd.css
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index ab583c935c1..2f310276bbb 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2015/01/23 21:47:44 wiedi Exp $
+$NetBSD: distinfo,v 1.5 2015/06/05 00:49:35 wiedi Exp $
 
-SHA1 (rspamd-0.8.1.tar.xz) = 7ffe119d8ddfb05e298d740c2ad66156385170db
-RMD160 (rspamd-0.8.1.tar.xz) = 16817053945d234122a93aee39287320f8c5cf75
-Size (rspamd-0.8.1.tar.xz) = 750724 bytes
+SHA1 (rspamd-0.9.5.tar.xz) = c298e7e02f77fc1577008ef5aa1da3ec5c8e2723
+RMD160 (rspamd-0.9.5.tar.xz) = 786b767f11328d4914db29dbbc13896742ee96a2
+Size (rspamd-0.9.5.tar.xz) = 802752 bytes