View | Details | Raw Unified | Return to bug 231703 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +4 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	rspamd
3
PORTNAME=	rspamd
4
PORTVERSION=	1.7.9
4
PORTVERSION=	1.8.0
5
PORTREVISION=	1
6
CATEGORIES=	mail
5
CATEGORIES=	mail
7
6
8
MAINTAINER=	vsevolod@FreeBSD.org
7
MAINTAINER=	vsevolod@FreeBSD.org
Lines 9-15 Link Here
9
COMMENT=	Fast spam filtering system
8
COMMENT=	Fast spam filtering system
10
9
11
LICENSE=	APACHE20
10
LICENSE=	APACHE20
12
LICENSE_FILE=	${WRKSRC}/LICENSE
11
LICENSE_FILE=	${WRKSRC}/LICENSE.md
13
12
14
LIB_DEPENDS=	libpcre.so:devel/pcre \
13
LIB_DEPENDS=	libpcre.so:devel/pcre \
15
		libevent.so:devel/libevent \
14
		libevent.so:devel/libevent \
Lines 18-25 Link Here
18
BUILD_DEPENDS=	ragel:devel/ragel
17
BUILD_DEPENDS=	ragel:devel/ragel
19
RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
18
RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
20
19
21
USES=		cmake:outsource pkgconfig perl5 \
20
USES=		cmake:outsource compiler:c11 gnome perl5 pkgconfig \
22
		compiler:c11 sqlite ssl
21
		sqlite ssl
