Updated rspamd to 1.6.1.

1.6.1: 14 Jun 2017
	* [Fix] Allow to init resolver without rspamd_config
	* [Fix] Do not crash when resolver failed to initialize
	* [Fix] Fix abstract context layout
	* [Fix] Fix CGP helper reply parsing
	* [Fix] Fix crashes when socket write errors occur
	* [Fix] Fix parsing IPv6 nameservers in resolv.conf
	* [Fix] Milter: Don't defer on "greylist" action

1.6.0: 12 Jun 2017
	* [Conf] Add rspamd_proxy to the default configuration set
	* [Conf] Add sample arc module config
	* [Conf] Do away with systemd specifics completely
	* [Conf] Increase min_bytes to avoid FP
	* [Conf] Remove ratelimits from default configuration
	* [CritFix] Fix accepting on IPv6 sockets
	* [CritFix] Fix corruption when multiple fuzzy are defined
	* [CritFix] Fix learn condition in fuzzy check
	* [CritFix] Fix memory leak in fuzzy check
	* [CritFix] Fix memory leak in maps scheduling
	* [CritFix] Paese the last character in DKIM signature correctly
	* [CritFix] Zero fill sockaddr_un
	* [Feature] Add ability to add doc strings by example
	* [Feature] Add API to verify DKIM (and ARC) signatures
	* [Feature] Add compression/decompression to proxy
	* [Feature] Add count to url structure
	* [Feature] Add initial support of the new protocol reply
	* [Feature] Add Lua plugin spamtrap
	* [Feature] Add `monitored_address` for rbls
	* [Feature] Add new schema for bayes tokens
	* [Feature] Add preliminary ARC support to dkim code
	* [Feature] Add preliminary support of ARC signing
	* [Feature] Add rules to detect bad 8bit characters in From and To
	* [Feature] Add scanning support for milter protocol
	* [Feature] Add support for bidirectional symbols in rspamd_stats
	* [Feature] Add support for static maps
	* [Feature] Add support of maps with multiple regexps matches
	* [Feature] Add `text_multiplier` param
	* [Feature] Add the preliminary ARC plugin
	* [Feature] Add top redirector targets rank
	* [Feature] Allow async events to be registered from LUA rules
	* [Feature] Allow storing bayes tokens in Redis
	* [Feature] Allow to exclude specific domains from mx check
	* [Feature] Allow to have a stack of watcher finalisers
	* [Feature] Allow to pass hostname to `-i` flag in Rspamc
	* [Feature] Allow to set custom user agent in url redirector
	* [Feature] Allow to use custom callback when parsing resolv.conf
	* [Feature] Allow to use domain from authenticated user
	* [Feature] Bayes expiry plugin
	* [Feature] Check dkim sign keys for modifications
	* [Feature] DKIM signing: sign_networks/local address specific use_domain settings
	* [Feature] DMARC: Support excluding domains from sampling
	* [Feature] Expire processing items for URL redirector aggressively
	* [Feature] Fix surbl monitored for IP lists, add `monitored_domain` option
	* [Feature] Implement caching for dkim body hashes
	* [Feature] Implement milter protocol scan reply
	* [Feature] Improve omograph phishing detection
	* [Feature] Initial support of self-scan in Rspamd proxy
	* [Feature] Keep track of headers in milter interface
	* [Feature] Milter headers: better controls for local/authenticated
	* [Feature] Multimap: email:domain:tld filter
	* [Feature] Preliminary DMARC reporting implementation
	* [Feature] Reuse stemmers in the cache
	* [Feature] Rework confighelp to load Lua plugins
	* [Feature] Rework hfilter to use hyperscan if possible
	* [Feature] Rework lua RSA API
	* [Feature] Rmilter_headers: approximate rmilter's extended_spam_headers
	* [Feature] Start integration of milter support in proxy
	* [Feature] Store average words length and short words count
	* [Feature] Store hash of headers order and names
	* [Feature] Support MTA name header
	* [Feature] Support multiple types of dkim signing in Lua
	* [Feature] Support numeric arguments for Redis requests
	* [Feature] Use headers hash in bayes metatokens
	* [Feature] Use normal resolv.conf rules of rotation in Rspamd
	* [Feature] Use version 2 proto for checking messages
	* [Fix] Allow to follow symlinks when safe
	* [Fix] Append MX name for authentication results as required
	* [Fix] Change default text multiplier from 0.5 to 2.0
	* [Fix] Check min_bytes for images as well
	* [Fix] Deal with 7bit charsets properly
	* [Fix] Deal with 8bit characters in email addresses
	* [Fix] Deal with unpaired <a> tags
	* [Fix] Detect confighelp in plugins initialisation
	* [Fix] Disable certain checks for utf spoof detection
	* [Fix] DKIM Signing: avoid nil index when From header is missing
	* [Fix] Do not add exact hashes from different parts
	* [Fix] Do not check DMARC if SPF or DKIM were not checked
	* [Fix] Do not check URLs that are resolved to be redirected
	* [Fix] Do not set bayes probability if we don't use it
	* [Fix] Do not stop on illegal unicode points - replace them
	* [Fix] Fix another race condition in arc checks
	* [Fix] Fix arc count logic
	* [Fix] Fix ARC signing
	* [Fix] Fix brain-damaged spamc protocol for now
	* [Fix] Fix calling for peak functions
	* [Fix] Fix couple of issues in FORWARDED rule
	* [Fix] Fix CTE propagation from parent containers to children parts
	* [Fix] Fix errors processing in the controller
	* [Fix] Fix format string in milter
	* [Fix] Fix issues in SPF macros parsing
	* [Fix] Fix logging format string
	* [Fix] Fix logic of cached passwords check
	* [Fix] Fix lowercasing of stemmed words
	* [Fix] Fix LRU elements removal
	* [Fix] Fix memory leak when accepting from unix sockets
	* [Fix] Fix milter connections persistence
	* [Fix] Fix objects merging in UCL
	* [Fix] Fix order of operations to avoid race condition
	* [Fix] Fix parsing of long regexp types
	* [Fix] Fix passing data to log helper when many symbols defined
	* [Fix] Fix pools management for milter session
	* [Fix] Fix processing of the watchers
	* [Fix] Fix queue id macro in milter
	* [Fix] Fix R_BAD_CTE_7BIT rule
	* [Fix] Fix Redis timeout set
	* [Fix] Fix REPLYTO_UNPARSEABLE rule
	* [Fix] Fix setting of email address
	* [Fix] Fix some more issues about duplicated fuzzy requests
	* [Fix] Fix spamc support in rspamd proxy
	* [Fix] Fix syntax error in spamtrap plugin
	* [Fix] Fix url counts for href urls
	* [Fix] Fix url handling in the protocol
	* [Fix] Multimap: Received IP filters with Redis
	* [Fix] Oops, fix d9d0fa5e86db2f4470d34395a233b450478b2f60
	* [Fix] Parse rgb[a](x,x,x[,x]) css colors
	* [Fix] Phishing: strict_domains
	* [Fix] Reduce maps aggressiveness
	* [Fix] Reresolve upstreams even if there is a single server there
	* [Fix] Rspamadm grep: Disable Lua patterns in string search by default
	* [Fix] Skip text parts when checking binary parts in fuzzy check
	* [Fix] Support v2 checks in controller
	* [Fix] Treat empty address as valid
	* [Fix] Try harder to detect CTE
	* [Fix] Try to deal with v4 mapped to v6 addresses on accept
	* [Fix] Use dkim signing callback properly
	* [Fix] Use non-volatile memory for storing data
	* [Fix] Use static maps instead of ugly hack for radix_from_config
	* [Fix] Use the same pool for related sessions
	* [Rework] Continue modularisation for lua library
	* [Rework] Initial milter protocol support
	* [Rework] Make log pipes worker agnostic, add scanners API
	* [Rework] Move authentication results generation to a separate routine
	* [Rework] Move common DKIM functions to a separate lua module
	* [Rework] Move global functions to a separate directory
	* [Rework] Prepare dkim module for ARC checks
	* [Rework] Propagate ucl variables from the command line
	* [Rework] Remove multiple metrics support from Rspamd
	* [Rework] Stop using name 'rmilter' for the modern protocol
	* [Rework] Use LFU algorithm in LRU cache
	* [Rules] Fix received TLS rules
	* [Rules] Improve URL_COUNT_ODD rule
	* [WebUI] Fix add header filter in history
	* [WebUI] Use modern protocol for checking messages

