Fri Mar 23 12:08:50 2018 UTC ()
mail/rspamd: Update to 1.7.1.

- [CritFix] Fix lowercase comparison
- [CritFix] Timezone defines seconds WEST UTC not East
- [Feature] Add filename to log format
- [Feature] Add lua rules squeezing
- [Feature] Add related symbols analysis to rspamd_stats
- [Feature] Remove upstream `X-Spam: Yes` header by default
- [Feature] rspamd_stats: Output progress info on STDERR
- [Feature] Whitelist for emails module
- [Fix] Do not allow dependencies on self
- [Fix] Do not cache metric result
- [Fix] Do not trust all issuers as a client certificate
- [Fix] Fix dependencies in lua squeeze
- [Fix] Fix enabling/disabling squeezed rules
- [Fix] Fix enabling/disabling symbols
- [Fix] Fix external dependencies
- [Fix] Fix processing of a single compressed file
- [Fix] Fix some typos
- [Fix] Fix various modules in case of empty message
- [Fix] Handle callbacks that returns table of options
- [Fix] Improve cached action interaction
- [Fix] Make dynamic conf more NaN aware
- [Fix] Never hide actions from WebUI `configuration` tab
- [Project] Implementation of Lua rules squeezing


(fhajny)
diff -r1.37 -r1.38 pkgsrc/mail/rspamd/Makefile
diff -r1.9 -r1.10 pkgsrc/mail/rspamd/PLIST
diff -r1.20 -r1.21 pkgsrc/mail/rspamd/distinfo
diff -r1.1 -r1.2 pkgsrc/mail/rspamd/patches/patch-src_libutil_util.c
cvs diff -r1.37 -r1.38 pkgsrc/mail/rspamd/Makefile (switch to unified diff)

--- pkgsrc/mail/rspamd/Makefile 2018/03/13 15:09:15 1.37
+++ pkgsrc/mail/rspamd/Makefile 2018/03/23 12:08:50 1.38
@@ -1,125 +1,125 @@ @@ -1,125 +1,125 @@
1# $NetBSD: Makefile,v 1.37 2018/03/13 15:09:15 fhajny Exp $ 1# $NetBSD: Makefile,v 1.38 2018/03/23 12:08:50 fhajny Exp $
2 2
3DISTNAME= rspamd-1.7.0 3DISTNAME= rspamd-1.7.1
4CATEGORIES= mail 4CATEGORIES= mail
5MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/}
6 6
7MAINTAINER= bartosz.kuzma@gmail.com 7MAINTAINER= bartosz.kuzma@gmail.com
8HOMEPAGE= https://www.rspamd.com/ 8HOMEPAGE= https://www.rspamd.com/
9COMMENT= Fast, free and open-source spam filtering system 9COMMENT= Fast, free and open-source spam filtering system
10LICENSE= 2-clause-bsd 10LICENSE= 2-clause-bsd
11 11
12.include "options.mk" 12.include "options.mk"
13 13
14DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg 14DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
15DEPENDS+= ragel-[0-9]*:../../devel/ragel 15DEPENDS+= ragel-[0-9]*:../../devel/ragel
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_TOOLS+= perl pkg-config 18USE_TOOLS+= perl pkg-config
19USE_LANGUAGES= c99 19USE_LANGUAGES= c99
20BUILD_DEFS+= VARBASE 20BUILD_DEFS+= VARBASE
21 21
22LUA_VERSIONS_ACCEPTED= 53 22LUA_VERSIONS_ACCEPTED= 53
23 23
24CPPFLAGS.SunOS+= -D__EXTENSIONS__ 24CPPFLAGS.SunOS+= -D__EXTENSIONS__
25 25
26LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd 26LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd
27TEST_TARGET= run-test 27TEST_TARGET= run-test
28 28
29RSPAMD_USER?= rspamd 29RSPAMD_USER?= rspamd
30RSPAMD_GROUP?= rspamd 30RSPAMD_GROUP?= rspamd
31PKG_GROUPS= ${RSPAMD_GROUP} 31PKG_GROUPS= ${RSPAMD_GROUP}
32PKG_USERS= ${RSPAMD_USER}:${RSPAMD_GROUP} 32PKG_USERS= ${RSPAMD_USER}:${RSPAMD_GROUP}
33 33
34PKG_GROUPS_VARS= RSPAMD_GROUP 34PKG_GROUPS_VARS= RSPAMD_GROUP
35PKG_USERS_VARS= RSPAMD_USER 35PKG_USERS_VARS= RSPAMD_USER
36 36
37PKG_GECOS.${RSPAMD_USER}= rspamd user 37PKG_GECOS.${RSPAMD_USER}= rspamd user
38 38
39PKG_SYSCONFSUBDIR= rspamd 39PKG_SYSCONFSUBDIR= rspamd
40 40
41EGDIR= ${PREFIX}/share/examples/${PKGBASE} 41EGDIR= ${PREFIX}/share/examples/${PKGBASE}
42LOGDIR= ${VARBASE}/log/rspamd 42LOGDIR= ${VARBASE}/log/rspamd
43DBDIR= ${VARBASE}/db/rspamd 43DBDIR= ${VARBASE}/db/rspamd
44RUNDIR= ${VARBASE}/run/rspamd 44RUNDIR= ${VARBASE}/run/rspamd
45 45
46FILES_SUBST+= RSPAMD_USER=${RSPAMD_USER} 46FILES_SUBST+= RSPAMD_USER=${RSPAMD_USER}
47FILES_SUBST+= RSPAMD_GROUP=${RSPAMD_GROUP} 47FILES_SUBST+= RSPAMD_GROUP=${RSPAMD_GROUP}
48 48
49RCD_SCRIPTS= rspamd 49RCD_SCRIPTS= rspamd
50 50
51CMAKE_ARGS+= -DMANDIR:PATH=${PREFIX}/${PKGMANDIR} 51CMAKE_ARGS+= -DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
52CMAKE_ARGS+= -DLOGDIR:PATH=${LOGDIR} 52CMAKE_ARGS+= -DLOGDIR:PATH=${LOGDIR}
53CMAKE_ARGS+= -DRUNDIR:PATH=${VARBASE}/run/rspamd 53CMAKE_ARGS+= -DRUNDIR:PATH=${VARBASE}/run/rspamd
54CMAKE_ARGS+= -DDBDIR:PATH=${DBDIR} 54CMAKE_ARGS+= -DDBDIR:PATH=${DBDIR}
55CMAKE_ARGS+= -DCONFDIR:PATH=${PKG_SYSCONFDIR} 55CMAKE_ARGS+= -DCONFDIR:PATH=${PKG_SYSCONFDIR}
56CMAKE_ARGS+= -DRSPAMD_USER=${RSPAMD_USER} 56CMAKE_ARGS+= -DRSPAMD_USER=${RSPAMD_USER}
57CMAKE_ARGS+= -DRSPAMD_GROUP=${RSPAMD_GROUP} 57CMAKE_ARGS+= -DRSPAMD_GROUP=${RSPAMD_GROUP}
58CMAKE_ARGS+= -DENABLE_SQLITE=ON 58CMAKE_ARGS+= -DENABLE_SQLITE=ON
59# Torch requires LuaJIT2, but LuaJIT2 only supports Lua 5.1 59# Torch requires LuaJIT2, but LuaJIT2 only supports Lua 5.1
60CMAKE_ARGS+= -DENABLE_LUAJIT=OFF 60CMAKE_ARGS+= -DENABLE_LUAJIT=OFF
61CMAKE_ARGS+= -DENABLE_TORCH=OFF 61CMAKE_ARGS+= -DENABLE_TORCH=OFF
62 62
63REPLACE_PERL+= utils/rspamd_stats.pl 63REPLACE_PERL+= utils/rspamd_stats.pl
64 64
65MAKE_DIRS+= ${PKG_SYSCONFDIR}/modules.d 65MAKE_DIRS+= ${PKG_SYSCONFDIR}/modules.d
66 66
67OWN_DIRS_PERMS+= ${DBDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0700 67OWN_DIRS_PERMS+= ${DBDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0700
68OWN_DIRS_PERMS+= ${LOGDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0750 68OWN_DIRS_PERMS+= ${LOGDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0750
69OWN_DIRS_PERMS+= ${RUNDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0755 69OWN_DIRS_PERMS+= ${RUNDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0755
70 70
71CFGFILES= 2tld.inc actions.conf common.conf composites.conf \ 71CFGFILES= 2tld.inc actions.conf common.conf composites.conf \
72 dmarc_whitelist.inc groups.conf logging.inc \ 72 dmarc_whitelist.inc groups.conf logging.inc \
73 maillist.inc metrics.conf mid.inc mime_types.inc \ 73 maillist.inc metrics.conf mid.inc mime_types.inc \
74 modules.conf modules.d/antivirus.conf modules.d/arc.conf \ 74 modules.conf modules.d/antivirus.conf modules.d/arc.conf \
75 modules.d/asn.conf modules.d/clickhouse.conf \ 75 modules.d/asn.conf modules.d/clickhouse.conf \
76 modules.d/dcc.conf modules.d/dkim_signing.conf \ 76 modules.d/dcc.conf modules.d/dkim_signing.conf \
77 modules.d/dkim.conf modules.d/dmarc.conf \ 77 modules.d/dkim.conf modules.d/dmarc.conf \
78 modules.d/elastic.conf modules.d/emails.conf \ 78 modules.d/elastic.conf modules.d/emails.conf \
79 modules.d/force_actions.conf \ 79 modules.d/force_actions.conf \
80 modules.d/forged_recipients.conf \ 80 modules.d/forged_recipients.conf \
81 modules.d/fuzzy_check.conf modules.d/greylist.conf \ 81 modules.d/fuzzy_check.conf modules.d/greylist.conf \
82 modules.d/hfilter.conf modules.d/history_redis.conf \ 82 modules.d/hfilter.conf modules.d/history_redis.conf \
83 modules.d/chartable.conf modules.d/ip_score.conf \ 83 modules.d/chartable.conf modules.d/ip_score.conf \
84 modules.d/maillist.conf modules.d/metadata_exporter.conf \ 84 modules.d/maillist.conf modules.d/metadata_exporter.conf \
85 modules.d/metric_exporter.conf modules.d/mid.conf \ 85 modules.d/metric_exporter.conf modules.d/mid.conf \
86 modules.d/milter_headers.conf modules.d/mime_types.conf \ 86 modules.d/milter_headers.conf modules.d/mime_types.conf \
87 modules.d/multimap.conf modules.d/mx_check.conf \ 87 modules.d/multimap.conf modules.d/mx_check.conf \
88 modules.d/neural.conf modules.d/once_received.conf \ 88 modules.d/neural.conf modules.d/once_received.conf \
89 modules.d/phishing.conf modules.d/ratelimit.conf \ 89 modules.d/phishing.conf modules.d/ratelimit.conf \
90 modules.d/rbl.conf modules.d/redis.conf \ 90 modules.d/rbl.conf modules.d/redis.conf \
91 modules.d/regexp.conf modules.d/replies.conf \ 91 modules.d/regexp.conf modules.d/replies.conf \
92 modules.d/rspamd_update.conf modules.d/spamassassin.conf \ 92 modules.d/rspamd_update.conf modules.d/spamassassin.conf \
93 modules.d/spamtrap.conf modules.d/spf.conf \ 93 modules.d/spamtrap.conf modules.d/spf.conf \
94 modules.d/surbl.conf modules.d/trie.conf \ 94 modules.d/surbl.conf modules.d/trie.conf \
95 modules.d/url_redirector.conf modules.d/url_reputation.conf \ 95 modules.d/url_redirector.conf modules.d/url_reputation.conf \
96 modules.d/url_tags.conf modules.d/whitelist.conf \ 96 modules.d/url_tags.conf modules.d/whitelist.conf \
97 options.inc redirectors.inc rspamd.conf \ 97 options.inc redirectors.inc rspamd.conf \
98 scores.d/fuzzy_group.conf scores.d/headers_group.conf \ 98 scores.d/fuzzy_group.conf scores.d/headers_group.conf \
99 scores.d/hfilter_group.conf scores.d/mime_types_group.conf \ 99 scores.d/hfilter_group.conf scores.d/mime_types_group.conf \
100 scores.d/mua_group.conf scores.d/phishing_group.conf \ 100 scores.d/mua_group.conf scores.d/phishing_group.conf \
101 scores.d/policies_group.conf scores.d/rbl_group.conf \ 101 scores.d/policies_group.conf scores.d/rbl_group.conf \
102 scores.d/statistics_group.conf scores.d/subject_group.conf \ 102 scores.d/statistics_group.conf scores.d/subject_group.conf \
103 scores.d/surbl_group.conf spf_dkim_whitelist.inc \ 103 scores.d/surbl_group.conf spf_dkim_whitelist.inc \
104 statistic.conf surbl-whitelist.inc worker-controller.inc \ 104 statistic.conf surbl-whitelist.inc worker-controller.inc \
105 worker-fuzzy.inc worker-normal.inc worker-proxy.inc 105 worker-fuzzy.inc worker-normal.inc worker-proxy.inc
106 106
107.for file in ${CFGFILES} 107.for file in ${CFGFILES}
108CONF_FILES= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} 108CONF_FILES= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
109.endfor 109.endfor
110 110
111post-extract: 111post-extract:
112 ${FIND} ${WRKSRC}/conf -type d -exec ${CHMOD} ${PKGDIRMODE} {} \; 112 ${FIND} ${WRKSRC}/conf -type d -exec ${CHMOD} ${PKGDIRMODE} {} \;
113 ${FIND} ${WRKSRC}/conf -type f -exec ${CHMOD} ${DOCMODE} {} \; 113 ${FIND} ${WRKSRC}/conf -type f -exec ${CHMOD} ${DOCMODE} {} \;
114 114
115.include "../../databases/hiredis/buildlink3.mk" 115.include "../../databases/hiredis/buildlink3.mk"
116.include "../../databases/sqlite3/buildlink3.mk" 116.include "../../databases/sqlite3/buildlink3.mk"
117.include "../../devel/fann/buildlink3.mk" 117.include "../../devel/fann/buildlink3.mk"
118.include "../../devel/glib2/buildlink3.mk" 118.include "../../devel/glib2/buildlink3.mk"
119.include "../../devel/libevent/buildlink3.mk" 119.include "../../devel/libevent/buildlink3.mk"
120.include "../../lang/lua/buildlink3.mk" 120.include "../../lang/lua/buildlink3.mk"
121.include "../../mail/gmime/buildlink3.mk" 121.include "../../mail/gmime/buildlink3.mk"
122.include "../../security/openssl/buildlink3.mk" 122.include "../../security/openssl/buildlink3.mk"
123.include "../../sysutils/file/buildlink3.mk" 123.include "../../sysutils/file/buildlink3.mk"
124.include "../../textproc/icu/buildlink3.mk" 124.include "../../textproc/icu/buildlink3.mk"
125.include "../../mk/bsd.pkg.mk" 125.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/mail/rspamd/PLIST (switch to unified diff)

--- pkgsrc/mail/rspamd/PLIST 2018/03/13 15:09:15 1.9
+++ pkgsrc/mail/rspamd/PLIST 2018/03/23 12:08:50 1.10
@@ -1,264 +1,265 @@ @@ -1,264 +1,265 @@
1@comment $NetBSD: PLIST,v 1.9 2018/03/13 15:09:15 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.10 2018/03/23 12:08:50 fhajny Exp $
2bin/rspamadm 2bin/rspamadm
3bin/rspamadm-${PKGVERSION} 3bin/rspamadm-${PKGVERSION}
4bin/rspamc 4bin/rspamc
5bin/rspamc-${PKGVERSION} 5bin/rspamc-${PKGVERSION}
6bin/rspamd 6bin/rspamd
7bin/${PKGNAME} 7bin/${PKGNAME}
8bin/rspamd_stats 8bin/rspamd_stats
9lib/rspamd/librspamd-actrie.so 9lib/rspamd/librspamd-actrie.so
10man/man1/rspamadm.1 10man/man1/rspamadm.1
11man/man1/rspamc.1 11man/man1/rspamc.1
12man/man8/rspamd.8 12man/man8/rspamd.8
13share/examples/rspamd/2tld.inc 13share/examples/rspamd/2tld.inc
14share/examples/rspamd/actions.conf 14share/examples/rspamd/actions.conf
15share/examples/rspamd/common.conf 15share/examples/rspamd/common.conf
16share/examples/rspamd/composites.conf 16share/examples/rspamd/composites.conf
17share/examples/rspamd/dmarc_whitelist.inc 17share/examples/rspamd/dmarc_whitelist.inc
18share/examples/rspamd/groups.conf 18share/examples/rspamd/groups.conf
19share/examples/rspamd/logging.inc 19share/examples/rspamd/logging.inc
20share/examples/rspamd/maillist.inc 20share/examples/rspamd/maillist.inc
21share/examples/rspamd/metrics.conf 21share/examples/rspamd/metrics.conf
22share/examples/rspamd/mid.inc 22share/examples/rspamd/mid.inc
23share/examples/rspamd/mime_types.inc 23share/examples/rspamd/mime_types.inc
24share/examples/rspamd/modules.conf 24share/examples/rspamd/modules.conf
25share/examples/rspamd/modules.d/antivirus.conf 25share/examples/rspamd/modules.d/antivirus.conf
26share/examples/rspamd/modules.d/arc.conf 26share/examples/rspamd/modules.d/arc.conf
27share/examples/rspamd/modules.d/asn.conf 27share/examples/rspamd/modules.d/asn.conf
28share/examples/rspamd/modules.d/chartable.conf 28share/examples/rspamd/modules.d/chartable.conf
29share/examples/rspamd/modules.d/clickhouse.conf 29share/examples/rspamd/modules.d/clickhouse.conf
30share/examples/rspamd/modules.d/dcc.conf 30share/examples/rspamd/modules.d/dcc.conf
31share/examples/rspamd/modules.d/dkim.conf 31share/examples/rspamd/modules.d/dkim.conf
32share/examples/rspamd/modules.d/dkim_signing.conf 32share/examples/rspamd/modules.d/dkim_signing.conf
33share/examples/rspamd/modules.d/dmarc.conf 33share/examples/rspamd/modules.d/dmarc.conf
34share/examples/rspamd/modules.d/elastic.conf 34share/examples/rspamd/modules.d/elastic.conf
35share/examples/rspamd/modules.d/emails.conf 35share/examples/rspamd/modules.d/emails.conf
36share/examples/rspamd/modules.d/force_actions.conf 36share/examples/rspamd/modules.d/force_actions.conf
37share/examples/rspamd/modules.d/forged_recipients.conf 37share/examples/rspamd/modules.d/forged_recipients.conf
38share/examples/rspamd/modules.d/fuzzy_check.conf 38share/examples/rspamd/modules.d/fuzzy_check.conf
39share/examples/rspamd/modules.d/greylist.conf 39share/examples/rspamd/modules.d/greylist.conf
40share/examples/rspamd/modules.d/hfilter.conf 40share/examples/rspamd/modules.d/hfilter.conf
41share/examples/rspamd/modules.d/history_redis.conf 41share/examples/rspamd/modules.d/history_redis.conf
42share/examples/rspamd/modules.d/ip_score.conf 42share/examples/rspamd/modules.d/ip_score.conf
43share/examples/rspamd/modules.d/maillist.conf 43share/examples/rspamd/modules.d/maillist.conf
44share/examples/rspamd/modules.d/metadata_exporter.conf 44share/examples/rspamd/modules.d/metadata_exporter.conf
45share/examples/rspamd/modules.d/metric_exporter.conf 45share/examples/rspamd/modules.d/metric_exporter.conf
46share/examples/rspamd/modules.d/mid.conf 46share/examples/rspamd/modules.d/mid.conf
47share/examples/rspamd/modules.d/milter_headers.conf 47share/examples/rspamd/modules.d/milter_headers.conf
48share/examples/rspamd/modules.d/mime_types.conf 48share/examples/rspamd/modules.d/mime_types.conf
49share/examples/rspamd/modules.d/multimap.conf 49share/examples/rspamd/modules.d/multimap.conf
50share/examples/rspamd/modules.d/mx_check.conf 50share/examples/rspamd/modules.d/mx_check.conf
51share/examples/rspamd/modules.d/neural.conf 51share/examples/rspamd/modules.d/neural.conf
52share/examples/rspamd/modules.d/once_received.conf 52share/examples/rspamd/modules.d/once_received.conf
53share/examples/rspamd/modules.d/phishing.conf 53share/examples/rspamd/modules.d/phishing.conf
54share/examples/rspamd/modules.d/ratelimit.conf 54share/examples/rspamd/modules.d/ratelimit.conf
55share/examples/rspamd/modules.d/rbl.conf 55share/examples/rspamd/modules.d/rbl.conf
56share/examples/rspamd/modules.d/redis.conf 56share/examples/rspamd/modules.d/redis.conf
57share/examples/rspamd/modules.d/regexp.conf 57share/examples/rspamd/modules.d/regexp.conf
58share/examples/rspamd/modules.d/replies.conf 58share/examples/rspamd/modules.d/replies.conf
59share/examples/rspamd/modules.d/rspamd_update.conf 59share/examples/rspamd/modules.d/rspamd_update.conf
60share/examples/rspamd/modules.d/spamassassin.conf 60share/examples/rspamd/modules.d/spamassassin.conf
61share/examples/rspamd/modules.d/spamtrap.conf 61share/examples/rspamd/modules.d/spamtrap.conf
62share/examples/rspamd/modules.d/spf.conf 62share/examples/rspamd/modules.d/spf.conf
63share/examples/rspamd/modules.d/surbl.conf 63share/examples/rspamd/modules.d/surbl.conf
64share/examples/rspamd/modules.d/trie.conf 64share/examples/rspamd/modules.d/trie.conf
65share/examples/rspamd/modules.d/url_redirector.conf 65share/examples/rspamd/modules.d/url_redirector.conf
66share/examples/rspamd/modules.d/url_reputation.conf 66share/examples/rspamd/modules.d/url_reputation.conf
67share/examples/rspamd/modules.d/url_tags.conf 67share/examples/rspamd/modules.d/url_tags.conf
68share/examples/rspamd/modules.d/whitelist.conf 68share/examples/rspamd/modules.d/whitelist.conf
69share/examples/rspamd/options.inc 69share/examples/rspamd/options.inc
70share/examples/rspamd/redirectors.inc 70share/examples/rspamd/redirectors.inc
71share/examples/rspamd/rspamd.conf 71share/examples/rspamd/rspamd.conf
72share/examples/rspamd/scores.d/fuzzy_group.conf 72share/examples/rspamd/scores.d/fuzzy_group.conf
73share/examples/rspamd/scores.d/headers_group.conf 73share/examples/rspamd/scores.d/headers_group.conf
74share/examples/rspamd/scores.d/hfilter_group.conf 74share/examples/rspamd/scores.d/hfilter_group.conf
75share/examples/rspamd/scores.d/mime_types_group.conf 75share/examples/rspamd/scores.d/mime_types_group.conf
76share/examples/rspamd/scores.d/mua_group.conf 76share/examples/rspamd/scores.d/mua_group.conf
77share/examples/rspamd/scores.d/phishing_group.conf 77share/examples/rspamd/scores.d/phishing_group.conf
78share/examples/rspamd/scores.d/policies_group.conf 78share/examples/rspamd/scores.d/policies_group.conf
79share/examples/rspamd/scores.d/rbl_group.conf 79share/examples/rspamd/scores.d/rbl_group.conf
80share/examples/rspamd/scores.d/statistics_group.conf 80share/examples/rspamd/scores.d/statistics_group.conf
81share/examples/rspamd/scores.d/subject_group.conf 81share/examples/rspamd/scores.d/subject_group.conf
82share/examples/rspamd/scores.d/surbl_group.conf 82share/examples/rspamd/scores.d/surbl_group.conf
83share/examples/rspamd/spf_dkim_whitelist.inc 83share/examples/rspamd/spf_dkim_whitelist.inc
84share/examples/rspamd/statistic.conf 84share/examples/rspamd/statistic.conf
85share/examples/rspamd/surbl-whitelist.inc 85share/examples/rspamd/surbl-whitelist.inc
86share/examples/rspamd/worker-controller.inc 86share/examples/rspamd/worker-controller.inc
87share/examples/rspamd/worker-fuzzy.inc 87share/examples/rspamd/worker-fuzzy.inc
88share/examples/rspamd/worker-normal.inc 88share/examples/rspamd/worker-normal.inc
89share/examples/rspamd/worker-proxy.inc 89share/examples/rspamd/worker-proxy.inc
90share/rspamd/effective_tld_names.dat 90share/rspamd/effective_tld_names.dat
91share/rspamd/elastic/kibana.json 91share/rspamd/elastic/kibana.json
92share/rspamd/elastic/rspamd_template.json 92share/rspamd/elastic/rspamd_template.json
93share/rspamd/languages/af.json 93share/rspamd/languages/af.json
94share/rspamd/languages/an.json 94share/rspamd/languages/an.json
95share/rspamd/languages/ar.json 95share/rspamd/languages/ar.json
96share/rspamd/languages/bg.json 96share/rspamd/languages/bg.json
97share/rspamd/languages/bn.json 97share/rspamd/languages/bn.json
98share/rspamd/languages/br.json 98share/rspamd/languages/br.json
99share/rspamd/languages/cs.json 99share/rspamd/languages/cs.json
100share/rspamd/languages/cy.json 100share/rspamd/languages/cy.json
101share/rspamd/languages/da.json 101share/rspamd/languages/da.json
102share/rspamd/languages/de.json 102share/rspamd/languages/de.json
103share/rspamd/languages/el.json 103share/rspamd/languages/el.json
104share/rspamd/languages/en.json 104share/rspamd/languages/en.json
105share/rspamd/languages/es.json 105share/rspamd/languages/es.json
106share/rspamd/languages/et.json 106share/rspamd/languages/et.json
107share/rspamd/languages/eu.json 107share/rspamd/languages/eu.json
108share/rspamd/languages/fa.json 108share/rspamd/languages/fa.json
109share/rspamd/languages/fi.json 109share/rspamd/languages/fi.json
110share/rspamd/languages/fr.json 110share/rspamd/languages/fr.json
111share/rspamd/languages/ga.json 111share/rspamd/languages/ga.json
112share/rspamd/languages/gl.json 112share/rspamd/languages/gl.json
113share/rspamd/languages/gu.json 113share/rspamd/languages/gu.json
114share/rspamd/languages/he.json 114share/rspamd/languages/he.json
115share/rspamd/languages/hi.json 115share/rspamd/languages/hi.json
116share/rspamd/languages/hr.json 116share/rspamd/languages/hr.json
117share/rspamd/languages/hu.json 117share/rspamd/languages/hu.json
118share/rspamd/languages/id.json 118share/rspamd/languages/id.json
119share/rspamd/languages/is.json 119share/rspamd/languages/is.json
120share/rspamd/languages/it.json 120share/rspamd/languages/it.json
121share/rspamd/languages/ja.json 121share/rspamd/languages/ja.json
122share/rspamd/languages/km.json 122share/rspamd/languages/km.json
123share/rspamd/languages/kn.json 123share/rspamd/languages/kn.json
124share/rspamd/languages/ko.json 124share/rspamd/languages/ko.json
125share/rspamd/languages/lt.json 125share/rspamd/languages/lt.json
126share/rspamd/languages/lv.json 126share/rspamd/languages/lv.json
127share/rspamd/languages/ml.json 127share/rspamd/languages/ml.json
128share/rspamd/languages/mr.json 128share/rspamd/languages/mr.json
129share/rspamd/languages/ms.json 129share/rspamd/languages/ms.json
130share/rspamd/languages/ne.json 130share/rspamd/languages/ne.json
131share/rspamd/languages/nl.json 131share/rspamd/languages/nl.json
132share/rspamd/languages/no.json 132share/rspamd/languages/no.json
133share/rspamd/languages/pa.json 133share/rspamd/languages/pa.json
134share/rspamd/languages/pl.json 134share/rspamd/languages/pl.json
135share/rspamd/languages/pt.json 135share/rspamd/languages/pt.json
136share/rspamd/languages/ro.json 136share/rspamd/languages/ro.json
137share/rspamd/languages/ru.json 137share/rspamd/languages/ru.json
138share/rspamd/languages/sl.json 138share/rspamd/languages/sl.json
139share/rspamd/languages/so.json 139share/rspamd/languages/so.json
140share/rspamd/languages/sq.json 140share/rspamd/languages/sq.json
141share/rspamd/languages/sr.json 141share/rspamd/languages/sr.json
142share/rspamd/languages/sv.json 142share/rspamd/languages/sv.json
143share/rspamd/languages/sw.json 143share/rspamd/languages/sw.json
144share/rspamd/languages/ta.json 144share/rspamd/languages/ta.json
145share/rspamd/languages/te.json 145share/rspamd/languages/te.json
146share/rspamd/languages/th.json 146share/rspamd/languages/th.json
147share/rspamd/languages/tr.json 147share/rspamd/languages/tr.json
148share/rspamd/languages/uk.json 148share/rspamd/languages/uk.json
149share/rspamd/languages/ur.json 149share/rspamd/languages/ur.json
150share/rspamd/languages/vi.json 150share/rspamd/languages/vi.json
151share/rspamd/languages/yi.json 151share/rspamd/languages/yi.json
152share/rspamd/languages/zh-CN.json 152share/rspamd/languages/zh-CN.json
153share/rspamd/lib/fun.lua 153share/rspamd/lib/fun.lua
154share/rspamd/lib/global_functions.lua 154share/rspamd/lib/global_functions.lua
155share/rspamd/lib/lua_auth_results.lua 155share/rspamd/lib/lua_auth_results.lua
156share/rspamd/lib/lua_cfg_transform.lua 156share/rspamd/lib/lua_cfg_transform.lua
157share/rspamd/lib/lua_dkim_tools.lua 157share/rspamd/lib/lua_dkim_tools.lua
158share/rspamd/lib/lua_maps.lua 158share/rspamd/lib/lua_maps.lua
159share/rspamd/lib/lua_meta.lua 159share/rspamd/lib/lua_meta.lua
160share/rspamd/lib/lua_nn.lua 160share/rspamd/lib/lua_nn.lua
161share/rspamd/lib/lua_redis.lua 161share/rspamd/lib/lua_redis.lua
 162share/rspamd/lib/lua_squeeze_rules.lua
162share/rspamd/lib/lua_stat.lua 163share/rspamd/lib/lua_stat.lua
163share/rspamd/lib/lua_util.lua 164share/rspamd/lib/lua_util.lua
164share/rspamd/lib/rspamadm/ansicolors.lua 165share/rspamd/lib/rspamadm/ansicolors.lua
165share/rspamd/lib/rspamadm/confighelp.lua 166share/rspamd/lib/rspamadm/confighelp.lua
166share/rspamd/lib/rspamadm/configwizard.lua 167share/rspamd/lib/rspamadm/configwizard.lua
167share/rspamd/lib/rspamadm/corpus_test.lua 168share/rspamd/lib/rspamadm/corpus_test.lua
168share/rspamd/lib/rspamadm/fuzzy_convert.lua 169share/rspamd/lib/rspamadm/fuzzy_convert.lua
169share/rspamd/lib/rspamadm/fuzzy_stat.lua 170share/rspamd/lib/rspamadm/fuzzy_stat.lua
170share/rspamd/lib/rspamadm/getopt.lua 171share/rspamd/lib/rspamadm/getopt.lua
171share/rspamd/lib/rspamadm/grep.lua 172share/rspamd/lib/rspamadm/grep.lua
172share/rspamd/lib/rspamadm/plugins_stats.lua 173share/rspamd/lib/rspamadm/plugins_stats.lua
173share/rspamd/lib/rspamadm/rescore.lua 174share/rspamd/lib/rspamadm/rescore.lua
174share/rspamd/lib/rspamadm/rescore_utility.lua 175share/rspamd/lib/rspamadm/rescore_utility.lua
175share/rspamd/lib/rspamadm/stat_convert.lua 176share/rspamd/lib/rspamadm/stat_convert.lua
176share/rspamd/lua/antivirus.lua 177share/rspamd/lua/antivirus.lua
177share/rspamd/lua/arc.lua 178share/rspamd/lua/arc.lua
178share/rspamd/lua/asn.lua 179share/rspamd/lua/asn.lua
179share/rspamd/lua/bayes_expiry.lua 180share/rspamd/lua/bayes_expiry.lua
180share/rspamd/lua/clickhouse.lua 181share/rspamd/lua/clickhouse.lua
181share/rspamd/lua/dcc.lua 182share/rspamd/lua/dcc.lua
182share/rspamd/lua/dkim_signing.lua 183share/rspamd/lua/dkim_signing.lua
183share/rspamd/lua/dmarc.lua 184share/rspamd/lua/dmarc.lua
184share/rspamd/lua/dynamic_conf.lua 185share/rspamd/lua/dynamic_conf.lua
185share/rspamd/lua/elastic.lua 186share/rspamd/lua/elastic.lua
186share/rspamd/lua/emails.lua 187share/rspamd/lua/emails.lua
187share/rspamd/lua/force_actions.lua 188share/rspamd/lua/force_actions.lua
188share/rspamd/lua/forged_recipients.lua 189share/rspamd/lua/forged_recipients.lua
189share/rspamd/lua/fuzzy_collect.lua 190share/rspamd/lua/fuzzy_collect.lua
190share/rspamd/lua/greylist.lua 191share/rspamd/lua/greylist.lua
191share/rspamd/lua/hfilter.lua 192share/rspamd/lua/hfilter.lua
192share/rspamd/lua/history_redis.lua 193share/rspamd/lua/history_redis.lua
193share/rspamd/lua/ip_score.lua 194share/rspamd/lua/ip_score.lua
194share/rspamd/lua/maillist.lua 195share/rspamd/lua/maillist.lua
195share/rspamd/lua/metadata_exporter.lua 196share/rspamd/lua/metadata_exporter.lua
196share/rspamd/lua/metric_exporter.lua 197share/rspamd/lua/metric_exporter.lua
197share/rspamd/lua/mid.lua 198share/rspamd/lua/mid.lua
198share/rspamd/lua/milter_headers.lua 199share/rspamd/lua/milter_headers.lua
199share/rspamd/lua/mime_types.lua 200share/rspamd/lua/mime_types.lua
200share/rspamd/lua/multimap.lua 201share/rspamd/lua/multimap.lua
201share/rspamd/lua/mx_check.lua 202share/rspamd/lua/mx_check.lua
202share/rspamd/lua/neural.lua 203share/rspamd/lua/neural.lua
203share/rspamd/lua/once_received.lua 204share/rspamd/lua/once_received.lua
204share/rspamd/lua/phishing.lua 205share/rspamd/lua/phishing.lua
205share/rspamd/lua/ratelimit.lua 206share/rspamd/lua/ratelimit.lua
206share/rspamd/lua/rbl.lua 207share/rspamd/lua/rbl.lua
207share/rspamd/lua/replies.lua 208share/rspamd/lua/replies.lua
208share/rspamd/lua/reputation.lua 209share/rspamd/lua/reputation.lua
209share/rspamd/lua/rspamd_update.lua 210share/rspamd/lua/rspamd_update.lua
210share/rspamd/lua/settings.lua 211share/rspamd/lua/settings.lua
211share/rspamd/lua/spamassassin.lua 212share/rspamd/lua/spamassassin.lua
212share/rspamd/lua/spamtrap.lua 213share/rspamd/lua/spamtrap.lua
213share/rspamd/lua/trie.lua 214share/rspamd/lua/trie.lua
214share/rspamd/lua/url_redirector.lua 215share/rspamd/lua/url_redirector.lua
215share/rspamd/lua/url_reputation.lua 216share/rspamd/lua/url_reputation.lua
216share/rspamd/lua/url_tags.lua 217share/rspamd/lua/url_tags.lua
217share/rspamd/lua/whitelist.lua 218share/rspamd/lua/whitelist.lua
218share/rspamd/rules/forwarding.lua 219share/rspamd/rules/forwarding.lua
219share/rspamd/rules/headers_checks.lua 220share/rspamd/rules/headers_checks.lua
220share/rspamd/rules/html.lua 221share/rspamd/rules/html.lua
221share/rspamd/rules/http_headers.lua 222share/rspamd/rules/http_headers.lua
222share/rspamd/rules/mid.lua 223share/rspamd/rules/mid.lua
223share/rspamd/rules/misc.lua 224share/rspamd/rules/misc.lua
224share/rspamd/rules/regexp/compromised_hosts.lua 225share/rspamd/rules/regexp/compromised_hosts.lua
225share/rspamd/rules/regexp/headers.lua 226share/rspamd/rules/regexp/headers.lua
226share/rspamd/rules/regexp/misc.lua 227share/rspamd/rules/regexp/misc.lua
227share/rspamd/rules/regexp/upstream_spam_filters.lua 228share/rspamd/rules/regexp/upstream_spam_filters.lua
228share/rspamd/rules/rspamd.classifiers.lua 229share/rspamd/rules/rspamd.classifiers.lua
229share/rspamd/rules/rspamd.lua 230share/rspamd/rules/rspamd.lua
230share/rspamd/rules/subject_checks.lua 231share/rspamd/rules/subject_checks.lua
231share/rspamd/www/README.md 232share/rspamd/www/README.md
232share/rspamd/www/css/bootstrap.min.css 233share/rspamd/www/css/bootstrap.min.css
233share/rspamd/www/css/d3evolution.css 234share/rspamd/www/css/d3evolution.css
234share/rspamd/www/css/footable.bootstrap.min.css 235share/rspamd/www/css/footable.bootstrap.min.css
235share/rspamd/www/css/rspamd.css 236share/rspamd/www/css/rspamd.css
236share/rspamd/www/favicon.ico 237share/rspamd/www/favicon.ico
237share/rspamd/www/fonts/glyphicons-halflings-regular.ttf 238share/rspamd/www/fonts/glyphicons-halflings-regular.ttf
238share/rspamd/www/fonts/glyphicons-halflings-regular.woff 239share/rspamd/www/fonts/glyphicons-halflings-regular.woff
239share/rspamd/www/fonts/glyphicons-halflings-regular.woff2 240share/rspamd/www/fonts/glyphicons-halflings-regular.woff2
240share/rspamd/www/img/asc.png 241share/rspamd/www/img/asc.png
241share/rspamd/www/img/desc.png 242share/rspamd/www/img/desc.png
242share/rspamd/www/img/rspamd_logo_navbar.png 243share/rspamd/www/img/rspamd_logo_navbar.png
243share/rspamd/www/index.html 244share/rspamd/www/index.html
244share/rspamd/www/js/app/config.js 245share/rspamd/www/js/app/config.js
245share/rspamd/www/js/app/graph.js 246share/rspamd/www/js/app/graph.js
246share/rspamd/www/js/app/history.js 247share/rspamd/www/js/app/history.js
247share/rspamd/www/js/app/rspamd.js 248share/rspamd/www/js/app/rspamd.js
248share/rspamd/www/js/app/stats.js 249share/rspamd/www/js/app/stats.js
249share/rspamd/www/js/app/symbols.js 250share/rspamd/www/js/app/symbols.js
250share/rspamd/www/js/app/upload.js 251share/rspamd/www/js/app/upload.js
251share/rspamd/www/js/lib/bootstrap.min.js 252share/rspamd/www/js/lib/bootstrap.min.js
252share/rspamd/www/js/lib/d3.min.js 253share/rspamd/www/js/lib/d3.min.js
253share/rspamd/www/js/lib/d3evolution.min.js 254share/rspamd/www/js/lib/d3evolution.min.js
254share/rspamd/www/js/lib/d3pie.min.js 255share/rspamd/www/js/lib/d3pie.min.js
255share/rspamd/www/js/lib/domReady.js 256share/rspamd/www/js/lib/domReady.js
256share/rspamd/www/js/lib/footable.min.js 257share/rspamd/www/js/lib/footable.min.js
257share/rspamd/www/js/lib/humanize.min.js 258share/rspamd/www/js/lib/humanize.min.js
258share/rspamd/www/js/lib/jquery-3.2.1.min.js 259share/rspamd/www/js/lib/jquery-3.2.1.min.js
259share/rspamd/www/js/lib/visibility.min.js 260share/rspamd/www/js/lib/visibility.min.js
260share/rspamd/www/js/main.js 261share/rspamd/www/js/main.js
261share/rspamd/www/js/require.js 262share/rspamd/www/js/require.js
262share/rspamd/www/plugins.txt 263share/rspamd/www/plugins.txt
263share/rspamd/www/react-index.html 264share/rspamd/www/react-index.html
264@pkgdir etc/rspamd 265@pkgdir etc/rspamd
cvs diff -r1.20 -r1.21 pkgsrc/mail/rspamd/distinfo (switch to unified diff)

--- pkgsrc/mail/rspamd/distinfo 2018/03/13 15:09:15 1.20
+++ pkgsrc/mail/rspamd/distinfo 2018/03/23 12:08:50 1.21
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.20 2018/03/13 15:09:15 fhajny Exp $ 1$NetBSD: distinfo,v 1.21 2018/03/23 12:08:50 fhajny Exp $
2 2
3SHA1 (rspamd-1.7.0.tar.gz) = 56fa8ff2ee8ef3ca3218c627bbda539cfbf824f4 3SHA1 (rspamd-1.7.1.tar.gz) = ba10983e20db45f57c73cab6591ee4fd237de18b
4RMD160 (rspamd-1.7.0.tar.gz) = 18226f2ba789e6ff05d1bd5d4ea6ca5ec925c8ab 4RMD160 (rspamd-1.7.1.tar.gz) = 6e55ea966b4afb6f2fa65e99d63676d3f3f229c3
5SHA512 (rspamd-1.7.0.tar.gz) = 84f23e8732b1f0481f7cceb31f517038125fe69145c61fe3f478422898a4c04beeaf9ef4628309d46ec38223c77c2c6b707bbbdc69c11be5563ea7b17bea5b6a 5SHA512 (rspamd-1.7.1.tar.gz) = 3de4e07fa9cc72e306936a201f6bc019b5bf6f3ade003bf9217dc8a7decf027b986d80e1c0d2f09460af6f1d59aa520fee68287ad6ccee1cec94698054bc2fbb
6Size (rspamd-1.7.0.tar.gz) = 4444320 bytes 6Size (rspamd-1.7.1.tar.gz) = 4453460 bytes
7SHA1 (patch-CMakeLists.txt) = 1d3e66b52ef38638674baf4c10b68c97b2ca38ad 7SHA1 (patch-CMakeLists.txt) = 1d3e66b52ef38638674baf4c10b68c97b2ca38ad
8SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a 8SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a
9SHA1 (patch-src_libutil_util.c) = 7709d5b0e9ee8d6cb2d2818b3982152f1f1acfd1 9SHA1 (patch-src_libutil_util.c) = 5d0479905df6e88f7d1ccc9dddbd1f4bf19035cd
cvs diff -r1.1 -r1.2 pkgsrc/mail/rspamd/patches/Attic/patch-src_libutil_util.c (switch to unified diff)

--- pkgsrc/mail/rspamd/patches/Attic/patch-src_libutil_util.c 2018/03/13 15:09:15 1.1
+++ pkgsrc/mail/rspamd/patches/Attic/patch-src_libutil_util.c 2018/03/23 12:08:50 1.2
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-src_libutil_util.c,v 1.1 2018/03/13 15:09:15 fhajny Exp $ 1$NetBSD: patch-src_libutil_util.c,v 1.2 2018/03/23 12:08:50 fhajny Exp $
2 2
3Fix SunOS workaround. 3Fix SunOS workaround.
4 4
5--- src/libutil/util.c.orig 2018-03-12 16:46:32.000000000 +0000 5--- src/libutil/util.c.orig 2018-03-20 12:26:55.000000000 +0000
6+++ src/libutil/util.c 6+++ src/libutil/util.c
7@@ -2766,8 +2766,8 @@ rspamd_gmtime (gint64 ts, struct tm *des 7@@ -2766,8 +2766,8 @@ rspamd_gmtime (gint64 ts, struct tm *des
8 dest->tm_sec = remsecs % 60; 8 dest->tm_sec = remsecs % 60;
9 #if !defined(__sun) 9 #if !defined(__sun)
10 dest->tm_gmtoff = 0; 10 dest->tm_gmtoff = 0;
11-#endif 11-#endif
12 dest->tm_zone = "GMT"; 12 dest->tm_zone = "GMT";
13+#endif 13+#endif
14 } 14 }
15  15
16 #ifdef HAVE_SANE_TZSET 16 #ifdef HAVE_SANE_TZSET
17@@ -2787,8 +2787,8 @@ void rspamd_localtime (gint64 ts, struct 17@@ -2787,8 +2787,8 @@ void rspamd_localtime (gint64 ts, struct
18  18
19 ts += timezone; 19 ts -= timezone;
20 rspamd_gmtime (ts, dest); 20 rspamd_gmtime (ts, dest);
21- dest->tm_zone = daylight ? (tzname[1] ? tzname[1] : tzname[0]) : tzname[0]; 21- dest->tm_zone = daylight ? (tzname[1] ? tzname[1] : tzname[0]) : tzname[0];
22 #if !defined(__sun) 22 #if !defined(__sun)
23+ dest->tm_zone = daylight ? (tzname[1] ? tzname[1] : tzname[0]) : tzname[0]; 23+ dest->tm_zone = daylight ? (tzname[1] ? tzname[1] : tzname[0]) : tzname[0];
24 dest->tm_gmtoff = timezone; 24 dest->tm_gmtoff = -timezone;
25 #endif 25 #endif
26 } 26 }