Tue Dec 21 15:00:41 2021 UTC ()
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


(triaxx)
diff -r1.77 -r1.78 pkgsrc/mail/rspamd/Makefile
diff -r1.22 -r1.23 pkgsrc/mail/rspamd/PLIST
diff -r1.39 -r1.40 pkgsrc/mail/rspamd/distinfo
diff -r1.2 -r0 pkgsrc/mail/rspamd/options.mk
diff -r1.6 -r1.7 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt
diff -r1.1 -r1.2 pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake
cvs diff -r1.77 -r1.78 pkgsrc/mail/rspamd/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/Makefile 2021/12/08 16:05:30 1.77
+++ pkgsrc/mail/rspamd/Makefile 2021/12/21 15:00:41 1.78
@@ -1,37 +1,35 @@ @@ -1,37 +1,35 @@
1# $NetBSD: Makefile,v 1.77 2021/12/08 16:05:30 adam Exp $ 1# $NetBSD: Makefile,v 1.78 2021/12/21 15:00:41 triaxx Exp $
2 2
3DISTNAME= rspamd-2.7 3DISTNAME= rspamd-3.1
4PKGREVISION= 3 
5CATEGORIES= mail 4CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=rspamd/}
7 6
8MAINTAINER= bartosz.kuzma@gmail.com 7MAINTAINER= bartosz.kuzma@gmail.com
9HOMEPAGE= https://www.rspamd.com/ 8HOMEPAGE= https://www.rspamd.com/
10COMMENT= Fast, free and open-source spam filtering system 9COMMENT= Fast, free and open-source spam filtering system
11LICENSE= 2-clause-bsd 10LICENSE= 2-clause-bsd
12 11
13.include "options.mk" 
14 
15DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg 12DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
16DEPENDS+= ragel-[0-9]*:../../devel/ragel 13DEPENDS+= ragel-[0-9]*:../../devel/ragel
17 14
 15GCC_REQD+= 8
 16
