FreeBSD Bugzilla – Attachment 191661 Details for
Bug 226802
[patch] update mail/rspamd 1.7.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Update to 1.7.1
rspamd.patch (text/plain), 6.00 KB, created by
Anton Yuzhaninov
on 2018-03-20 16:26:31 UTC
(
hide
)
Description:
Update to 1.7.1
Filename:
MIME Type:
Creator:
Anton Yuzhaninov
Created:
2018-03-20 16:26:31 UTC
Size:
6.00 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 465087) >+++ Makefile (working copy) >@@ -1,7 +1,7 @@ > # $FreeBSD$ > > PORTNAME= rspamd >-PORTVERSION= 1.7.0 >+PORTVERSION= 1.7.1 > CATEGORIES= mail > > MAINTAINER= vsevolod@FreeBSD.org >@@ -13,21 +13,25 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > 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 TORCH_BLAS >+OPTIONS_DEFINE= GPERF GD CGP TORCH_BLAS > OPTIONS_DEFINE_amd64= HYPERSCAN >-OPTIONS_DEFAULT= TORCH >+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 >@@ -43,8 +47,7 @@ CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rsp > -DCMAKE_INSTALL_PREFIX=${PREFIX} \ > -DBUILD_PORT=yes \ > -DLIBDIR=${PREFIX}/lib/rspamd \ >- -DNO_SHARED=ON \ >- -DENABLE_FANN=ON >+ -DNO_SHARED=ON > > USES= cmake:outsource pkgconfig perl5 \ > compiler:c11 sqlite ssl >@@ -67,6 +70,9 @@ GPERF_LIB_DEPENDS= libprofiler.so:devel/ > 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 > >Index: distinfo >=================================================================== >--- distinfo (revision 465087) >+++ distinfo (working copy) >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1520893818 >-SHA256 (vstakhov-rspamd-1.7.0_GH0.tar.gz) = cf8bd3cbe3e6e146dbb9c5d6c0098ccfe69dda5a672b9cf6af629e9fbbdba039 >-SIZE (vstakhov-rspamd-1.7.0_GH0.tar.gz) = 4444320 >+TIMESTAMP = 1521561252 >+SHA256 (vstakhov-rspamd-1.7.1_GH0.tar.gz) = 3dd083e68edc800b3174563db41166734bebc6dff2df8d7d7a1ced4ba10b880d >+SIZE (vstakhov-rspamd-1.7.1_GH0.tar.gz) = 4453460 >Index: files/patch-CMakeLists.txt >=================================================================== >--- files/patch-CMakeLists.txt (revision 465087) >+++ files/patch-CMakeLists.txt (working copy) >@@ -1,10 +1,12 @@ >---- CMakeLists.txt.orig 2017-06-06 15:07:59 UTC >+--- CMakeLists.txt.orig 2018-03-12 16:46:32 UTC > +++ CMakeLists.txt >-@@ -1302,6 +1302,24 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON") >- ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON") >+@@ -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") >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 465087) >+++ pkg-plist (working copy) >@@ -8,11 +8,11 @@ bin/rspamd_stats > %%CGP%%bin/rspamd-cgp-helper > etc/newsyslog.conf.d/rspamd.newsyslog.conf > @sample %%ETCDIR%%/2tld.inc.sample >-@sample %%ETCDIR%%/actions.conf >+@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 %%ETCDIR%%/groups.conf.sample > @sample %%ETCDIR%%/logging.inc.sample > @sample %%ETCDIR%%/maillist.inc.sample > @sample %%ETCDIR%%/metrics.conf.sample >@@ -63,12 +63,10 @@ etc/newsyslog.conf.d/rspamd.newsyslog.co > %%ETCDIR%%/modules.d/url_reputation.conf > %%ETCDIR%%/modules.d/url_tags.conf > %%ETCDIR%%/modules.d/whitelist.conf >-%%ETCDIR%%/options.inc >-%%ETCDIR%%/options.inc.sample >+@sample %%ETCDIR%%/options.inc.sample > %%ETCDIR%%/redirectors.inc >-%%ETCDIR%%/rspamd.conf >-%%ETCDIR%%/rspamd.conf.sample >-%%ETCDIR%%/rspamd.newsyslog.conf.sample >+@sample %%ETCDIR%%/rspamd.conf.sample >+@sample %%ETCDIR%%/rspamd.newsyslog.conf.sample > %%ETCDIR%%/scores.d/fuzzy_group.conf > %%ETCDIR%%/scores.d/headers_group.conf > %%ETCDIR%%/scores.d/hfilter_group.conf >@@ -80,20 +78,13 @@ etc/newsyslog.conf.d/rspamd.newsyslog.co > %%ETCDIR%%/scores.d/statistics_group.conf > %%ETCDIR%%/scores.d/subject_group.conf > %%ETCDIR%%/scores.d/surbl_group.conf >-%%ETCDIR%%/spf_dkim_whitelist.inc >-%%ETCDIR%%/spf_dkim_whitelist.inc.sample >-%%ETCDIR%%/statistic.conf >-%%ETCDIR%%/statistic.conf.sample >-%%ETCDIR%%/surbl-whitelist.inc >-%%ETCDIR%%/surbl-whitelist.inc.sample >-%%ETCDIR%%/worker-controller.inc >-%%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 >+@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 > lib/rspamd/librspamd-actrie.so > %%TORCH%%lib/rspamd/libTH.so > %%TORCH%%lib/rspamd/libTHNN.so >@@ -441,6 +432,7 @@ man/man8/rspamd.8.gz > %%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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 226802
: 191661