Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Feb 2020 16:59:24 +0000 (UTC)
From:      Vsevolod Stakhov <vsevolod@FreeBSD.org>
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
Message-ID:  <202002061659.016GxOFL047477@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <moiseev at mezonplus.ru>

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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002061659.016GxOFL047477>