pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/mail/rspamd



Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb 17 15:01:33 UTC 2017

Modified Files:
        pkgsrc/mail/rspamd: Makefile PLIST distinfo
        pkgsrc/mail/rspamd/patches: patch-src_CMakeLists.txt

Log Message:
Updated rspamd to 1.4.3 based on changes in wip by Bartosz Kuzma.

1.4.3:
        * [CritFix] Backport PTR_ARRAY_FOREACH fix
        * [CritFix] Fix descriptors leak on reload
        * [Feature] Add `caseless_hash` method to `lua_util`
        * [Feature] Use t1ha for hashes, allow inlining
        * [Feature] Use t1ha instead of metrohash and xxhash32
        * [Fix] Another try to fix descriptors leak
        * [Fix] Another try to fix reload and logger
        * [Fix] Avoid extensive reallocs
        * [Fix] Avoid race condition on saving cache and reload
        * [Fix] Backport redis pool fixes from master
        * [Fix] Break pool connection on fatal redis errors
        * [Fix] Fix argument returned on redis backend errors
        * [Fix] Fix errors handling in fuzzy backend initialization
        * [Fix] Fix race condition in SIGUSR2 handler
        * [Fix] Fix reload and hyperscan ready event
        * [Fix] More fixes to logger initialization
        * [Fix] Plug memory leak in learning fuzzy storage

