Received: by mail.netbsd.org (Postfix, from userid 605) id 9B51084E68; Mon, 13 Mar 2023 11:41:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CA15684D54 for ; Mon, 13 Mar 2023 11:41:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id B1NVBdO2S5wS for ; Mon, 13 Mar 2023 11:41:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EE79984D08 for ; Mon, 13 Mar 2023 11:41:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E1ACEFA90; Mon, 13 Mar 2023 11:41:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1678707717199910" MIME-Version: 1.0 Date: Mon, 13 Mar 2023 11:41:57 +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: <20230313114157.E1ACEFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1678707717199910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Mon Mar 13 11:41:57 UTC 2023 Modified Files: pkgsrc/mail/rspamd: Makefile distinfo pkgsrc/mail/rspamd/patches: patch-CMakeLists.txt patch-src_rspamd.c Removed Files: pkgsrc/mail/rspamd/patches: patch-src_libserver_symcache_symcache__internal.hxx Log Message: rspamd: Update to 3.4 pkgsrc changes: --------------- * Remove LUA_VERSIONS_ACCEPTED since it is redundant with lang/lua/luaversion.mk. upstream changes: ----------------- 3.4: 01 Nov 2022 * [CritFix] Restore compatibility with the integrations and headers alterations * [Feature] Milter_headers: Add `x-rspamd-action` routine * [Feature] Share hyperscan database among processes * [Fix] Another corner case in url parsing * [Fix] Another fix for the enable password * [Fix] Another try to fix close method in lua_tcp * [Fix] Fix additional fields in the Redis schema * [Fix] Fix emoji joiner FP * [Fix] Fix favicon.ico Content-Type header * [Fix] Fix hang when close is used * [Fix] Lua_tcp: Sigh, another try to fix `close` invocation * [Fix] Mx_check: Cache the fact of a missing MX record * [Fix] Try to fix parsing of the unencoded `>` characters in html attributes * [Fix] Try to fix the case where password == enable_password * [Project] (Re)implement hyperscan caching * [Project] Rework cleanup * [Project] Synchronize hyperscan caches via the main process * [Rework] Convert multipattern to use hyperscan tools * [Rework] Make http normalize path function a generic function * [Rework] Split locked and unlocked files, as mmap does not need flock normally * [Rework] Start movement of the hyperscan related routines into a single unit * [Rework] Store the current worker, so other libraries could use this information * [Rework] Use blocking socket for IPC between main and workers * [Rework] Use more predictable size for commands buffers * [Rules] Do not insert ONCE_RECEIVED_STRICT on RDNS missing * [Rules] Reduce score of HTTP_TO_HTTPS - subject to remove completely To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 pkgsrc/mail/rspamd/Makefile cvs rdiff -u -r1.45 -r1.46 pkgsrc/mail/rspamd/distinfo cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt cvs rdiff -u -r1.1 -r0 \ pkgsrc/mail/rspamd/patches/patch-src_libserver_symcache_symcache__internal.hxx cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/rspamd/patches/patch-src_rspamd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1678707717199910 Content-Disposition: inline Content-Length: 4081 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.85 pkgsrc/mail/rspamd/Makefile:1.86 --- pkgsrc/mail/rspamd/Makefile:1.85 Tue Jan 24 18:36:29 2023 +++ pkgsrc/mail/rspamd/Makefile Mon Mar 13 11:41:57 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.85 2023/01/24 18:36:29 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2023/03/13 11:41:57 triaxx Exp $ -DISTNAME= rspamd-3.3 -PKGREVISION= 1 +DISTNAME= rspamd-3.4 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GITHUB:=rspamd/} @@ -19,8 +18,6 @@ USE_TOOLS+= perl pkg-config USE_LANGUAGES= c99 c++ BUILD_DEFS+= VARBASE -LUA_VERSIONS_ACCEPTED= 54 53 52 51 - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915 Index: pkgsrc/mail/rspamd/distinfo diff -u pkgsrc/mail/rspamd/distinfo:1.45 pkgsrc/mail/rspamd/distinfo:1.46 --- pkgsrc/mail/rspamd/distinfo:1.45 Sun Oct 30 15:38:54 2022 +++ pkgsrc/mail/rspamd/distinfo Mon Mar 13 11:41:57 2023 @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.45 2022/10/30 15:38:54 jperkin Exp $ +$NetBSD: distinfo,v 1.46 2023/03/13 11:41:57 triaxx Exp $ -BLAKE2s (rspamd-3.3.tar.gz) = 3859e25081ef504e8c9f1e0799d71c2221c2fd41920e4bee5ee39f6b8af4fbeb -SHA512 (rspamd-3.3.tar.gz) = 02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c -Size (rspamd-3.3.tar.gz) = 5680874 bytes -SHA1 (patch-CMakeLists.txt) = 04cace824a93ba92fba3f8cbf3d30452b1138725 +BLAKE2s (rspamd-3.4.tar.gz) = ac06715e2da961d4bb54402e0b1ee962228415fd723d886f4f881afef3aa0ddd +SHA512 (rspamd-3.4.tar.gz) = fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf +Size (rspamd-3.4.tar.gz) = 5689732 bytes +SHA1 (patch-CMakeLists.txt) = f97a56da19c30a39b927c992c725c8a225049bf4 SHA1 (patch-cmake_Toolset.cmake) = fbc4027fedb4261ce913701ebbb32d8395bc7783 SHA1 (patch-contrib_doctest_doctest_doctest.h) = 5238cb9f837e1d8f402023ddc2f7d02dda3f67ab SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 SHA1 (patch-src_libserver_symcache_symcache__impl.cxx) = 8a5c69ab343409427619a9cbc0dc080d548b9c53 -SHA1 (patch-src_libserver_symcache_symcache__internal.hxx) = 9b4ce55f42d4bc637efdb6eb91ec93a5e33517fe -SHA1 (patch-src_rspamd.c) = b02512138fbcba443997a2e080fc82b00675e3b3 +SHA1 (patch-src_rspamd.c) = b5b8cc948253526e0cde47ef4c436034f934923c Index: pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt diff -u pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.8 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.9 --- pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.8 Sat Oct 15 19:56:55 2022 +++ pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt Mon Mar 13 11:41:57 2023 @@ -1,4 +1,4 @@ -$NetBSD: patch-CMakeLists.txt,v 1.8 2022/10/15 19:56:55 triaxx Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.9 2023/03/13 11:41:57 triaxx Exp $ For pkgsrc. Install config files to examples directory. Find lua more reliably. @@ -41,7 +41,7 @@ Find lua more reliably. ENDIF() ENDIF() ENDIF() -@@ -679,9 +679,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$ +@@ -685,9 +685,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$ "${CMAKE_SOURCE_DIR}/conf/*.inc" ) FOREACH(CONF_FILE ${CONF_FILES}) GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH) Index: pkgsrc/mail/rspamd/patches/patch-src_rspamd.c diff -u pkgsrc/mail/rspamd/patches/patch-src_rspamd.c:1.1 pkgsrc/mail/rspamd/patches/patch-src_rspamd.c:1.2 --- pkgsrc/mail/rspamd/patches/patch-src_rspamd.c:1.1 Sun Oct 30 15:38:54 2022 +++ pkgsrc/mail/rspamd/patches/patch-src_rspamd.c Mon Mar 13 11:41:57 2023 @@ -1,10 +1,10 @@ -$NetBSD: patch-src_rspamd.c,v 1.1 2022/10/30 15:38:54 jperkin Exp $ +$NetBSD: patch-src_rspamd.c,v 1.2 2023/03/13 11:41:57 triaxx Exp $ Avoid sun define. --- src/rspamd.c.orig 2022-10-01 14:19:21.000000000 +0000 +++ src/rspamd.c -@@ -451,7 +451,7 @@ systemd_get_socket (struct rspamd_main * +@@ -455,7 +455,7 @@ systemd_get_socket (struct rspamd_main * union { struct sockaddr_storage ss; struct sockaddr sa; --_----------=_1678707717199910--