1.5.9:
	* [Conf] Increase min_bytes to avoid FP
	* [Conf] Remove ratelimits from default configuration
	* [CritFix] Fix accepting on IPv6 sockets
	* [CritFix] Zero fill sockaddr_un
	* [Feature] Add `text_multiplier` param
	* [Fix] Check min_bytes for images as well
	* [Fix] Do not add exact hashes from different parts
	* [Fix] Fix memory leak when accepting from unix sockets
	* [Fix] Fix some more issues about duplicated fuzzy requests
	* [Fix] Phishing: strict_domains
	* [Fix] Skip text parts when checking binary parts in fuzzy check
	* [Minor] Add the same duplicates protection for all fuzzy hashes types
	* [Minor] Fix braces
	* [Minor] Fix test
	* [Minor] SPOOF_DISPLAY_NAME: Use all SMTP/MIME recipients
	* [Minor] Validate assumed spoofed display name domains to contain a dot


1.5.8:
	* [CritFix] Fix memory leak in fuzzy check
	* [CritFix] Fix memory leak in maps scheduling
	* [Feature] Multimap: email:domain:tld filter
	* [Fix] DKIM Signing: avoid nil index when From header is missing
	* [Fix] Do not set bayes probability if we don't use it
	* [Fix] Do not stop on illegal unicode points - replace them
	* [Fix] Fix brain-damaged spamc protocol for now
	* [Fix] Fix Redis timeout set
	* [Fix] Fix spamc support in rspamd proxy
	* [Fix] Multimap: Received IP filters with Redis
	* [Fix] Parse rgb[a](x,x,x[,x]) css colors
	* [Fix] Reresolve upstreams even if there is a single server there
	* [Fix] Treat empty address as valid
	* [Fix] Try harder to detect CTE
	* [Fix] Try to deal with v4 mapped to v6 addresses on accept
	* [Minor] Add `wsf` and `hta` bad archive extensions
	* [Minor] Fix configuration option
	* [Minor] Fix result parsing for SAVAPI
	* [Minor] Further logging improvements
	* [Minor] Improve logging of errors
	* [Minor] Prevent MID_CONTAINS_FROM from firing on empty address
	* [Minor] Reduce digit->number transmission penalty
	* [Minor] Relax CTYPE_MISSING_DISPOSITION rule


