Index: head/mail/rspamd/Makefile =================================================================== --- head/mail/rspamd/Makefile (revision 442331) +++ head/mail/rspamd/Makefile (revision 442332) @@ -1,102 +1,102 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 1.5.8 +PORTVERSION= 1.5.9 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org COMMENT= Fast spam filtering system LICENSE= APACHE20 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 CONFLICTS_INSTALL= rspamd-devel OPTIONS_DEFINE= GPERF HYPERSCAN GD CGP OPTIONS_DEFAULT= GD GPERF_DESC= Google perf-tools profiling 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 SUB_FILES= pkg-message rspamd.newsyslog.conf.sample PLIST_SUB+= ETCDIR=etc/rspamd \ RSPAMDVERSION=${PORTVERSION} CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rspamd \ -DLOGDIR=/var/log/rspamd \ -DDBDIR=/var/db/rspamd \ -DRUNDIR=/var/run/rspamd \ -DMANDIR=${MANPREFIX}/man \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DBUILD_PORT=yes \ -DLIBDIR=${PREFIX}/lib/rspamd \ -DNO_SHARED=ON \ -DENABLE_FANN=ON USES= cmake:outsource pkgconfig perl5 \ compiler:c11 sqlite ssl USE_LDCONFIG= yes USE_PERL5= build USE_GNOME= glib20 USE_GITHUB= yes GH_ACCOUNT= vstakhov .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 .endif .if ${PORT_OPTIONS:MHYPERSCAN} CMAKE_ARGS+= -DENABLE_HYPERSCAN=ON LIB_DEPENDS+= libhs.so:devel/hyperscan ONLY_FOR_ARCHS= amd64 .endif .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 post-install: @${MKDIR} \ ${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 ${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 Index: head/mail/rspamd/distinfo =================================================================== --- head/mail/rspamd/distinfo (revision 442331) +++ head/mail/rspamd/distinfo (revision 442332) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495707999 -SHA256 (vstakhov-rspamd-1.5.8_GH0.tar.gz) = 1c414396e02df52b3a31914cad51a4ca8f9947af619db7221b98c9aa04907668 -SIZE (vstakhov-rspamd-1.5.8_GH0.tar.gz) = 2385290 +TIMESTAMP = 1496352567 +SHA256 (vstakhov-rspamd-1.5.9_GH0.tar.gz) = 864705c09733257449ffc52740f380c1edeb56bb4be6e0ad0a8ab8c0cdf6cbe6 +SIZE (vstakhov-rspamd-1.5.9_GH0.tar.gz) = 2386813 Index: head/mail/rspamd/files/patch-ipv6-support =================================================================== --- head/mail/rspamd/files/patch-ipv6-support (revision 442331) +++ head/mail/rspamd/files/patch-ipv6-support (nonexistent) @@ -1,29 +0,0 @@ -diff --git a/src/libutil/addr.c b/src/libutil/addr.c -index 1687c80bd..ee70a90f4 100644 ---- src/libutil/addr.c -+++ src/libutil/addr.c -@@ -287,8 +287,6 @@ rspamd_accept_from_socket (gint sock, rspamd_inet_addr_t **target, - addr->slen = len; - - if (addr->af == AF_UNIX) { -- addr->u.un = g_slice_alloc0 (sizeof (*addr->u.un)); -- /* Get name from the listening socket */ - len = sizeof (su); - - if (getsockname (sock, &su.sa, &len) != -1) { -diff --git a/src/libutil/addr.c b/src/libutil/addr.c -index ee70a90f4..9a278a432 100644 ---- src/libutil/addr.c -+++ src/libutil/addr.c -@@ -280,6 +280,11 @@ rspamd_accept_from_socket (gint sock, rspamd_inet_addr_t **target, - sizeof (struct in6_addr)); - } - } -+ else { -+ addr = rspamd_inet_addr_create (AF_INET6); -+ memcpy (&addr->u.in.addr.s6.sin6_addr, &su.s6.sin6_addr, -+ sizeof (struct in6_addr)); -+ } - - } - else { Property changes on: head/mail/rspamd/files/patch-ipv6-support ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property