svn commit: r404259 - in head/mail/rspamd: . files

[Vsevolod Stakhov]

Author: vsevolod
Date: Tue Dec 22 17:33:04 2015
New Revision: 404259
URL: https://svnweb.freebsd.org/changeset/ports/404259

Log:
  - Update to 1.0.11
  - Add newsyslog entry creation [1]
  - Add hiredis option (enabled by default) [2]
  
  PR:		205456 [1]
  Submitted by:	Alexander Moisseev <moiseev at mezonplus.ru> [1],
  		Alexandre Perrin via IRC [2]

Added:
  head/mail/rspamd/files/pkg-message.in   (contents, props changed)
  head/mail/rspamd/files/rspamd.newsyslog.conf.sample.in   (contents, props changed)
Modified:
  head/mail/rspamd/Makefile
  head/mail/rspamd/distinfo
  head/mail/rspamd/pkg-plist

Modified: head/mail/rspamd/Makefile
==============================================================================
--- head/mail/rspamd/Makefile	Tue Dec 22 17:11:40 2015	(r404258)
+++ head/mail/rspamd/Makefile	Tue Dec 22 17:33:04 2015	(r404259)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.0.10
-PORTREVISION=	1
+PORTVERSION=	1.0.11
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
@@ -14,17 +13,19 @@ LICENSE=	BSD2CLAUSE
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libgmime-2.4.so:${PORTSDIR}/mail/gmime24 \
 		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
-		libhiredis.so:${PORTSDIR}/databases/hiredis
+		libluajit-5.1.so:${PORTSDIR}/lang/luajit
 
 CONFLICTS_INSTALL=	rspamd
 
-OPTIONS_DEFINE=	GPERF REDIRECTOR
-GPERF_DESC=		google perf-tools profiling
+OPTIONS_DEFINE=	GPERF REDIRECTOR HIREDIS
+GPERF_DESC=		Google perf-tools profiling
 REDIRECTOR_DESC=	Install HTTP redirector
+HIREDIS_DESC=		Redis support through hiredis
+OPTIONS_DEFAULT=	HIREDIS
 
 USE_RC_SUBR=	rspamd
 
+SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${PORTVERSION}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
@@ -75,14 +76,25 @@ USE_SQLITE=	yes
  PLIST_SUB+=		REDIRECTOR="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MHIREDIS}
+ LIB_DEPENDS+=	libhiredis.so:${PORTSDIR}/databases/hiredis
+.else
+ CMAKE_ARGS+=	-DENABLE_HIREDIS=OFF
+.endif
+
 post-stage:
 	${INSTALL} -d \
 		${STAGEDIR}/var/log/rspamd \
 		${STAGEDIR}/var/db/rspamd \
 		${STAGEDIR}/var/run/rspamd
-		# Linux specific
-		${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
-		# No need, since rspamd.conf.sample is a same
-		${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
+	# Linux specific
+	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
+	# No need, since rspamd.conf.sample is a same
+	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
+	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
+	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 
 .include <bsd.port.mk>

Modified: head/mail/rspamd/distinfo
==============================================================================
--- head/mail/rspamd/distinfo	Tue Dec 22 17:11:40 2015	(r404258)
+++ head/mail/rspamd/distinfo	Tue Dec 22 17:33:04 2015	(r404259)
@@ -1,2 +1,2 @@
-SHA256 (rspamd-1.0.10.tar.xz) = da8b3404ddd46e1a20fc629dfb681d28cee680160821f34d58336d733552bd38
-SIZE (rspamd-1.0.10.tar.xz) = 1176584
+SHA256 (rspamd-1.0.11.tar.xz) = b914c77c30dcab863f6c685b4a83a1662ee1b4503654fbf3ee3ae2fbca1ed928
+SIZE (rspamd-1.0.11.tar.xz) = 1176160

Added: head/mail/rspamd/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/rspamd/files/pkg-message.in	Tue Dec 22 17:33:04 2015	(r404259)
@@ -0,0 +1,10 @@
+======================================================================
+ - Add the following line to /etc/rc.conf to enable rspamd:
+
+     rspamd_enable="YES"
+
+ - A symbolic link to %%ETCDIR%%/rspamd.newsyslog.conf
+   has been created in the /usr/local/etc/newsyslog.conf.d directory.
+   You can edit %%ETCDIR%%/rspamd.newsyslog.conf
+   to change log file rotation configuration.
+======================================================================

Added: head/mail/rspamd/files/rspamd.newsyslog.conf.sample.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/rspamd/files/rspamd.newsyslog.conf.sample.in	Tue Dec 22 17:33:04 2015	(r404259)
@@ -0,0 +1,11 @@
+# newsyslog configuration file for rspamd(8)
+#
+# Link (or copy) rspamd.newsyslog.conf to /usr/local/etc/newsyslog.conf.d/
+# to take care of log rotation.
+#
+# ln -s /usr/local/etc/rspamd/rspamd.newsyslog.conf /usr/local/etc/newsyslog.conf.d
+#
+# See newsyslog.conf(5) for details.
+#
+# logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
+/var/log/rspamd/rspamd.log	nobody:nobody	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30

Modified: head/mail/rspamd/pkg-plist
==============================================================================
--- head/mail/rspamd/pkg-plist	Tue Dec 22 17:11:40 2015	(r404258)
+++ head/mail/rspamd/pkg-plist	Tue Dec 22 17:33:04 2015	(r404259)
@@ -36,6 +36,8 @@ bin/rspamc
 @sample %%ETCDIR%%/surbl-whitelist.inc.sample
 @sample %%ETCDIR%%/worker-controller.inc.sample
 @sample %%ETCDIR%%/worker-normal.inc.sample
+ at sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
+/usr/local/etc/newsyslog.conf.d/rspamd.newsyslog.conf
 lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/effective_tld_names.dat
 %%DATADIR%%/lua/dmarc.lua