Attachment #191661 for bug #226802

View | Details | Raw Unified | Return to bug 226802
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	rspamd
PORTVERSION=	1.7.1
CATEGORIES=	mail

MAINTAINER=	vsevolod@FreeBSD.org

LIB_DEPENDS=	libpcre.so:devel/pcre \
		libevent.so:devel/libevent \
		libluajit-5.1.so:lang/luajit \
		libfann.so:math/fann \
		libicui18n.so:devel/icu
BUILD_DEPENDS=	ragel:devel/ragel
RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss

CONFLICTS_INSTALL=	rspamd-devel

OPTIONS_DEFINE=		GPERF GD CGP TORCH_BLAS
OPTIONS_DEFINE_amd64=	HYPERSCAN
OPTIONS_DEFAULT_amd64=	TORCH
OPTIONS_SUB=	yes

OPTIONS_RADIO=	NEURAL_NETWORK
OPTIONS_RADIO_NEURAL_NETWORK=	FANN TORCH

CGP_DESC=		Install Communigate Pro(tm) helper
GD_DESC=		Enable libgd support for images fuzzy hashes
GPERF_DESC=		Google perf-tools profiling
HYPERSCAN_DESC=		Use hyperscan optimizations (amd64 only)
FANN_DESC=		Use Fast Artificial Neural Network Library (FANN)
TORCH_DESC=		Machine learning support using torch
TORCH_BLAS_DESC=	Build torch with OpenBLAS
TORCH_BLAS_IMPLIES=	TORCH

		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
		-DBUILD_PORT=yes \
		-DLIBDIR=${PREFIX}/lib/rspamd \
		-DNO_SHARED=ON
		-DENABLE_FANN=ON

USES=		cmake:outsource pkgconfig perl5 \
		compiler:c11 sqlite ssl

HYPERSCAN_CMAKE_ON=	-DENABLE_HYPERSCAN=ON
HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan

FANN_CMAKE_ON=	-DENABLE_FANN=ON
FANN_LIB_DEPENDS=libfann.so:math/fann

TORCH_CMAKE_ON=	-DENABLE_TORCH=ON
TORCH_CMAKE_OFF=-DENABLE_TORCH=OFF


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1520893818	1	TIMESTAMP = 1521561252
2	SHA256 (vstakhov-rspamd-1.7.0_GH0.tar.gz) = cf8bd3cbe3e6e146dbb9c5d6c0098ccfe69dda5a672b9cf6af629e9fbbdba039	2	SHA256 (vstakhov-rspamd-1.7.1_GH0.tar.gz) = 3dd083e68edc800b3174563db41166734bebc6dff2df8d7d7a1ced4ba10b880d
3	SIZE (vstakhov-rspamd-1.7.0_GH0.tar.gz) = 4444320	3	SIZE (vstakhov-rspamd-1.7.1_GH0.tar.gz) = 4453460




--- CMakeLists.txt.orig	2018-03-12 16:46:32 UTC
+++ CMakeLists.txt
@@ -1307,6 +1307,26 @@ ENDFOREACH(CONF_FILE)
 SET(MAIN_CONF "conf/rspamd.conf")
 IF(BUILD_PORT)
 	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
+	INSTALL_IF_NOT_EXISTS("conf/actions.conf" ${CONFDIR} "actions.conf" ".sample")
+	INSTALL_IF_NOT_EXISTS("conf/common.conf" ${CONFDIR} "common.conf" ".sample")
+	INSTALL_IF_NOT_EXISTS("conf/groups.conf" ${CONFDIR} "groups.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")




%%CGP%%bin/rspamd-cgp-helper
etc/newsyslog.conf.d/rspamd.newsyslog.conf
@sample %%ETCDIR%%/2tld.inc.sample
@sample %%ETCDIR%%/actions.conf.sample
@sample %%ETCDIR%%/common.conf.sample
@sample %%ETCDIR%%/composites.conf.sample
@sample %%ETCDIR%%/dmarc_whitelist.inc.sample
@sample %%ETCDIR%%/groups.conf.sample
@sample %%ETCDIR%%/logging.inc.sample
@sample %%ETCDIR%%/maillist.inc.sample
@sample %%ETCDIR%%/metrics.conf.sample

%%ETCDIR%%/modules.d/url_reputation.conf
%%ETCDIR%%/modules.d/url_tags.conf
%%ETCDIR%%/modules.d/whitelist.conf
@sample %%ETCDIR%%/options.inc.sample
%%ETCDIR%%/options.inc.sample
%%ETCDIR%%/redirectors.inc
@sample %%ETCDIR%%/rspamd.conf.sample
@sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
%%ETCDIR%%/rspamd.newsyslog.conf.sample
%%ETCDIR%%/scores.d/fuzzy_group.conf
%%ETCDIR%%/scores.d/headers_group.conf
%%ETCDIR%%/scores.d/hfilter_group.conf