23
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
24
USE_PERL5=	build run
23
USE_PERL5=	build run
25
USE_GNOME=	glib20
24
USE_GNOME=	glib20
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1533239067
1
TIMESTAMP = 1537810481
2
SHA256 (vstakhov-rspamd-1.7.9_GH0.tar.gz) = 70941726253c585799e2c4670743650472be13f85e9d31bfe23bdc13c9e9bae4
2
SHA256 (vstakhov-rspamd-1.8.0_GH0.tar.gz) = 3d83fbe240c61cf457bbbd74b9fee68c74ed5edd3480e6da358b0db7d4f732be
3
SIZE (vstakhov-rspamd-1.7.9_GH0.tar.gz) = 4557492
3
SIZE (vstakhov-rspamd-1.8.0_GH0.tar.gz) = 4261319
(-)files/patch-CMakeLists.txt (-2 / +3 lines)
Lines 1-6 Link Here
1
--- CMakeLists.txt.orig	2018-05-18 14:14:33 UTC
1
--- CMakeLists.txt.orig	2018-09-24 13:53:53 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -1309,6 +1309,27 @@ ENDFOREACH(CONF_FILE)
3
@@ -1320,6 +1320,28 @@ ENDFOREACH(CONF_FILE)
4
 SET(MAIN_CONF "conf/rspamd.conf")
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")
Lines 21-26 Link Here
21
+	INSTALL_IF_NOT_EXISTS("conf/metrics.conf" ${CONFDIR} "metrics.conf" ".sample")
21
+	INSTALL_IF_NOT_EXISTS("conf/metrics.conf" ${CONFDIR} "metrics.conf" ".sample")
22
+	INSTALL_IF_NOT_EXISTS("conf/mid.inc" ${CONFDIR} "mid.inc" ".sample")
22
+	INSTALL_IF_NOT_EXISTS("conf/mid.inc" ${CONFDIR} "mid.inc" ".sample")
23
+	INSTALL_IF_NOT_EXISTS("conf/modules.conf" ${CONFDIR} "modules.conf" ".sample")
23
+	INSTALL_IF_NOT_EXISTS("conf/modules.conf" ${CONFDIR} "modules.conf" ".sample")
24
+	INSTALL_IF_NOT_EXISTS("conf/settings.conf" ${CONFDIR} "settings.conf" ".sample")
24
+	INSTALL_IF_NOT_EXISTS("conf/statistic.conf" ${CONFDIR} "statistic.conf" ".sample")
25
+	INSTALL_IF_NOT_EXISTS("conf/statistic.conf" ${CONFDIR} "statistic.conf" ".sample")
25
+	INSTALL_IF_NOT_EXISTS("conf/surbl-whitelist.inc" ${CONFDIR} "surbl-whitelist.inc" ".sample")
26
+	INSTALL_IF_NOT_EXISTS("conf/surbl-whitelist.inc" ${CONFDIR} "surbl-whitelist.inc" ".sample")
26
+	INSTALL_IF_NOT_EXISTS("conf/dmarc_whitelist.inc" ${CONFDIR} "dmarc_whitelist.inc" ".sample")
27
+	INSTALL_IF_NOT_EXISTS("conf/dmarc_whitelist.inc" ${CONFDIR} "dmarc_whitelist.inc" ".sample")
(-)pkg-plist (-14 / +8 lines)
Lines 82-87 Link Here
82
%%ETCDIR%%/scores.d/surbl_group.conf
82
%%ETCDIR%%/scores.d/surbl_group.conf
83
@sample %%ETCDIR%%/spf_dkim_whitelist.inc.sample
83
@sample %%ETCDIR%%/spf_dkim_whitelist.inc.sample
84
@sample %%ETCDIR%%/statistic.conf.sample
84
@sample %%ETCDIR%%/statistic.conf.sample
85
@sample %%ETCDIR%%/settings.conf.sample
85
@sample %%ETCDIR%%/surbl-whitelist.inc.sample
86
@sample %%ETCDIR%%/surbl-whitelist.inc.sample
86
@sample %%ETCDIR%%/worker-controller.inc.sample
87
@sample %%ETCDIR%%/worker-controller.inc.sample
87
@sample %%ETCDIR%%/worker-fuzzy.inc.sample
88
@sample %%ETCDIR%%/worker-fuzzy.inc.sample
Lines 109-115 Link Here
109
%%DATADIR%%/languages/cy.json
110
%%DATADIR%%/languages/cy.json
110
%%DATADIR%%/languages/da.json
111
%%DATADIR%%/languages/da.json
111
%%DATADIR%%/languages/de.json
112
%%DATADIR%%/languages/de.json
112
%%DATADIR%%/languages/el.json
113
%%DATADIR%%/languages/en.json
113
%%DATADIR%%/languages/en.json
114
%%DATADIR%%/languages/es.json
114
%%DATADIR%%/languages/es.json
115
%%DATADIR%%/languages/et.json
115
%%DATADIR%%/languages/et.json
Lines 118-126 Link Here
118
%%DATADIR%%/languages/fi.json
118
%%DATADIR%%/languages/fi.json
119
%%DATADIR%%/languages/fr.json
119
%%DATADIR%%/languages/fr.json
120
%%DATADIR%%/languages/ga.json
120
%%DATADIR%%/languages/ga.json
121
%%DATADIR%%/languages/gl.json
122
%%DATADIR%%/languages/gu.json
123
%%DATADIR%%/languages/he.json
124
%%DATADIR%%/languages/hi.json
121
%%DATADIR%%/languages/hi.json
125
%%DATADIR%%/languages/hr.json
122
%%DATADIR%%/languages/hr.json
126
%%DATADIR%%/languages/hu.json
123
%%DATADIR%%/languages/hu.json
Lines 127-139 Link Here
127
%%DATADIR%%/languages/id.json
124
%%DATADIR%%/languages/id.json
128
%%DATADIR%%/languages/is.json
125
%%DATADIR%%/languages/is.json
129
%%DATADIR%%/languages/it.json
126
%%DATADIR%%/languages/it.json
130
%%DATADIR%%/languages/ja.json
131
%%DATADIR%%/languages/km.json
132
%%DATADIR%%/languages/kn.json
133
%%DATADIR%%/languages/ko.json
134
%%DATADIR%%/languages/lt.json
127
%%DATADIR%%/languages/lt.json
135
%%DATADIR%%/languages/lv.json
128
%%DATADIR%%/languages/lv.json
136
%%DATADIR%%/languages/ml.json
137
%%DATADIR%%/languages/mr.json
129
%%DATADIR%%/languages/mr.json
138
%%DATADIR%%/languages/ms.json
130
%%DATADIR%%/languages/ms.json
139
%%DATADIR%%/languages/ne.json
131
%%DATADIR%%/languages/ne.json
Lines 148-164 Link Here
148
%%DATADIR%%/languages/so.json
140
%%DATADIR%%/languages/so.json
149
%%DATADIR%%/languages/sq.json
141
%%DATADIR%%/languages/sq.json
150
%%DATADIR%%/languages/sr.json
142
%%DATADIR%%/languages/sr.json
143
%%DATADIR%%/languages/stop_words
151
%%DATADIR%%/languages/sv.json
144
%%DATADIR%%/languages/sv.json
152
%%DATADIR%%/languages/sw.json
145
%%DATADIR%%/languages/sw.json
153
%%DATADIR%%/languages/ta.json
154
%%DATADIR%%/languages/te.json
155
%%DATADIR%%/languages/th.json
156
%%DATADIR%%/languages/tr.json
146
%%DATADIR%%/languages/tr.json
157
%%DATADIR%%/languages/uk.json
147
%%DATADIR%%/languages/uk.json
158
%%DATADIR%%/languages/ur.json
148
%%DATADIR%%/languages/ur.json
159
%%DATADIR%%/languages/vi.json
149
%%DATADIR%%/languages/vi.json
160
%%DATADIR%%/languages/yi.json
161
%%DATADIR%%/languages/zh-CN.json
162
%%DATADIR%%/lib/ansicolors.lua
150
%%DATADIR%%/lib/ansicolors.lua
163
%%DATADIR%%/lib/argparse.lua
151
%%DATADIR%%/lib/argparse.lua
164
%%DATADIR%%/lib/fun.lua
152
%%DATADIR%%/lib/fun.lua
Lines 165-177 Link Here
165
%%DATADIR%%/lib/global_functions.lua
153
%%DATADIR%%/lib/global_functions.lua
166
%%DATADIR%%/lib/lua_auth_results.lua
154
%%DATADIR%%/lib/lua_auth_results.lua
167
%%DATADIR%%/lib/lua_cfg_transform.lua
155
%%DATADIR%%/lib/lua_cfg_transform.lua
156
%%DATADIR%%/lib/lua_clickhouse.lua
168
%%DATADIR%%/lib/lua_dkim_tools.lua
157
%%DATADIR%%/lib/lua_dkim_tools.lua
169
%%DATADIR%%/lib/lua_maps.lua
158
%%DATADIR%%/lib/lua_maps.lua
170
%%DATADIR%%/lib/lua_meta.lua
159
%%DATADIR%%/lib/lua_meta.lua
171
%%DATADIR%%/lib/lua_nn.lua
160
%%DATADIR%%/lib/lua_nn.lua
172
%%DATADIR%%/lib/lua_redis.lua
161
%%DATADIR%%/lib/lua_redis.lua
162
%%DATADIR%%/lib/lua_selectors.lua
173
%%DATADIR%%/lib/lua_squeeze_rules.lua
163
%%DATADIR%%/lib/lua_squeeze_rules.lua
174
%%DATADIR%%/lib/lua_stat.lua
164
%%DATADIR%%/lib/lua_stat.lua
165
%%DATADIR%%/lib/lua_tcp_sync.lua
175
%%DATADIR%%/lib/lua_util.lua
166
%%DATADIR%%/lib/lua_util.lua
176
%%DATADIR%%/lib/plugins_stats.lua
167
%%DATADIR%%/lib/plugins_stats.lua
177
%%DATADIR%%/lib/rescore_utility.lua
168
%%DATADIR%%/lib/rescore_utility.lua
Lines 185-190 Link Here
185
%%DATADIR%%/lib/rspamadm/mime.lua
176
%%DATADIR%%/lib/rspamadm/mime.lua
186
%%DATADIR%%/lib/rspamadm/rescore.lua
177
%%DATADIR%%/lib/rspamadm/rescore.lua
187
%%DATADIR%%/lib/rspamadm/stat_convert.lua
178
%%DATADIR%%/lib/rspamadm/stat_convert.lua
179
%%DATADIR%%/lib/tableshape.lua
188
%%TORCH%%%%DATADIR%%/lib/decisiontree/CartNode.lua
180
%%TORCH%%%%DATADIR%%/lib/decisiontree/CartNode.lua
189
%%TORCH%%%%DATADIR%%/lib/decisiontree/CartTrainer.lua
181
%%TORCH%%%%DATADIR%%/lib/decisiontree/CartTrainer.lua
190
%%TORCH%%%%DATADIR%%/lib/decisiontree/CartTree.lua
182
%%TORCH%%%%DATADIR%%/lib/decisiontree/CartTree.lua
Lines 497-502 Link Here
497
%%DATADIR%%/www/css/bootstrap.min.css
489
%%DATADIR%%/www/css/bootstrap.min.css
498
%%DATADIR%%/www/css/d3evolution.css
490
%%DATADIR%%/www/css/d3evolution.css
499
%%DATADIR%%/www/css/footable.bootstrap.min.css
491
%%DATADIR%%/www/css/footable.bootstrap.min.css
492
%%DATADIR%%/www/css/nprogress.css
500
%%DATADIR%%/www/css/rspamd.css
493
%%DATADIR%%/www/css/rspamd.css
501
%%DATADIR%%/www/favicon.ico
494
%%DATADIR%%/www/favicon.ico
502
%%DATADIR%%/www/fonts/glyphicons-halflings-regular.ttf
495
%%DATADIR%%/www/fonts/glyphicons-halflings-regular.ttf
Lines 521-526 Link Here
521
%%DATADIR%%/www/js/lib/footable.min.js
514
%%DATADIR%%/www/js/lib/footable.min.js
522
%%DATADIR%%/www/js/lib/humanize.min.js
515
%%DATADIR%%/www/js/lib/humanize.min.js
523
%%DATADIR%%/www/js/lib/jquery-3.3.1.min.js
516
%%DATADIR%%/www/js/lib/jquery-3.3.1.min.js
517
%%DATADIR%%/www/js/lib/nprogress.min.js
524
%%DATADIR%%/www/js/lib/require.min.js
518
%%DATADIR%%/www/js/lib/require.min.js
525
%%DATADIR%%/www/js/lib/visibility.min.js
519
%%DATADIR%%/www/js/lib/visibility.min.js
526
%%DATADIR%%/www/js/main.js
520
%%DATADIR%%/www/js/main.js

Return to bug 231703