From owner-svn-ports-head@freebsd.org Tue Mar 7 18:56:12 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75FB7D00BA1; Tue, 7 Mar 2017 18:56:12 +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 mx1.freebsd.org (Postfix) with ESMTPS id 28E18180B; Tue, 7 Mar 2017 18:56:12 +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 v27IuB3j005073; Tue, 7 Mar 2017 18:56:11 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v27IuBYO005070; Tue, 7 Mar 2017 18:56:11 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201703071856.v27IuBYO005070@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Tue, 7 Mar 2017 18:56:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435637 - head/mail/rspamd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2017 18:56:12 -0000 Author: vsevolod Date: Tue Mar 7 18:56:10 2017 New Revision: 435637 URL: https://svnweb.freebsd.org/changeset/ports/435637 Log: - Update to 1.5.2 Modified: head/mail/rspamd/Makefile head/mail/rspamd/distinfo head/mail/rspamd/pkg-plist Modified: head/mail/rspamd/Makefile ============================================================================== --- head/mail/rspamd/Makefile Tue Mar 7 18:44:46 2017 (r435636) +++ head/mail/rspamd/Makefile Tue Mar 7 18:56:10 2017 (r435637) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES= mail MASTER_SITES= http://rspamd.com/downloads/ @@ -19,10 +19,13 @@ BUILD_DEPENDS= ragel:devel/ragel CONFLICTS_INSTALL= rspamd-devel -OPTIONS_DEFINE= GPERF REDIRECTOR HYPERSCAN +OPTIONS_DEFINE= GPERF REDIRECTOR HYPERSCAN GD CGP +OPTIONS_DEFAULT= GD GPERF_DESC= Google perf-tools profiling REDIRECTOR_DESC= Install HTTP redirector HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only) +GD_DESC= Enable libgd support for images fuzzy hashes +CGP_DESC= Install Communigate Pro(tm) helper USE_RC_SUBR= rspamd @@ -37,11 +40,10 @@ CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rsp -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DBUILD_PORT=yes \ -DLIBDIR=${PREFIX}/lib/rspamd \ - -DENABLE_FANN=ON \ - -DENABLE_GD=OFF \ - -DNO_SHARED=ON + -DNO_SHARED=ON \ + -DENABLE_FANN=ON -USES= cmake:outsource gettext pkgconfig tar:xz perl5 \ +USES= cmake:outsource gettext tar:xz pkgconfig perl5 \ compiler:c11 sqlite ssl USE_LDCONFIG= yes USE_PERL5= build @@ -50,6 +52,13 @@ USE_GNOME= glib20 .include +.if ${PORT_OPTIONS:MGD} + CMAKE_ARGS+= -DENABLE_GD=ON + LIB_DEPENDS+= libgd.so:graphics/gd +.else + CMAKE_ARGS+= -DENABLE_GD=OFF +.endif + .if ${PORT_OPTIONS:MGPERF} CMAKE_ARGS+= -DENABLE_GPERF_TOOLS=ON LIB_DEPENDS+= libprofiler.so:devel/google-perftools @@ -76,17 +85,25 @@ USE_GNOME= glib20 p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \ p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \ p5-Proc-PidUtil>=0:sysutils/p5-Proc-PidUtil \ - p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \ - p5-SWF-File>=0:graphics/p5-SWF-File + p5-Proc-Daemon>=0:devel/p5-Proc-Daemon .else PLIST_SUB+= REDIRECTOR="@comment " .endif -post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d - ${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d +.if ${PORT_OPTIONS:MCGP} + USE_PERL5+= run + PLIST_SUB+= CGP="" + RUN_DEPENDS+= \ + p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \ + p5-AnyEvent>=0:devel/p5-AnyEvent \ + p5-EV>=0:devel/p5-EV \ + p5-JSON-XS>=0:converters/p5-JSON-XS +.else + PLIST_SUB+= CGP="@comment " +.endif - ${INSTALL} -d \ +post-install: + @${MKDIR} \ ${STAGEDIR}/var/log/rspamd \ ${STAGEDIR}/var/db/rspamd \ ${STAGEDIR}/var/run/rspamd @@ -95,5 +112,10 @@ post-install: # No need, since rspamd.conf.sample is a same ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf ${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 +.if ${PORT_OPTIONS:MCGP} + ${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper +.endif .include Modified: head/mail/rspamd/distinfo ============================================================================== --- head/mail/rspamd/distinfo Tue Mar 7 18:44:46 2017 (r435636) +++ head/mail/rspamd/distinfo Tue Mar 7 18:56:10 2017 (r435637) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488478243 -SHA256 (rspamd-1.5.1.tar.xz) = 18e0f15d0121c3971cd11e7db1e15c0634289b1493b88656088fed0db92bc220 -SIZE (rspamd-1.5.1.tar.xz) = 1846668 +TIMESTAMP = 1488912778 +SHA256 (rspamd-1.5.2.tar.xz) = 6ff0c2f5956610d17bd7f470922fc6c53593bb9408f68e25294d2228b1fe315e +SIZE (rspamd-1.5.2.tar.xz) = 1848756 Modified: head/mail/rspamd/pkg-plist ============================================================================== --- head/mail/rspamd/pkg-plist Tue Mar 7 18:44:46 2017 (r435636) +++ head/mail/rspamd/pkg-plist Tue Mar 7 18:56:10 2017 (r435637) @@ -6,6 +6,7 @@ bin/rspamadm bin/rspamc-%%RSPAMDVERSION%% bin/rspamc %%REDIRECTOR%%bin/rspamd-redirector +%%CGP%%bin/rspamd-cgp-helper @sample %%ETCDIR%%/2tld.inc.sample @sample %%ETCDIR%%/mime_types.inc.sample @sample %%ETCDIR%%/common.conf.sample @@ -16,11 +17,13 @@ bin/rspamc @sample %%ETCDIR%%/metrics.conf.sample @sample %%ETCDIR%%/mid.inc.sample @sample %%ETCDIR%%/modules.conf.sample +%%ETCDIR%%/modules.d/antivirus.conf %%ETCDIR%%/modules.d/asn.conf %%ETCDIR%%/modules.d/chartable.conf %%ETCDIR%%/modules.d/clickhouse.conf %%ETCDIR%%/modules.d/dcc.conf %%ETCDIR%%/modules.d/dkim.conf +%%ETCDIR%%/modules.d/dkim_signing.conf %%ETCDIR%%/modules.d/dmarc.conf %%ETCDIR%%/modules.d/emails.conf %%ETCDIR%%/modules.d/fann_redis.conf @@ -36,16 +39,20 @@ bin/rspamc %%ETCDIR%%/modules.d/mime_types.conf %%ETCDIR%%/modules.d/mid.conf %%ETCDIR%%/modules.d/multimap.conf +%%ETCDIR%%/modules.d/mx_check.conf %%ETCDIR%%/modules.d/once_received.conf %%ETCDIR%%/modules.d/phishing.conf %%ETCDIR%%/modules.d/ratelimit.conf %%ETCDIR%%/modules.d/rbl.conf %%ETCDIR%%/modules.d/redis.conf %%ETCDIR%%/modules.d/regexp.conf +%%ETCDIR%%/modules.d/replies.conf %%ETCDIR%%/modules.d/rmilter_headers.conf %%ETCDIR%%/modules.d/rspamd_update.conf +%%ETCDIR%%/modules.d/spamassassin.conf %%ETCDIR%%/modules.d/spf.conf %%ETCDIR%%/modules.d/surbl.conf +%%ETCDIR%%/modules.d/trie.conf %%ETCDIR%%/modules.d/url_redirector.conf %%ETCDIR%%/modules.d/url_reputation.conf %%ETCDIR%%/modules.d/url_tags.conf