18USE_CMAKE= yes 17USE_CMAKE= yes
19USE_TOOLS+= perl pkg-config 18USE_TOOLS+= perl pkg-config
20USE_LANGUAGES= c99 c++ 19USE_LANGUAGES= c99 c++
21BUILD_DEFS+= VARBASE 20BUILD_DEFS+= VARBASE
22 21
23# Not really true, but difficult to avoid picking up 5.3 22LUA_VERSIONS_ACCEPTED= 54 53 52 51
24LUA_VERSIONS_ACCEPTED= 53 
25 23
26CPPFLAGS.SunOS+= -D__EXTENSIONS__ 24CPPFLAGS.SunOS+= -D__EXTENSIONS__
27 25
28CMAKE_INSTALL_NAME_DIR= ${PREFIX}/lib/rspamd 26CMAKE_INSTALL_NAME_DIR= ${PREFIX}/lib/rspamd
29LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd 27LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd
30TEST_TARGET= run-test 28TEST_TARGET= run-test
31 29
32RSPAMD_USER?= rspamd 30RSPAMD_USER?= rspamd
33RSPAMD_GROUP?= rspamd 31RSPAMD_GROUP?= rspamd
34PKG_GROUPS= ${RSPAMD_GROUP} 32PKG_GROUPS= ${RSPAMD_GROUP}
35PKG_USERS= ${RSPAMD_USER}:${RSPAMD_GROUP} 33PKG_USERS= ${RSPAMD_USER}:${RSPAMD_GROUP}
36 34
37PKG_GROUPS_VARS= RSPAMD_GROUP 35PKG_GROUPS_VARS= RSPAMD_GROUP
@@ -50,30 +48,28 @@ FILES_SUBST+= RSPAMD_USER=${RSPAMD_USER} @@ -50,30 +48,28 @@ FILES_SUBST+= RSPAMD_USER=${RSPAMD_USER}
50FILES_SUBST+= RSPAMD_GROUP=${RSPAMD_GROUP} 48FILES_SUBST+= RSPAMD_GROUP=${RSPAMD_GROUP}
51 49
52RCD_SCRIPTS= rspamd 50RCD_SCRIPTS= rspamd
53SMF_METHODS= rspamd 51SMF_METHODS= rspamd
54 52
55CMAKE_ARGS+= -DMANDIR:PATH=${PREFIX}/${PKGMANDIR} 53CMAKE_ARGS+= -DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
56CMAKE_ARGS+= -DLOGDIR:PATH=${LOGDIR} 54CMAKE_ARGS+= -DLOGDIR:PATH=${LOGDIR}
57CMAKE_ARGS+= -DRUNDIR:PATH=${VARBASE}/run/rspamd 55CMAKE_ARGS+= -DRUNDIR:PATH=${VARBASE}/run/rspamd
58CMAKE_ARGS+= -DDBDIR:PATH=${DBDIR} 56CMAKE_ARGS+= -DDBDIR:PATH=${DBDIR}
59CMAKE_ARGS+= -DCONFDIR:PATH=${PKG_SYSCONFDIR} 57CMAKE_ARGS+= -DCONFDIR:PATH=${PKG_SYSCONFDIR}
60CMAKE_ARGS+= -DEXAMPLESDIR:PATH=${EGDIR} 58CMAKE_ARGS+= -DEXAMPLESDIR:PATH=${EGDIR}
61CMAKE_ARGS+= -DRSPAMD_USER=${RSPAMD_USER} 59CMAKE_ARGS+= -DRSPAMD_USER=${RSPAMD_USER}
62CMAKE_ARGS+= -DRSPAMD_GROUP=${RSPAMD_GROUP} 60CMAKE_ARGS+= -DRSPAMD_GROUP=${RSPAMD_GROUP}
63CMAKE_ARGS+= -DENABLE_SQLITE=ON 
64# Torch requires LuaJIT2, but LuaJIT2 only supports Lua 5.1 61# Torch requires LuaJIT2, but LuaJIT2 only supports Lua 5.1
65CMAKE_ARGS+= -DENABLE_LUAJIT=OFF 62CMAKE_ARGS+= -DENABLE_LUAJIT=OFF
66CMAKE_ARGS+= -DENABLE_TORCH=OFF 
67 63
68# Assumes inotify == Linux 64# Assumes inotify == Linux
69CMAKE_ARGS.SunOS+= -DHAVE_INOTIFY_INIT=NO 65CMAKE_ARGS.SunOS+= -DHAVE_INOTIFY_INIT=NO
70 66
71REPLACE_PERL+= utils/rspamd_stats.pl 67REPLACE_PERL+= utils/rspamd_stats.pl
72 68
73MAKE_DIRS+= ${PKG_SYSCONFDIR}/maps.d 69MAKE_DIRS+= ${PKG_SYSCONFDIR}/maps.d
74MAKE_DIRS+= ${PKG_SYSCONFDIR}/modules.d 70MAKE_DIRS+= ${PKG_SYSCONFDIR}/modules.d
75MAKE_DIRS+= ${PKG_SYSCONFDIR}/scores.d 71MAKE_DIRS+= ${PKG_SYSCONFDIR}/scores.d
76 72
77OWN_DIRS_PERMS+= ${DBDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0700 73OWN_DIRS_PERMS+= ${DBDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0700
78OWN_DIRS_PERMS+= ${LOGDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0750 74OWN_DIRS_PERMS+= ${LOGDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0750
79OWN_DIRS_PERMS+= ${RUNDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0755 75OWN_DIRS_PERMS+= ${RUNDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0755
cvs diff -r1.22 -r1.23 pkgsrc/mail/rspamd/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/PLIST 2021/01/21 16:53:30 1.22
+++ pkgsrc/mail/rspamd/PLIST 2021/12/21 15:00:41 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.22 2021/01/21 16:53:30 triaxx Exp $ 1@comment $NetBSD: PLIST,v 1.23 2021/12/21 15:00:41 triaxx Exp $
2bin/rspamadm 2bin/rspamadm
3bin/rspamadm-${PKGVERSION} 3bin/rspamadm-${PKGVERSION}
4bin/rspamc 4bin/rspamc
5bin/rspamc-${PKGVERSION} 5bin/rspamc-${PKGVERSION}
6bin/rspamd 6bin/rspamd
7bin/${PKGNAME} 7bin/${PKGNAME}
8bin/rspamd_stats 8bin/rspamd_stats
9lib/rspamd/librspamd-actrie.so 9lib/rspamd/librspamd-actrie.so
10lib/rspamd/librspamd-ev.so 10lib/rspamd/librspamd-ev.so
11lib/rspamd/librspamd-kann.so 11lib/rspamd/librspamd-kann.so
12lib/rspamd/librspamd-replxx.so 12lib/rspamd/librspamd-replxx.so
13lib/rspamd/librspamd-server.so 13lib/rspamd/librspamd-server.so
14man/man1/rspamadm.1 14man/man1/rspamadm.1
@@ -22,34 +22,36 @@ share/examples/rspamd/groups.conf @@ -22,34 +22,36 @@ share/examples/rspamd/groups.conf
22share/examples/rspamd/logging.inc 22share/examples/rspamd/logging.inc
23share/examples/rspamd/maps.d/dmarc_whitelist.inc 23share/examples/rspamd/maps.d/dmarc_whitelist.inc
24share/examples/rspamd/maps.d/maillist.inc 24share/examples/rspamd/maps.d/maillist.inc
25share/examples/rspamd/maps.d/mid.inc 25share/examples/rspamd/maps.d/mid.inc
26share/examples/rspamd/maps.d/mime_types.inc 26share/examples/rspamd/maps.d/mime_types.inc
27share/examples/rspamd/maps.d/redirectors.inc 27share/examples/rspamd/maps.d/redirectors.inc
28share/examples/rspamd/maps.d/spf_dkim_whitelist.inc 28share/examples/rspamd/maps.d/spf_dkim_whitelist.inc
29share/examples/rspamd/maps.d/surbl-whitelist.inc 29share/examples/rspamd/maps.d/surbl-whitelist.inc
30share/examples/rspamd/metrics.conf 30share/examples/rspamd/metrics.conf
31share/examples/rspamd/modules.conf 31share/examples/rspamd/modules.conf
32share/examples/rspamd/modules.d/antivirus.conf 32share/examples/rspamd/modules.d/antivirus.conf
33share/examples/rspamd/modules.d/arc.conf 33share/examples/rspamd/modules.d/arc.conf
34share/examples/rspamd/modules.d/asn.conf 34share/examples/rspamd/modules.d/asn.conf
 35share/examples/rspamd/modules.d/aws_s3.conf
35share/examples/rspamd/modules.d/chartable.conf 36share/examples/rspamd/modules.d/chartable.conf
36share/examples/rspamd/modules.d/clickhouse.conf 37share/examples/rspamd/modules.d/clickhouse.conf
37share/examples/rspamd/modules.d/dcc.conf 38share/examples/rspamd/modules.d/dcc.conf
38share/examples/rspamd/modules.d/dkim.conf 39share/examples/rspamd/modules.d/dkim.conf
39share/examples/rspamd/modules.d/dkim_signing.conf 40share/examples/rspamd/modules.d/dkim_signing.conf
40share/examples/rspamd/modules.d/dmarc.conf 41share/examples/rspamd/modules.d/dmarc.conf
41share/examples/rspamd/modules.d/elastic.conf 42share/examples/rspamd/modules.d/elastic.conf
42share/examples/rspamd/modules.d/emails.conf 43share/examples/rspamd/modules.d/emails.conf
 44share/examples/rspamd/modules.d/external_relay.conf
43share/examples/rspamd/modules.d/external_services.conf 45share/examples/rspamd/modules.d/external_services.conf
44share/examples/rspamd/modules.d/force_actions.conf 46share/examples/rspamd/modules.d/force_actions.conf
45share/examples/rspamd/modules.d/forged_recipients.conf 47share/examples/rspamd/modules.d/forged_recipients.conf
46share/examples/rspamd/modules.d/fuzzy_check.conf 48share/examples/rspamd/modules.d/fuzzy_check.conf
47share/examples/rspamd/modules.d/greylist.conf 49share/examples/rspamd/modules.d/greylist.conf
48share/examples/rspamd/modules.d/hfilter.conf 50share/examples/rspamd/modules.d/hfilter.conf
49share/examples/rspamd/modules.d/history_redis.conf 51share/examples/rspamd/modules.d/history_redis.conf
50share/examples/rspamd/modules.d/http_headers.conf 52share/examples/rspamd/modules.d/http_headers.conf
51share/examples/rspamd/modules.d/maillist.conf 53share/examples/rspamd/modules.d/maillist.conf
52share/examples/rspamd/modules.d/metadata_exporter.conf 54share/examples/rspamd/modules.d/metadata_exporter.conf
53share/examples/rspamd/modules.d/metric_exporter.conf 55share/examples/rspamd/modules.d/metric_exporter.conf
54share/examples/rspamd/modules.d/mid.conf 56share/examples/rspamd/modules.d/mid.conf
55share/examples/rspamd/modules.d/milter_headers.conf 57share/examples/rspamd/modules.d/milter_headers.conf
@@ -141,112 +143,122 @@ share/rspamd/languages/sr.json @@ -141,112 +143,122 @@ share/rspamd/languages/sr.json
141share/rspamd/languages/stop_words 143share/rspamd/languages/stop_words
142share/rspamd/languages/sv.json 144share/rspamd/languages/sv.json
143share/rspamd/languages/sw.json 145share/rspamd/languages/sw.json
144share/rspamd/languages/tr.json 146share/rspamd/languages/tr.json
145share/rspamd/languages/uk.json 147share/rspamd/languages/uk.json
146share/rspamd/languages/ur.json 148share/rspamd/languages/ur.json
147share/rspamd/languages/vi.json 149share/rspamd/languages/vi.json
148share/rspamd/lualib/ansicolors.lua 150share/rspamd/lualib/ansicolors.lua
149share/rspamd/lualib/argparse.lua 151share/rspamd/lualib/argparse.lua
150share/rspamd/lualib/fun.lua 152share/rspamd/lualib/fun.lua
151share/rspamd/lualib/global_functions.lua 153share/rspamd/lualib/global_functions.lua
152share/rspamd/lualib/lpegre.lua 154share/rspamd/lualib/lpegre.lua
153share/rspamd/lualib/lua_auth_results.lua 155share/rspamd/lualib/lua_auth_results.lua
 156share/rspamd/lualib/lua_aws.lua
154share/rspamd/lualib/lua_bayes_learn.lua 157share/rspamd/lualib/lua_bayes_learn.lua
155share/rspamd/lualib/lua_cfg_transform.lua 158share/rspamd/lualib/lua_cfg_transform.lua
156share/rspamd/lualib/lua_clickhouse.lua 159share/rspamd/lualib/lua_clickhouse.lua
157share/rspamd/lualib/lua_content/ical.lua 160share/rspamd/lualib/lua_content/ical.lua
158share/rspamd/lualib/lua_content/init.lua 161share/rspamd/lualib/lua_content/init.lua
159share/rspamd/lualib/lua_content/pdf.lua 162share/rspamd/lualib/lua_content/pdf.lua
 163share/rspamd/lualib/lua_content/vcard.lua
160share/rspamd/lualib/lua_dkim_tools.lua 164share/rspamd/lualib/lua_dkim_tools.lua
161share/rspamd/lualib/lua_ffi/common.lua 165share/rspamd/lualib/lua_ffi/common.lua
162share/rspamd/lualib/lua_ffi/dkim.lua 166share/rspamd/lualib/lua_ffi/dkim.lua
163share/rspamd/lualib/lua_ffi/init.lua 167share/rspamd/lualib/lua_ffi/init.lua
164share/rspamd/lualib/lua_ffi/linalg.lua 168share/rspamd/lualib/lua_ffi/linalg.lua
165share/rspamd/lualib/lua_ffi/spf.lua 169share/rspamd/lualib/lua_ffi/spf.lua
166share/rspamd/lualib/lua_fuzzy.lua 170share/rspamd/lualib/lua_fuzzy.lua
167share/rspamd/lualib/lua_lexer.lua 171share/rspamd/lualib/lua_lexer.lua
168share/rspamd/lualib/lua_magic/heuristics.lua 172share/rspamd/lualib/lua_magic/heuristics.lua
169share/rspamd/lualib/lua_magic/init.lua 173share/rspamd/lualib/lua_magic/init.lua
170share/rspamd/lualib/lua_magic/patterns.lua 174share/rspamd/lualib/lua_magic/patterns.lua
171share/rspamd/lualib/lua_magic/types.lua 175share/rspamd/lualib/lua_magic/types.lua
172share/rspamd/lualib/lua_maps.lua 176share/rspamd/lualib/lua_maps.lua
173share/rspamd/lualib/lua_maps_expressions.lua 177share/rspamd/lualib/lua_maps_expressions.lua
174share/rspamd/lualib/lua_meta.lua 178share/rspamd/lualib/lua_meta.lua
175share/rspamd/lualib/lua_mime.lua 179share/rspamd/lualib/lua_mime.lua
 180share/rspamd/lualib/lua_mime_types.lua
176share/rspamd/lualib/lua_redis.lua 181share/rspamd/lualib/lua_redis.lua
177share/rspamd/lualib/lua_scanners/avast.lua 182share/rspamd/lualib/lua_scanners/avast.lua
178share/rspamd/lualib/lua_scanners/clamav.lua 183share/rspamd/lualib/lua_scanners/clamav.lua
179share/rspamd/lualib/lua_scanners/common.lua 184share/rspamd/lualib/lua_scanners/common.lua
180share/rspamd/lualib/lua_scanners/dcc.lua 185share/rspamd/lualib/lua_scanners/dcc.lua
181share/rspamd/lualib/lua_scanners/fprot.lua 186share/rspamd/lualib/lua_scanners/fprot.lua
182share/rspamd/lualib/lua_scanners/icap.lua 187share/rspamd/lualib/lua_scanners/icap.lua
183share/rspamd/lualib/lua_scanners/init.lua 188share/rspamd/lualib/lua_scanners/init.lua
184share/rspamd/lualib/lua_scanners/kaspersky_av.lua 189share/rspamd/lualib/lua_scanners/kaspersky_av.lua
185share/rspamd/lualib/lua_scanners/kaspersky_se.lua 190share/rspamd/lualib/lua_scanners/kaspersky_se.lua
186share/rspamd/lualib/lua_scanners/oletools.lua 191share/rspamd/lualib/lua_scanners/oletools.lua
187share/rspamd/lualib/lua_scanners/p0f.lua 192share/rspamd/lualib/lua_scanners/p0f.lua
 193share/rspamd/lualib/lua_scanners/pyzor.lua
188share/rspamd/lualib/lua_scanners/razor.lua 194share/rspamd/lualib/lua_scanners/razor.lua
189share/rspamd/lualib/lua_scanners/savapi.lua 195share/rspamd/lualib/lua_scanners/savapi.lua
190share/rspamd/lualib/lua_scanners/sophos.lua 196share/rspamd/lualib/lua_scanners/sophos.lua
191share/rspamd/lualib/lua_scanners/spamassassin.lua 197share/rspamd/lualib/lua_scanners/spamassassin.lua
192share/rspamd/lualib/lua_scanners/vadesecure.lua 198share/rspamd/lualib/lua_scanners/vadesecure.lua
193share/rspamd/lualib/lua_scanners/virustotal.lua 199share/rspamd/lualib/lua_scanners/virustotal.lua
194share/rspamd/lualib/lua_selectors/common.lua 200share/rspamd/lualib/lua_selectors/common.lua
195share/rspamd/lualib/lua_selectors/extractors.lua 201share/rspamd/lualib/lua_selectors/extractors.lua
196share/rspamd/lualib/lua_selectors/init.lua 202share/rspamd/lualib/lua_selectors/init.lua
197share/rspamd/lualib/lua_selectors/maps.lua 203share/rspamd/lualib/lua_selectors/maps.lua
198share/rspamd/lualib/lua_selectors/transforms.lua 204share/rspamd/lualib/lua_selectors/transforms.lua
199share/rspamd/lualib/lua_settings.lua 205share/rspamd/lualib/lua_settings.lua
200share/rspamd/lualib/lua_smtp.lua 206share/rspamd/lualib/lua_smtp.lua
201share/rspamd/lualib/lua_stat.lua 207share/rspamd/lualib/lua_stat.lua
202share/rspamd/lualib/lua_tcp_sync.lua 208share/rspamd/lualib/lua_tcp_sync.lua
203share/rspamd/lualib/lua_urls_compose.lua 209share/rspamd/lualib/lua_urls_compose.lua
204share/rspamd/lualib/lua_util.lua 210share/rspamd/lualib/lua_util.lua
205share/rspamd/lualib/lua_verdict.lua 211share/rspamd/lualib/lua_verdict.lua
206share/rspamd/lualib/lupa.lua 212share/rspamd/lualib/lupa.lua
 213share/rspamd/lualib/plugins/dmarc.lua
207share/rspamd/lualib/plugins/neural.lua 214share/rspamd/lualib/plugins/neural.lua
208share/rspamd/lualib/plugins/rbl.lua 215share/rspamd/lualib/plugins/rbl.lua
209share/rspamd/lualib/plugins_stats.lua 216share/rspamd/lualib/plugins_stats.lua
210share/rspamd/lualib/rescore_utility.lua 217share/rspamd/lualib/rescore_utility.lua
211share/rspamd/lualib/rspamadm/clickhouse.lua 218share/rspamd/lualib/rspamadm/clickhouse.lua
212share/rspamd/lualib/rspamadm/configgraph.lua 219share/rspamd/lualib/rspamadm/configgraph.lua
213share/rspamd/lualib/rspamadm/confighelp.lua 220share/rspamd/lualib/rspamadm/confighelp.lua
214share/rspamd/lualib/rspamadm/configwizard.lua 221share/rspamd/lualib/rspamadm/configwizard.lua
215share/rspamd/lualib/rspamadm/cookie.lua 222share/rspamd/lualib/rspamadm/cookie.lua
216share/rspamd/lualib/rspamadm/corpus_test.lua 223share/rspamd/lualib/rspamadm/corpus_test.lua
 224share/rspamd/lualib/rspamadm/dmarc_report.lua
217share/rspamd/lualib/rspamadm/dns_tool.lua 225share/rspamd/lualib/rspamadm/dns_tool.lua
218share/rspamd/lualib/rspamadm/fuzzy_convert.lua 226share/rspamd/lualib/rspamadm/fuzzy_convert.lua
219share/rspamd/lualib/rspamadm/fuzzy_stat.lua 227share/rspamd/lualib/rspamadm/fuzzy_stat.lua
220share/rspamd/lualib/rspamadm/grep.lua 228share/rspamd/lualib/rspamadm/grep.lua
221share/rspamd/lualib/rspamadm/keypair.lua 229share/rspamd/lualib/rspamadm/keypair.lua
222share/rspamd/lualib/rspamadm/mime.lua 230share/rspamd/lualib/rspamadm/mime.lua
 231share/rspamd/lualib/rspamadm/neural_test.lua
223share/rspamd/lualib/rspamadm/rescore.lua 232share/rspamd/lualib/rspamadm/rescore.lua
224share/rspamd/lualib/rspamadm/stat_convert.lua 233share/rspamd/lualib/rspamadm/stat_convert.lua
 234share/rspamd/lualib/rspamadm/statistics_dump.lua
225share/rspamd/lualib/rspamadm/template.lua 235share/rspamd/lualib/rspamadm/template.lua
226share/rspamd/lualib/rspamadm/vault.lua 236share/rspamd/lualib/rspamadm/vault.lua
227share/rspamd/lualib/tableshape.lua 237share/rspamd/lualib/tableshape.lua
228share/rspamd/plugins/antivirus.lua 238share/rspamd/plugins/antivirus.lua
229share/rspamd/plugins/arc.lua 239share/rspamd/plugins/arc.lua
230share/rspamd/plugins/asn.lua 240share/rspamd/plugins/asn.lua
 241share/rspamd/plugins/aws_s3.lua
231share/rspamd/plugins/bayes_expiry.lua 242share/rspamd/plugins/bayes_expiry.lua
232share/rspamd/plugins/clickhouse.lua 243share/rspamd/plugins/clickhouse.lua
233share/rspamd/plugins/clustering.lua 244share/rspamd/plugins/clustering.lua
234share/rspamd/plugins/dcc.lua 245share/rspamd/plugins/dcc.lua
235share/rspamd/plugins/dkim_signing.lua 246share/rspamd/plugins/dkim_signing.lua
236share/rspamd/plugins/dmarc.lua 247share/rspamd/plugins/dmarc.lua
237share/rspamd/plugins/dynamic_conf.lua 248share/rspamd/plugins/dynamic_conf.lua
238share/rspamd/plugins/elastic.lua 249share/rspamd/plugins/elastic.lua
239share/rspamd/plugins/emails.lua 250share/rspamd/plugins/emails.lua
 251share/rspamd/plugins/external_relay.lua
240share/rspamd/plugins/external_services.lua 252share/rspamd/plugins/external_services.lua
241share/rspamd/plugins/force_actions.lua 253share/rspamd/plugins/force_actions.lua
242share/rspamd/plugins/forged_recipients.lua 254share/rspamd/plugins/forged_recipients.lua
243share/rspamd/plugins/fuzzy_collect.lua 255share/rspamd/plugins/fuzzy_collect.lua
244share/rspamd/plugins/greylist.lua 256share/rspamd/plugins/greylist.lua
245share/rspamd/plugins/hfilter.lua 257share/rspamd/plugins/hfilter.lua
246share/rspamd/plugins/history_redis.lua 258share/rspamd/plugins/history_redis.lua
247share/rspamd/plugins/http_headers.lua 259share/rspamd/plugins/http_headers.lua
248share/rspamd/plugins/ip_score.lua 260share/rspamd/plugins/ip_score.lua
249share/rspamd/plugins/maillist.lua 261share/rspamd/plugins/maillist.lua
250share/rspamd/plugins/maps_stats.lua 262share/rspamd/plugins/maps_stats.lua
251share/rspamd/plugins/metadata_exporter.lua 263share/rspamd/plugins/metadata_exporter.lua
252share/rspamd/plugins/metric_exporter.lua 264share/rspamd/plugins/metric_exporter.lua
@@ -316,25 +328,25 @@ share/rspamd/www/js/app/graph.js @@ -316,25 +328,25 @@ share/rspamd/www/js/app/graph.js
316share/rspamd/www/js/app/history.js 328share/rspamd/www/js/app/history.js
317share/rspamd/www/js/app/rspamd.js 329share/rspamd/www/js/app/rspamd.js
318share/rspamd/www/js/app/selectors.js 330share/rspamd/www/js/app/selectors.js
319share/rspamd/www/js/app/stats.js 331share/rspamd/www/js/app/stats.js
320share/rspamd/www/js/app/symbols.js 332share/rspamd/www/js/app/symbols.js
321share/rspamd/www/js/app/upload.js 333share/rspamd/www/js/app/upload.js
322share/rspamd/www/js/lib/bootstrap.bundle.min.js 334share/rspamd/www/js/lib/bootstrap.bundle.min.js
323share/rspamd/www/js/lib/codejar.min.js 335share/rspamd/www/js/lib/codejar.min.js
324share/rspamd/www/js/lib/d3.min.js 336share/rspamd/www/js/lib/d3.min.js
325share/rspamd/www/js/lib/d3evolution.min.js 337share/rspamd/www/js/lib/d3evolution.min.js
326share/rspamd/www/js/lib/d3pie.min.js 338share/rspamd/www/js/lib/d3pie.min.js
327share/rspamd/www/js/lib/fontawesome.min.js 339share/rspamd/www/js/lib/fontawesome.min.js
328share/rspamd/www/js/lib/footable.min.js 340share/rspamd/www/js/lib/footable.min.js
329share/rspamd/www/js/lib/jquery-3.5.1.min.js 341share/rspamd/www/js/lib/jquery-3.6.0.min.js
330share/rspamd/www/js/lib/jquery.stickytabs.min.js 342share/rspamd/www/js/lib/jquery.stickytabs.min.js
331share/rspamd/www/js/lib/linenumbers.min.js 343share/rspamd/www/js/lib/linenumbers.min.js
332share/rspamd/www/js/lib/nprogress.min.js 344share/rspamd/www/js/lib/nprogress.min.js
333share/rspamd/www/js/lib/prism.js 345share/rspamd/www/js/lib/prism.js
334share/rspamd/www/js/lib/require.min.js 346share/rspamd/www/js/lib/require.min.js
335share/rspamd/www/js/lib/solid.min.js 347share/rspamd/www/js/lib/solid.min.js
336share/rspamd/www/js/lib/visibility.min.js 348share/rspamd/www/js/lib/visibility.min.js
337share/rspamd/www/js/main.js 349share/rspamd/www/js/main.js
338share/rspamd/www/mstile-150x150.png 350share/rspamd/www/mstile-150x150.png
339share/rspamd/www/safari-pinned-tab.svg 351share/rspamd/www/safari-pinned-tab.svg
340@pkgdir etc/rspamd 352@pkgdir etc/rspamd
cvs diff -r1.39 -r1.40 pkgsrc/mail/rspamd/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/distinfo 2021/10/26 10:54:27 1.39
+++ pkgsrc/mail/rspamd/distinfo 2021/12/21 15:00:41 1.40
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.39 2021/10/26 10:54:27 nia Exp $ 1$NetBSD: distinfo,v 1.40 2021/12/21 15:00:41 triaxx Exp $
2 2
3BLAKE2s (rspamd-2.7.tar.gz) = 16338aef6040183803d06ac4e0598af0f4ee4d4d91e200491b9b00d4b9293781 3BLAKE2s (rspamd-3.1.tar.gz) = d23e3aba1974e31236295171e7d74df624497c9ab11c8d8ebfe95830b70d9d7a
4SHA512 (rspamd-2.7.tar.gz) = 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7 4SHA512 (rspamd-3.1.tar.gz) = 3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
5Size (rspamd-2.7.tar.gz) = 5126227 bytes 5Size (rspamd-3.1.tar.gz) = 5566920 bytes
6SHA1 (patch-CMakeLists.txt) = 16f653a7bea23cd2440ebf730c5c7879af395f62 6SHA1 (patch-CMakeLists.txt) = e50137fb3c2d467a8c880491e5d34d475e1a8d05
7SHA1 (patch-cmake_Toolset.cmake) = d4900720b85a8e3078c4fdaa76757fcbbd4f89bd 7SHA1 (patch-cmake_Toolset.cmake) = fbc4027fedb4261ce913701ebbb32d8395bc7783
8SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 8SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6
File Deleted: pkgsrc/mail/rspamd/Attic/options.mk
cvs diff -r1.6 -r1.7 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt 2020/10/07 00:04:40 1.6
+++ pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt 2021/12/21 15:00:41 1.7
@@ -1,29 +1,55 @@ @@ -1,29 +1,55 @@
1$NetBSD: patch-CMakeLists.txt,v 1.6 2020/10/07 00:04:40 schmonz Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.7 2021/12/21 15:00:41 triaxx Exp $
2 2
3For pkgsrc. Install config files to examples directory. 3For pkgsrc. Install config files to examples directory.
4Find lua more reliably. 4Find lua more reliably.
5 5
6--- CMakeLists.txt.orig 2020-09-30 19:27:23.000000000 +0000 6--- CMakeLists.txt.orig 2021-11-01 14:33:30.000000000 +0000
7+++ CMakeLists.txt 7+++ CMakeLists.txt
8@@ -146,8 +146,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON") 8@@ -155,7 +155,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
9 "include/lua53" 9 "include/lua53"
10 "include/lua" 10 "include/lua"
11 ROOT ${LUA_ROOT} 11 ROOT ${LUA_ROOT}
12- MODULES lua53 12- MODULES lua53
13- OPTIONAL) 13+ MODULES lua-5.3
14+ MODULES lua-5.3) 14 OPTIONAL)
15  15
16 IF (NOT WITH_LIBLUA) 16 IF (NOT WITH_LIBLUA)
17 ProcessPackage(LIBLUA LIBRARY "lua" 17@@ -168,7 +168,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
18@@ -684,9 +683,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$ 18 "include/lua54"
19 "${CMAKE_SOURCE_DIR}/conf/*" ) 19 "include/lua"
 20 ROOT ${LUA_ROOT}
 21- MODULES lua54
 22+ MODULES lua-5.4
 23 OPTIONAL)
 24 IF (NOT WITH_LIBLUA)
 25 ProcessPackage(LIBLUA LIBRARY "lua"
 26@@ -180,7 +180,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
 27 "include/lua52"
 28 "include/lua"
 29 ROOT ${LUA_ROOT}
 30- MODULES lua52
 31+ MODULES lua-5.2
 32 OPTIONAL)
 33
 34 IF (NOT WITH_LIBLUA)
 35@@ -192,7 +192,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
 36 "include/lua51"
 37 "include/lua"
 38 ROOT ${LUA_ROOT}
 39- MODULES lua51)
 40+ MODULES lua-5.1)
 41 ENDIF()
 42 ENDIF()
 43 ENDIF()
 44@@ -677,9 +677,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
 45 "${CMAKE_SOURCE_DIR}/conf/*.inc" )
