diff options
| -rw-r--r-- | mail/rspamd/Makefile | 48 | ||||
| -rw-r--r-- | mail/rspamd/PLIST | 71 | ||||
| -rw-r--r-- | mail/rspamd/distinfo | 11 | ||||
| -rw-r--r-- | mail/rspamd/patches/patch-src_CMakeLists.txt | 15 |
4 files changed, 118 insertions, 27 deletions
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 81e933b5e70..329bda80df0 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2016/07/09 06:38:31 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2016/08/27 15:07:42 wiz Exp $ -DISTNAME= rspamd-0.9.10 -PKGREVISION= 4 +DISTNAME= rspamd-1.3.4 CATEGORIES= mail MASTER_SITES= http://www.rspamd.com/downloads/ EXTRACT_SUFX= .tar.xz @@ -11,8 +10,10 @@ HOMEPAGE= https://www.rspamd.com/ COMMENT= Fast, free and open-source spam filtering system LICENSE= 2-clause-bsd +DEPENDS+= ragel-[0-9]*:../../devel/ragel + USE_CMAKE= yes -USE_TOOLS+= perl pkg-config +USE_TOOLS+= perl:run pkg-config USE_LANGUAGES= c99 CPPFLAGS.SunOS+= -D__EXTENSIONS__ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd @@ -25,33 +26,54 @@ CMAKE_ARGS+= -DMANDIR:PATH=${PREFIX}/${PKGMANDIR} CMAKE_ARGS+= -DCONFDIR:PATH=${EGDIR} CMAKE_ARGS+= -DENABLE_LUAJIT=OFF -MAKE_DIRS+= ${PKG_SYSCONFDIR}/lua -MAKE_DIRS+= ${PKG_SYSCONFDIR}/lua/regexp +REPLACE_PERL+= utils/rspamd_stats.pl + +MAKE_DIRS+= ${PKG_SYSCONFDIR}/modules.d CONF_FILES= ${EGDIR}/2tld.inc ${PKG_SYSCONFDIR}/2tld.inc CONF_FILES+= ${EGDIR}/common.conf ${PKG_SYSCONFDIR}/common.conf CONF_FILES+= ${EGDIR}/composites.conf ${PKG_SYSCONFDIR}/composites.conf CONF_FILES+= ${EGDIR}/logging.inc ${PKG_SYSCONFDIR}/logging.inc -CONF_FILES+= ${EGDIR}/lua/hfilter.lua ${PKG_SYSCONFDIR}/lua/hfilter.lua -CONF_FILES+= ${EGDIR}/lua/regexp/drugs.lua ${PKG_SYSCONFDIR}/lua/regexp/drugs.lua -CONF_FILES+= ${EGDIR}/lua/regexp/fraud.lua ${PKG_SYSCONFDIR}/lua/regexp/fraud.lua -CONF_FILES+= ${EGDIR}/lua/regexp/headers.lua ${PKG_SYSCONFDIR}/lua/regexp/headers.lua -CONF_FILES+= ${EGDIR}/lua/regexp/lotto.lua ${PKG_SYSCONFDIR}/lua/regexp/lotto.lua -CONF_FILES+= ${EGDIR}/lua/rspamd.classifiers.lua ${PKG_SYSCONFDIR}/lua/rspamd.classifiers.lua -CONF_FILES+= ${EGDIR}/lua/rspamd.lua ${PKG_SYSCONFDIR}/lua/rspamd.lua CONF_FILES+= ${EGDIR}/metrics.conf ${PKG_SYSCONFDIR}/metrics.conf +CONF_FILES+= ${EGDIR}/mime_types.inc ${PKG_SYSCONFDIR}/mime_types.inc CONF_FILES+= ${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf +CONF_FILES+= ${EGDIR}/modules.d/chartable.conf ${PKG_SYSCONFDIR}/modules.d/chartable.conf +CONF_FILES+= ${EGDIR}/modules.d/dkim.conf ${PKG_SYSCONFDIR}/modules.d/dkim.conf +CONF_FILES+= ${EGDIR}/modules.d/dmarc.conf ${PKG_SYSCONFDIR}/modules.d/dmarc.conf +CONF_FILES+= ${EGDIR}/modules.d/emails.conf ${PKG_SYSCONFDIR}/modules.d/emails.conf +CONF_FILES+= ${EGDIR}/modules.d/forged_recipients.conf ${PKG_SYSCONFDIR}/modules.d/forged_recipients.conf +CONF_FILES+= ${EGDIR}/modules.d/fuzzy_check.conf ${PKG_SYSCONFDIR}/modules.d/fuzzy_check.conf +CONF_FILES+= ${EGDIR}/modules.d/hfilter.conf ${PKG_SYSCONFDIR}/modules.d/hfilter.conf +CONF_FILES+= ${EGDIR}/modules.d/ip_score.conf ${PKG_SYSCONFDIR}/modules.d/ip_score.conf +CONF_FILES+= ${EGDIR}/modules.d/maillist.conf ${PKG_SYSCONFDIR}/modules.d/maillist.conf +CONF_FILES+= ${EGDIR}/modules.d/mime_types.conf ${PKG_SYSCONFDIR}/modules.d/mime_types.conf +CONF_FILES+= ${EGDIR}/modules.d/multimap.conf ${PKG_SYSCONFDIR}/modules.d/multimap.conf +CONF_FILES+= ${EGDIR}/modules.d/once_received.conf ${PKG_SYSCONFDIR}/modules.d/once_received.conf +CONF_FILES+= ${EGDIR}/modules.d/phishing.conf ${PKG_SYSCONFDIR}/modules.d/phishing.conf +CONF_FILES+= ${EGDIR}/modules.d/ratelimit.conf ${PKG_SYSCONFDIR}/modules.d/ratelimit.conf +CONF_FILES+= ${EGDIR}/modules.d/rbl.conf ${PKG_SYSCONFDIR}/modules.d/rbl.conf +CONF_FILES+= ${EGDIR}/modules.d/regexp.conf ${PKG_SYSCONFDIR}/modules.d/regexp.conf +CONF_FILES+= ${EGDIR}/modules.d/rspamd_update.conf ${PKG_SYSCONFDIR}/modules.d/rspamd_update.conf +CONF_FILES+= ${EGDIR}/modules.d/spf.conf ${PKG_SYSCONFDIR}/modules.d/spf.conf +CONF_FILES+= ${EGDIR}/modules.d/surbl.conf ${PKG_SYSCONFDIR}/modules.d/surbl.conf +CONF_FILES+= ${EGDIR}/modules.d/whitelist.conf ${PKG_SYSCONFDIR}/modules.d/whitelist.conf CONF_FILES+= ${EGDIR}/options.inc ${PKG_SYSCONFDIR}/options.inc +CONF_FILES+= ${EGDIR}/redirectors.inc ${PKG_SYSCONFDIR}/redirectors.inc CONF_FILES+= ${EGDIR}/rspamd.conf ${PKG_SYSCONFDIR}/rspamd.conf +CONF_FILES+= ${EGDIR}/rspamd.systemd.conf ${PKG_SYSCONFDIR}/rspamd.systemd.conf +CONF_FILES+= ${EGDIR}/rspamd.sysvinit.conf ${PKG_SYSCONFDIR}/rspamd.sysvinit.conf CONF_FILES+= ${EGDIR}/statistic.conf ${PKG_SYSCONFDIR}/statistic.conf +CONF_FILES+= ${EGDIR}/spf_dkim_whitelist.inc ${PKG_SYSCONFDIR}/spf_dkim_whitelist.inc CONF_FILES+= ${EGDIR}/surbl-whitelist.inc ${PKG_SYSCONFDIR}/surbl-whitelist.inc CONF_FILES+= ${EGDIR}/worker-controller.inc ${PKG_SYSCONFDIR}/worker-controller.inc +CONF_FILES+= ${EGDIR}/worker-fuzzy.inc ${PKG_SYSCONFDIR}/worker-fuzzy.inc CONF_FILES+= ${EGDIR}/worker-normal.inc ${PKG_SYSCONFDIR}/worker-normal.inc post-extract: ${FIND} ${WRKSRC}/conf -type d -exec ${CHMOD} ${PKGDIRMODE} {} \; ${FIND} ${WRKSRC}/conf -type f -exec ${CHMOD} ${DOCMODE} {} \; +.include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libevent/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../mail/gmime/buildlink3.mk" diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST index a637aa236c9..6f5109433b5 100644 --- a/mail/rspamd/PLIST +++ b/mail/rspamd/PLIST @@ -1,52 +1,105 @@ -@comment $NetBSD: PLIST,v 1.3 2015/06/05 00:49:35 wiedi Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/08/27 15:07:42 wiz Exp $ +bin/rspamadm +bin/rspamadm-${PKGVERSION} bin/rspamc bin/rspamc-${PKGVERSION} bin/rspamd bin/${PKGNAME} +bin/rspamd_stats lib/rspamd/librspamd-actrie.so +man/man1/rspamadm.1 man/man1/rspamc.1 man/man8/rspamd.8 share/examples/rspamd/2tld.inc share/examples/rspamd/common.conf share/examples/rspamd/composites.conf +share/examples/rspamd/dmarc_whitelist.inc share/examples/rspamd/logging.inc -share/examples/rspamd/lua/hfilter.lua -share/examples/rspamd/lua/regexp/drugs.lua -share/examples/rspamd/lua/regexp/fraud.lua -share/examples/rspamd/lua/regexp/headers.lua -share/examples/rspamd/lua/regexp/lotto.lua -share/examples/rspamd/lua/rspamd.classifiers.lua -share/examples/rspamd/lua/rspamd.lua share/examples/rspamd/metrics.conf +share/examples/rspamd/mime_types.inc share/examples/rspamd/modules.conf +share/examples/rspamd/modules.d/chartable.conf +share/examples/rspamd/modules.d/dkim.conf +share/examples/rspamd/modules.d/dmarc.conf +share/examples/rspamd/modules.d/emails.conf +share/examples/rspamd/modules.d/forged_recipients.conf +share/examples/rspamd/modules.d/fuzzy_check.conf +share/examples/rspamd/modules.d/hfilter.conf +share/examples/rspamd/modules.d/ip_score.conf +share/examples/rspamd/modules.d/maillist.conf +share/examples/rspamd/modules.d/mime_types.conf +share/examples/rspamd/modules.d/multimap.conf +share/examples/rspamd/modules.d/once_received.conf +share/examples/rspamd/modules.d/phishing.conf +share/examples/rspamd/modules.d/ratelimit.conf +share/examples/rspamd/modules.d/rbl.conf +share/examples/rspamd/modules.d/regexp.conf +share/examples/rspamd/modules.d/rspamd_update.conf +share/examples/rspamd/modules.d/spf.conf +share/examples/rspamd/modules.d/surbl.conf +share/examples/rspamd/modules.d/whitelist.conf share/examples/rspamd/options.inc +share/examples/rspamd/redirectors.inc share/examples/rspamd/rspamd.conf +share/examples/rspamd/rspamd.systemd.conf +share/examples/rspamd/rspamd.sysvinit.conf +share/examples/rspamd/spf_dkim_whitelist.inc share/examples/rspamd/statistic.conf share/examples/rspamd/surbl-whitelist.inc share/examples/rspamd/worker-controller.inc +share/examples/rspamd/worker-fuzzy.inc share/examples/rspamd/worker-normal.inc share/rspamd/effective_tld_names.dat +share/rspamd/lua/asn.lua +share/rspamd/lua/dcc.lua share/rspamd/lua/dmarc.lua share/rspamd/lua/emails.lua +share/rspamd/lua/fann_scores.lua share/rspamd/lua/forged_recipients.lua share/rspamd/lua/fun.lua +share/rspamd/lua/greylist.lua +share/rspamd/lua/hfilter.lua share/rspamd/lua/ip_score.lua share/rspamd/lua/maillist.lua +share/rspamd/lua/mime_types.lua share/rspamd/lua/multimap.lua share/rspamd/lua/once_received.lua share/rspamd/lua/phishing.lua share/rspamd/lua/ratelimit.lua share/rspamd/lua/rbl.lua +share/rspamd/lua/replies.lua +share/rspamd/lua/rspamd_update.lua share/rspamd/lua/settings.lua share/rspamd/lua/spamassassin.lua share/rspamd/lua/trie.lua +share/rspamd/lua/whitelist.lua +share/rspamd/rules/forwarding.lua +share/rspamd/rules/html.lua +share/rspamd/rules/http_headers.lua +share/rspamd/rules/misc.lua +share/rspamd/rules/regexp/drugs.lua +share/rspamd/rules/regexp/fraud.lua +share/rspamd/rules/regexp/headers.lua +share/rspamd/rules/regexp/lotto.lua +share/rspamd/rules/regexp/upstream_spam_filters.lua +share/rspamd/rules/rspamd.classifiers.lua +share/rspamd/rules/rspamd.lua share/rspamd/www/README.md +share/rspamd/www/css/d3evolution.css +share/rspamd/www/css/datatables.min.css +share/rspamd/www/css/glyphicons-halflings-regular.woff +share/rspamd/www/css/glyphicons-halflings-regular.woff2 share/rspamd/www/css/rspamd.css +share/rspamd/www/favicon.ico share/rspamd/www/img/asc.png share/rspamd/www/img/desc.png share/rspamd/www/img/spinner.gif share/rspamd/www/img/spinner.png share/rspamd/www/index.html -share/rspamd/www/js/jquery.paginatetable.js +share/rspamd/www/js/d3evolution.min.js +share/rspamd/www/js/d3pie.min.js +share/rspamd/www/js/datatables.min.js +share/rspamd/www/js/humanize.min.js share/rspamd/www/js/rspamd.js share/rspamd/www/plugins.txt +share/rspamd/www/react-index.html diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index 7cc86134932..67a519910e7 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.7 2015/11/03 23:27:19 agc Exp $ +$NetBSD: distinfo,v 1.8 2016/08/27 15:07:42 wiz Exp $ -SHA1 (rspamd-0.9.10.tar.xz) = bc2a247fddc3dad13f07714b4d110f355bb4423f -RMD160 (rspamd-0.9.10.tar.xz) = 21bdddd0258b6aa55b63175e751139fd766d61af -SHA512 (rspamd-0.9.10.tar.xz) = dc8984a4fdcf2cac54d493cfebb4cea292f674e10f8f4578b8d6022b132fe880e8ca3231d0365acb979745a1f9aa30f5566e742728a67cc09645315d22f91f9a -Size (rspamd-0.9.10.tar.xz) = 808764 bytes +SHA1 (rspamd-1.3.4.tar.xz) = d935810734b34d3754952bbd29dc963da9a01e87 +RMD160 (rspamd-1.3.4.tar.xz) = 2cc49d3c4a4c8cc2ce4a8baa4cfc2093d82e0730 +SHA512 (rspamd-1.3.4.tar.xz) = 41a3aa9b699ca1e40d229ebc9c3fd41ef07ad99b0badda44481fe4ff3003000069352f58379fa47013f96d98b08430a3c7bea0d97cab4a7e6db17a9084b082d6 +Size (rspamd-1.3.4.tar.xz) = 1484632 bytes +SHA1 (patch-src_CMakeLists.txt) = 7bf7ea8851cccc374c962277ff122a9c8ecddbbc diff --git a/mail/rspamd/patches/patch-src_CMakeLists.txt b/mail/rspamd/patches/patch-src_CMakeLists.txt new file mode 100644 index 00000000000..92fb4b75332 --- /dev/null +++ b/mail/rspamd/patches/patch-src_CMakeLists.txt @@ -0,0 +1,15 @@ +$NetBSD: patch-src_CMakeLists.txt,v 1.1 2016/08/27 15:07:42 wiz Exp $ + +Add librt to link line for shm_open(). + +--- src/CMakeLists.txt.orig 2016-07-23 16:14:45.000000000 +0000 ++++ src/CMakeLists.txt +@@ -140,6 +140,8 @@ TARGET_LINK_LIBRARIES(rspamd-server rspa + TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb) + TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg) + TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) ++# for shm_open ++TARGET_LINK_LIBRARIES(rspamd-server rt) + + IF (ENABLE_CLANG_PLUGIN MATCHES "ON") + ADD_DEPENDENCIES(rspamd-server rspamd-clang) |