diff options
| -rw-r--r-- | mail/rspamd/Makefile | 12 | ||||
| -rw-r--r-- | mail/rspamd/PLIST | 53 | ||||
| -rw-r--r-- | mail/rspamd/cfgfiles.mk | 4 | ||||
| -rw-r--r-- | mail/rspamd/distinfo | 10 |
4 files changed, 46 insertions, 33 deletions
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 14d40c59f7e..a95e602d77a 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.55 2019/11/02 16:25:27 rillig Exp $ +# $NetBSD: Makefile,v 1.56 2019/11/03 18:19:32 triaxx Exp $ -DISTNAME= rspamd-1.9.4 -PKGREVISION= 1 +DISTNAME= rspamd-2.1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} @@ -17,14 +16,14 @@ DEPENDS+= ragel-[0-9]*:../../devel/ragel USE_CMAKE= yes USE_TOOLS+= perl pkg-config -USE_LANGUAGES= c99 +USE_LANGUAGES= c99 c++ BUILD_DEFS+= VARBASE # Not really true, but difficult to avoid picking up 5.3 LUA_VERSIONS_ACCEPTED= 53 -CPPFLAGS.SunOS+= -D__EXTENSIONS__ -BUILDLINK_TRANSFORM.Darwin+= rm:-lrt +CPPFLAGS.SunOS+= -D__EXTENSIONS__ +BUILDLINK_FNAME_TRANSFORM.Darwin+= -e "s|-lrt||g" LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd TEST_TARGET= run-test @@ -101,6 +100,7 @@ post-extract: .include "../../lang/lua/buildlink3.mk" .include "../../mail/gmime/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.include "../../security/libsodium/buildlink3.mk" .include "../../sysutils/file/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST index fd9f7b3b24c..83aff7fb83a 100644 --- a/mail/rspamd/PLIST +++ b/mail/rspamd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2019/06/21 15:00:12 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.17 2019/11/03 18:19:32 triaxx Exp $ bin/rspamadm bin/rspamadm-${PKGVERSION} bin/rspamc @@ -7,22 +7,27 @@ bin/rspamd bin/${PKGNAME} bin/rspamd_stats lib/rspamd/librspamd-actrie.so +lib/rspamd/librspamd-ev.so +lib/rspamd/librspamd-kann.so +lib/rspamd/librspamd-replxx.so lib/rspamd/librspamd-server.so man/man1/rspamadm.1 man/man1/rspamc.1 man/man8/rspamd.8 -share/examples/rspamd/2tld.inc share/examples/rspamd/actions.conf share/examples/rspamd/cgp.inc share/examples/rspamd/common.conf share/examples/rspamd/composites.conf -share/examples/rspamd/dmarc_whitelist.inc share/examples/rspamd/groups.conf share/examples/rspamd/logging.inc -share/examples/rspamd/maillist.inc +share/examples/rspamd/maps.d/dmarc_whitelist.inc +share/examples/rspamd/maps.d/maillist.inc +share/examples/rspamd/maps.d/mid.inc +share/examples/rspamd/maps.d/mime_types.inc +share/examples/rspamd/maps.d/redirectors.inc +share/examples/rspamd/maps.d/spf_dkim_whitelist.inc +share/examples/rspamd/maps.d/surbl-whitelist.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/antivirus.conf share/examples/rspamd/modules.d/arc.conf @@ -42,7 +47,6 @@ share/examples/rspamd/modules.d/fuzzy_check.conf share/examples/rspamd/modules.d/greylist.conf share/examples/rspamd/modules.d/hfilter.conf share/examples/rspamd/modules.d/history_redis.conf -share/examples/rspamd/modules.d/ip_score.conf share/examples/rspamd/modules.d/maillist.conf share/examples/rspamd/modules.d/metadata_exporter.conf share/examples/rspamd/modules.d/metric_exporter.conf @@ -53,6 +57,7 @@ share/examples/rspamd/modules.d/multimap.conf share/examples/rspamd/modules.d/mx_check.conf share/examples/rspamd/modules.d/neural.conf share/examples/rspamd/modules.d/once_received.conf +share/examples/rspamd/modules.d/p0f.conf share/examples/rspamd/modules.d/phishing.conf share/examples/rspamd/modules.d/ratelimit.conf share/examples/rspamd/modules.d/rbl.conf @@ -67,11 +72,8 @@ share/examples/rspamd/modules.d/spf.conf share/examples/rspamd/modules.d/surbl.conf share/examples/rspamd/modules.d/trie.conf share/examples/rspamd/modules.d/url_redirector.conf -share/examples/rspamd/modules.d/url_reputation.conf -share/examples/rspamd/modules.d/url_tags.conf 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/scores.d/fuzzy_group.conf share/examples/rspamd/scores.d/headers_group.conf @@ -86,9 +88,7 @@ share/examples/rspamd/scores.d/subject_group.conf share/examples/rspamd/scores.d/surbl_group.conf share/examples/rspamd/scores.d/whitelist_group.conf share/examples/rspamd/settings.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 @@ -149,6 +149,7 @@ share/rspamd/lualib/fun.lua share/rspamd/lualib/global_functions.lua share/rspamd/lualib/lpegre.lua share/rspamd/lualib/lua_auth_results.lua +share/rspamd/lualib/lua_bayes_learn.lua share/rspamd/lualib/lua_cfg_transform.lua share/rspamd/lualib/lua_clickhouse.lua share/rspamd/lualib/lua_dkim_tools.lua @@ -158,9 +159,15 @@ share/rspamd/lualib/lua_ffi/init.lua share/rspamd/lualib/lua_ffi/spf.lua share/rspamd/lualib/lua_fuzzy.lua share/rspamd/lualib/lua_ical.lua +share/rspamd/lualib/lua_lexer.lua +share/rspamd/lualib/lua_magic/heuristics.lua +share/rspamd/lualib/lua_magic/init.lua +share/rspamd/lualib/lua_magic/patterns.lua +share/rspamd/lualib/lua_magic/types.lua share/rspamd/lualib/lua_maps.lua +share/rspamd/lualib/lua_maps_expressions.lua share/rspamd/lualib/lua_meta.lua -share/rspamd/lualib/lua_nn.lua +share/rspamd/lualib/lua_mime.lua share/rspamd/lualib/lua_redis.lua share/rspamd/lualib/lua_scanners/clamav.lua share/rspamd/lualib/lua_scanners/common.lua @@ -169,13 +176,20 @@ share/rspamd/lualib/lua_scanners/fprot.lua share/rspamd/lualib/lua_scanners/icap.lua share/rspamd/lualib/lua_scanners/init.lua share/rspamd/lualib/lua_scanners/kaspersky_av.lua +share/rspamd/lualib/lua_scanners/kaspersky_se.lua share/rspamd/lualib/lua_scanners/oletools.lua +share/rspamd/lualib/lua_scanners/p0f.lua +share/rspamd/lualib/lua_scanners/razor.lua share/rspamd/lualib/lua_scanners/savapi.lua share/rspamd/lualib/lua_scanners/sophos.lua share/rspamd/lualib/lua_scanners/spamassassin.lua share/rspamd/lualib/lua_scanners/vadesecure.lua -share/rspamd/lualib/lua_selectors.lua -share/rspamd/lualib/lua_squeeze_rules.lua +share/rspamd/lualib/lua_selectors/extractors.lua +share/rspamd/lualib/lua_selectors/init.lua +share/rspamd/lualib/lua_selectors/maps.lua +share/rspamd/lualib/lua_selectors/transforms.lua +share/rspamd/lualib/lua_settings.lua +share/rspamd/lualib/lua_smtp.lua share/rspamd/lualib/lua_stat.lua share/rspamd/lualib/lua_tcp_sync.lua share/rspamd/lualib/lua_util.lua @@ -229,6 +243,7 @@ share/rspamd/plugins/multimap.lua share/rspamd/plugins/mx_check.lua share/rspamd/plugins/neural.lua share/rspamd/plugins/once_received.lua +share/rspamd/plugins/p0f.lua share/rspamd/plugins/phishing.lua share/rspamd/plugins/ratelimit.lua share/rspamd/plugins/rbl.lua @@ -240,9 +255,8 @@ share/rspamd/plugins/spamassassin.lua share/rspamd/plugins/spamtrap.lua share/rspamd/plugins/trie.lua share/rspamd/plugins/url_redirector.lua -share/rspamd/plugins/url_reputation.lua -share/rspamd/plugins/url_tags.lua share/rspamd/plugins/whitelist.lua +share/rspamd/rules/bitcoin.lua share/rspamd/rules/forwarding.lua share/rspamd/rules/headers_checks.lua share/rspamd/rules/html.lua @@ -253,7 +267,6 @@ share/rspamd/rules/regexp/compromised_hosts.lua share/rspamd/rules/regexp/headers.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/rules/subject_checks.lua share/rspamd/www/README.md @@ -281,10 +294,9 @@ share/rspamd/www/js/lib/bootstrap.min.js share/rspamd/www/js/lib/d3.min.js share/rspamd/www/js/lib/d3evolution.min.js share/rspamd/www/js/lib/d3pie.min.js -share/rspamd/www/js/lib/domReady.js share/rspamd/www/js/lib/footable.min.js share/rspamd/www/js/lib/humanize.min.js -share/rspamd/www/js/lib/jquery-3.3.1.min.js +share/rspamd/www/js/lib/jquery-3.4.1.min.js share/rspamd/www/js/lib/jquery.stickytabs.min.js share/rspamd/www/js/lib/nprogress.min.js share/rspamd/www/js/lib/require.min.js @@ -292,3 +304,4 @@ share/rspamd/www/js/lib/visibility.min.js share/rspamd/www/js/main.js share/rspamd/www/plugins.txt share/rspamd/www/react-index.html +@pkgdir etc/rspamd diff --git a/mail/rspamd/cfgfiles.mk b/mail/rspamd/cfgfiles.mk index 9979573a198..a47f02e5ce8 100644 --- a/mail/rspamd/cfgfiles.mk +++ b/mail/rspamd/cfgfiles.mk @@ -1,4 +1,4 @@ -# $NetBSD: cfgfiles.mk,v 1.3 2019/06/21 15:00:12 jperkin Exp $ +# $NetBSD: cfgfiles.mk,v 1.4 2019/11/03 18:19:32 triaxx Exp $ # Do not edit, regenerate post-extract using 'make cfgfiles' CFGFILES= \ -2tld.inc actions.conf cgp.inc common.conf composites.conf dmarc_whitelist.inc groups.conf logging.inc maillist.inc metrics.conf mid.inc mime_types.inc modules.conf modules.d/antivirus.conf modules.d/arc.conf modules.d/asn.conf modules.d/chartable.conf modules.d/clickhouse.conf modules.d/dcc.conf modules.d/dkim.conf modules.d/dkim_signing.conf modules.d/dmarc.conf modules.d/elastic.conf modules.d/emails.conf modules.d/external_services.conf modules.d/force_actions.conf modules.d/forged_recipients.conf modules.d/fuzzy_check.conf modules.d/greylist.conf modules.d/hfilter.conf modules.d/history_redis.conf modules.d/ip_score.conf modules.d/maillist.conf modules.d/metadata_exporter.conf modules.d/metric_exporter.conf modules.d/mid.conf modules.d/milter_headers.conf modules.d/mime_types.conf modules.d/multimap.conf modules.d/mx_check.conf modules.d/neural.conf modules.d/once_received.conf modules.d/phishing.conf modules.d/ratelimit.conf modules.d/rbl.conf modules.d/redis.conf modules.d/regexp.conf modules.d/replies.conf modules.d/reputation.conf modules.d/rspamd_update.conf modules.d/spamassassin.conf modules.d/spamtrap.conf modules.d/spf.conf modules.d/surbl.conf modules.d/trie.conf modules.d/url_redirector.conf modules.d/url_reputation.conf modules.d/url_tags.conf modules.d/whitelist.conf options.inc redirectors.inc rspamd.conf scores.d/fuzzy_group.conf scores.d/headers_group.conf scores.d/hfilter_group.conf scores.d/mime_types_group.conf scores.d/mua_group.conf scores.d/phishing_group.conf scores.d/policies_group.conf scores.d/rbl_group.conf scores.d/statistics_group.conf scores.d/subject_group.conf scores.d/surbl_group.conf scores.d/whitelist_group.conf settings.conf spf_dkim_whitelist.inc statistic.conf surbl-whitelist.inc worker-controller.inc worker-fuzzy.inc worker-normal.inc worker-proxy.inc +actions.conf cgp.inc common.conf composites.conf groups.conf logging.inc maps.d/dmarc_whitelist.inc maps.d/maillist.inc maps.d/mid.inc maps.d/mime_types.inc maps.d/redirectors.inc maps.d/spf_dkim_whitelist.inc maps.d/surbl-whitelist.inc metrics.conf modules.conf modules.d/antivirus.conf modules.d/arc.conf modules.d/asn.conf modules.d/chartable.conf modules.d/clickhouse.conf modules.d/dcc.conf modules.d/dkim.conf modules.d/dkim_signing.conf modules.d/dmarc.conf modules.d/elastic.conf modules.d/emails.conf modules.d/external_services.conf modules.d/force_actions.conf modules.d/forged_recipients.conf modules.d/fuzzy_check.conf modules.d/greylist.conf modules.d/hfilter.conf modules.d/history_redis.conf modules.d/maillist.conf modules.d/metadata_exporter.conf modules.d/metric_exporter.conf modules.d/mid.conf modules.d/milter_headers.conf modules.d/mime_types.conf modules.d/multimap.conf modules.d/mx_check.conf modules.d/neural.conf modules.d/once_received.conf modules.d/p0f.conf modules.d/phishing.conf modules.d/ratelimit.conf modules.d/rbl.conf modules.d/redis.conf modules.d/regexp.conf modules.d/replies.conf modules.d/reputation.conf modules.d/rspamd_update.conf modules.d/spamassassin.conf modules.d/spamtrap.conf modules.d/spf.conf modules.d/surbl.conf modules.d/trie.conf modules.d/url_redirector.conf modules.d/whitelist.conf options.inc rspamd.conf scores.d/fuzzy_group.conf scores.d/headers_group.conf scores.d/hfilter_group.conf scores.d/mime_types_group.conf scores.d/mua_group.conf scores.d/phishing_group.conf scores.d/policies_group.conf scores.d/rbl_group.conf scores.d/statistics_group.conf scores.d/subject_group.conf scores.d/surbl_group.conf scores.d/whitelist_group.conf settings.conf statistic.conf worker-controller.inc worker-fuzzy.inc worker-normal.inc worker-proxy.inc diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index c49fa9a79ed..8daa5993ac4 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.29 2019/06/21 15:00:12 jperkin Exp $ +$NetBSD: distinfo,v 1.30 2019/11/03 18:19:32 triaxx Exp $ -SHA1 (rspamd-1.9.4.tar.gz) = a6f10a6f676a389c11566e50dc0ef9c28240c46c -RMD160 (rspamd-1.9.4.tar.gz) = 776b5ab95caf2c2b0f59cf34563ffaead8aebd7a -SHA512 (rspamd-1.9.4.tar.gz) = 3acecec6adb91580ac2ad96419fdc9588b120ec5a3b4a44135fc5a3e7c15f2dbc99963a8337f9effb9423846489545a55d89d1849c5ba62d8cd91dc67c32d8dc -Size (rspamd-1.9.4.tar.gz) = 4476230 bytes +SHA1 (rspamd-2.1.tar.gz) = 17e7e7025c66bf7c15313a58adc1bd9ee0fac4b0 +RMD160 (rspamd-2.1.tar.gz) = 223eadaa92fc6bf9ca0c25f83dccd2d5a9acb2cc +SHA512 (rspamd-2.1.tar.gz) = 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f +Size (rspamd-2.1.tar.gz) = 4232297 bytes SHA1 (patch-CMakeLists.txt) = 1d3e66b52ef38638674baf4c10b68c97b2ca38ad SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a |