From owner-svn-ports-all@freebsd.org Thu Feb 6 16:59:25 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 96426230C35; Thu, 6 Feb 2020 16:59:25 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48D4R13Lqbz4Gjj; Thu, 6 Feb 2020 16:59:25 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6DB841EC62; Thu, 6 Feb 2020 16:59:25 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 016GxPD5047481; Thu, 6 Feb 2020 16:59:25 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 016GxOFL047477; Thu, 6 Feb 2020 16:59:24 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <202002061659.016GxOFL047477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Thu, 6 Feb 2020 16:59:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525391 - in head/mail: rspamd rspamd-devel X-SVN-Group: ports-head X-SVN-Commit-Author: vsevolod X-SVN-Commit-Paths: in head/mail: rspamd rspamd-devel X-SVN-Commit-Revision: 525391 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Feb 2020 16:59:25 -0000 Author: vsevolod Date: Thu Feb 6 16:59:24 2020 New Revision: 525391 URL: https://svnweb.freebsd.org/changeset/ports/525391 Log: use tabs after variable names PR: 243697 Submitted by: Alexander Moisseev Modified: head/mail/rspamd-devel/Makefile head/mail/rspamd-devel/distinfo head/mail/rspamd-devel/pkg-plist head/mail/rspamd/Makefile Modified: head/mail/rspamd-devel/Makefile ============================================================================== --- head/mail/rspamd-devel/Makefile Thu Feb 6 16:49:44 2020 (r525390) +++ head/mail/rspamd-devel/Makefile Thu Feb 6 16:59:24 2020 (r525391) @@ -29,19 +29,19 @@ CONFLICTS_INSTALL= rspamd USERS= rspamd GROUPS= rspamd -OPTIONS_DEFINE= BLAS CGP GPERF LUAJIT -OPTIONS_DEFINE_amd64= HYPERSCAN -OPTIONS_DEFAULT_amd64= LUAJIT -OPTIONS_DEFAULT_armv7= LUAJIT -OPTIONS_DEFAULT_i386= LUAJIT -OPTIONS_DEFAULT_powerpc= LUAJIT +OPTIONS_DEFINE= BLAS CGP GPERF LUAJIT +OPTIONS_DEFINE_amd64= HYPERSCAN +OPTIONS_DEFAULT_amd64= LUAJIT +OPTIONS_DEFAULT_armv7= LUAJIT +OPTIONS_DEFAULT_i386= LUAJIT +OPTIONS_DEFAULT_powerpc= LUAJIT OPTIONS_SUB= yes -BLAS_DESC= Use OpenBLAS to accelerate KANN -CGP_DESC= Install Communigate Pro(tm) helper -GPERF_DESC= Google perf-tools profiling -HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only) -LUAJIT_DESC= Use LuaJIT instead of standard Lua +BLAS_DESC= Use OpenBLAS to accelerate KANN +CGP_DESC= Install Communigate Pro(tm) helper +GPERF_DESC= Google perf-tools profiling +HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only) +LUAJIT_DESC= Use LuaJIT instead of standard Lua SUB_FILES= pkg-message rspamd.newsyslog.conf.sample PLIST_SUB+= ETCDIR=etc/rspamd \ @@ -57,7 +57,7 @@ CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rspamd \ -DDEBUG=ON \ -DGIT_ID=${GH_TAGNAME} USE_GITHUB= yes -GH_TAGNAME= b30c5df +GH_TAGNAME= 3f7e7ef DEBUG_FLAGS= -g -O0 WITH_DEBUG= yes @@ -73,8 +73,8 @@ GPERF_LIB_DEPENDS= libprofiler.so:devel/google-perftoo HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit -LUAJIT_USES_OFF= lua:51 +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_USES_OFF= lua:51 CGP_RUN_DEPENDS+= \ p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \ @@ -91,8 +91,6 @@ post-install: # Linux specific ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf - # No examples installed by the port - ${RMDIR} ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d Modified: head/mail/rspamd-devel/distinfo ============================================================================== --- head/mail/rspamd-devel/distinfo Thu Feb 6 16:49:44 2020 (r525390) +++ head/mail/rspamd-devel/distinfo Thu Feb 6 16:59:24 2020 (r525391) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574229469 -SHA256 (rspamd-rspamd-2.3.a1.20191120-b30c5df_GH0.tar.gz) = 7c3b9eac78032b3fe6aa61abe3fc4c912aee1da69e17843c8557ec4ff163f913 -SIZE (rspamd-rspamd-2.3.a1.20191120-b30c5df_GH0.tar.gz) = 4257851 +TIMESTAMP = 1580275428 +SHA256 (rspamd-rspamd-2.3.a1.20200129-3f7e7ef_GH0.tar.gz) = ce2a69cad8db60b633dee3e4c3543b6d6262dc1f560d6eb36322eab813d789f3 +SIZE (rspamd-rspamd-2.3.a1.20200129-3f7e7ef_GH0.tar.gz) = 4407393 Modified: head/mail/rspamd-devel/pkg-plist ============================================================================== --- head/mail/rspamd-devel/pkg-plist Thu Feb 6 16:49:44 2020 (r525390) +++ head/mail/rspamd-devel/pkg-plist Thu Feb 6 16:59:24 2020 (r525391) @@ -69,6 +69,7 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf %%ETCDIR%%/options.inc %%ETCDIR%%/rspamd.conf @sample %%ETCDIR%%/rspamd.newsyslog.conf.sample +%%ETCDIR%%/scores.d/content_group.conf %%ETCDIR%%/scores.d/fuzzy_group.conf %%ETCDIR%%/scores.d/headers_group.conf %%ETCDIR%%/scores.d/hfilter_group.conf @@ -154,20 +155,22 @@ man/man8/rspamd.8.gz %%DATADIR%%/lualib/lua_bayes_learn.lua %%DATADIR%%/lualib/lua_cfg_transform.lua %%DATADIR%%/lualib/lua_clickhouse.lua +%%DATADIR%%/lualib/lua_content/ical.lua +%%DATADIR%%/lualib/lua_content/init.lua +%%DATADIR%%/lualib/lua_content/pdf.lua %%DATADIR%%/lualib/lua_dkim_tools.lua %%DATADIR%%/lualib/lua_ffi/common.lua %%DATADIR%%/lualib/lua_ffi/dkim.lua %%DATADIR%%/lualib/lua_ffi/init.lua %%DATADIR%%/lualib/lua_ffi/spf.lua %%DATADIR%%/lualib/lua_fuzzy.lua -%%DATADIR%%/lualib/lua_ical.lua %%DATADIR%%/lualib/lua_lexer.lua %%DATADIR%%/lualib/lua_magic/heuristics.lua %%DATADIR%%/lualib/lua_magic/init.lua %%DATADIR%%/lualib/lua_magic/patterns.lua %%DATADIR%%/lualib/lua_magic/types.lua -%%DATADIR%%/lualib/lua_maps_expressions.lua %%DATADIR%%/lualib/lua_maps.lua +%%DATADIR%%/lualib/lua_maps_expressions.lua %%DATADIR%%/lualib/lua_meta.lua %%DATADIR%%/lualib/lua_mime.lua %%DATADIR%%/lualib/lua_redis.lua @@ -257,10 +260,12 @@ man/man8/rspamd.8.gz %%DATADIR%%/plugins/settings.lua %%DATADIR%%/plugins/spamassassin.lua %%DATADIR%%/plugins/spamtrap.lua +%%DATADIR%%/plugins/spf.lua %%DATADIR%%/plugins/trie.lua %%DATADIR%%/plugins/url_redirector.lua %%DATADIR%%/plugins/whitelist.lua %%DATADIR%%/rules/bitcoin.lua +%%DATADIR%%/rules/content.lua %%DATADIR%%/rules/forwarding.lua %%DATADIR%%/rules/headers_checks.lua %%DATADIR%%/rules/html.lua @@ -274,11 +279,14 @@ man/man8/rspamd.8.gz %%DATADIR%%/rules/rspamd.lua %%DATADIR%%/rules/subject_checks.lua %%DATADIR%%/www/README.md +%%DATADIR%%/www/browserconfig.xml %%DATADIR%%/www/css/bootstrap.min.css %%DATADIR%%/www/css/d3evolution.css %%DATADIR%%/www/css/footable.bootstrap.min.css %%DATADIR%%/www/css/nprogress.css %%DATADIR%%/www/css/rspamd.css +%%DATADIR%%/www/favicon-16x16.png +%%DATADIR%%/www/favicon-32x32.png %%DATADIR%%/www/favicon.ico %%DATADIR%%/www/fonts/glyphicons-halflings-regular.ttf %%DATADIR%%/www/fonts/glyphicons-halflings-regular.woff @@ -306,8 +314,8 @@ man/man8/rspamd.8.gz %%DATADIR%%/www/js/lib/require.min.js %%DATADIR%%/www/js/lib/visibility.min.js %%DATADIR%%/www/js/main.js -%%DATADIR%%/www/plugins.txt -%%DATADIR%%/www/react-index.html +%%DATADIR%%/www/mstile-150x150.png +%%DATADIR%%/www/safari-pinned-tab.svg @owner rspamd @group rspamd @dir /var/db/rspamd Modified: head/mail/rspamd/Makefile ============================================================================== --- head/mail/rspamd/Makefile Thu Feb 6 16:49:44 2020 (r525390) +++ head/mail/rspamd/Makefile Thu Feb 6 16:59:24 2020 (r525391) @@ -28,19 +28,19 @@ CONFLICTS_INSTALL= rspamd-devel USERS= rspamd GROUPS= rspamd -OPTIONS_DEFINE= BLAS CGP GPERF LUAJIT -OPTIONS_DEFINE_amd64= HYPERSCAN -OPTIONS_DEFAULT_amd64= LUAJIT -OPTIONS_DEFAULT_armv7= LUAJIT -OPTIONS_DEFAULT_i386= LUAJIT -OPTIONS_DEFAULT_powerpc= LUAJIT +OPTIONS_DEFINE= BLAS CGP GPERF LUAJIT +OPTIONS_DEFINE_amd64= HYPERSCAN +OPTIONS_DEFAULT_amd64= LUAJIT +OPTIONS_DEFAULT_armv7= LUAJIT +OPTIONS_DEFAULT_i386= LUAJIT +OPTIONS_DEFAULT_powerpc= LUAJIT OPTIONS_SUB= yes -BLAS_DESC= Use OpenBLAS to accelerate KANN -CGP_DESC= Install Communigate Pro(tm) helper -GPERF_DESC= Google perf-tools profiling -HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only) -LUAJIT_DESC= Use LuaJIT instead of standard Lua +BLAS_DESC= Use OpenBLAS to accelerate KANN +CGP_DESC= Install Communigate Pro(tm) helper +GPERF_DESC= Google perf-tools profiling +HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only) +LUAJIT_DESC= Use LuaJIT instead of standard Lua SUB_FILES= pkg-message rspamd.newsyslog.conf.sample PLIST_SUB+= ETCDIR=etc/rspamd \ @@ -67,8 +67,8 @@ GPERF_LIB_DEPENDS= libprofiler.so:devel/google-perftoo HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit -LUAJIT_USES_OFF= lua:51 +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_USES_OFF= lua:51 CGP_RUN_DEPENDS+= \ p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \