diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,6 +1,5 @@ PORTNAME= rspamd -PORTVERSION= 2.7 -PORTREVISION= 1 +PORTVERSION= 3.0 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org @@ -9,28 +8,44 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.md -LIB_DEPENDS= libpcre.so:devel/pcre \ - libicui18n.so:devel/icu \ - libsodium.so:security/libsodium BUILD_DEPENDS= ragel:devel/ragel +LIB_DEPENDS= libicui18n.so:devel/icu \ + libpcre.so:devel/pcre \ + libsodium.so:security/libsodium RUN_DEPENDS= ca_root_nss>=3.*:security/ca_root_nss -USES= cmake cpe gnome perl5 pkgconfig sqlite ssl +USES= cmake compiler:c++17-lang cpe gnome perl5 pkgconfig sqlite ssl +CPE_VENDOR= rspamd_project +USE_GITHUB= yes +USE_GNOME= glib20 USE_LDCONFIG= yes USE_PERL5= build run -USE_GNOME= glib20 -CPE_VENDOR= rspamd_project +USE_RC_SUBR= rspamd + +CMAKE_ARGS+= -DBUILD_PORT=yes \ + -DCMAKE_INSTALL_PREFIX=${PREFIX} \ + -DCONFDIR=${PREFIX}/etc/rspamd \ + -DDBDIR=/var/db/rspamd \ + -DLIBDIR=${PREFIX}/lib/rspamd \ + -DLOGDIR=/var/log/rspamd \ + -DMANDIR=${MANPREFIX}/man \ + -DRUNDIR=/var/run/rspamd CONFLICTS_INSTALL= rspamd-devel +SUB_FILES= pkg-message rspamd.newsyslog.conf.sample + USERS= rspamd GROUPS= rspamd -OPTIONS_DEFINE= BLAS CGP GPERF LUAJIT -OPTIONS_DEFINE_amd64= HYPERSCAN -OPTIONS_DEFAULT_amd64= LUAJIT -OPTIONS_DEFAULT_armv7= LUAJIT -OPTIONS_DEFAULT_i386= LUAJIT +PLIST_SUB+= ETCDIR=etc/rspamd \ + RSPAMDVERSION=${PORTVERSION} + +OPTIONS_DEFINE= BLAS CGP GPERF LUAJIT +OPTIONS_DEFINE_amd64= HYPERSCAN +OPTIONS_DEFAULT_amd64= LUAJIT +OPTIONS_DEFAULT_armv7= LUAJIT +OPTIONS_DEFAULT_i386= LUAJIT OPTIONS_DEFAULT_powerpc= LUAJIT OPTIONS_DEFAULT_powerpc64= LUAJIT OPTIONS_DEFAULT_powerpc64le= LUAJIT @@ -42,49 +57,30 @@ HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only) LUAJIT_DESC= Use LuaJIT instead of standard Lua -SUB_FILES= pkg-message rspamd.newsyslog.conf.sample -PLIST_SUB+= ETCDIR=etc/rspamd \ - RSPAMDVERSION=${PORTVERSION} -CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rspamd \ - -DLOGDIR=/var/log/rspamd \ - -DDBDIR=/var/db/rspamd \ - -DRUNDIR=/var/run/rspamd \ - -DMANDIR=${MANPREFIX}/man \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DBUILD_PORT=yes \ - -DLIBDIR=${PREFIX}/lib/rspamd +BLAS_LIB_DEPENDS= libblis.so:math/blis \ + liblapack.so:math/lapack +BLAS_USES= blaslapack:openblas +BLAS_CMAKE_ON= -DENABLE_BLAS=ON -USE_GITHUB= yes +CGP_RUN_DEPENDS+= p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \ + p5-AnyEvent>=0:devel/p5-AnyEvent \ + p5-EV>=0:devel/p5-EV \ + p5-JSON-XS>=0:converters/p5-JSON-XS -USE_RC_SUBR= rspamd - -BLAS_CMAKE_ON= -DENABLE_BLAS=ON -BLAS_LIB_DEPENDS= libblis.so:math/blis liblapack.so:math/lapack -BLAS_USES= blaslapack:openblas - -GPERF_CMAKE_ON= -DENABLE_GPERF_TOOLS=ON GPERF_LIB_DEPENDS= libprofiler.so:devel/google-perftools +GPERF_CMAKE_ON= -DENABLE_GPERF_TOOLS=ON -HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan +HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON -LUAJIT_CMAKE_OFF= -DENABLE_LUAJIT=OFF LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUAJIT_USES_OFF= lua:51+ - -CGP_RUN_DEPENDS+= \ - p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \ - p5-AnyEvent>=0:devel/p5-AnyEvent \ - p5-EV>=0:devel/p5-EV \ - p5-JSON-XS>=0:converters/p5-JSON-XS +LUAJIT_CMAKE_OFF= -DENABLE_LUAJIT=OFF .include .if ${ARCH:Mpowerpc*} LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty -USES+= compiler:gcc-c++11-lib -.else -USES+= compiler:c11 .endif post-install: diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1610114328 -SHA256 (rspamd-rspamd-2.7_GH0.tar.gz) = e2606c18f0d9b1e7eee86907bd8545e0dcda83b1642ddf58915d5d44a53e3df0 -SIZE (rspamd-rspamd-2.7_GH0.tar.gz) = 5126227 +TIMESTAMP = 1629385545 +SHA256 (rspamd-rspamd-3.0_GH0.tar.gz) = 86600f6b6690395f42fd2136b708b0410e3c17328a9e05d7034e80a2dc0aaf12 +SIZE (rspamd-rspamd-3.0_GH0.tar.gz) = 5535659 diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist --- a/mail/rspamd/pkg-plist +++ b/mail/rspamd/pkg-plist @@ -25,6 +25,7 @@ %%ETCDIR%%/modules.d/antivirus.conf %%ETCDIR%%/modules.d/arc.conf %%ETCDIR%%/modules.d/asn.conf +%%ETCDIR%%/modules.d/aws_s3.conf %%ETCDIR%%/modules.d/chartable.conf %%ETCDIR%%/modules.d/clickhouse.conf %%ETCDIR%%/modules.d/dcc.conf @@ -33,6 +34,7 @@ %%ETCDIR%%/modules.d/dmarc.conf %%ETCDIR%%/modules.d/elastic.conf %%ETCDIR%%/modules.d/emails.conf +%%ETCDIR%%/modules.d/external_relay.conf %%ETCDIR%%/modules.d/external_services.conf %%ETCDIR%%/modules.d/force_actions.conf %%ETCDIR%%/modules.d/forged_recipients.conf @@ -153,12 +155,14 @@ %%DATADIR%%/lualib/global_functions.lua %%DATADIR%%/lualib/lpegre.lua %%DATADIR%%/lualib/lua_auth_results.lua +%%DATADIR%%/lualib/lua_aws.lua %%DATADIR%%/lualib/lua_bayes_learn.lua %%DATADIR%%/lualib/lua_cfg_transform.lua %%DATADIR%%/lualib/lua_clickhouse.lua %%DATADIR%%/lualib/lua_content/ical.lua %%DATADIR%%/lualib/lua_content/init.lua %%DATADIR%%/lualib/lua_content/pdf.lua +%%DATADIR%%/lualib/lua_content/vcard.lua %%DATADIR%%/lualib/lua_dkim_tools.lua %%DATADIR%%/lualib/lua_ffi/common.lua %%DATADIR%%/lualib/lua_ffi/dkim.lua @@ -175,6 +179,7 @@ %%DATADIR%%/lualib/lua_maps_expressions.lua %%DATADIR%%/lualib/lua_meta.lua %%DATADIR%%/lualib/lua_mime.lua +%%DATADIR%%/lualib/lua_mime_types.lua %%DATADIR%%/lualib/lua_redis.lua %%DATADIR%%/lualib/lua_scanners/avast.lua %%DATADIR%%/lualib/lua_scanners/clamav.lua @@ -187,6 +192,7 @@ %%DATADIR%%/lualib/lua_scanners/kaspersky_se.lua %%DATADIR%%/lualib/lua_scanners/oletools.lua %%DATADIR%%/lualib/lua_scanners/p0f.lua +%%DATADIR%%/lualib/lua_scanners/pyzor.lua %%DATADIR%%/lualib/lua_scanners/razor.lua %%DATADIR%%/lualib/lua_scanners/savapi.lua %%DATADIR%%/lualib/lua_scanners/sophos.lua @@ -206,6 +212,7 @@ %%DATADIR%%/lualib/lua_util.lua %%DATADIR%%/lualib/lua_verdict.lua %%DATADIR%%/lualib/lupa.lua +%%DATADIR%%/lualib/plugins/dmarc.lua %%DATADIR%%/lualib/plugins/neural.lua %%DATADIR%%/lualib/plugins/rbl.lua %%DATADIR%%/lualib/plugins_stats.lua @@ -216,6 +223,7 @@ %%DATADIR%%/lualib/rspamadm/configwizard.lua %%DATADIR%%/lualib/rspamadm/cookie.lua %%DATADIR%%/lualib/rspamadm/corpus_test.lua +%%DATADIR%%/lualib/rspamadm/dmarc_report.lua %%DATADIR%%/lualib/rspamadm/dns_tool.lua %%DATADIR%%/lualib/rspamadm/fuzzy_convert.lua %%DATADIR%%/lualib/rspamadm/fuzzy_stat.lua @@ -224,12 +232,14 @@ %%DATADIR%%/lualib/rspamadm/mime.lua %%DATADIR%%/lualib/rspamadm/rescore.lua %%DATADIR%%/lualib/rspamadm/stat_convert.lua +%%DATADIR%%/lualib/rspamadm/statistics_dump.lua %%DATADIR%%/lualib/rspamadm/template.lua %%DATADIR%%/lualib/rspamadm/vault.lua %%DATADIR%%/lualib/tableshape.lua %%DATADIR%%/plugins/antivirus.lua %%DATADIR%%/plugins/arc.lua %%DATADIR%%/plugins/asn.lua +%%DATADIR%%/plugins/aws_s3.lua %%DATADIR%%/plugins/bayes_expiry.lua %%DATADIR%%/plugins/clickhouse.lua %%DATADIR%%/plugins/clustering.lua @@ -239,6 +249,7 @@ %%DATADIR%%/plugins/dynamic_conf.lua %%DATADIR%%/plugins/elastic.lua %%DATADIR%%/plugins/emails.lua +%%DATADIR%%/plugins/external_relay.lua %%DATADIR%%/plugins/external_services.lua %%DATADIR%%/plugins/force_actions.lua %%DATADIR%%/plugins/forged_recipients.lua @@ -328,7 +339,7 @@ %%DATADIR%%/www/js/lib/d3pie.min.js %%DATADIR%%/www/js/lib/fontawesome.min.js %%DATADIR%%/www/js/lib/footable.min.js -%%DATADIR%%/www/js/lib/jquery-3.5.1.min.js +%%DATADIR%%/www/js/lib/jquery-3.6.0.min.js %%DATADIR%%/www/js/lib/jquery.stickytabs.min.js %%DATADIR%%/www/js/lib/linenumbers.min.js %%DATADIR%%/www/js/lib/nprogress.min.js