diff options
| -rw-r--r-- | UPDATING | 8 | ||||
| -rw-r--r-- | mail/rspamd/Makefile | 8 | ||||
| -rw-r--r-- | mail/rspamd/distinfo | 4 | ||||
| -rw-r--r-- | mail/rspamd/files/patch-CMakeLists.txt | 29 | ||||
| -rw-r--r-- | mail/rspamd/pkg-plist | 85 |
5 files changed, 102 insertions, 32 deletions
@@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150921: + AFFECTS: users of mail/rspamd + AUTHOR: vsevolod@FreeBSD.org + + rspamd has been updated to the version 1.0. + For migration from the previous releases, please read the following document: + https://rspamd.com/doc/migration.html + 20150919: AFFECTS: users of multimedia/ffmpeg AUTHOR: riggs@FreeBSD.org diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 03f17edce1f6..f4fab107ad65 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 0.9.10 +PORTVERSION= 1.0.0 CATEGORIES= mail MASTER_SITES= http://rspamd.com/downloads/ @@ -52,7 +52,7 @@ USE_SQLITE= yes .endif .if ${PORT_OPTIONS:MREDIRECTOR} - USES+= perl5 + USE_PERL5+= run CMAKE_ARGS+= -DENABLE_REDIRECTOR=ON PLIST_SUB+= REDIRECTOR="" USE_RC_SUBR+= rspamd_redirector @@ -77,5 +77,9 @@ post-stage: ${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 .include <bsd.port.mk> diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index 7ab5688de277..f876c615d39e 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,2 +1,2 @@ -SHA256 (rspamd-0.9.10.tar.xz) = 5ff557610cc5b7000abe2df727d6b9bfec7e3fe019ce3fdcc386d16262b45652 -SIZE (rspamd-0.9.10.tar.xz) = 808764 +SHA256 (rspamd-1.0.0.tar.xz) = 63b23ab1c35db6291150e1b11b3cdee33155252bd1ec57382c9b0f8f76d69a39 +SIZE (rspamd-1.0.0.tar.xz) = 1045208 diff --git a/mail/rspamd/files/patch-CMakeLists.txt b/mail/rspamd/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..2ec964da1760 --- /dev/null +++ b/mail/rspamd/files/patch-CMakeLists.txt @@ -0,0 +1,29 @@ +--- ./CMakeLists.txt.orig 2015-09-01 16:28:36.000000000 +0300 ++++ ./CMakeLists.txt 2015-09-21 14:10:42.046330451 +0300 +@@ -1042,6 +1042,19 @@ + 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-normal.inc" ${CONFDIR} "worker-normal.inc" ".sample") ++ INSTALL_IF_NOT_EXISTS("conf/2tld.inc" ${CONFDIR} "2tld.inc" ".sample") ++ INSTALL_IF_NOT_EXISTS("conf/composites.conf" ${CONFDIR} "composites.conf" ".sample") ++ INSTALL_IF_NOT_EXISTS("conf/metrics.conf" ${CONFDIR} "metrics.conf" ".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) +@@ -1109,4 +1122,4 @@ + IF(NOT DEBIAN_BUILD) + ADD_CUSTOM_TARGET(check DEPENDS rspamd-test) + ADD_CUSTOM_TARGET(run-test DEPENDS check COMMAND test/rspamd-test) +-ENDIF(NOT DEBIAN_BUILD) +\ No newline at end of file ++ENDIF(NOT DEBIAN_BUILD) diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist index 7837f51af5b2..8dee8f27afe5 100644 --- a/mail/rspamd/pkg-plist +++ b/mail/rspamd/pkg-plist @@ -3,17 +3,44 @@ bin/rspamd bin/rspamc-%%RSPAMDVERSION%% bin/rspamc %%REDIRECTOR%%bin/rspamd-redirector -%%ETCDIR%%/lua/regexp/drugs.lua -%%ETCDIR%%/lua/regexp/fraud.lua -%%ETCDIR%%/lua/regexp/headers.lua -%%ETCDIR%%/lua/regexp/lotto.lua -%%ETCDIR%%/lua/rspamd.classifiers.lua -%%ETCDIR%%/lua/rspamd.lua -%%ETCDIR%%/lua/hfilter.lua +@sample %%ETCDIR%%/2tld.inc.sample +@sample %%ETCDIR%%/common.conf.sample +@sample %%ETCDIR%%/composites.conf.sample +@sample %%ETCDIR%%/dmarc_whitelist.inc.sample +@sample %%ETCDIR%%/logging.inc.sample +@sample %%ETCDIR%%/metrics.conf.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/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/multimap.conf +%%ETCDIR%%/modules.d/once_received.conf +%%ETCDIR%%/modules.d/phishing.conf +%%ETCDIR%%/modules.d/ratelimit.conf +%%ETCDIR%%/modules.d/regexp.conf +%%ETCDIR%%/modules.d/spf.conf +%%ETCDIR%%/modules.d/surbl.conf +%%ETCDIR%%/modules.d/whitelist.conf +@sample %%ETCDIR%%/options.inc.sample +@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-normal.inc.sample +lib/rspamd/librspamd-actrie.so +%%DATADIR%%/effective_tld_names.dat %%DATADIR%%/lua/dmarc.lua %%DATADIR%%/lua/emails.lua %%DATADIR%%/lua/forged_recipients.lua %%DATADIR%%/lua/fun.lua +%%DATADIR%%/lua/hfilter.lua %%DATADIR%%/lua/ip_score.lua %%DATADIR%%/lua/maillist.lua %%DATADIR%%/lua/multimap.lua @@ -24,30 +51,32 @@ bin/rspamc %%DATADIR%%/lua/settings.lua %%DATADIR%%/lua/spamassassin.lua %%DATADIR%%/lua/trie.lua -%%DATADIR%%/effective_tld_names.dat -%%DATADIR%%/www/index.html -%%DATADIR%%/www/plugins.txt -%%DATADIR%%/www/img/spinner.gif -%%DATADIR%%/www/img/desc.png +%%DATADIR%%/lua/whitelist.lua +%%DATADIR%%/rules/html.lua +%%DATADIR%%/rules/misc.lua +%%DATADIR%%/rules/regexp/drugs.lua +%%DATADIR%%/rules/regexp/fraud.lua +%%DATADIR%%/rules/regexp/headers.lua +%%DATADIR%%/rules/regexp/lotto.lua +%%DATADIR%%/rules/rspamd.classifiers.lua +%%DATADIR%%/rules/rspamd.lua +%%DATADIR%%/www/README.md +%%DATADIR%%/www/css/rspamd.css %%DATADIR%%/www/img/asc.png +%%DATADIR%%/www/img/desc.png +%%DATADIR%%/www/img/spinner.gif %%DATADIR%%/www/img/spinner.png -%%DATADIR%%/www/README.md -%%DATADIR%%/www/js/rspamd.js +%%DATADIR%%/www/index.html %%DATADIR%%/www/js/jquery.paginatetable.js -%%DATADIR%%/www/css/rspamd.css -lib/rspamd/librspamd-actrie.so -@sample %%ETCDIR%%/common.conf.sample -@sample %%ETCDIR%%/logging.inc.sample -@sample %%ETCDIR%%/options.inc.sample -@sample %%ETCDIR%%/worker-controller.inc.sample -@sample %%ETCDIR%%/worker-normal.inc.sample -@sample %%ETCDIR%%/rspamd.conf.sample -@sample %%ETCDIR%%/2tld.inc.sample -@sample %%ETCDIR%%/composites.conf.sample -@sample %%ETCDIR%%/metrics.conf.sample -@sample %%ETCDIR%%/modules.conf.sample -@sample %%ETCDIR%%/statistic.conf.sample -@sample %%ETCDIR%%/surbl-whitelist.inc.sample +%%DATADIR%%/www/js/rspamd.js +%%DATADIR%%/www/plugins.txt +%%DATADIR%%/www/react-index.html +%%DATADIR%%/www/src/Gruntfile.js +%%DATADIR%%/www/src/common.js +%%DATADIR%%/www/src/components/app.jsx +%%DATADIR%%/www/src/components/dashboard.jsx +%%DATADIR%%/www/src/components/login.jsx +%%DATADIR%%/www/src/package.json man/man1/rspamc.1.gz man/man8/rspamd.8.gz @dir %%EXAMPLESDIR%% |