svn commit: r426229 - in head/mail/rspamd-devel: . files
Vsevolod Stakhov
vsevolod at FreeBSD.org
Wed Nov 16 09:50:08 UTC 2016
Author: vsevolod
Date: Wed Nov 16 09:50:06 2016
New Revision: 426229
URL: https://svnweb.freebsd.org/changeset/ports/426229
Log:
- Restore reload command
- Replace BUILD_DEPENDS with LIB_DEPENDS for hyperscan
- Update to a5eef8b
- Bump PORTVERSION
PR: 212320
Submitted by: Alexander Moisseev <moiseev at mezonplus.ru>
Modified:
head/mail/rspamd-devel/Makefile
head/mail/rspamd-devel/distinfo
head/mail/rspamd-devel/files/patch-CMakeLists.txt
head/mail/rspamd-devel/files/rspamd.in
head/mail/rspamd-devel/pkg-plist
Modified: head/mail/rspamd-devel/Makefile
==============================================================================
--- head/mail/rspamd-devel/Makefile Wed Nov 16 09:29:15 2016 (r426228)
+++ head/mail/rspamd-devel/Makefile Wed Nov 16 09:50:06 2016 (r426229)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= rspamd
-PORTVERSION= 1.4.0.a1.01092016
+PORTVERSION= 1.4.0.a2.16112016
CATEGORIES= mail
PKGNAMESUFFIX= -devel
@@ -23,7 +23,7 @@ RSPAMD_VERSION= 1.4.0
USE_GITHUB= yes
GH_ACCOUNT= vstakhov
GH_PROJECT= rspamd
-GH_TAGNAME= 99c2eb2
+GH_TAGNAME= a5eef8b
OPTIONS_DEFINE= GPERF REDIRECTOR HYPERSCAN
GPERF_DESC= Google perf-tools profiling
@@ -67,7 +67,7 @@ WITH_DEBUG= yes
.if ${PORT_OPTIONS:MHYPERSCAN}
CMAKE_ARGS+= -DENABLE_HYPERSCAN=ON
- BUILD_DEPENDS+= ${LOCALBASE}/lib/libhs.a:devel/hyperscan
+ LIB_DEPENDS+= libhs.so:devel/hyperscan
ONLY_FOR_ARCHS= amd64
.endif
Modified: head/mail/rspamd-devel/distinfo
==============================================================================
--- head/mail/rspamd-devel/distinfo Wed Nov 16 09:29:15 2016 (r426228)
+++ head/mail/rspamd-devel/distinfo Wed Nov 16 09:50:06 2016 (r426229)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472732727
-SHA256 (vstakhov-rspamd-1.4.0.a1.01092016-99c2eb2_GH0.tar.gz) = 12b3a57fff521bb15d99f339fb36a55f9ecee39e6f5d18a516a830f2e2e20ed0
-SIZE (vstakhov-rspamd-1.4.0.a1.01092016-99c2eb2_GH0.tar.gz) = 1929783
+TIMESTAMP = 1479286296
+SHA256 (vstakhov-rspamd-1.4.0.a2.16112016-a5eef8b_GH0.tar.gz) = 72f8b39c36c1900f7dd1e1f8208dc20a392fde5540f19955321170bf0d904149
+SIZE (vstakhov-rspamd-1.4.0.a2.16112016-a5eef8b_GH0.tar.gz) = 2295731
Modified: head/mail/rspamd-devel/files/patch-CMakeLists.txt
==============================================================================
--- head/mail/rspamd-devel/files/patch-CMakeLists.txt Wed Nov 16 09:29:15 2016 (r426228)
+++ head/mail/rspamd-devel/files/patch-CMakeLists.txt Wed Nov 16 09:50:06 2016 (r426229)
@@ -1,6 +1,6 @@
---- 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")
@@ -13,7 +13,9 @@
+ 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")
Modified: head/mail/rspamd-devel/files/rspamd.in
==============================================================================
--- head/mail/rspamd-devel/files/rspamd.in Wed Nov 16 09:29:15 2016 (r426228)
+++ head/mail/rspamd-devel/files/rspamd.in Wed Nov 16 09:50:06 2016 (r426229)
@@ -34,13 +34,15 @@ pidfile=${rspamd_pidfile:-"/var/run/rspa
command=%%PREFIX%%/bin/rspamd
command_adm=%%PREFIX%%/bin/rspamadm
restart_precmd="rspamd_checkconfig"
+reload_precmd="rspamd_checkconfig"
configtest_cmd="rspamd_checkconfig"
reopenlog_cmd="reopenlog_cmd"
required_files=%%PREFIX%%/etc/rspamd/rspamd.conf
command_args="-u ${rspamd_user} -g ${rspamd_group}"
-extra_commands="configtest reopenlog"
+extra_commands="reload configtest reopenlog"
stop_postcmd="rm -f $pidfile"
+sig_reload="HUP"
rspamd_checkconfig()
{
Modified: head/mail/rspamd-devel/pkg-plist
==============================================================================
--- head/mail/rspamd-devel/pkg-plist Wed Nov 16 09:29:15 2016 (r426228)
+++ head/mail/rspamd-devel/pkg-plist Wed Nov 16 09:50:06 2016 (r426229)
@@ -12,7 +12,9 @@ bin/rspamc
@sample %%ETCDIR%%/composites.conf.sample
@sample %%ETCDIR%%/dmarc_whitelist.inc.sample
@sample %%ETCDIR%%/logging.inc.sample
+ at sample %%ETCDIR%%/maillist.inc.sample
@sample %%ETCDIR%%/metrics.conf.sample
+ at sample %%ETCDIR%%/mid.inc.sample
@sample %%ETCDIR%%/modules.conf.sample
%%ETCDIR%%/modules.d/chartable.conf
%%ETCDIR%%/modules.d/dkim.conf
@@ -24,6 +26,7 @@ bin/rspamc
%%ETCDIR%%/modules.d/ip_score.conf
%%ETCDIR%%/modules.d/maillist.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
@@ -51,7 +54,10 @@ lib/rspamd/librspamd-actrie.so
%%DATADIR%%/lua/asn.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
@@ -59,8 +65,12 @@ lib/rspamd/librspamd-actrie.so
%%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
@@ -75,6 +85,7 @@ lib/rspamd/librspamd-actrie.so
%%DATADIR%%/rules/html.lua
%%DATADIR%%/rules/http_headers.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
@@ -83,14 +94,19 @@ lib/rspamd/librspamd-actrie.so
%%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
@@ -98,6 +114,10 @@ lib/rspamd/librspamd-actrie.so
%%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
More information about the svn-ports-head
mailing list