Received: by mail.netbsd.org (Postfix, from userid 605) id DA78684E97; Sun, 8 Dec 2019 09:32:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 611C984DAA for ; Sun, 8 Dec 2019 09:32:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id DB_bhj-XUZ6p for ; Sun, 8 Dec 2019 09:32:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8042884CD4 for ; Sun, 8 Dec 2019 09:32:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 72EBFFA97; Sun, 8 Dec 2019 09:32:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1575797525254530" MIME-Version: 1.0 Date: Sun, 8 Dec 2019 09:32:05 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/mail/rspamd To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20191208093205.72EBFFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1575797525254530 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: triaxx Date: Sun Dec 8 09:32:05 UTC 2019 Modified Files: pkgsrc/mail/rspamd: Makefile PLIST distinfo pkgsrc/mail/rspamd/patches: patch-CMakeLists.txt patch-src_CMakeLists.txt Log Message: rspamd: update to 2.2 upstream changes: ----------------- [Conf] Antivirus: Fix the default config [Feature] Add verdict library in lua [Feature] Allow exception when choosing upstream [Feature] Allow to disable symbols from the metric config [Feature] Allow to limit maps per specific worker [Feature] Always validate Rspamd protocol output [Feature] Antivirus: Add preliminary virustotal support [Feature] Clickhouse: Rework Clickhouse collection logic [Feature] Improve base64 usage [Feature] Shutdown timeout is now associated with task timeout [Fix] #3129 Multiple classifiers on redis working incorrectly [Fix] Allow real upstreams configuration [Fix] Another try to fix slow callbacks and timers [Fix] Check results of write message as SSL can bork them [Fix] Clickhouse: Avoid potential races in collection [Fix] Clickhouse: Fix periodic script [Fix] Fail DNS upstream on each retransmit attempt [Fix] Fix consistent hashing when upstreams are marked inactive [Fix] Fix issues found [Fix] Fix off-by-one in retries for the proxy [Fix] Fix termination [Fix] Fix upstreams exclusion logic [Fix] Fix utf8 validation for symbols options and empty strings [Fix] Oops, fix maps reload [Fix] Rbl: Allow utf8 lookups for IDN domains [Fix] Sigh, another try to fix brain-damaged openssl [Project] Add fast utf8 validation library [Project] Use own utf8 validation instead of glib [Rework] Another phase of finish actions rework [Rework] Further cmake system rework [Rework] Further isolation of the controller’s functions [Rework] Make cmake structure more modular [Rework] Move cmake modules to a dedicated path [Rework] Replace controller functions by any scanner worker if needed [Rework] Rework final scripts logic [Rework] Rewrite rspamd_str_make_utf_valid function To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 pkgsrc/mail/rspamd/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/rspamd/PLIST cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/rspamd/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt cvs rdiff -u -r1.2 -r1.3 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. --_----------=_1575797525254530 Content-Disposition: inline Content-Length: 5744 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/rspamd/Makefile diff -u pkgsrc/mail/rspamd/Makefile:1.59 pkgsrc/mail/rspamd/Makefile:1.60 --- pkgsrc/mail/rspamd/Makefile:1.59 Fri Dec 6 16:37:52 2019 +++ pkgsrc/mail/rspamd/Makefile Sun Dec 8 09:32:05 2019 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.59 2019/12/06 16:37:52 jperkin Exp $ +# $NetBSD: Makefile,v 1.60 2019/12/08 09:32:05 triaxx Exp $ -DISTNAME= rspamd-2.1 +DISTNAME= rspamd-2.2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} Index: pkgsrc/mail/rspamd/PLIST diff -u pkgsrc/mail/rspamd/PLIST:1.17 pkgsrc/mail/rspamd/PLIST:1.18 --- pkgsrc/mail/rspamd/PLIST:1.17 Sun Nov 3 18:19:32 2019 +++ pkgsrc/mail/rspamd/PLIST Sun Dec 8 09:32:05 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2019/11/03 18:19:32 triaxx Exp $ +@comment $NetBSD: PLIST,v 1.18 2019/12/08 09:32:05 triaxx Exp $ bin/rspamadm bin/rspamadm-${PKGVERSION} bin/rspamc @@ -184,6 +184,7 @@ share/rspamd/lualib/lua_scanners/savapi. share/rspamd/lualib/lua_scanners/sophos.lua share/rspamd/lualib/lua_scanners/spamassassin.lua share/rspamd/lualib/lua_scanners/vadesecure.lua +share/rspamd/lualib/lua_scanners/virustotal.lua share/rspamd/lualib/lua_selectors/extractors.lua share/rspamd/lualib/lua_selectors/init.lua share/rspamd/lualib/lua_selectors/maps.lua @@ -193,6 +194,7 @@ share/rspamd/lualib/lua_smtp.lua share/rspamd/lualib/lua_stat.lua share/rspamd/lualib/lua_tcp_sync.lua share/rspamd/lualib/lua_util.lua +share/rspamd/lualib/lua_verdict.lua share/rspamd/lualib/lupa.lua share/rspamd/lualib/plugins_stats.lua share/rspamd/lualib/rescore_utility.lua Index: pkgsrc/mail/rspamd/distinfo diff -u pkgsrc/mail/rspamd/distinfo:1.30 pkgsrc/mail/rspamd/distinfo:1.31 --- pkgsrc/mail/rspamd/distinfo:1.30 Sun Nov 3 18:19:32 2019 +++ pkgsrc/mail/rspamd/distinfo Sun Dec 8 09:32:05 2019 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.30 2019/11/03 18:19:32 triaxx Exp $ +$NetBSD: distinfo,v 1.31 2019/12/08 09:32:05 triaxx Exp $ -SHA1 (rspamd-2.1.tar.gz) = 17e7e7025c66bf7c15313a58adc1bd9ee0fac4b0 -RMD160 (rspamd-2.1.tar.gz) = 223eadaa92fc6bf9ca0c25f83dccd2d5a9acb2cc -SHA512 (rspamd-2.1.tar.gz) = 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f -Size (rspamd-2.1.tar.gz) = 4232297 bytes -SHA1 (patch-CMakeLists.txt) = 1d3e66b52ef38638674baf4c10b68c97b2ca38ad +SHA1 (rspamd-2.2.tar.gz) = 06de7849611ab6024af7bfb886aeced3a245ab23 +RMD160 (rspamd-2.2.tar.gz) = a68863cf34da19e178469123ce687b4a814c54a1 +SHA512 (rspamd-2.2.tar.gz) = e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe +Size (rspamd-2.2.tar.gz) = 4257574 bytes +SHA1 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 -SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a +SHA1 (patch-src_CMakeLists.txt) = 672873307ee1f30236e53298a6c0d422c7a79b0e Index: pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt diff -u pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.4 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.5 --- pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.4 Fri Jun 23 13:47:06 2017 +++ pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt Sun Dec 8 09:32:05 2019 @@ -1,11 +1,11 @@ -$NetBSD: patch-CMakeLists.txt,v 1.4 2017/06/23 13:47:06 wiz Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.5 2019/12/08 09:32:05 triaxx Exp $ For pkgsrc. Install config files to examples directory. ---- CMakeLists.txt.orig 2017-06-14 14:45:41.000000000 +0000 +--- CMakeLists.txt.orig 2019-11-19 17:31:43.000000000 +0000 +++ CMakeLists.txt -@@ -1289,16 +1289,16 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$ - "${CMAKE_CURRENT_SOURCE_DIR}/conf/*" ) +@@ -641,9 +641,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$ + "${CMAKE_SOURCE_DIR}/conf/*" ) FOREACH(CONF_FILE ${CONF_FILES}) GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH) - INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${CONFDIR}/${_rp})") @@ -15,13 +15,4 @@ For pkgsrc. Install config files to exam + DESTINATION ${EXAMPLESDIR}/${_rp}) ENDFOREACH(CONF_FILE) - SET(MAIN_CONF "conf/rspamd.conf") - IF(BUILD_PORT) -- INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample") -+ INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" ".sample") - ELSE(BUILD_PORT) -- INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "") -+ INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" "") - ENDIF(BUILD_PORT) - IF(INSTALL_EXAMPLES MATCHES "ON") - INSTALL(FILES ${MAIN_CONF} DESTINATION ${EXAMPLESDIR}) + # Lua plugins Index: pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt diff -u pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt:1.2 pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt:1.3 --- pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt:1.2 Fri Feb 17 15:01:33 2017 +++ pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt Sun Dec 8 09:32:05 2019 @@ -1,12 +1,10 @@ -$NetBSD: patch-src_CMakeLists.txt,v 1.2 2017/02/17 15:01:33 wiz Exp $ +$NetBSD: patch-src_CMakeLists.txt,v 1.3 2019/12/08 09:32:05 triaxx Exp $ -Add librt to link line for shm_open(). - ---- src/CMakeLists.txt.orig 2016-10-17 14:30:59.000000000 +0000 +--- src/CMakeLists.txt.orig 2019-11-19 17:31:43.000000000 +0000 +++ src/CMakeLists.txt -@@ -141,6 +141,9 @@ TARGET_LINK_LIBRARIES(rspamd-server rspa - TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) +@@ -186,6 +186,9 @@ TARGET_LINK_LIBRARIES(rspamd-server lcbt TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) + TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) +# for shm_open +TARGET_LINK_LIBRARIES(rspamd-server rt) --_----------=_1575797525254530--