1.5.7:
	* [CritFix] Fix corruption when multiple fuzzy are defined
	* [CritFix] Fix learn condition in fuzzy check
	* [Feature] Add rules to detect bad 8bit characters in From and To
	* [Feature] DKIM signing: sign_networks/local address specific use_domain settings
	* [Feature] Support numeric arguments for Redis requests
	* [Fix] Deal with 8bit characters in email addresses
	* [Fix] Fix couple of issues in FORWARDED rule
	* [Fix] Fix passing data to log helper when many symbols defined
	* [Fix] Fix R_BAD_CTE_7BIT rule
	* [Fix] Fix REPLYTO_UNPARSEABLE rule
	* [Fix] Fix setting of email address
	* [Fix] Rspamadm grep: Disable Lua patterns in string search by default
	* [Minor] Add Lua 5.3 workaround
	* [Minor] Add lua methods to detect if a part has 8bit characters
	* [Minor] Allow session-less lua dns requests
	* [Minor] Allow to append greylist end time to message reported
	* [Minor] Avoid `nil` table
	* [Minor] Disable dkim_signing if redis is specified but not configured
	* [Minor] Fix build with pcre2
	* [Minor] Fix rule
	* [Minor] Fix warnings
	* [Minor] Format floating point number
	* [Minor] Push email flags to the lua API
	* [Minor] Silence some warnings
	* [Minor] Silence warning
	* [Minor] Try all hostname regexps to find the most significant one
	* [WebUI] Fix add header filter in history

4 files changed, 35 insertions, 31 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index bb95edead02..aa7a93b67a0 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2017/05/02 11:02:36 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2017/06/23 13:47:05 wiz Exp $
 
-DISTNAME=	rspamd-1.5.6
+DISTNAME=	rspamd-1.6.1
 CATEGORIES=	mail
-MASTER_SITES=	http://www.rspamd.com/downloads/
-EXTRACT_SUFX=	.tar.xz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=vstakhov/}
 
 MAINTAINER=	bartosz.kuzma@gmail.com
 HOMEPAGE=	https://www.rspamd.com/
@@ -80,7 +79,9 @@ CONF_FILES+=	${EGDIR}/surbl-whitelist.inc ${PKG_SYSCONFDIR}/surbl-whitelist.inc
 CONF_FILES+=	${EGDIR}/worker-controller.inc ${PKG_SYSCONFDIR}/worker-controller.inc
 CONF_FILES+=	${EGDIR}/worker-fuzzy.inc ${PKG_SYSCONFDIR}/worker-fuzzy.inc
 CONF_FILES+=	${EGDIR}/worker-normal.inc ${PKG_SYSCONFDIR}/worker-normal.inc
