Index: head/mail/rspamd/Makefile =================================================================== --- head/mail/rspamd/Makefile (revision 427428) +++ head/mail/rspamd/Makefile (revision 427429) @@ -1,100 +1,100 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.1 CATEGORIES= mail MASTER_SITES= http://rspamd.com/downloads/ MAINTAINER= vsevolod@FreeBSD.org COMMENT= Fast spam filtering system LICENSE= APACHE20 LIB_DEPENDS= libpcre.so:devel/pcre \ libgmime-2.6.so:mail/gmime26 \ libevent.so:devel/libevent2 \ libluajit-5.1.so:lang/luajit \ libfann.so:math/fann BUILD_DEPENDS= ragel:devel/ragel CONFLICTS_INSTALL= rspamd-devel OPTIONS_DEFINE= GPERF REDIRECTOR HYPERSCAN GPERF_DESC= Google perf-tools profiling REDIRECTOR_DESC= Install HTTP redirector HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only) USE_RC_SUBR= rspamd 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 \ -DFORCE_GMIME24=yes \ -DLIBDIR=${PREFIX}/lib/rspamd \ -DENABLE_FANN=ON \ -DNO_SHARED=ON USES= cmake:outsource gettext iconv pkgconfig tar:xz perl5 \ compiler:c11 sqlite ssl USE_LDCONFIG= yes USE_PERL5= build USE_GNOME= glib20 .include .if ${PORT_OPTIONS:MGPERF} CMAKE_ARGS+= -DENABLE_GPERF_TOOLS=ON LIB_DEPENDS+= libprofiler.so:devel/google-perftools .endif .if ${PORT_OPTIONS:MHYPERSCAN} CMAKE_ARGS+= -DENABLE_HYPERSCAN=ON LIB_DEPENDS+= libhs.so:devel/hyperscan ONLY_FOR_ARCHS= amd64 .endif .if ${PORT_OPTIONS:MREDIRECTOR} USE_PERL5+= run CMAKE_ARGS+= -DENABLE_REDIRECTOR=ON PLIST_SUB+= REDIRECTOR="" USE_RC_SUBR+= rspamd_redirector RUN_DEPENDS+= \ p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \ p5-IO-String>=0:devel/p5-IO-String \ p5-XML-Parser>=0:textproc/p5-XML-Parser \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \ p5-POE-Component-Client-DNS>=0:dns/p5-POE-Component-Client-DNS \ p5-POE-Component-Client-HTTP>=0:www/p5-POE-Component-Client-HTTP \ p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \ p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \ p5-Proc-PidUtil>=0:sysutils/p5-Proc-PidUtil \ p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \ p5-SWF-File>=0:graphics/p5-SWF-File .else PLIST_SUB+= REDIRECTOR="@comment " .endif post-stage: ${INSTALL} -d \ ${STAGEDIR}/var/log/rspamd \ ${STAGEDIR}/var/db/rspamd \ ${STAGEDIR}/var/run/rspamd # Linux specific ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf # No need, since rspamd.conf.sample is a same ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf ${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR} post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d .include Index: head/mail/rspamd/distinfo =================================================================== --- head/mail/rspamd/distinfo (revision 427428) +++ head/mail/rspamd/distinfo (revision 427429) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479731945 -SHA256 (rspamd-1.4.0.tar.xz) = 30c9acf93bdcc6c009524c8b2770931475929c6c9e948faa90d7412306055a1c -SIZE (rspamd-1.4.0.tar.xz) = 1769860 +TIMESTAMP = 1480517320 +SHA256 (rspamd-1.4.1.tar.xz) = 11e39e4b44a85feaf546696d28a72ffc32e35c01a028a251d5175ba58343eb28 +SIZE (rspamd-1.4.1.tar.xz) = 1779492 Index: head/mail/rspamd/files/patch-CMakeLists.txt =================================================================== --- head/mail/rspamd/files/patch-CMakeLists.txt (revision 427428) +++ head/mail/rspamd/files/patch-CMakeLists.txt (revision 427429) @@ -1,24 +1,26 @@ ---- CMakeLists.txt.orig 2016-07-03 20:55:47 UTC +--- CMakeLists.txt.orig 2016-10-19 16:09:11 UTC +++ CMakeLists.txt -@@ -1223,6 +1223,21 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON") +@@ -1261,6 +1261,23 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON") ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON") IF(BUILD_PORT) INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample") + INSTALL_IF_NOT_EXISTS("conf/common.conf" ${CONFDIR} "common.conf" ".sample") + INSTALL_IF_NOT_EXISTS("conf/logging.inc" ${CONFDIR} "logging.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/options.inc" ${CONFDIR} "options.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/worker-controller.inc" ${CONFDIR} "worker-controller.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/worker-fuzzy.inc" ${CONFDIR} "worker-fuzzy.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/worker-normal.inc" ${CONFDIR} "worker-normal.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/2tld.inc" ${CONFDIR} "2tld.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/mime_types.inc" ${CONFDIR} "mime_types.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/composites.conf" ${CONFDIR} "composites.conf" ".sample") ++ INSTALL_IF_NOT_EXISTS("conf/maillist.inc" ${CONFDIR} "maillist.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/metrics.conf" ${CONFDIR} "metrics.conf" ".sample") ++ INSTALL_IF_NOT_EXISTS("conf/mid.inc" ${CONFDIR} "mid.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/modules.conf" ${CONFDIR} "modules.conf" ".sample") + INSTALL_IF_NOT_EXISTS("conf/statistic.conf" ${CONFDIR} "statistic.conf" ".sample") + INSTALL_IF_NOT_EXISTS("conf/surbl-whitelist.inc" ${CONFDIR} "surbl-whitelist.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/dmarc_whitelist.inc" ${CONFDIR} "dmarc_whitelist.inc" ".sample") + INSTALL_IF_NOT_EXISTS("conf/spf_dkim_whitelist.inc" ${CONFDIR} "spf_dkim_whitelist.inc" ".sample") ELSE(BUILD_PORT) INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "") ENDIF(BUILD_PORT) Index: head/mail/rspamd/pkg-plist =================================================================== --- head/mail/rspamd/pkg-plist (revision 427428) +++ head/mail/rspamd/pkg-plist (revision 427429) @@ -1,136 +1,139 @@ bin/rspamd-%%RSPAMDVERSION%% bin/rspamd bin/rspamd_stats bin/rspamadm-%%RSPAMDVERSION%% bin/rspamadm bin/rspamc-%%RSPAMDVERSION%% bin/rspamc %%REDIRECTOR%%bin/rspamd-redirector @sample %%ETCDIR%%/2tld.inc.sample @sample %%ETCDIR%%/mime_types.inc.sample @sample %%ETCDIR%%/common.conf.sample @sample %%ETCDIR%%/composites.conf.sample @sample %%ETCDIR%%/dmarc_whitelist.inc.sample @sample %%ETCDIR%%/logging.inc.sample -%%ETCDIR%%/maillist.inc +@sample %%ETCDIR%%/maillist.inc.sample @sample %%ETCDIR%%/metrics.conf.sample -%%ETCDIR%%/mid.inc +@sample %%ETCDIR%%/mid.inc.sample @sample %%ETCDIR%%/modules.conf.sample %%ETCDIR%%/modules.d/chartable.conf %%ETCDIR%%/modules.d/dkim.conf %%ETCDIR%%/modules.d/dmarc.conf %%ETCDIR%%/modules.d/emails.conf %%ETCDIR%%/modules.d/fann_redis.conf %%ETCDIR%%/modules.d/forged_recipients.conf %%ETCDIR%%/modules.d/fuzzy_check.conf %%ETCDIR%%/modules.d/hfilter.conf %%ETCDIR%%/modules.d/ip_score.conf %%ETCDIR%%/modules.d/maillist.conf -%%ETCDIR%%/modules.d/mid.conf %%ETCDIR%%/modules.d/mime_types.conf +%%ETCDIR%%/modules.d/mid.conf %%ETCDIR%%/modules.d/multimap.conf %%ETCDIR%%/modules.d/once_received.conf %%ETCDIR%%/modules.d/phishing.conf %%ETCDIR%%/modules.d/ratelimit.conf %%ETCDIR%%/modules.d/rbl.conf %%ETCDIR%%/modules.d/redis.conf %%ETCDIR%%/modules.d/regexp.conf %%ETCDIR%%/modules.d/rspamd_update.conf %%ETCDIR%%/modules.d/spf.conf %%ETCDIR%%/modules.d/surbl.conf %%ETCDIR%%/modules.d/whitelist.conf @sample %%ETCDIR%%/options.inc.sample %%ETCDIR%%/redirectors.inc @sample %%ETCDIR%%/rspamd.conf.sample @sample %%ETCDIR%%/spf_dkim_whitelist.inc.sample @sample %%ETCDIR%%/statistic.conf.sample @sample %%ETCDIR%%/surbl-whitelist.inc.sample @sample %%ETCDIR%%/worker-controller.inc.sample @sample %%ETCDIR%%/worker-fuzzy.inc.sample @sample %%ETCDIR%%/worker-normal.inc.sample @sample %%ETCDIR%%/rspamd.newsyslog.conf.sample +etc/newsyslog.conf.d/rspamd.newsyslog.conf +lib/rspamd/librspamd-actrie.so %%DATADIR%%/effective_tld_names.dat %%DATADIR%%/lua/antivirus.lua %%DATADIR%%/lua/asn.lua +%%DATADIR%%/lua/clickhouse.lua %%DATADIR%%/lua/dcc.lua %%DATADIR%%/lua/dmarc.lua %%DATADIR%%/lua/dynamic_conf.lua %%DATADIR%%/lua/emails.lua %%DATADIR%%/lua/fann_classifier.lua %%DATADIR%%/lua/fann_redis.lua %%DATADIR%%/lua/fann_scores.lua %%DATADIR%%/lua/forged_recipients.lua %%DATADIR%%/lua/fun.lua %%DATADIR%%/lua/greylist.lua %%DATADIR%%/lua/hfilter.lua %%DATADIR%%/lua/ip_score.lua %%DATADIR%%/lua/maillist.lua %%DATADIR%%/lua/metadata_exporter.lua %%DATADIR%%/lua/metric_exporter.lua %%DATADIR%%/lua/mid.lua %%DATADIR%%/lua/mime_types.lua %%DATADIR%%/lua/multimap.lua %%DATADIR%%/lua/mx_check.lua %%DATADIR%%/lua/once_received.lua %%DATADIR%%/lua/phishing.lua %%DATADIR%%/lua/ratelimit.lua -%%DATADIR%%/lua/rbl.lua %%DATADIR%%/lua/replies.lua +%%DATADIR%%/lua/rbl.lua %%DATADIR%%/lua/rspamd_update.lua %%DATADIR%%/lua/settings.lua %%DATADIR%%/lua/spamassassin.lua %%DATADIR%%/lua/trie.lua %%DATADIR%%/lua/whitelist.lua %%DATADIR%%/rules/forwarding.lua %%DATADIR%%/rules/html.lua %%DATADIR%%/rules/http_headers.lua +%%DATADIR%%/rules/mid.lua %%DATADIR%%/rules/misc.lua %%DATADIR%%/rules/regexp/compromised_hosts.lua %%DATADIR%%/rules/regexp/drugs.lua %%DATADIR%%/rules/regexp/fraud.lua %%DATADIR%%/rules/regexp/headers.lua %%DATADIR%%/rules/regexp/lotto.lua +%%DATADIR%%/rules/regexp/misc.lua %%DATADIR%%/rules/regexp/upstream_spam_filters.lua %%DATADIR%%/rules/rspamd.classifiers.lua %%DATADIR%%/rules/rspamd.lua %%DATADIR%%/www/README.md %%DATADIR%%/www/css/bootstrap.min.css %%DATADIR%%/www/css/d3evolution.css %%DATADIR%%/www/css/datatables.min.css %%DATADIR%%/www/css/glyphicons-halflings-regular.woff %%DATADIR%%/www/css/glyphicons-halflings-regular.woff2 %%DATADIR%%/www/css/rspamd.css %%DATADIR%%/www/favicon.ico %%DATADIR%%/www/fonts/glyphicons-halflings-regular.ttf %%DATADIR%%/www/fonts/glyphicons-halflings-regular.woff %%DATADIR%%/www/fonts/glyphicons-halflings-regular.woff2 %%DATADIR%%/www/img/asc.png %%DATADIR%%/www/img/desc.png %%DATADIR%%/www/img/rspamd_logo_navbar.png %%DATADIR%%/www/img/spinner.gif %%DATADIR%%/www/img/spinner.png %%DATADIR%%/www/index.html -%%DATADIR%%/www/js/bootstrap.min.js -%%DATADIR%%/www/js/d3.min.js %%DATADIR%%/www/js/d3evolution.min.js %%DATADIR%%/www/js/d3pie.min.js %%DATADIR%%/www/js/datatables.min.js %%DATADIR%%/www/js/humanize.min.js +%%DATADIR%%/www/js/bootstrap.min.js +%%DATADIR%%/www/js/d3.min.js %%DATADIR%%/www/js/jquery-3.1.1.min.js %%DATADIR%%/www/js/jquery.cookie.min.js %%DATADIR%%/www/js/rspamd.js %%DATADIR%%/www/plugins.txt %%DATADIR%%/www/react-index.html -etc/newsyslog.conf.d/rspamd.newsyslog.conf -lib/rspamd/librspamd-actrie.so man/man1/rspamadm.1.gz man/man1/rspamc.1.gz man/man8/rspamd.8.gz @dir %%EXAMPLESDIR%% @owner nobody @group nobody @dir /var/db/rspamd @dir /var/log/rspamd @dir /var/run/rspamd @owner @group