Index: head/mail/rspamd/Makefile =================================================================== --- head/mail/rspamd/Makefile (revision 515971) +++ head/mail/rspamd/Makefile (revision 515972) @@ -1,84 +1,84 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 2.0 +PORTVERSION= 2.1 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org COMMENT= Fast spam filtering system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libpcre.so:devel/pcre \ libluajit-5.1.so:lang/luajit \ libicui18n.so:devel/icu \ libsodium.so:security/libsodium BUILD_DEPENDS= ragel:devel/ragel RUN_DEPENDS= ca_root_nss>=3.*:security/ca_root_nss USES= cmake compiler:c11 gnome perl5 pkgconfig \ sqlite ssl USE_LDCONFIG= yes USE_PERL5= build run USE_GNOME= glib20 CONFLICTS_INSTALL= rspamd-devel USERS= rspamd GROUPS= rspamd OPTIONS_DEFINE= CGP GPERF OPTIONS_DEFINE_amd64= HYPERSCAN OPTIONS_SUB= yes CGP_DESC= Install Communigate Pro(tm) helper GPERF_DESC= Google perf-tools profiling HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only) 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 USE_GITHUB= yes USE_RC_SUBR= rspamd GPERF_CMAKE_ON= -DENABLE_GPERF_TOOLS=ON GPERF_LIB_DEPENDS= libprofiler.so:devel/google-perftools HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan 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 post-install: @${MKDIR} \ ${STAGEDIR}/var/log/rspamd \ ${STAGEDIR}/var/db/rspamd \ ${STAGEDIR}/var/run/rspamd ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.conf.sample # 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 post-install-CGP-on: ${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper .include Index: head/mail/rspamd/distinfo =================================================================== --- head/mail/rspamd/distinfo (revision 515971) +++ head/mail/rspamd/distinfo (revision 515972) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570866704 -SHA256 (rspamd-rspamd-2.0_GH0.tar.gz) = 88d90c874f4256de64621b3697630c530cadc9a5194652d7ab67a9f075defe7b -SIZE (rspamd-rspamd-2.0_GH0.tar.gz) = 4230761 +TIMESTAMP = 1572306585 +SHA256 (rspamd-rspamd-2.1_GH0.tar.gz) = 9b3180b5d44dd808df09dc118b73c467991f6f71e422850bc591382835f3efcc +SIZE (rspamd-rspamd-2.1_GH0.tar.gz) = 4232297 Index: head/mail/rspamd/files/patch-src_lua_lua__regexp.c =================================================================== --- head/mail/rspamd/files/patch-src_lua_lua__regexp.c (revision 515971) +++ head/mail/rspamd/files/patch-src_lua_lua__regexp.c (nonexistent) @@ -1,28 +0,0 @@ ---- src/lua/lua_regexp.c.orig 2019-10-11 16:56:09 UTC -+++ src/lua/lua_regexp.c -@@ -889,16 +889,18 @@ lua_load_regexp (lua_State * L) - void - luaopen_regexp (lua_State * L) - { -+ if (!regexp_static_pool) { -+ regexp_static_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), -+ "regexp_lua_pool"); -+ } -+ - rspamd_lua_new_class (L, "rspamd{regexp}", regexplib_m); - lua_pop (L, 1); - rspamd_lua_add_preload (L, "rspamd_regexp", lua_load_regexp); - } - --RSPAMD_CONSTRUCTOR (lua_re_static_pool_ctor) { -- regexp_static_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), -- "regexp_lua_pool"); --} -- - RSPAMD_DESTRUCTOR (lua_re_static_pool_dtor) { -- rspamd_mempool_delete (regexp_static_pool); -+ if (regexp_static_pool) { -+ rspamd_mempool_delete (regexp_static_pool); -+ } - } -\ No newline at end of file Property changes on: head/mail/rspamd/files/patch-src_lua_lua__regexp.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 Index: head/mail/rspamd/files/patch-src_libutil_mem__pool.c =================================================================== --- head/mail/rspamd/files/patch-src_libutil_mem__pool.c (revision 515971) +++ head/mail/rspamd/files/patch-src_libutil_mem__pool.c (nonexistent) @@ -1,28 +0,0 @@ ---- src/libutil/mem_pool.c.orig 2019-10-11 16:56:09 UTC -+++ src/libutil/mem_pool.c -@@ -111,7 +111,7 @@ pool_chain_free (struct _pool_chain *chain) - chain->slice_size - occupied : 0); - } - --/* By default allocate 8Kb chunks of memory */ -+/* By default allocate 4Kb chunks of memory */ - #define FIXED_POOL_SIZE 4096 - - static inline struct rspamd_mempool_entry_point * -@@ -156,6 +156,7 @@ RSPAMD_DESTRUCTOR (rspamd_mempool_entries_dtor) - }); - - kh_destroy (mempool_entry, mempool_entries); -+ mempool_entries = NULL; - } - - static inline struct rspamd_mempool_entry_point * -@@ -676,7 +677,7 @@ rspamd_mempool_delete (rspamd_mempool_t * pool) - cur = pool->pools[RSPAMD_MEMPOOL_NORMAL]; - } - -- if (cur) { -+ if (cur && mempool_entries) { - pool->entry->elts[pool->entry->cur_elts].leftover = - pool_chain_free (cur); - Property changes on: head/mail/rspamd/files/patch-src_libutil_mem__pool.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