1.4.2:
        * [CritFix] Deal with absent headers in DKIM
        * [CritFix] Do not trust remote shingles count
        * [CritFix] Fix headers selection in DKIM verification
        * [Feature] Add EXT_CSS rule
        * [Feature] Add toggle for disabling SURBLs
        * [Feature] Extend redis lock when learning spawned
        * [Feature] Parse <link> HTML tags
        * [Fix] Avoid reusing g_error (Fixes #1262)
        * [Fix] Do not reset loaded ANN when learning is requested
        * [Fix] Fix another issue with external deps in SA
        * [Fix] Fix body trie matching
        * [Fix] Fix checking of DKIM bodies that needs just `\n` to be added
        * [Fix] Fix fuzzy hashes count
        * [Fix] Fix keys names
        * [Fix] Fix length calculations for url encoded urls
        * [Fix] Fix matching of the same patterns from different tries
        * [Fix] Fix name of var
        * [Fix] Fix parsing of URLs with spaces and other bad chars
        * [Fix] Fix probability calculations for fuzzy redis backend
        * [Fix] Fix signing headers creation in DKIM
        * [Fix] Plug memory leak
        * [Fix] Really fix chained SA dependencies
        * [Fix] Really increase lock lifetime
        * [Fix] Use checksum to avoid intersection between different ANNs
        * [Fix] Use rspamd hashes in embedded ucl
        * [Fix] Yet another change for testing external deps

1.4.1:
        * [Feature] ASN support in Clickhouse module
        * [Feature] Add clickhouse plugin
        * [Feature] Add generic tool to add universal maps for lua modules
        * [Feature] Add logger.debugm to debug lua modules
        * [Feature] Allow to register metrics symbols using register_symbol
        * [Feature] Allow to specify prefix for fann_redis
        * [Feature] Clickhouse: support different masks for IPv4/IPv6
        * [Feature] Support forcing action in antivirus plugin
        * [Fix] Add handling of regexp maps
        * [Fix] Allow backslashes in http urls
        * [Fix] Avoid mapping of empty files
        * [Fix] Do not load tld file to speed up rspamadm
        * [Fix] Do not resolve numeric IP addresses due to ipv6 insanity
        * [Fix] Filter incorrect training data
        * [Fix] Fix Fuzzyconvert tool when password or DB is given
        * [Fix] Fix build with custom glib/gmime
        * [Fix] Fix converting of learn count from sqlite to redis
        * [Fix] Fix crashes with invalid received and task:set_from_ip
        * [Fix] Fix external dependencies for SA module
        * [Fix] Fix fann_redis when number of scores has been changed
        * [Fix] Fix hyperscan usage for non compatible platforms
        * [Fix] Fix loading of maps from UCL objects
        * [Fix] Fix memory leak for task-less redis requests
        * [Fix] Fix mid module with new maps syntax
        * [Fix] Fix parsing of URLs with username
        * [Fix] Fix re cache initialisation
        * [Fix] Fix replacements to sanitize '%' character
        * [Fix] Fix set and regexp like static maps
        * [Fix] Fix some issues in redis settings
        * [Fix] Fix static IP maps
        * [Fix] Fix total learns counter for redis stats
        * [Fix] Fix usage of config during reload
        * [Fix] Fix various warnings and issues
        * [Fix] Invalidate ANN if training data is incorrect
        * [Fix] Miltiple fixes to fann_redis module
        * [Fix] More fixes for URLs with backslashes
        * [Fix] Properly get options for ip_score module
        * [Fix] Relax requirements for Received as gmail cannot RFC
        * [Fix] Remove or fix hyperscan incompatible regexps
        * [Fix] Settings: correctly read redis config
        * [Rework] Rework lua logger interface slightly
        * [Rework] Use new maps add function

1.4.0:
        * [CritFix] Add guards for inactive redis connections
        * [CritFix] Another fix for proxying files using rspamd_proxy
        * [CritFix] Cleanup inactive redis connections
        * [CritFix] Do not sometimes try to exec posfilters before classification
        * [CritFix] Fix application of IPv6 mask
        * [CritFix] Fix chunked encoding when reading messages
        * [CritFix] Fix file mode for rspamd_proxy
        * [CritFix] Fix hyperscan compilation on regexp change
        * [CritFix] Fix issue with finding of end of lines pointers
        * [CritFix] Fix iteration over headers array (introduced in 1.4)
        * [CritFix] Fix processing of learned tokens count for redis backend
        * [CritFix] Fix race condition in checking of cached maps
        * [CritFix] Fix workers scripts by sharing workers configs
        * [CritFix] Introduce raw content to text parts
        * [CritFix] Plug memory leak and potential memory corruption
        * [Feature] Adaptive ratelimits
        * [Feature] Add ASN -> rbldnsd script for asn.rspamd.com
        * [Feature] Add DMARC_NA symbol
        * [Feature] Add F-Prot support to antivirus module
        * [Feature] Add HTTP backend to metadata exporter
        * [Feature] Add Lua API module for monitored objects
        * [Feature] Add R_DKIM_NA / R_SPF_NA / AUTH_NA symbols
        * [Feature] Add R_DKIM_PERMFAIL symbol
        * [Feature] Add R_SPF_PERMFAIL symbol
        * [Feature] Add Sophos antivirus support
        * [Feature] Add ZSTD compression to Lua API
        * [Feature] Add `mid` Lua module
        * [Feature] Add `one_param` flag for metric symbols
        * [Feature] Add a generic lua classifier
        * [Feature] Add a very basic interface to access workers data from on_load
        * [Feature] Add ability to delete a hash by its data to fuzzy_check plugin
        * [Feature] Add ability to enable/disable symbols via dynamic_conf
        * [Feature] Add ability to lookup settings by key
        * [Feature] Add common way to disable Lua modules
        * [Feature] Add compression support to rspamd client
        * [Feature] Add condition to do antiviral check
        * [Feature] Add configuration for lua classifiers
        * [Feature] Add configuration knobs for the errors circular buffer
        * [Feature] Add decompression support in rspamd client
        * [Feature] Add errors exporter to the controller
        * [Feature] Add expected value for monitored DNS resources
        * [Feature] Add exporter from error ringbuf to ucl
        * [Feature] Add extended version for fann creation function
        * [Feature] Add ffi friendly version of process_regexp function
        * [Feature] Add frequency and time display to webui
        * [Feature] Add fuzzy_delhash command to rspamc client
        * [Feature] Add implementation of redis connections pool
        * [Feature] Add latency and offline time monitoring
        * [Feature] Add learning support for lua classifiers
        * [Feature] Add max-size and timeout options to CGP helper
        * [Feature] Add method to enable/disable symbols in config
        * [Feature] Add methods to get metric's actions and symbols from Lua
        * [Feature] Add mmap support to lua_text
        * [Feature] Add monitored object for surbl plugin
        * [Feature] Add more exceptions to surbl whitelist
        * [Feature] Add more meta-tokens to bayes
        * [Feature] Add neural net classifier to fann_scores module
        * [Feature] Add neural net serialization/deserialization
        * [Feature] Add new dynamic conf module
        * [Feature] Add periodic events support for lua_config
        * [Feature] Add plugin to check MX'es for the sender's domain
        * [Feature] Add preliminary monitored module
        * [Feature] Add preliminary support of dynamic conf updates in Redis
        * [Feature] Add preliminary version of clamav plugin
        * [Feature] Add redis cache to asn module
        * [Feature] Add replies compression
        * [Feature] Add spamhaus DROP dnsbl
        * [Feature] Add support for dictionary in client compression
        * [Feature] Add support for fuzzy learn and unlearn from lua
        * [Feature] Add support for input encryption
        * [Feature] Add support of min_learns to neural net classifier
        * [Feature] Add termination callbacks for workers
        * [Feature] Add user-agent for rspamc
        * [Feature] Add utility to perform classifier tests
        * [Feature] Add zstd compression library
        * [Feature] Allow HTTPS requests in lua_http
        * [Feature] Allow conditions for pre and postfilters
        * [Feature] Allow custom functions for ratelimits
        * [Feature] Allow for excluding messages from AV scanning based on size
        * [Feature] Allow for getting worker stats from Lua
        * [Feature] Allow getting task UID from Lua
        * [Feature] Allow parsing of mailbox messages from the commandline
        * [Feature] Allow plugins to publish their lua API via rspamd_plugins
        * [Feature] Allow to compare other systems with Rspamd
        * [Feature] Allow to execute Lua scripts by controller
        * [Feature] Allow to have a function to set custom greylist message
        * [Feature] Allow to iterate over multiple tags
        * [Feature] Allow to pass extra data from plugins to log helper
        * [Feature] Allow to plan new periodics at different time
        * [Feature] Allow to reset hashes
        * [Feature] Allow to run rspamadm lua just as a lua interpreter
        * [Feature] Allow to store settings in redis
        * [Feature] Allow to update dynamic conf in Redis
        * [Feature] Allow to use dictionaries for compression
        * [Feature] Allow to use md5, sha1, sha256, sha384 and sha512 hashes in Lua
        * [Feature] Allow whitelisting by IP for greylisting plugin
        * [Feature] Antivirus: Support whitelists & pattern-matching sig names
        * [Feature] Backport pack/unpack routines from Lua 5.3
        * [Feature] Check settings with equal priopities in alphabetical order
        * [Feature] Compress neural net in redis
        * [Feature] Consider more tags when doing WHITE_ON_WHITE rule
        * [Feature] Descriptive options for DMARC failure symbols
        * [Feature] Descriptive options for RBL symbols
        * [Feature] Enable configuration for monitored objects
        * [Feature] Execute on_load scripts with ev_base ready
        * [Feature] Fann scores now uses metadata from a message
        * [Feature] Implement FANN threaded learning
        * [Feature] Implement classifying for lua classifiers
        * [Feature] Implement finish scripts for worker processes
        * [Feature] Implement monitoring for DNS resources
        * [Feature] Implement real priorities for pre and post filters
        * [Feature] Insert two symbols: FANN_HAM and FANN_SPAM instead of one
        * [Feature] Module to push metadata/messages to redis pubsub
        * [Feature] Monitor RBL records
        * [Feature] Move fann_classifier to a separate plugin
        * [Feature] Normalize all ANN inputs
        * [Feature] Preliminary version of metric exporter module
        * [Feature] Preserve decompression context between tasks
        * [Feature] Ratelimit: Support dynamic bucket size/leak rate
        * [Feature] Relax FORGED_RECIPIENTS: allow senders to BCC themselves
        * [Feature] Remove symbols weights on composites processing
        * [Feature] Return symbol scores when getting resulting symbols
        * [Feature] Rework lua tcp module
        * [Feature] Rule to detect some obvious X-PHP-Originating-Script forgeries
        * [Feature] Rule to identify some X-PHP-Script forgeries
        * [Feature] Rules for scoring Google Message-ID fixes
        * [Feature] Send hashes values to reply
        * [Feature] Set expire for dmarc reports
        * [Feature] Stop using cymru zone as it is unstable
        * [Feature] Stop using of GLists for headers, improve performance
        * [Feature] Store `for` in task:get_received_headers
        * [Feature] Store `for` part in received headers
        * [Feature] Store enabled flag for webui session
        * [Feature] Store error messages in ring buffer
        * [Feature] Support compressed maps
        * [Feature] Support excluding selected users from ratelimits
        * [Feature] Support looking up NS records in lua_dns
        * [Feature] Support modern style SURBL configuration
        * [Feature] Support multiple hashes in delhash path
        * [Feature] Support new messages in rspamc
        * [Feature] Support requests without reads in lua_tcp
        * [Feature] Support setting task message from Lua
        * [Feature] Track visibility of HTML elements
        * [Feature] Try to add CRLF when checking DKIM
        * [Feature] Try to guess line endings when folding headers
        * [Feature] Try to improve normalization function for bayes
        * [Feature] Use FFI to optimize SA module
        * [Feature] Use length based arguments for redis, allow lua_text as arg
        * [Feature] Use more layers for fann and another normalization
        * [Feature] User-defined ratelimits
        * [Feature] Utility to convert fuzzy storage from sqlite to redis
        * [Feature] Yield DMARC_DNSFAIL on lookup failure
        * [Fix] Adopt fuzzy storage for flexible backends
        * [Fix] Allow plain IP addresses in Rspamd maps
        * [Fix] Another fix for brain-damaged hiredis
        * [Fix] Another fix for rdns write errors
        * [Fix] Another fix for rdns_make_request_full invocation
        * [Fix] Another fix in DKIM canonicalization
        * [Fix] Another memory leak plugged
        * [Fix] Another try to deal with posix idiotizm
        * [Fix] Another try to fix RDNS events processing logic
        * [Fix] Avoid double frees in HEAD requests
        * [Fix] Avoid extra symbols for RBLs
        * [Fix] Banish table.maxn from Lua parts
        * [Fix] Check for socket error before connection in lua_tcp
        * [Fix] Correctly propagate redis timeouts to Lua
        * [Fix] Do not add extra newline in MIME mode
        * [Fix] Do not be cheated by system hiredis
        * [Fix] Do not classify when a message has not enough tokens
        * [Fix] Do not crash on redis errors
        * [Fix] Do not distinguish NXDOMAIN and NOREC for monitored
        * [Fix] Do not replan retransmits if merely one server is defined
        * [Fix] Do not use headers to calculate messages digests
        * [Fix] Don't force action in replies module for authenticated users/local networks
        * [Fix] Explicitly ban default passwords in webui
        * [Fix] Finally fix ambiguity between parsed and resolved spf elts
        * [Fix] Fix 'decoded' value in task:get_header_full()
        * [Fix] Fix DKIM calculations
        * [Fix] Fix DKIM signing for messages with no newline at the end
        * [Fix] Fix DNS request in monitored
        * [Fix] Fix DNS write errors processing
        * [Fix] Fix HTTP methods other than GET and POST
        * [Fix] Fix PERMFAIL for v6/v4 ambiguities
        * [Fix] Fix absurdic scores for HFILTER_URL_ONLY
        * [Fix] Fix actions in rolling history
        * [Fix] Fix actrie patterns
        * [Fix] Fix applying of lua dynamic confg
        * [Fix] Fix autolearning errors and redis cache
        * [Fix] Fix bayes learn_condition
        * [Fix] Fix build with the recent OpenSSL
        * [Fix] Fix caching and compressed maps
        * [Fix] Fix check plain text part
        * [Fix] Fix crash on OpenBSD in `url_email_start`
        * [Fix] Fix double free in SPF
        * [Fix] Fix extraction of shingles from redis fuzzy storage
        * [Fix] Fix false sharing for symbols in the cache
        * [Fix] Fix float usage in util:get_time
        * [Fix] Fix folding algorithm to deal with empty tokens
        * [Fix] Fix format string
        * [Fix] Fix format string usage in controller errors handling
        * [Fix] Fix handling of '\0' in lua_tcp
        * [Fix] Fix handling of HTTP HEAD methods
        * [Fix] Fix hash creation
        * [Fix] Fix hiredis stupidity
        * [Fix] Fix implicit settings module settingsup
        * [Fix] Fix interaction with lua GC to avoid craches
        * [Fix] Fix ip_score module registration
        * [Fix] Fix issue with empty messages and dkim
        * [Fix] Fix issues with CGP helper
        * [Fix] Fix issues with the recent SPF changes
        * [Fix] Fix key name to load ANN correctly
        * [Fix] Fix lua tcp module by saving `do_read` in callback data
        * [Fix] Fix memory leak in client when using compression
        * [Fix] Fix min_learns option
        * [Fix] Fix on_finish scripts and async handlers
        * [Fix] Fix options for SPF dnsfail symbol
        * [Fix] Fix parsing includes and redirects in SPF
        * [Fix] Fix parsing of lua comments with empty lines
        * [Fix] Fix parsing of unquoted HTML attributes
        * [Fix] Fix periodic events and redis
        * [Fix] Fix processing of fuzzy learns from Lua
        * [Fix] Fix processing of redirect in SPF includes
        * [Fix] Fix processing of symbols when reject limit is reached
        * [Fix] Fix refcounts when map is specified by IP
        * [Fix] Fix rspamd{session} class in Lua API
        * [Fix] Fix setting ratelimit key for 'ip' bucket
        * [Fix] Fix some cases of TLD urls detector
        * [Fix] Fix statconvert tool
        * [Fix] Fix stats for backend-less classifiers
        * [Fix] Fix training script for fann_redis
        * [Fix] Fix variable in ann module
        * [Fix] Fix various errors in lua dynamic conf plugin
        * [Fix] Forget old ANN when max_usages is reached to avoid overtrain
        * [Fix] Further canonicalization fixes
        * [Fix] Further fixes for fann_redis prefixes
        * [Fix] Handle failures for inactive pooled connections
        * [Fix] Improve multimap info message
        * [Fix] More fixes in ANN loading
        * [Fix] More fixes to fann_redis
        * [Fix] More issues in fann_redis
        * [Fix] More spaces fix in DKIM signature
        * [Fix] Multiple fixes to asn script, add IPv6 support
        * [Fix] Multiple issues in fann_redis
        * [Fix] No greylist rejected messages
        * [Fix] One more attempt to fix lua_redis
        * [Fix] One more check for readdir...
        * [Fix] Params should be treated as a hash
        * [Fix] Plug memory leak in regexp desctructor
        * [Fix] Process headers only once
        * [Fix] Properly handle nil values in ratelimit plugin
        * [Fix] Really fix redis shingles check
        * [Fix] Remove fann with incorrect layers count
        * [Fix] Remove mentions of deleted include
        * [Fix] Remove some incompatible functions
        * [Fix] Settings: fix `authenticated` parameter (#886)
        * [Fix] Skip MX check for authenticated users and local networks
        * [Fix] Slightly fix ANN routines
        * [Fix] Stop caching records with DNS failures
        * [Fix] Treat all errors in redis_pool as fatal errors for a connection
        * [Fix] Try avoid false-positives in HEADER_FORGED_MDN rule
        * [Fix] Try to avoid race condition when using rrd
        * [Fix] Try to reload redis scripts if they are missing
        * [Fix] Unbreak once_received skipping for local networks
        * [Fix] Unlock ANN on error
        * [Fix] Use memmove for overlapping regions
        * [Fix] Use real size instead of displayed for core limits
        * [Fix] Use the correct macro to get the size of control
        * [Fix] Various fixes for errors ringbuffer
        * [Fix] Yield R_SPF_DNSFAIL if lookup of included record fails
        * [Fix] mid: fix map initialization
        * [Fix] mid: handle incorrect rgexps in the map
        * [Rework] Add extract training data function to fann_redis
        * [Rework] Add preliminary train tests
        * [Rework] Add redis storage feature to fann_redis
        * [Rework] Adopt fuzzy storage for abstract backend
        * [Rework] Adopt plugins
        * [Rework] First reiteration on fann scores
        * [Rework] Implement loading/invalidating
        * [Rework] Make lua_redis task agnostic
        * [Rework] Make rspamd protocol messages useful
        * [Rework] Massive removal of legacy code
        * [Rework] More cleanup actions
        * [Rework] Remove legacy code never used for classifiers
        * [Rework] Remove outdated and unused lua_session module
        * [Rework] Reorganize fuzzy backend structure
        * [Rework] Reorganize the internal backend structure
        * [Rework] Restore old fann_scores, move common parts
        * [Rework] Rework and simplify rbl plugin
        * [Rework] Rework parsing of DMARC records


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/rspamd/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/rspamd/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.22 pkgsrc/mail/rspamd/Makefile:1.23
--- pkgsrc/mail/rspamd/Makefile:1.22    Sun Dec  4 05:17:33 2016
+++ pkgsrc/mail/rspamd/Makefile Fri Feb 17 15:01:33 2017
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2016/12/04 05:17:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2017/02/17 15:01:33 wiz Exp $
 
-DISTNAME=      rspamd-1.3.5
-PKGREVISION=   1
+DISTNAME=      rspamd-1.4.3
 CATEGORIES=    mail
 MASTER_SITES=  http://www.rspamd.com/downloads/
 EXTRACT_SUFX=  .tar.xz
 
-MAINTAINER=    wiedi%frubar.net@localhost
+MAINTAINER=    bartosz.kuzma%gmail.com@localhost
 HOMEPAGE=      https://www.rspamd.com/
 COMMENT=       Fast, free and open-source spam filtering system
 LICENSE=       2-clause-bsd
@@ -14,72 +13,117 @@ LICENSE=   2-clause-bsd
 DEPENDS+=      ragel-[0-9]*:../../devel/ragel
 
 USE_CMAKE=     yes
-USE_TOOLS+=    perl:run pkg-config
+USE_TOOLS+=    perl pkg-config
 USE_LANGUAGES= c99
+BUILD_DEFS+=   VARBASE
+
+LUA_VERSIONS_ACCEPTED= 53
+
 CPPFLAGS.SunOS+=       -D__EXTENSIONS__
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd
 TEST_TARGET=   run-test
 
+RSPAMD_USER?=  rspamd
+RSPAMD_GROUP?= rspamd
+PKG_GROUPS=    ${RSPAMD_GROUP}
+PKG_USERS=     ${RSPAMD_USER}:${RSPAMD_GROUP}
+
+PKG_GROUPS_VARS=       RSPAMD_GROUP
+PKG_USERS_VARS=                RSPAMD_USER
+
+PKG_GECOS.${RSPAMD_USER}=      rspamd user
+
 PKG_SYSCONFSUBDIR=     rspamd
 EGDIR=         ${PREFIX}/share/examples/${PKGBASE}
+LOGDIR=                ${VARBASE}/log/rspamd
+DBDIR=         ${VARBASE}/db/rspamd
+RUNDIR=                ${VARBASE}/run/rspamd
 
 CMAKE_ARGS+=   -DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+=   -DCONFDIR:PATH=${EGDIR}
+CMAKE_ARGS+=   -DLOGDIR:PATH=${LOGDIR}
+CMAKE_ARGS+=   -DRUNDIR:PATH=${VARBASE}/run/rspamd
+CMAKE_ARGS+=   -DDBDIR:PATH=${DBDIR}
+CMAKE_ARGS+=   -DCONFDIR:PATH=${PKG_SYSCONFDIR}
+CMAKE_ARGS+=   -DRSPAMD_USER=${RSPAMD_USER}
+CMAKE_ARGS+=   -DRSPAMD_GROUP=${RSPAMD_GROUP}
 CMAKE_ARGS+=   -DENABLE_LUAJIT=OFF
 
 REPLACE_PERL+= utils/rspamd_stats.pl
 
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/modules.d
 
+OWN_DIRS_PERMS+=       ${DBDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0700
+OWN_DIRS_PERMS+=       ${LOGDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0750
+OWN_DIRS_PERMS+=       ${RUNDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0755
+
 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}/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
+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
+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
 
 post-extract:
        ${FIND} ${WRKSRC}/conf -type d -exec ${CHMOD} ${PKGDIRMODE} {} \;
        ${FIND} ${WRKSRC}/conf -type f -exec ${CHMOD} ${DOCMODE} {} \;
 
+.include "../../databases/hiredis/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../mail/gmime/buildlink3.mk"
-.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/libevent/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
-.include "../../databases/hiredis/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/rspamd/PLIST
diff -u pkgsrc/mail/rspamd/PLIST:1.4 pkgsrc/mail/rspamd/PLIST:1.5
--- pkgsrc/mail/rspamd/PLIST:1.4        Sat Aug 27 15:07:42 2016
+++ pkgsrc/mail/rspamd/PLIST    Fri Feb 17 15:01:33 2017
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2016/08/27 15:07:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/02/17 15:01:33 wiz Exp $
 bin/rspamadm
 bin/rspamadm-${PKGVERSION}
 bin/rspamc
 bin/rspamc-${PKGVERSION}
 bin/rspamd
-bin/${PKGNAME}
+bin/rspamd-${PKGVERSION}
 bin/rspamd_stats
 lib/rspamd/librspamd-actrie.so
 man/man1/rspamadm.1
@@ -15,24 +15,29 @@ share/examples/rspamd/common.conf
 share/examples/rspamd/composites.conf
 share/examples/rspamd/dmarc_whitelist.inc
 share/examples/rspamd/logging.inc
+share/examples/rspamd/maillist.inc
 share/examples/rspamd/metrics.conf
+share/examples/rspamd/mid.inc
 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/fann_redis.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/mid.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/redis.conf
 share/examples/rspamd/modules.d/regexp.conf
 share/examples/rspamd/modules.d/rspamd_update.conf
 share/examples/rspamd/modules.d/spf.conf
@@ -50,10 +55,15 @@ share/examples/rspamd/worker-controller.
 share/examples/rspamd/worker-fuzzy.inc
 share/examples/rspamd/worker-normal.inc
 share/rspamd/effective_tld_names.dat
+share/rspamd/lua/antivirus.lua
 share/rspamd/lua/asn.lua
+share/rspamd/lua/clickhouse.lua
 share/rspamd/lua/dcc.lua
 share/rspamd/lua/dmarc.lua
+share/rspamd/lua/dynamic_conf.lua
 share/rspamd/lua/emails.lua
+share/rspamd/lua/fann_classifier.lua
+share/rspamd/lua/fann_redis.lua
 share/rspamd/lua/fann_scores.lua
 share/rspamd/lua/forged_recipients.lua
 share/rspamd/lua/fun.lua
@@ -61,8 +71,12 @@ share/rspamd/lua/greylist.lua
 share/rspamd/lua/hfilter.lua
 share/rspamd/lua/ip_score.lua
 share/rspamd/lua/maillist.lua
+share/rspamd/lua/metadata_exporter.lua
+share/rspamd/lua/metric_exporter.lua
+share/rspamd/lua/mid.lua
 share/rspamd/lua/mime_types.lua
 share/rspamd/lua/multimap.lua
+share/rspamd/lua/mx_check.lua
 share/rspamd/lua/once_received.lua
 share/rspamd/lua/phishing.lua
 share/rspamd/lua/ratelimit.lua
@@ -76,30 +90,42 @@ share/rspamd/lua/whitelist.lua
 share/rspamd/rules/forwarding.lua
 share/rspamd/rules/html.lua
 share/rspamd/rules/http_headers.lua
+share/rspamd/rules/mid.lua
 share/rspamd/rules/misc.lua
+share/rspamd/rules/regexp/compromised_hosts.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/misc.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/bootstrap.min.css
 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/fonts/glyphicons-halflings-regular.ttf
+share/rspamd/www/fonts/glyphicons-halflings-regular.woff
+share/rspamd/www/fonts/glyphicons-halflings-regular.woff2
 share/rspamd/www/img/asc.png
 share/rspamd/www/img/desc.png
+share/rspamd/www/img/rspamd_logo_navbar.png
 share/rspamd/www/img/spinner.gif
 share/rspamd/www/img/spinner.png
 share/rspamd/www/index.html
+share/rspamd/www/js/bootstrap.min.js
+share/rspamd/www/js/d3.min.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/jquery-3.1.1.min.js
+share/rspamd/www/js/jquery.cookie.min.js
 share/rspamd/www/js/rspamd.js
 share/rspamd/www/plugins.txt
 share/rspamd/www/react-index.html

Index: pkgsrc/mail/rspamd/distinfo
diff -u pkgsrc/mail/rspamd/distinfo:1.9 pkgsrc/mail/rspamd/distinfo:1.10
--- pkgsrc/mail/rspamd/distinfo:1.9     Sat Nov  5 10:34:25 2016
+++ pkgsrc/mail/rspamd/distinfo Fri Feb 17 15:01:33 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2016/11/05 10:34:25 wiz Exp $
+$NetBSD: distinfo,v 1.10 2017/02/17 15:01:33 wiz Exp $
 
-SHA1 (rspamd-1.3.5.tar.xz) = 3471af33cd8a40aa85e53167f376acf59716e07e
-RMD160 (rspamd-1.3.5.tar.xz) = 9c6933cff9fd136602b40b70c3b2576f36697e59
-SHA512 (rspamd-1.3.5.tar.xz) = 6d7223c6be6e49296a5228d3d05a5f8dfd4a4002df9d247740bce75f2f652a01d86c30456b8475d08d529d2787aa30191713961ffc82c380c00612cae371b61c
-Size (rspamd-1.3.5.tar.xz) = 1483044 bytes
-SHA1 (patch-src_CMakeLists.txt) = 7bf7ea8851cccc374c962277ff122a9c8ecddbbc
+SHA1 (rspamd-1.4.3.tar.xz) = b8f4de5a908ea5106e2e260732c10c22e18dd87f
+RMD160 (rspamd-1.4.3.tar.xz) = daf7f374518dd6ee3f912db1452112522bb09df5
+SHA512 (rspamd-1.4.3.tar.xz) = bae86953d881be446f049384cc8bf8451b04619b461a7e2d571407d5af5f2547af8bc9db578e84190e8c55d01f9e32ea1d29e998daa2bbb2fac431ed50df27ca
+Size (rspamd-1.4.3.tar.xz) = 1780104 bytes
+SHA1 (patch-CMakeLists.txt) = 81b847220b8c8736b13209fb5bedf0020a8d7acf
+SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a

Index: pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt:1.1 pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt:1.2
--- pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt:1.1     Sat Aug 27 15:07:42 2016
+++ pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt Fri Feb 17 15:01:33 2017
@@ -1,15 +1,16 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2016/08/27 15:07:42 wiz Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.2 2017/02/17 15:01:33 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.orig    2016-10-17 14:30:59.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)
+@@ -141,6 +141,9 @@ TARGET_LINK_LIBRARIES(rspamd-server rspa
  TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+ 
 +# for shm_open
 +TARGET_LINK_LIBRARIES(rspamd-server rt)
- 
++
  IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
        ADD_DEPENDENCIES(rspamd-server rspamd-clang)
+ ENDIF()



Home | Main Index | Thread Index | Old Index