+CONF_FILES+=	${EGDIR}/worker-proxy.inc ${PKG_SYSCONFDIR}/worker-proxy.inc
 CONF_FILES+=	${EGDIR}/modules.d/antivirus.conf ${PKG_SYSCONFDIR}/modules.d/antivirus.conf
+CONF_FILES+=	${EGDIR}/modules.d/arc.conf ${PKG_SYSCONFDIR}/modules.d/arc.conf
 CONF_FILES+=	${EGDIR}/modules.d/asn.conf ${PKG_SYSCONFDIR}/modules.d/asn.conf
 CONF_FILES+=	${EGDIR}/modules.d/chartable.conf ${PKG_SYSCONFDIR}/modules.d/chartable.conf
 CONF_FILES+=	${EGDIR}/modules.d/clickhouse.conf ${PKG_SYSCONFDIR}/modules.d/clickhouse.conf
@@ -100,6 +101,7 @@ CONF_FILES+=	${EGDIR}/modules.d/maillist.conf ${PKG_SYSCONFDIR}/modules.d/mailli
 CONF_FILES+=	${EGDIR}/modules.d/metadata_exporter.conf ${PKG_SYSCONFDIR}/modules.d/metadata_exporter.conf
 CONF_FILES+=	${EGDIR}/modules.d/metric_exporter.conf ${PKG_SYSCONFDIR}/modules.d/metric_exporter.conf
 CONF_FILES+=	${EGDIR}/modules.d/mid.conf ${PKG_SYSCONFDIR}/modules.d/mid.conf
+CONF_FILES+=	${EGDIR}/modules.d/milter_headers.conf ${PKG_SYSCONFDIR}/modules.d/milter_headers.conf
 CONF_FILES+=	${EGDIR}/modules.d/mime_types.conf ${PKG_SYSCONFDIR}/modules.d/mime_types.conf
 CONF_FILES+=	${EGDIR}/modules.d/multimap.conf ${PKG_SYSCONFDIR}/modules.d/multimap.conf
 CONF_FILES+=	${EGDIR}/modules.d/mx_check.conf ${PKG_SYSCONFDIR}/modules.d/mx_check.conf
@@ -110,9 +112,9 @@ CONF_FILES+=	${EGDIR}/modules.d/rbl.conf ${PKG_SYSCONFDIR}/modules.d/rbl.conf
 CONF_FILES+=	${EGDIR}/modules.d/redis.conf ${PKG_SYSCONFDIR}/modules.d/redis.conf
 CONF_FILES+=	${EGDIR}/modules.d/regexp.conf ${PKG_SYSCONFDIR}/modules.d/regexp.conf
 CONF_FILES+=	${EGDIR}/modules.d/replies.conf ${PKG_SYSCONFDIR}/modules.d/replies.conf
-CONF_FILES+=	${EGDIR}/modules.d/rmilter_headers.conf ${PKG_SYSCONFDIR}/modules.d/rmilter_headers.conf
 CONF_FILES+=	${EGDIR}/modules.d/rspamd_update.conf ${PKG_SYSCONFDIR}/modules.d/rspamd_update.conf
 CONF_FILES+=	${EGDIR}/modules.d/spamassassin.conf ${PKG_SYSCONFDIR}/modules.d/spamassassin.conf
+CONF_FILES+=	${EGDIR}/modules.d/spamtrap.conf ${PKG_SYSCONFDIR}/modules.d/spamtrap.conf
 CONF_FILES+=	${EGDIR}/modules.d/spf.conf ${PKG_SYSCONFDIR}/modules.d/spf.conf
 CONF_FILES+=	${EGDIR}/modules.d/surbl.conf ${PKG_SYSCONFDIR}/modules.d/surbl.conf
 CONF_FILES+=	${EGDIR}/modules.d/trie.conf ${PKG_SYSCONFDIR}/modules.d/trie.conf
diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST
index d7e0e379d10..62cb269532b 100644
--- a/mail/rspamd/PLIST
+++ b/mail/rspamd/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2017/04/19 18:31:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/06/23 13:47:05 wiz Exp $
 bin/rspamadm
 bin/rspamadm-${PKGVERSION}
 bin/rspamc
 bin/rspamc-${PKGVERSION}
 bin/rspamd
