From nobody Wed Dec 18 06:39:00 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YCkY13F49z5gtj5; Wed, 18 Dec 2024 06:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YCkY11yj1z4bv0; Wed, 18 Dec 2024 06:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734503941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/P1RAhwgPjPM/eA7UTe7RTN5pA6+9w+gmBnAEN/2qUE=; b=uQYkLOKUmM8B1Du3FRwagNf3X9qM9a4SaH9Qt5qCnb6mF7i/syec5lHsF3dlzcn7oyrbXh S6kiuI17dNqpGBwVV+0qN7PsIF30ASyUtI0gedpKT9tiGOPxet626UOl9bPrXR2ErBRMdL rakkmdgahWkRfe4Nbj52nSclpIQou1K2jA5m8xlMeoFZn4b6qopzMgE/ZHUxc1DfhgKyEJ Ig9e0IbkM7hDDj5rmmu93QQaH9juAL6f33Ar+VwSjEPty7rm6BYSl4bBd9+d1piDITjXHA xoDJOEaOcZL8/ZnGPlpT7EKgUrjwOaLr2GGk61I1nnS08oRNd0u3oWVELB8i6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734503941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/P1RAhwgPjPM/eA7UTe7RTN5pA6+9w+gmBnAEN/2qUE=; b=T62YykWYVspDF1vrWyvuJeA0MbOWRekiscie4LMDerFMvdjJqR1DWmg6PHWn/kAfO7+wCA bGOn4eyUnUEnh/KM4JKM3OtgZSe6EXn5+xi7skP6Dz2lfeaOi31GEL3P6x+cNXEGcw5B2v VdYVC21XZ4P1it0Kg0yeRdpEPyyP/7i5IGJJzLGeIRPSzhU/uWAOPoNN/Gh6pey1nzzN9s J72MgS/+c/3sp5WQM639JIGXpQaM5qwrv4eIKMaEC1uPk0r21dgHnMeaD1DL8H42wUEC07 /EdqLnYviUqG7mMABtyGSUvYV0wmleNlr00eEfTiPQYSgjO4kc0jUbBQ7UNLlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734503941; a=rsa-sha256; cv=none; b=PPj1bFUjESpYVm502EmS1Bsi6mb3siCj43m1NbYusiZzdsiERoJZ3K3GmdAmwW0WTzEagK H6U0+5U2fHaKZrqM2MMf+BvIR5emFOLsQtbLpi/F6S1Nv0t6+DX0fv8sKGbKIh/XVjOj4C Nz8EJnojcs2CQJ8l6Mb3/K+2QiGG3LuKEZlNF940cOnfUpZzpwVnvtNSdueRYc3Y6qtMhv 0iIyYOp/DOtJiYWXDwD8QRa8v3D5LYvkCmpvQp8aVHQhNxW0IUhIKOSVo7Pgb9m6nSrwzt NxPmZ5KkNIy0M0GuJqXwnaOz28oiX66Id7JAx8v0oxk675KvvzMGbYGbuhpFhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YCkY06pkhzxVh; Wed, 18 Dec 2024 06:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BI6d0OW019488; Wed, 18 Dec 2024 06:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BI6d0e2019485; Wed, 18 Dec 2024 06:39:00 GMT (envelope-from git) Date: Wed, 18 Dec 2024 06:39:00 GMT Message-Id: <202412180639.4BI6d0e2019485@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 56c99895b0eb - main - mail/rspamd: Update to 3.11.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56c99895b0eb91f4198e503bd07e9cfdd363f049 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=56c99895b0eb91f4198e503bd07e9cfdd363f049 commit 56c99895b0eb91f4198e503bd07e9cfdd363f049 Author: Yasuhiro Kimura AuthorDate: 2024-12-16 16:48:14 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-12-18 06:37:56 +0000 mail/rspamd: Update to 3.11.0 ReleaseNotes: https://www.rspamd.com/announce/2024/12/16/rspamd-3.11.0.html PR: 283365 Approved by: vsevolod (maintainer) --- mail/rspamd/Makefile | 2 +- mail/rspamd/distinfo | 6 +++--- mail/rspamd/files/patch-src_rspamd.c | 29 +++++++++++++++++++++++++++++ mail/rspamd/pkg-plist | 7 +++++-- 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 02d794156a03..4190c2a768e3 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,5 +1,5 @@ PORTNAME= rspamd -PORTVERSION= 3.10.2 +PORTVERSION= 3.11.0 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index d37671bfa903..f2bdcc1666d2 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1729467927 -SHA256 (rspamd-rspamd-3.10.2_GH0.tar.gz) = 3f77a2230c88b5026b5c3cef022f0432b324ef492fdc297f30c6916f17103bdf -SIZE (rspamd-rspamd-3.10.2_GH0.tar.gz) = 6048061 +TIMESTAMP = 1734363357 +SHA256 (rspamd-rspamd-3.11.0_GH0.tar.gz) = 6dbe6fc7df4079a64f59cd6e8e996400d02d946d808140a1f30060cea76088a6 +SIZE (rspamd-rspamd-3.11.0_GH0.tar.gz) = 6440612 diff --git a/mail/rspamd/files/patch-src_rspamd.c b/mail/rspamd/files/patch-src_rspamd.c new file mode 100644 index 000000000000..9b40b9da918e --- /dev/null +++ b/mail/rspamd/files/patch-src_rspamd.c @@ -0,0 +1,29 @@ +From ccb45df90df60fae36b9438cfb2b0088e590306b Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov +Date: Tue, 17 Dec 2024 13:37:54 +0000 +Subject: [PATCH] [Fix] Fix crash on FreeBSD when Rspamd is built without + hyperscan + +--- + src/rspamd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git src/rspamd.c src/rspamd.c +index 088bfba49..dafd9aebe 100644 +--- src/rspamd.c ++++ src/rspamd.c +@@ -56,9 +56,10 @@ + + #ifdef WITH_HYPERSCAN + #include "libserver/hyperscan_tools.h" +-#include "rspamd_simdutf.h" + #endif + ++#include "rspamd_simdutf.h" ++ + /* 2 seconds to fork new process in place of dead one */ + #define SOFT_FORK_TIME 2 + +-- +2.47.1 + diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist index 8bf4bb6163d2..f97e58fd1abd 100644 --- a/mail/rspamd/pkg-plist +++ b/mail/rspamd/pkg-plist @@ -13,7 +13,9 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf %%ETCDIR%%/composites.conf %%ETCDIR%%/groups.conf %%ETCDIR%%/lang_detection.inc +%%ETCDIR%%/local.d/module.conf.example %%ETCDIR%%/logging.inc +%%ETCDIR%%/lua.local.d/module.lua.example %%ETCDIR%%/maps.d/dmarc_whitelist.inc %%ETCDIR%%/maps.d/exe_clickbait.inc %%ETCDIR%%/maps.d/maillist.inc @@ -75,7 +77,9 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf %%ETCDIR%%/modules.d/trie.conf %%ETCDIR%%/modules.d/url_redirector.conf %%ETCDIR%%/modules.d/whitelist.conf +%%ETCDIR%%/modules.local.d/module.conf.example %%ETCDIR%%/options.inc +%%ETCDIR%%/override.d/module.conf.example %%ETCDIR%%/rspamd.conf @sample %%ETCDIR%%/rspamd.newsyslog.conf.sample %%ETCDIR%%/scores.d/content_group.conf @@ -106,8 +110,6 @@ share/man/man1/rspamadm.1.gz share/man/man1/rspamc.1.gz share/man/man8/rspamd.8.gz %%DATADIR%%/effective_tld_names.dat -%%DATADIR%%/elastic/kibana.json -%%DATADIR%%/elastic/rspamd_template.json %%DATADIR%%/languages/af.json %%DATADIR%%/languages/an.json %%DATADIR%%/languages/ar.json @@ -256,6 +258,7 @@ share/man/man8/rspamd.8.gz %%DATADIR%%/lualib/rspamadm/mime.lua %%DATADIR%%/lualib/rspamadm/neural_test.lua %%DATADIR%%/lualib/rspamadm/publicsuffix.lua +%%DATADIR%%/lualib/rspamadm/ratelimit.lua %%DATADIR%%/lualib/rspamadm/secretbox.lua %%DATADIR%%/lualib/rspamadm/stat_convert.lua %%DATADIR%%/lualib/rspamadm/statistics_dump.lua