20 FOREACH(CONF_FILE ${CONF_FILES}) 46 FOREACH(CONF_FILE ${CONF_FILES})
21 GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH) 47 GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH)
22- INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${CONFDIR}/${_rp})") 48- INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${CONFDIR}/${_rp})")
23+ INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${EXAMPLESDIR}/${_rp})") 49+ INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${EXAMPLESDIR}/${_rp})")
24 INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/conf/${CONF_FILE}" 50 INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/conf/${CONF_FILE}"
25- DESTINATION ${CONFDIR}/${_rp}) 51- DESTINATION ${CONFDIR}/${_rp})
26+ DESTINATION ${EXAMPLESDIR}/${_rp}) 52+ DESTINATION ${EXAMPLESDIR}/${_rp})
27 ENDFOREACH(CONF_FILE) 53 ENDFOREACH(CONF_FILE)
28  54
29 # Lua plugins 55 # Lua plugins
cvs diff -r1.1 -r1.2 pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake 2020/05/18 11:10:56 1.1
+++ pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake 2021/12/21 15:00:41 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-cmake_Toolset.cmake,v 1.1 2020/05/18 11:10:56 nia Exp $ 1$NetBSD: patch-cmake_Toolset.cmake,v 1.2 2021/12/21 15:00:41 triaxx Exp $
2 2
3Avoid specifying a custom linker: 3Avoid specifying a custom linker:
4gcc: error: unrecognized command line option '-fuse-ld=lld'; did you mean '-fuse-ld=bfd'? 4gcc: error: unrecognized command line option '-fuse-ld=lld'; did you mean '-fuse-ld=bfd'?
5 5
6--- cmake/Toolset.cmake.orig 2020-04-01 13:57:55.000000000 +0000 6--- cmake/Toolset.cmake.orig 2021-11-01 14:33:30.000000000 +0000
7+++ cmake/Toolset.cmake 7+++ cmake/Toolset.cmake
8@@ -41,8 +41,8 @@ endif () 8@@ -52,8 +52,8 @@ endif ()
9  9
10 option(LINKER_NAME "Linker name or full path") 10 option(LINKER_NAME "Linker name or full path")
11  11
12-find_program(LLD_PATH NAMES "ld.lld" "lld") 12-find_program(LLD_PATH NAMES "ld.lld" "lld")
13-find_program(GOLD_PATH NAMES "ld.gold" "gold") 13-find_program(GOLD_PATH NAMES "ld.gold" "gold")
14+#find_program(LLD_PATH NAMES "ld.lld" "lld") 14+#find_program(LLD_PATH NAMES "ld.lld" "lld")
15+#find_program(GOLD_PATH NAMES "ld.gold" "gold") 15+#find_program(GOLD_PATH NAMES "ld.gold" "gold")
16  16
17 if(NOT LINKER_NAME) 17 if(NOT LINKER_NAME)
18 if(LLD_PATH) 18 if(LLD_PATH)