summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@FreeBSD.org>2011-02-25 16:07:57 +0000
committerVsevolod Stakhov <vsevolod@FreeBSD.org>2011-02-25 16:07:57 +0000
commit008dd088ac39d11c06b5327e6c16e0af435268a3 (patch)
treeb2805b0364353052dd2528329c1bdcff100d887d
parent- Upgrade to 0.12. (diff)
Update rspamd to the next stable release 0.3.7.
Add support of rspamd_flags variable in rc.conf. Feature safe: yes
Notes
Notes: svn path=/head/; revision=269717
-rw-r--r--mail/rspamd/Makefile2
-rw-r--r--mail/rspamd/distinfo4
-rw-r--r--mail/rspamd/files/rspamd.in5
-rw-r--r--mail/rspamd/pkg-plist1
4 files changed, 8 insertions, 4 deletions
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 49849fe82bc7..76efc5015904 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= rspamd
-PORTVERSION= 0.3.6
+PORTVERSION= 0.3.7
CATEGORIES= mail
MASTER_SITES= http://highsecure.ru/
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index d9a4e5a2e4f0..e3e6ff91e1ab 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rspamd-0.3.6.tar.gz) = 4c8436b1f6aa30bd8353bc487dd65e39254783eb20e3e2038fb2508b93d15f4e
-SIZE (rspamd-0.3.6.tar.gz) = 714557
+SHA256 (rspamd-0.3.7.tar.gz) = a8a122cc4a13db4b30568ae0e27937cad3e1d21fc4cb2ed57fccb69acd53b2a4
+SIZE (rspamd-0.3.7.tar.gz) = 706180
diff --git a/mail/rspamd/files/rspamd.in b/mail/rspamd/files/rspamd.in
index e41c3498a46b..2343baaac984 100644
--- a/mail/rspamd/files/rspamd.in
+++ b/mail/rspamd/files/rspamd.in
@@ -14,6 +14,8 @@
# rspamd_user (str): Default to "nobody".
#
# rspamd_group (str): Default to "nobody".
+#
+# rspamd_flags (str): Default to "-c %%PREFIX%%/etc/rspamd.xml".
. /etc/rc.subr
@@ -34,6 +36,7 @@ load_rc_config $name
: ${rspamd_pidfile="/var/run/rspamd/rspamd.pid"}
: ${rspamd_user="nobody"}
: ${rspamd_group="nobody"}
+: ${rspamd_flags="-c %%PREFIX%%/etc/rspamd.xml"}
stop_postcmd="rm -f $rspamd_pidfile"
@@ -50,7 +53,7 @@ reopenlog_cmd()
sig_reload="HUP"
-command_args="-u ${rspamd_user} -g ${rspamd_group} -c /usr/local/etc/rspamd.xml"
+command_args="-u ${rspamd_user} -g ${rspamd_group} ${rspamd_flags}"
extra_commands="reload configtest reopenlog"
run_rc_command "$1"
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index 98b62199e4b9..0ec62fa2ee46 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -6,6 +6,7 @@ bin/rspamc
etc/rspamd.xml.sample
%%ETCDIR%%/2tld.inc
%%ETCDIR%%/2tld.inc.orig
+%%ETCDIR%%/surbl-whitelist.inc
%%ETCDIR%%/plugins/lua/forged_recipients.lua
%%ETCDIR%%/plugins/lua/maillist.lua
%%ETCDIR%%/plugins/lua/multimap.lua