%%ETCDIR%%/scores.d/statistics_group.conf
%%ETCDIR%%/scores.d/subject_group.conf
%%ETCDIR%%/scores.d/surbl_group.conf
@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%%/worker-proxy.inc.sample
%%ETCDIR%%/worker-controller.inc.sample
%%ETCDIR%%/worker-fuzzy.inc
%%ETCDIR%%/worker-fuzzy.inc.sample
%%ETCDIR%%/worker-normal.inc
%%ETCDIR%%/worker-normal.inc.sample
%%ETCDIR%%/worker-proxy.inc
%%ETCDIR%%/worker-proxy.inc.sample
lib/rspamd/librspamd-actrie.so
%%TORCH%%lib/rspamd/libTH.so
%%TORCH%%lib/rspamd/libTHNN.so

%%TORCH%%%%DATADIR%%/lib/torch/init.lua
%%TORCH%%%%DATADIR%%/lib/torch/paths.lua
%%TORCH%%%%DATADIR%%/lib/torch/test.lua
%%DATADIR%%/lib/lua_squeeze_rules.lua
%%DATADIR%%/lua/antivirus.lua
%%DATADIR%%/lua/arc.lua
%%DATADIR%%/lua/asn.lua

Return to bug 226802

Lines 1-7 Link Here

(-)Makefile (-6 / +12 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= rspamd	3	PORTNAME= rspamd
4	PORTVERSION= 1.7.0	4	PORTVERSION= 1.7.1
5	CATEGORIES= mail	5	CATEGORIES= mail
6		6
7	MAINTAINER= vsevolod@FreeBSD.org	7	MAINTAINER= vsevolod@FreeBSD.org
Lines 13-33 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
13	LIB_DEPENDS= libpcre.so:devel/pcre \	13	LIB_DEPENDS= libpcre.so:devel/pcre \
14	libevent.so:devel/libevent \	14	libevent.so:devel/libevent \
15	libluajit-5.1.so:lang/luajit \	15	libluajit-5.1.so:lang/luajit \
16	libfann.so:math/fann \
17	libicui18n.so:devel/icu	16	libicui18n.so:devel/icu
18	BUILD_DEPENDS= ragel:devel/ragel	17	BUILD_DEPENDS= ragel:devel/ragel
		18	RUN_DEPENDS= ca_root_nss>=3.*:security/ca_root_nss
19		19
20	CONFLICTS_INSTALL= rspamd-devel	20	CONFLICTS_INSTALL= rspamd-devel
21		21
22	OPTIONS_DEFINE= GPERF GD CGP TORCH TORCH_BLAS	22	OPTIONS_DEFINE= GPERF GD CGP TORCH_BLAS
23	OPTIONS_DEFINE_amd64= HYPERSCAN	23	OPTIONS_DEFINE_amd64= HYPERSCAN
24	OPTIONS_DEFAULT= TORCH	24	OPTIONS_DEFAULT_amd64= TORCH
25	OPTIONS_SUB= yes	25	OPTIONS_SUB= yes
26		26
		27	OPTIONS_RADIO= NEURAL_NETWORK
		28	OPTIONS_RADIO_NEURAL_NETWORK= FANN TORCH
		29
27	CGP_DESC= Install Communigate Pro(tm) helper	30	CGP_DESC= Install Communigate Pro(tm) helper
28	GD_DESC= Enable libgd support for images fuzzy hashes	31	GD_DESC= Enable libgd support for images fuzzy hashes
29	GPERF_DESC= Google perf-tools profiling	32	GPERF_DESC= Google perf-tools profiling
30	HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only)	33	HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only)
		34	FANN_DESC= Use Fast Artificial Neural Network Library (FANN)