-bin/rspamd-${PKGVERSION}
+bin/${PKGNAME}
 bin/rspamd_stats
 lib/rspamd/librspamd-actrie.so
 man/man1/rspamadm.1
@@ -21,6 +21,7 @@ share/examples/rspamd/mid.inc
 share/examples/rspamd/mime_types.inc
 share/examples/rspamd/modules.conf
 share/examples/rspamd/modules.d/antivirus.conf
+share/examples/rspamd/modules.d/arc.conf
 share/examples/rspamd/modules.d/asn.conf
 share/examples/rspamd/modules.d/chartable.conf
 share/examples/rspamd/modules.d/clickhouse.conf
@@ -41,6 +42,7 @@ share/examples/rspamd/modules.d/maillist.conf
 share/examples/rspamd/modules.d/metadata_exporter.conf
 share/examples/rspamd/modules.d/metric_exporter.conf
 share/examples/rspamd/modules.d/mid.conf
+share/examples/rspamd/modules.d/milter_headers.conf
 share/examples/rspamd/modules.d/mime_types.conf
 share/examples/rspamd/modules.d/multimap.conf
 share/examples/rspamd/modules.d/mx_check.conf
@@ -51,9 +53,9 @@ 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/replies.conf
-share/examples/rspamd/modules.d/rmilter_headers.conf
 share/examples/rspamd/modules.d/rspamd_update.conf
 share/examples/rspamd/modules.d/spamassassin.conf
+share/examples/rspamd/modules.d/spamtrap.conf
 share/examples/rspamd/modules.d/spf.conf
 share/examples/rspamd/modules.d/surbl.conf
 share/examples/rspamd/modules.d/trie.conf
@@ -64,17 +66,26 @@ share/examples/rspamd/modules.d/whitelist.conf
 share/examples/rspamd/options.inc
 share/examples/rspamd/redirectors.inc
 share/examples/rspamd/rspamd.conf
-share/examples/rspamd/rspamd.systemd.conf
-share/examples/rspamd/rspamd.sysvinit.conf
 share/examples/rspamd/spf_dkim_whitelist.inc
 share/examples/rspamd/statistic.conf
 share/examples/rspamd/surbl-whitelist.inc
 share/examples/rspamd/worker-controller.inc
 share/examples/rspamd/worker-fuzzy.inc
 share/examples/rspamd/worker-normal.inc
+share/examples/rspamd/worker-proxy.inc
 share/rspamd/effective_tld_names.dat
+share/rspamd/lib/auth_results.lua
+share/rspamd/lib/dkim_sign_tools.lua
+share/rspamd/lib/fun.lua
+share/rspamd/lib/global_functions.lua
+share/rspamd/lib/lua_redis.lua
+share/rspamd/lib/lua_util.lua
+share/rspamd/lib/maps.lua
+share/rspamd/lib/meta_functions.lua
 share/rspamd/lua/antivirus.lua
+share/rspamd/lua/arc.lua
 share/rspamd/lua/asn.lua
+share/rspamd/lua/bayes_expiry.lua
 share/rspamd/lua/clickhouse.lua
 share/rspamd/lua/dcc.lua
 share/rspamd/lua/dkim_signing.lua
@@ -86,7 +97,6 @@ share/rspamd/lua/fann_redis.lua
 share/rspamd/lua/fann_scores.lua
 share/rspamd/lua/force_actions.lua
 share/rspamd/lua/forged_recipients.lua
-share/rspamd/lua/fun.lua
 share/rspamd/lua/fuzzy_collect.lua
 share/rspamd/lua/greylist.lua
 share/rspamd/lua/hfilter.lua
@@ -96,6 +106,7 @@ 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/milter_headers.lua
 share/rspamd/lua/mime_types.lua
 share/rspamd/lua/multimap.lua
 share/rspamd/lua/mx_check.lua
@@ -104,17 +115,16 @@ share/rspamd/lua/phishing.lua
 share/rspamd/lua/ratelimit.lua
 share/rspamd/lua/rbl.lua
 share/rspamd/lua/replies.lua
-share/rspamd/lua/rmilter_headers.lua
 share/rspamd/lua/rspamd_update.lua
 share/rspamd/lua/settings.lua
 share/rspamd/lua/spamassassin.lua
