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: triaxx
Date: Tue Dec 21 15:00:41 UTC 2021
Modified Files:
pkgsrc/mail/rspamd: Makefile PLIST distinfo
pkgsrc/mail/rspamd/patches: patch-CMakeLists.txt
patch-cmake_Toolset.cmake
Removed Files:
pkgsrc/mail/rspamd: options.mk
Log Message:
rspamd: Update to 3.1
pkgsrc changes:
---------------
* Remove variables that are no more used by the project.
* Remove options.mk since GD is no more parameterizable.
* Accept the 4 versions of lua provided by pkgsrc since the package
successfuly build against all of them.
upstream changes:
-----------------
3.1: 01 Nov 2021
* [Feature] Add junk_threshold for autolearn
* [Feature] Add neural test command
* [Feature] Antivirus: Allow to set fake eicar patterns for testing AV engines
* [Feature] Lua_cdb: Add cdb building interface
* [Feature] Ratelimit: Add per bucket configurations
* [Feature] S3: Allow to store structured data in messagepack
* [Fix] Add concept of uncancellable events to prevent use-after-free
* [Fix] Add temporary guard to prevent linked list exploitation
* [Fix] Another rework of the ucl hashing
* [Fix] Another try to fix references safety
* [Fix] Another try to fix rspamd_text passing in the selectors
* [Fix] Avoid copy for received structure as it has raw C pointers
* [Fix] Avoid dangling reference
* [Fix] Correctly check numeric URLs in URL DNS lists
* [Fix] Delete the correct pointer type
* [Fix] Dmarc: Always lowercase domain
* [Fix] Fix compilation of the hyperscan databases with errors
* [Fix] Fix hash table lookup
* [Fix] Fix http message flag shift
* [Fix] Fix parsing of the from_hostname when it is an IP address
* [Fix] Fix parsing of the unquoted attributes in HTML
* [Fix] Fix passing of rspamd_text in selectors pipelines
* [Fix] Fix rubbish QP sequences decoding
* [Fix] Fix some complicated case with the closing tags parsing
* [Fix] Fix the case when l tag is too small
* [Fix] Html: Fix the case where only bgcolor is explicitly set
* [Fix] Libucl: Fix deletion from ucl objects
* [Fix] Namespace and add metadata for OpenMetrics, fix interleaving
* [Fix] Plug memory leak in http settings reload
* [Fix] Preserve SPF top record in the mempool variable
* [Fix] Remove aarch64 GC64 workaround
* [Fix] Remove bogus G_LIKELY
* [Fix] Spf: Do not parse non TXT DNS replies as TXT replies
* [Fix] Try to use on_connect/on_disconnect callbacks to handle internal Redis failures
* [Fix] buffer overflow in rspamc counters
* [Fix] fix static building
* [Fix] lua_scanners - message_min_words logic
* [Fix] src/lua/lua_mimepart.c: fix null dereference
* [Project] Add constant iterators
* [Project] Add helper library to handle mime strings in a more safe matter
* [Project] Add preliminary support of CDB bayes dump
* [Project] Add trim operations
* [Project] Allow mempool allocated mime strings
* [Project] Cdb: Finish backend implementation
* [Project] Cdb: Fix configuration load
* [Project] Cdb: Use shared data between cdb statfiles
* [Project] Cdb: continue statistics backend implementation
* [Project] Finish received headers rework part
* [Project] Move C++ specific declarations to C++ header
* [Project] Rework received headers parsing to C++
* [Project] Start using of the new received structure
* [Project] Start work on cdb backend
* [Rework] Further rework of the redis pool
* [Rework] Redis_pool: fix issues found
* [Rework] Rework learn and add classify condition
* [Rework] Save invisible content to a separate buffer
* [Rework] Start rewriting of the redis pool logic
* [Rules] Improve zero font rule
3.0: 19 Aug 2021
* [Conf] Align ARC scores with DKIM scores
* [CritFix] Neural: Fix sorting application
* [Feature] Add a simple dumper for bayes tokens
* [Feature] Add lua_maps.fill_config_maps function
* [Feature] Add preliminary exporter to AWS S3
* [Feature] Add preliminary restore bayes support
* [Feature] Add race condition protection against hs_helper restarts
* [Feature] Add rspamd_utf8_strcmp utility
* [Feature] Add zstd streaming API
* [Feature] Allow to log severity level explicitly
* [Feature] Allow to save and show attachment name when inserting AV scan results
* [Feature] Allow to sort urls for Lua
* [Feature] Allow to specify different timeouts/retransmits for fuzzy rules
* [Feature] Aws_s3: Allow to compress data stored
* [Feature] CMakeLists.txt: Change check and run-test to use rspamd-test-cxx * fixes #3807
* [Feature] Dmarc_report: allow sending reports in batches
* [Feature] Fuzzy_check: Allow to disable subject when making short text hash
* [Feature] Lua_cryptobox: Add keyed ssl hash functions via HMAC
* [Feature] Lua_task: Add get_urls_filtered method
* [Feature] Make monitored checks less frequent
* [Feature] Milter_headers: Add x-rspamd-pre-result header
* [Feature] Neural: Allow to balance FP/FN for the network
* [Feature] Ppopagate monitored errors from rbl module
* [Feature] Pyzor calculate score dynamically Count - WL-Count of default_score in percent
* [Feature] Rbl: Distinguish flattened and non-flattened selectors in RBL requests
* [Feature] Re-add pyzor support
* [Feature] Settings: add ip_map check and rework structure slightly
* [Feature] Spamassassin: Allow to set the default priority for SA scores
* [Feature] Strip smtp comments from message id
* [Feature] add SYSTEM_ZSTD cmake option To use the system zstd instead on the bundled version
* [Feature] external_relay plugin
* [Feature] rspamadm clickhouse neural_train subcommand
* [Fix] #3400 milter_headers: fix inverted logic for extended_headers_rcpt
* [Fix] ASN: fix _FAIL symbol for when main symbol is disabled
* [Fix] Add a special logic for text part with no text extraction
* [Fix] Add diacritics flag for several eu languages
* [Fix] Another FSM fix to accomodate possibility of multiple consequent ?
* [Fix] Avoid curse of dynamic array referencing
* [Fix] Avoid reinitialising neural settings
* [Fix] Check remain before processing TXT records
* [Fix] Enable error multiplier on http errors
* [Fix] Finally rework parsing entities logic
* [Fix] Fix '==' parsing in the content type attributes parser
* [Fix] Fix IPv6 expansion for SPF macros
* [Fix] Fix Mozilla Message-ID detection
* [Fix] Fix an edge case in BITCOIN_ADDR rule
* [Fix] Fix brain-damaged behaviour when http request has a custom Host header
* [Fix] Fix check of limits in email address parsing
* [Fix] Fix copy&paste error and rework
* [Fix] Fix expressions logic for and/or and float values
* [Fix] Fix fuzzy retransmits
* [Fix] Fix http maps with no or invalid expires data
* [Fix] Fix last quote character parsing in the content-type state machine
* [Fix] Fix normalisation flags propagation
* [Fix] Fix overflow when appending many broken tags
* [Fix] Fix parsing of rfc2047 tokens with '?' inside
* [Fix] Fix phishing flag set
* [Fix] Fix rfc2047 embedded into rfc2231 pieces in special headers
* [Fix] Fix round-robin rotation
* [Fix] Fix searching for symbols
* [Fix] Fix storing of the regexps inside variant
* [Fix] Fix tokenization near exceptions
* [Fix] Fix visibility calculations
* [Fix] Html: Attach inline tags to the structure
* [Fix] Html: Do not treat empty tags as block tags
* [Fix] Ical: Do not extract urls from all flags using merely specific ones
* [Fix] Initialise symcache even if it cannot be loaded properly
* [Fix] Lua_fuzzy: Remove text parts check when checking image dimensions
* [Fix] Lua_maps: Fix adjustments for the map type in the complex map definitions
* [Fix] Lua_task: Fix deleted symbols in has_symbol/get_symbol
* [Fix] Move metric and symcache link from validation to the init stage
* [Fix] Oletools: Another try to fix table sorting
* [Fix] One more default behaviour fix
* [Fix] Phishing: Rework urls processing
* [Fix] RBL: was missing some config schema
* [Fix] Replies: Fix 'Reply-To' handling in task:get_reply_sender
* [Fix] Rework metrics handling
* [Fix] Save symcache on exit
* [Fix] Selectors: Filter nil elements in lists
* [Fix] Selectors: Properly fix implicit tostring for nils
* [Fix] Try to fix some broken code in DMARC reporting plugin
* [Fix] Urls: Fix processing of html urls when it comes to the flags
* [Fix] Use proper buffer length
* [Fix] Various visibility fixes
* [Fix]: ASN: dns cb func should also return in case of an error
* [Project] Add a simple css rule definition
* [Project] Add css style skeleton
* [Project] Add css syntax (adopted from ebnf)
* [Project] Add css_selectors
* [Project] Add doctest unit testing library
* [Project] Add expected library
* [Project] Add fmt library for simple string ops
* [Project] Add fu2 library to better functions abstractions
* [Project] Add hashing method
* [Project] Add parsers skeleton
* [Project] Add preliminary support of vcard parser
* [Project] Add process exceptions for invisible text
* [Project] Add some methods for css parser
* [Project] Allow static libstdc++
* [Project] Another whitespace hack
* [Project] CSS: Various fixes in the declarations and values parsing
* [Project] Cpp: Add robin-hood hash map library
* [Project] Css: Add AST debug
* [Project] Css: Add colors conversion functions
* [Project] Css: Add dimensions handling
* [Project] Css: Add display value support
* [Project] Css: Add frozen library from https://github.com/serge-sans-paille/frozen/
* [Project] Css: Add opacity support
* [Project] Css: Add parser helpers to simplify debugging
* [Project] Css: Add preliminary stylesheet support
* [Project] Css: Add rules processing functions and tests
* [Project] Css: Add simple selectors unit tests
* [Project] Css: Add some c++ unit tests
* [Project] Css: Add some debug methods
* [Project] Css: Add some debug statements for the css parser
* [Project] Css: Add some logical skeleton for declarations parser
* [Project] Css: Add url/function tokens
* [Project] Css: Allow at rules parsing
* [Project] Css: Declarations parsing logic skeleton
* [Project] Css: Enable conditional css parsing support from the HTML parser
* [Project] Css: Finish generic lexer cases
* [Project] Css: Fix HSL conversion
* [Project] Css: Fix minus parsing
* [Project] Css: Fix parser consumers nesting
* [Project] Css: Fix parsing of the qualified rules
* [Project] Css: Fix rules merging
* [Project] Css: Further fixes to lexer
* [Project] Css: Further steps to parse css colors + rework
* [Project] Css: Further work on parser's methods
* [Project] Css: Implement backlog of css tokens
* [Project] Css: Implement numbers and ident parsers
* [Project] Css: Implement simple css selectors lookup
* [Project] Css: Implement styles merging
* [Project] Css: Make debug strings json like to simplify tests
* [Project] Css: Minor adjustments
* [Project] Css: More meat to the lexer
* [Project] Css: Move some of the tests to the doctest
* [Project] Css: Projected a parser
* [Project] Css: Properties attachment logic
* [Project] Css: Remove ragel from build targets (maybe keep for reference)
* [Project] Css: Rework css block structure
* [Project] Css: Rework flags of css properties
* [Project] Css: Rework tokens structure
* [Project] Css: Several fixes + tests
* [Project] Css: Simplify checks
* [Project] Css: Simplify debug code
* [Project] Css: Start css selectors parsing logic
* [Project] Css: Start semantic parsing for rules
* [Project] Css: Start stylesheet implementation
* [Project] Css: Tidy up lambdas
* [Project] Css: rework tokeniser
* [Project] Dmarc: Add dmarc report tool (WIP)
* [Project] Dmarc: Add munging configuration
* [Project] Dmarc: Add preliminary munging logic
* [Project] Dmarc: Fix header removal
* [Project] Dmarc: Fix munging logic
* [Project] Dmarc: Use full recipient address instead of a domain map
* [Project] Dmarc: Use zlists for dmarc reports
* [Project] Dmarc_report: Add message generation logic
* [Project] Dmarc_report: Add preliminary sending support
* [Project] Fix lua bindings
* [Project] Fix xml/sgml tags processing
* [Project] Handle new modification
* [Project] Html/CSS: Add transform from a CSS rule to html block
* [Project] Html/CSS: Link html and css styles
* [Project] Html/CSS: Switch styles parsing to css parser
* [Project] Html/Css: Fix some issues found
* [Project] Html/Css: Implement visibility rules for a block
* [Project] Html: Add more tests cases and fix some more corner issues
* [Project] Html: Add rows display type support
* [Project] Html: Allow decode entities function to normalise spaces + unit tests
* [Project] Html: Another rework of the tags structure
* [Project] Html: Another try to fix unbalanced cases
* [Project] Html: Fix crossing spans
* [Project] Html: Fix parent propagation
* [Project] Html: Further rework of the html parsing stuff
* [Project] Html: Implement logic for tags pairing
* [Project] Html: Implement rawtext state machine
* [Project] Html: Insert closing tags as well :(
* [Project] Html: More fixes
* [Project] Html: More fixes
* [Project] Html: More spaces logic fixes
* [Project] Html: One more attempt to write text content
* [Project] Html: Replace \0 in html content
* [Project] Html: Rework img/a tags handling
* [Project] Html: Rework propagation method
* [Project] Html: Rework tags placement
* [Project] Html: Rework transparency logic
* [Project] Html: Support 'hidden' attribute
* [Project] Html: Try another approach to append tags content
* [Project] Html: Try to deal with bad unknown tags properly
* [Project] Lua_aws: Add canonicalisation utility
* [Project] Lua_aws: Add function to produce AWS Authorisation header
* [Project] Lua_aws: Implement request signing
* [Project] Lua_mime: Add lua_mime.modify_headers routine
* [Project] Lua_task: Add modify_header method
* [Project] Lua_task: Allow to extract modified headers
* [Project] Make unescape code public for unit testing
* [Project] More fixes for closed tags
* [Project] More fixes to calculations
* [Project] Rework API for the modified headers
* [Project] Rework html visibility rule
* [Project] Skeleton of the css library
* [Project] Start headers modification API structure
* [Project] Start working on AWS Lua API
* [Project] Use lua_mime to modify headers
* [Project] Use modified headers on dkim signing
* [Project] Use string_view to constexpr variant unpacking
* [Rework] Add composites manager concept
* [Rework] Add tags definitions
* [Rework] Allow C code to be compiled with C++ compiler
* [Rework] Clickhouse: Store url flags
* [Rework] Composites: Rewrite the composites logic
* [Rework] Composites: Start rework of the composites framework
* [Rework] Dmarc: Move check policy function to the common utils
* [Rework] Dmarc: Rework reports keys structure
* [Rework] Further work to make html content private
* [Rework] Html/CSS: Remove css C bindings as they are useless now
* [Rework] Html/CSS: Rework Lua bindings
* [Rework] Html/Css: Start rework of the html blocks
* [Rework] Html: Add images processing logic
* [Rework] Html: Add traverse function
* [Rework] Html: Another steps to get rid of gnode
* [Rework] Html: Convert to variant
* [Rework] Html: Deal with the utf_content part
* [Rework] Html: Final rework part for the html processing code
* [Rework] Html: Fix Lua bindings
* [Rework] Html: Forgot to add the internal include
* [Rework] Html: Further html urls rework
* [Rework] Html: Further rework of the tags content extraction
* [Rework] Html: Make parameters as a vector again
* [Rework] Html: Move blocks part
* [Rework] Html: Move images processing stuff
* [Rework] Html: Rework lua bindings
* [Rework] Html: Start html text extraction rework
* [Rework] Html: Start refactoring of the html tags handling
* [Rework] Html: Start removing of GNode stuff
* [Rework] Html: Start rework of the html content structure
* [Rework] Lua_magic: Try to detect text parts with 8bit characters for non-utf8 encodings
* [Rework] Move HTML url functions and rework them
* [Rework] Move and adopt entities handling logic
* [Rework] Move common and rarely used dmarc code to the library
* [Rework] Move compression routines outside of rspamd_util library
* [Rework] Move entities/tags handling
* [Rework] Phishing: Split from redirectors usage
* [Rework] Redesign html blocks propagation logic
* [Rework] Remove tag name string
* [Rework] Rename phished url to a linked url
* [Rework] Reorganize dmarc plugin and remove unsupported reporting code
* [Rework] Reputation: Use more flexible types in get/set functions
* [Rework] Require proper C++ environment for Rspamd build
* [Rework] Rework extended urls output
* [Rework] Rework tags parsing machine
* [Rework] Slightly improve old regexp API
* [Rework] Start conversion of the redis pool code to c++
* [Rework] Try to resolve failed upstreams more agressively
* [Rework] Use C++ utf8 library with unit tests to trim whitespaces
* [Rework] Use C++ version for unicode normalisation
* [Rework] Use C++ version of the lua threads pool
* [Rules] Add raw addresses to MULTIPLE_FROM options
* [Rules] Another fix to HTTP_TO_HTTPS rule
* [Rules] Do not trigger HTML_SHORT_LINK_IMG on external images
* [Rules] Extend FORGED_X_MAILER
* [Rules] Extend OLD_X_MAILER
* [Rules] Fix CTYPE_MIXED_BOGUS for text attachments
* [Rules] Fix FPs for CTYPE_MIXED_BOGUS
* [Rules] Fix HTTP_TO_HTTPS rule
* [Rules] Fix HTTP_TO_HTTPS rule
* [Rules] Fix zerofont rule (partially)
* [Rules] Micro-optimize X_PHP_EVAL
* [Rules] Reduce default weight for R_MISSING_CHARSET
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/rspamd/PLIST
cvs rdiff -u -r1.39 -r1.40 pkgsrc/mail/rspamd/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/mail/rspamd/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake
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.77 pkgsrc/mail/rspamd/Makefile:1.78
--- pkgsrc/mail/rspamd/Makefile:1.77 Wed Dec 8 16:05:30 2021
+++ pkgsrc/mail/rspamd/Makefile Tue Dec 21 15:00:41 2021
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.77 2021/12/08 16:05:30 adam Exp $
+# $NetBSD: Makefile,v 1.78 2021/12/21 15:00:41 triaxx Exp $
-DISTNAME= rspamd-2.7
-PKGREVISION= 3
+DISTNAME= rspamd-3.1
CATEGORIES= mail
-MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=rspamd/}
MAINTAINER= bartosz.kuzma%gmail.com@localhost
HOMEPAGE= https://www.rspamd.com/
COMMENT= Fast, free and open-source spam filtering system
LICENSE= 2-clause-bsd
-.include "options.mk"
-
DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
DEPENDS+= ragel-[0-9]*:../../devel/ragel
+GCC_REQD+= 8
+
USE_CMAKE= yes
USE_TOOLS+= perl pkg-config
USE_LANGUAGES= c99 c++
BUILD_DEFS+= VARBASE
-# Not really true, but difficult to avoid picking up 5.3
-LUA_VERSIONS_ACCEPTED= 53
+LUA_VERSIONS_ACCEPTED= 54 53 52 51
CPPFLAGS.SunOS+= -D__EXTENSIONS__
@@ -60,10 +58,8 @@ CMAKE_ARGS+= -DCONFDIR:PATH=${PKG_SYSCON
CMAKE_ARGS+= -DEXAMPLESDIR:PATH=${EGDIR}
CMAKE_ARGS+= -DRSPAMD_USER=${RSPAMD_USER}
CMAKE_ARGS+= -DRSPAMD_GROUP=${RSPAMD_GROUP}
-CMAKE_ARGS+= -DENABLE_SQLITE=ON
# Torch requires LuaJIT2, but LuaJIT2 only supports Lua 5.1
CMAKE_ARGS+= -DENABLE_LUAJIT=OFF
-CMAKE_ARGS+= -DENABLE_TORCH=OFF
# Assumes inotify == Linux
CMAKE_ARGS.SunOS+= -DHAVE_INOTIFY_INIT=NO
Index: pkgsrc/mail/rspamd/PLIST
diff -u pkgsrc/mail/rspamd/PLIST:1.22 pkgsrc/mail/rspamd/PLIST:1.23
--- pkgsrc/mail/rspamd/PLIST:1.22 Thu Jan 21 16:53:30 2021
+++ pkgsrc/mail/rspamd/PLIST Tue Dec 21 15:00:41 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2021/01/21 16:53:30 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.23 2021/12/21 15:00:41 triaxx Exp $
bin/rspamadm
bin/rspamadm-${PKGVERSION}
bin/rspamc
@@ -32,6 +32,7 @@ share/examples/rspamd/modules.conf
share/examples/rspamd/modules.d/antivirus.conf
share/examples/rspamd/modules.d/arc.conf
share/examples/rspamd/modules.d/asn.conf
+share/examples/rspamd/modules.d/aws_s3.conf
share/examples/rspamd/modules.d/chartable.conf
share/examples/rspamd/modules.d/clickhouse.conf
share/examples/rspamd/modules.d/dcc.conf
@@ -40,6 +41,7 @@ share/examples/rspamd/modules.d/dkim_sig
share/examples/rspamd/modules.d/dmarc.conf
share/examples/rspamd/modules.d/elastic.conf
share/examples/rspamd/modules.d/emails.conf
+share/examples/rspamd/modules.d/external_relay.conf
share/examples/rspamd/modules.d/external_services.conf
share/examples/rspamd/modules.d/force_actions.conf
share/examples/rspamd/modules.d/forged_recipients.conf
@@ -151,12 +153,14 @@ share/rspamd/lualib/fun.lua
share/rspamd/lualib/global_functions.lua
share/rspamd/lualib/lpegre.lua
share/rspamd/lualib/lua_auth_results.lua
+share/rspamd/lualib/lua_aws.lua
share/rspamd/lualib/lua_bayes_learn.lua
share/rspamd/lualib/lua_cfg_transform.lua
share/rspamd/lualib/lua_clickhouse.lua
share/rspamd/lualib/lua_content/ical.lua
share/rspamd/lualib/lua_content/init.lua
share/rspamd/lualib/lua_content/pdf.lua
+share/rspamd/lualib/lua_content/vcard.lua
share/rspamd/lualib/lua_dkim_tools.lua
share/rspamd/lualib/lua_ffi/common.lua
share/rspamd/lualib/lua_ffi/dkim.lua
@@ -173,6 +177,7 @@ share/rspamd/lualib/lua_maps.lua
share/rspamd/lualib/lua_maps_expressions.lua
share/rspamd/lualib/lua_meta.lua
share/rspamd/lualib/lua_mime.lua
+share/rspamd/lualib/lua_mime_types.lua
share/rspamd/lualib/lua_redis.lua
share/rspamd/lualib/lua_scanners/avast.lua
share/rspamd/lualib/lua_scanners/clamav.lua
@@ -185,6 +190,7 @@ share/rspamd/lualib/lua_scanners/kaspers
share/rspamd/lualib/lua_scanners/kaspersky_se.lua
share/rspamd/lualib/lua_scanners/oletools.lua
share/rspamd/lualib/lua_scanners/p0f.lua
+share/rspamd/lualib/lua_scanners/pyzor.lua
share/rspamd/lualib/lua_scanners/razor.lua
share/rspamd/lualib/lua_scanners/savapi.lua
share/rspamd/lualib/lua_scanners/sophos.lua
@@ -204,6 +210,7 @@ share/rspamd/lualib/lua_urls_compose.lua
share/rspamd/lualib/lua_util.lua
share/rspamd/lualib/lua_verdict.lua
share/rspamd/lualib/lupa.lua
+share/rspamd/lualib/plugins/dmarc.lua
share/rspamd/lualib/plugins/neural.lua
share/rspamd/lualib/plugins/rbl.lua
share/rspamd/lualib/plugins_stats.lua
@@ -214,20 +221,24 @@ share/rspamd/lualib/rspamadm/confighelp.
share/rspamd/lualib/rspamadm/configwizard.lua
share/rspamd/lualib/rspamadm/cookie.lua
share/rspamd/lualib/rspamadm/corpus_test.lua
+share/rspamd/lualib/rspamadm/dmarc_report.lua
share/rspamd/lualib/rspamadm/dns_tool.lua
share/rspamd/lualib/rspamadm/fuzzy_convert.lua
share/rspamd/lualib/rspamadm/fuzzy_stat.lua
share/rspamd/lualib/rspamadm/grep.lua
share/rspamd/lualib/rspamadm/keypair.lua
share/rspamd/lualib/rspamadm/mime.lua
+share/rspamd/lualib/rspamadm/neural_test.lua
share/rspamd/lualib/rspamadm/rescore.lua
share/rspamd/lualib/rspamadm/stat_convert.lua
+share/rspamd/lualib/rspamadm/statistics_dump.lua
share/rspamd/lualib/rspamadm/template.lua
share/rspamd/lualib/rspamadm/vault.lua
share/rspamd/lualib/tableshape.lua
share/rspamd/plugins/antivirus.lua
share/rspamd/plugins/arc.lua
share/rspamd/plugins/asn.lua
+share/rspamd/plugins/aws_s3.lua
share/rspamd/plugins/bayes_expiry.lua
share/rspamd/plugins/clickhouse.lua
share/rspamd/plugins/clustering.lua
@@ -237,6 +248,7 @@ share/rspamd/plugins/dmarc.lua
share/rspamd/plugins/dynamic_conf.lua
share/rspamd/plugins/elastic.lua
share/rspamd/plugins/emails.lua
+share/rspamd/plugins/external_relay.lua
share/rspamd/plugins/external_services.lua
share/rspamd/plugins/force_actions.lua
share/rspamd/plugins/forged_recipients.lua
@@ -326,7 +338,7 @@ share/rspamd/www/js/lib/d3evolution.min.
share/rspamd/www/js/lib/d3pie.min.js
share/rspamd/www/js/lib/fontawesome.min.js
share/rspamd/www/js/lib/footable.min.js
-share/rspamd/www/js/lib/jquery-3.5.1.min.js
+share/rspamd/www/js/lib/jquery-3.6.0.min.js
share/rspamd/www/js/lib/jquery.stickytabs.min.js
share/rspamd/www/js/lib/linenumbers.min.js
share/rspamd/www/js/lib/nprogress.min.js
Index: pkgsrc/mail/rspamd/distinfo
diff -u pkgsrc/mail/rspamd/distinfo:1.39 pkgsrc/mail/rspamd/distinfo:1.40
--- pkgsrc/mail/rspamd/distinfo:1.39 Tue Oct 26 10:54:27 2021
+++ pkgsrc/mail/rspamd/distinfo Tue Dec 21 15:00:41 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2021/10/26 10:54:27 nia Exp $
+$NetBSD: distinfo,v 1.40 2021/12/21 15:00:41 triaxx Exp $
-BLAKE2s (rspamd-2.7.tar.gz) = 16338aef6040183803d06ac4e0598af0f4ee4d4d91e200491b9b00d4b9293781
-SHA512 (rspamd-2.7.tar.gz) = 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
-Size (rspamd-2.7.tar.gz) = 5126227 bytes
-SHA1 (patch-CMakeLists.txt) = 16f653a7bea23cd2440ebf730c5c7879af395f62
-SHA1 (patch-cmake_Toolset.cmake) = d4900720b85a8e3078c4fdaa76757fcbbd4f89bd
+BLAKE2s (rspamd-3.1.tar.gz) = d23e3aba1974e31236295171e7d74df624497c9ab11c8d8ebfe95830b70d9d7a
+SHA512 (rspamd-3.1.tar.gz) = 3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
+Size (rspamd-3.1.tar.gz) = 5566920 bytes
+SHA1 (patch-CMakeLists.txt) = e50137fb3c2d467a8c880491e5d34d475e1a8d05
+SHA1 (patch-cmake_Toolset.cmake) = fbc4027fedb4261ce913701ebbb32d8395bc7783
SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6
Index: pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt
diff -u pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.6 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.7
--- pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.6 Wed Oct 7 00:04:40 2020
+++ pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt Tue Dec 21 15:00:41 2021
@@ -1,22 +1,48 @@
-$NetBSD: patch-CMakeLists.txt,v 1.6 2020/10/07 00:04:40 schmonz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.7 2021/12/21 15:00:41 triaxx Exp $
For pkgsrc. Install config files to examples directory.
Find lua more reliably.
---- CMakeLists.txt.orig 2020-09-30 19:27:23.000000000 +0000
+--- CMakeLists.txt.orig 2021-11-01 14:33:30.000000000 +0000
+++ CMakeLists.txt
-@@ -146,8 +146,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
+@@ -155,7 +155,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
"include/lua53"
"include/lua"
ROOT ${LUA_ROOT}
- MODULES lua53
-- OPTIONAL)
-+ MODULES lua-5.3)
++ MODULES lua-5.3
+ OPTIONAL)
IF (NOT WITH_LIBLUA)
- ProcessPackage(LIBLUA LIBRARY "lua"
-@@ -684,9 +683,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
- "${CMAKE_SOURCE_DIR}/conf/*" )
+@@ -168,7 +168,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
+ "include/lua54"
+ "include/lua"
+ ROOT ${LUA_ROOT}
+- MODULES lua54
++ MODULES lua-5.4
+ OPTIONAL)
+ IF (NOT WITH_LIBLUA)
+ ProcessPackage(LIBLUA LIBRARY "lua"
+@@ -180,7 +180,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
+ "include/lua52"
+ "include/lua"
+ ROOT ${LUA_ROOT}
+- MODULES lua52
++ MODULES lua-5.2
+ OPTIONAL)
+
+ IF (NOT WITH_LIBLUA)
+@@ -192,7 +192,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
+ "include/lua51"
+ "include/lua"
+ ROOT ${LUA_ROOT}
+- MODULES lua51)
++ MODULES lua-5.1)
+ ENDIF()
+ ENDIF()
+ ENDIF()
+@@ -677,9 +677,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
+ "${CMAKE_SOURCE_DIR}/conf/*.inc" )
FOREACH(CONF_FILE ${CONF_FILES})
GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH)
- INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${CONFDIR}/${_rp})")
Index: pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake
diff -u pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake:1.1 pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake:1.2
--- pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake:1.1 Mon May 18 11:10:56 2020
+++ pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake Tue Dec 21 15:00:41 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-cmake_Toolset.cmake,v 1.1 2020/05/18 11:10:56 nia Exp $
+$NetBSD: patch-cmake_Toolset.cmake,v 1.2 2021/12/21 15:00:41 triaxx Exp $
Avoid specifying a custom linker:
gcc: error: unrecognized command line option '-fuse-ld=lld'; did you mean '-fuse-ld=bfd'?
---- cmake/Toolset.cmake.orig 2020-04-01 13:57:55.000000000 +0000
+--- cmake/Toolset.cmake.orig 2021-11-01 14:33:30.000000000 +0000
+++ cmake/Toolset.cmake
-@@ -41,8 +41,8 @@ endif ()
+@@ -52,8 +52,8 @@ endif ()
option(LINKER_NAME "Linker name or full path")
Home |
Main Index |
Thread Index |
Old Index