31	TORCH_DESC= Machine learning support using torch	35	TORCH_DESC= Machine learning support using torch
32	TORCH_BLAS_DESC= Build torch with OpenBLAS	36	TORCH_BLAS_DESC= Build torch with OpenBLAS
33	TORCH_BLAS_IMPLIES= TORCH	37	TORCH_BLAS_IMPLIES= TORCH
Lines 43-50 CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rsp Link Here
43	-DCMAKE_INSTALL_PREFIX=${PREFIX} \	47	-DCMAKE_INSTALL_PREFIX=${PREFIX} \
44	-DBUILD_PORT=yes \	48	-DBUILD_PORT=yes \
45	-DLIBDIR=${PREFIX}/lib/rspamd \	49	-DLIBDIR=${PREFIX}/lib/rspamd \
46	-DNO_SHARED=ON \	50	-DNO_SHARED=ON
47	-DENABLE_FANN=ON
48		51
49	USES= cmake:outsource pkgconfig perl5 \	52	USES= cmake:outsource pkgconfig perl5 \
50	compiler:c11 sqlite ssl	53	compiler:c11 sqlite ssl
Lines 67-72 GPERF_LIB_DEPENDS= libprofiler.so:devel/ Link Here
67	HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON	70	HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON
68	HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan	71	HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan
69		72
		73	FANN_CMAKE_ON= -DENABLE_FANN=ON
		74	FANN_LIB_DEPENDS=libfann.so:math/fann
		75
70	TORCH_CMAKE_ON= -DENABLE_TORCH=ON	76	TORCH_CMAKE_ON= -DENABLE_TORCH=ON
71	TORCH_CMAKE_OFF=-DENABLE_TORCH=OFF	77	TORCH_CMAKE_OFF=-DENABLE_TORCH=OFF
72		78

Lines 1-10 Link Here

(-)files/patch-CMakeLists.txt (-3 / +5 lines)
1	--- CMakeLists.txt.orig 2017-06-06 15:07:59 UTC	1	--- CMakeLists.txt.orig 2018-03-12 16:46:32 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -1302,6 +1302,24 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")	3	@@ -1307,6 +1307,26 @@ ENDFOREACH(CONF_FILE)
4	ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")	4	SET(MAIN_CONF "conf/rspamd.conf")
5	IF(BUILD_PORT)	5	IF(BUILD_PORT)
6	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")	6	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
		7	+ INSTALL_IF_NOT_EXISTS("conf/actions.conf" ${CONFDIR} "actions.conf" ".sample")
7	+ INSTALL_IF_NOT_EXISTS("conf/common.conf" ${CONFDIR} "common.conf" ".sample")	8	+ INSTALL_IF_NOT_EXISTS("conf/common.conf" ${CONFDIR} "common.conf" ".sample")
		9	+ INSTALL_IF_NOT_EXISTS("conf/groups.conf" ${CONFDIR} "groups.conf" ".sample")
8	+ INSTALL_IF_NOT_EXISTS("conf/logging.inc" ${CONFDIR} "logging.inc" ".sample")	10	+ INSTALL_IF_NOT_EXISTS("conf/logging.inc" ${CONFDIR} "logging.inc" ".sample")
9	+ INSTALL_IF_NOT_EXISTS("conf/options.inc" ${CONFDIR} "options.inc" ".sample")	11	+ INSTALL_IF_NOT_EXISTS("conf/options.inc" ${CONFDIR} "options.inc" ".sample")
10	+ INSTALL_IF_NOT_EXISTS("conf/worker-controller.inc" ${CONFDIR} "worker-controller.inc" ".sample")	12	+ INSTALL_IF_NOT_EXISTS("conf/worker-controller.inc" ${CONFDIR} "worker-controller.inc" ".sample")

Lines 8-18 bin/rspamd_stats Link Here