+share/rspamd/lua/spamtrap.lua
 share/rspamd/lua/trie.lua
 share/rspamd/lua/url_redirector.lua
 share/rspamd/lua/url_reputation.lua
 share/rspamd/lua/url_tags.lua
 share/rspamd/lua/whitelist.lua
 share/rspamd/rules/forwarding.lua
-share/rspamd/rules/global_functions.lua
 share/rspamd/rules/headers_checks.lua
 share/rspamd/rules/html.lua
 share/rspamd/rules/http_headers.lua
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index bc4d8cf032f..d92e56c73e1 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2017/05/02 11:02:36 wiz Exp $
+$NetBSD: distinfo,v 1.15 2017/06/23 13:47:05 wiz Exp $
 
-SHA1 (rspamd-1.5.6.tar.xz) = f4717295fbdcc64d6bedb2baa129070d5fcb394e
-RMD160 (rspamd-1.5.6.tar.xz) = 8f2e930911f8a8fac24f38f99788b706e69a6905
-SHA512 (rspamd-1.5.6.tar.xz) = 3735052817ecd12d46505e4657456a01cde6aac25d7bdffaf0c8722458c674edbe89aeb589f338ec9ed22b5455314511fe1f55b5a0be3532761579b4f7b44cfa
-Size (rspamd-1.5.6.tar.xz) = 1853052 bytes
-SHA1 (patch-CMakeLists.txt) = 81b847220b8c8736b13209fb5bedf0020a8d7acf
+SHA1 (rspamd-1.6.1.tar.gz) = c2fb3b8aae561932b2cde746b77bdeb1ba5ea0c9
+RMD160 (rspamd-1.6.1.tar.gz) = 1576044887557da12075776dbf259e25f4d00dfe
+SHA512 (rspamd-1.6.1.tar.gz) = 3bd50ebc1d7e413afbe52608f94b644e1cf684a708776207710eb4556abb0500b2a23141a90e811854a25a9fbedf0a6b1c5a05363c0cf372921b8acd457b702b
+Size (rspamd-1.6.1.tar.gz) = 2462565 bytes
+SHA1 (patch-CMakeLists.txt) = 1d3e66b52ef38638674baf4c10b68c97b2ca38ad
 SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a
diff --git a/mail/rspamd/patches/patch-CMakeLists.txt b/mail/rspamd/patches/patch-CMakeLists.txt
index 6dd4f59015f..a8195a9804a 100644
--- a/mail/rspamd/patches/patch-CMakeLists.txt
+++ b/mail/rspamd/patches/patch-CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2017/02/17 15:01:52 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2017/06/23 13:47:06 wiz Exp $
 
 For pkgsrc. Install config files to examples directory.
 
---- CMakeLists.txt.orig	2016-09-01 11:42:54.000000000 +0000
+--- CMakeLists.txt.orig	2017-06-14 14:45:41.000000000 +0000
 +++ CMakeLists.txt
-@@ -1244,9 +1244,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
+@@ -1289,16 +1289,16 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
  	"${CMAKE_CURRENT_SOURCE_DIR}/conf/*" )
  FOREACH(CONF_FILE ${CONF_FILES})
  	GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH)
@@ -15,10 +15,7 @@ For pkgsrc. Install config files to examples directory.
 +		DESTINATION ${EXAMPLESDIR}/${_rp})
  ENDFOREACH(CONF_FILE)
  
- # Main config is special due to systemd
-@@ -1256,13 +1256,13 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
- 	SET(MAIN_CONF "conf/rspamd.sysvinit.conf")
- ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")
+ SET(MAIN_CONF "conf/rspamd.conf")
  IF(BUILD_PORT)
 -	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" ".sample")
@@ -26,10 +23,5 @@ For pkgsrc. Install config files to examples directory.
 -	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "")
 +	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" "")
  ENDIF(BUILD_PORT)
- # Debian is also special
- IF(DEBIAN_BUILD)
--	INSTALL_IF_NOT_EXISTS("conf/rspamd.sysvinit.conf" ${CONFDIR} "rspamd.sysvinit.conf" "")
-+	INSTALL_IF_NOT_EXISTS("conf/rspamd.sysvinit.conf" ${EXAMPLESDIR} "rspamd.sysvinit.conf" "")
- ENDIF(DEBIAN_BUILD)
  IF(INSTALL_EXAMPLES MATCHES "ON")
  	INSTALL(FILES ${MAIN_CONF} DESTINATION ${EXAMPLESDIR})