Index: head/mail/rspamd/Makefile =================================================================== --- head/mail/rspamd/Makefile (revision 399465) +++ head/mail/rspamd/Makefile (revision 399466) @@ -1,86 +1,85 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 1.0.5 -PORTREVISION= 2 +PORTVERSION= 1.0.6 CATEGORIES= mail MASTER_SITES= http://rspamd.com/downloads/ MAINTAINER= vsevolod@FreeBSD.org COMMENT= Fast spam filtering system 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 OPTIONS_DEFINE= GPERF REDIRECTOR GPERF_DESC= google perf-tools profiling REDIRECTOR_DESC= Install HTTP redirector USE_RC_SUBR= rspamd 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 \ -DFORCE_GMIME24=yes \ -DLIBDIR=${PREFIX}/lib/rspamd \ -DNO_SHARED=ON USES= cmake:outsource gettext iconv pkgconfig tar:xz perl5 \ compiler:c11 USE_LDCONFIG= yes USE_PERL5= build USE_GNOME= glib20 USE_OPENSSL= yes USE_SQLITE= yes .include .if ${PORT_OPTIONS:MGPERF} CMAKE_ARGS+= -DENABLE_GPERF_TOOLS=ON LIB_DEPENDS+= libprofiler.so:${PORTSDIR}/devel/google-perftools .endif .if ${PORT_OPTIONS:MREDIRECTOR} USE_PERL5+= run CMAKE_ARGS+= -DENABLE_REDIRECTOR=ON PLIST_SUB+= REDIRECTOR="" USE_RC_SUBR+= rspamd_redirector RUN_DEPENDS+= \ p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \ p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \ p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \ p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \ p5-POE-Component-Client-DNS>=0:${PORTSDIR}/dns/p5-POE-Component-Client-DNS \ p5-POE-Component-Client-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Client-HTTP \ p5-POE-Component-Server-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Server-HTTP \ p5-Cache-Memcached-Fast>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Fast \ p5-Proc-PidUtil>=0:${PORTSDIR}/sysutils/p5-Proc-PidUtil \ p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \ p5-SWF-File>=0:${PORTSDIR}/graphics/p5-SWF-File .else PLIST_SUB+= REDIRECTOR="@comment " .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 .include Index: head/mail/rspamd/distinfo =================================================================== --- head/mail/rspamd/distinfo (revision 399465) +++ head/mail/rspamd/distinfo (revision 399466) @@ -1,2 +1,2 @@ -SHA256 (rspamd-1.0.5.tar.xz) = 0a020e572515c276ef82352dea4a698e22552c941d3c4c3c379e1f3a163a11df -SIZE (rspamd-1.0.5.tar.xz) = 1159360 +SHA256 (rspamd-1.0.6.tar.xz) = 95ba042c5e539406d13aafee2af4b42fe277a1c7201f1498215bfcc8b63557ac +SIZE (rspamd-1.0.6.tar.xz) = 1160492 Index: head/mail/rspamd/files/patch-src-libcryptobox-CMakeLists.txt =================================================================== --- head/mail/rspamd/files/patch-src-libcryptobox-CMakeLists.txt (revision 399465) +++ head/mail/rspamd/files/patch-src-libcryptobox-CMakeLists.txt (nonexistent) @@ -1,36 +0,0 @@ -diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt -index 80e922f..ccdfba2 100644 ---- src/libcryptobox/CMakeLists.txt -+++ src/libcryptobox/CMakeLists.txt -@@ -9,6 +9,9 @@ SET(POLYSRC ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/poly1305.c) - SET(SIPHASHSRC ${CMAKE_CURRENT_SOURCE_DIR}/siphash/siphash.c - ${CMAKE_CURRENT_SOURCE_DIR}/siphash/ref.c) - -+SET(CURVESRC ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/ref.c -+ ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519.c) -+ - # For now we support only x86_64 architecture with optimizations - IF(${ARCH} STREQUAL "x86_64") - SET(ASM_CODE "vpaddq %ymm0, %ymm0, %ymm0") -@@ -41,19 +44,14 @@ IF(${ARCH} STREQUAL "x86_64") - ASM_OP(HAVE_DOLLARMACRO "dollar macro convention") - - SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-64.c) -+ SET(CURVESRC ${CURVESRC} ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna-c64.c) - ELSEIF(${ARCH} STREQUAL "i386") - SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-32.c) -- -+ SET(CURVESRC ${CURVESRC} ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna.c) - ELSE() -- SET(CURVESRC ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/ref.c) - SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-32.c) - ENDIF() - --SET(CURVESRC ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna-c64.c -- ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna.c -- ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/ref.c -- ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519.c) -- - IF(HAVE_AVX2) - SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx2.S) - SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/avx2.S) Property changes on: head/mail/rspamd/files/patch-src-libcryptobox-CMakeLists.txt ___________________________________________________________________ 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 Index: head/mail/rspamd/files/patch-src-libutil-addr.c =================================================================== --- head/mail/rspamd/files/patch-src-libutil-addr.c (revision 399465) +++ head/mail/rspamd/files/patch-src-libutil-addr.c (nonexistent) @@ -1,30 +0,0 @@ -diff --git a/src/libutil/addr.c b/src/libutil/addr.c -index 5958e9e..7d0d5fe 100644 ---- src/libutil/addr.c -+++ src/libutil/addr.c -@@ -279,7 +279,7 @@ static gboolean - rspamd_parse_unix_path (rspamd_inet_addr_t **target, const char *src) - { - gchar **tokens, **cur_tok, *p, *pwbuf; -- gint pwlen; -+ glong pwlen; - struct passwd pw, *ppw; - struct group gr, *pgr; - rspamd_inet_addr_t *addr; -@@ -299,8 +299,15 @@ rspamd_parse_unix_path (rspamd_inet_addr_t **target, const char *src) - addr->u.un->group = (gid_t)-1; - - cur_tok = &tokens[1]; -+#ifdef _SC_GETPW_R_SIZE_MAX - pwlen = sysconf (_SC_GETPW_R_SIZE_MAX); -- g_assert (pwlen > 0); -+ if (pwlen <= 0) { -+ pwlen = 8192; -+ } -+#else -+ pwlen = 8192; -+#endif -+ - pwbuf = g_alloca (pwlen); - - while (*cur_tok) { Property changes on: head/mail/rspamd/files/patch-src-libutil-addr.c ___________________________________________________________________ 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