(-)pkg-plist (-21 / +13 lines)
8	%%CGP%%bin/rspamd-cgp-helper	8	%%CGP%%bin/rspamd-cgp-helper
9	etc/newsyslog.conf.d/rspamd.newsyslog.conf	9	etc/newsyslog.conf.d/rspamd.newsyslog.conf
10	@sample %%ETCDIR%%/2tld.inc.sample	10	@sample %%ETCDIR%%/2tld.inc.sample
11	@sample %%ETCDIR%%/actions.conf	11	@sample %%ETCDIR%%/actions.conf.sample
12	@sample %%ETCDIR%%/common.conf.sample	12	@sample %%ETCDIR%%/common.conf.sample
13	@sample %%ETCDIR%%/composites.conf.sample	13	@sample %%ETCDIR%%/composites.conf.sample
14	@sample %%ETCDIR%%/dmarc_whitelist.inc.sample	14	@sample %%ETCDIR%%/dmarc_whitelist.inc.sample
15	@sample %%ETCDIR%%/groups.conf	15	@sample %%ETCDIR%%/groups.conf.sample
16	@sample %%ETCDIR%%/logging.inc.sample	16	@sample %%ETCDIR%%/logging.inc.sample
17	@sample %%ETCDIR%%/maillist.inc.sample	17	@sample %%ETCDIR%%/maillist.inc.sample
18	@sample %%ETCDIR%%/metrics.conf.sample	18	@sample %%ETCDIR%%/metrics.conf.sample
Lines 63-74 etc/newsyslog.conf.d/rspamd.newsyslog.co Link Here
63	%%ETCDIR%%/modules.d/url_reputation.conf	63	%%ETCDIR%%/modules.d/url_reputation.conf
64	%%ETCDIR%%/modules.d/url_tags.conf	64	%%ETCDIR%%/modules.d/url_tags.conf
65	%%ETCDIR%%/modules.d/whitelist.conf	65	%%ETCDIR%%/modules.d/whitelist.conf
66	%%ETCDIR%%/options.inc	66	@sample %%ETCDIR%%/options.inc.sample
67	%%ETCDIR%%/options.inc.sample
68	%%ETCDIR%%/redirectors.inc	67	%%ETCDIR%%/redirectors.inc
69	%%ETCDIR%%/rspamd.conf	68	@sample %%ETCDIR%%/rspamd.conf.sample
70	%%ETCDIR%%/rspamd.conf.sample	69	@sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
71	%%ETCDIR%%/rspamd.newsyslog.conf.sample
72	%%ETCDIR%%/scores.d/fuzzy_group.conf	70	%%ETCDIR%%/scores.d/fuzzy_group.conf
73	%%ETCDIR%%/scores.d/headers_group.conf	71	%%ETCDIR%%/scores.d/headers_group.conf
74	%%ETCDIR%%/scores.d/hfilter_group.conf	72	%%ETCDIR%%/scores.d/hfilter_group.conf
Lines 80-99 etc/newsyslog.conf.d/rspamd.newsyslog.co Link Here
80	%%ETCDIR%%/scores.d/statistics_group.conf	78	%%ETCDIR%%/scores.d/statistics_group.conf
81	%%ETCDIR%%/scores.d/subject_group.conf	79	%%ETCDIR%%/scores.d/subject_group.conf
82	%%ETCDIR%%/scores.d/surbl_group.conf	80	%%ETCDIR%%/scores.d/surbl_group.conf
83	%%ETCDIR%%/spf_dkim_whitelist.inc	81	@sample %%ETCDIR%%/spf_dkim_whitelist.inc.sample
84	%%ETCDIR%%/spf_dkim_whitelist.inc.sample	82	@sample %%ETCDIR%%/statistic.conf.sample
85	%%ETCDIR%%/statistic.conf	83	@sample %%ETCDIR%%/surbl-whitelist.inc.sample
86	%%ETCDIR%%/statistic.conf.sample	84	@sample %%ETCDIR%%/worker-controller.inc.sample
87	%%ETCDIR%%/surbl-whitelist.inc	85	@sample %%ETCDIR%%/worker-fuzzy.inc.sample
88	%%ETCDIR%%/surbl-whitelist.inc.sample	86	@sample %%ETCDIR%%/worker-normal.inc.sample
89	%%ETCDIR%%/worker-controller.inc	87	@sample %%ETCDIR%%/worker-proxy.inc.sample
90	%%ETCDIR%%/worker-controller.inc.sample
91	%%ETCDIR%%/worker-fuzzy.inc
92	%%ETCDIR%%/worker-fuzzy.inc.sample
93	%%ETCDIR%%/worker-normal.inc
94	%%ETCDIR%%/worker-normal.inc.sample
95	%%ETCDIR%%/worker-proxy.inc
96	%%ETCDIR%%/worker-proxy.inc.sample
97	lib/rspamd/librspamd-actrie.so	88	lib/rspamd/librspamd-actrie.so
98	%%TORCH%%lib/rspamd/libTH.so	89	%%TORCH%%lib/rspamd/libTH.so
99	%%TORCH%%lib/rspamd/libTHNN.so	90	%%TORCH%%lib/rspamd/libTHNN.so
Lines 441-446 man/man8/rspamd.8.gz Link Here
441	%%TORCH%%%%DATADIR%%/lib/torch/init.lua	432	%%TORCH%%%%DATADIR%%/lib/torch/init.lua
442	%%TORCH%%%%DATADIR%%/lib/torch/paths.lua	433	%%TORCH%%%%DATADIR%%/lib/torch/paths.lua
443	%%TORCH%%%%DATADIR%%/lib/torch/test.lua	434	%%TORCH%%%%DATADIR%%/lib/torch/test.lua
		435	%%DATADIR%%/lib/lua_squeeze_rules.lua
444	%%DATADIR%%/lua/antivirus.lua	436	%%DATADIR%%/lua/antivirus.lua
445	%%DATADIR%%/lua/arc.lua	437	%%DATADIR%%/lua/arc.lua
446	%%DATADIR%%/lua/asn.lua	438	%%DATADIR%%/lua/asn.lua