From patchwork Sun May 22 23:43:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ykonai X-Patchwork-Id: 39577 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3CED127BBE9; Mon, 23 May 2022 02:50:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BC71527BBEA for ; Mon, 23 May 2022 02:50:17 +0100 (BST) Received: from localhost ([::1]:34486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsxD6-00074m-UO for patchwork@mira.cbaines.net; Sun, 22 May 2022 21:50:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsxCs-00074A-JT for guix-patches@gnu.org; Sun, 22 May 2022 21:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nsxCs-00029K-AC for guix-patches@gnu.org; Sun, 22 May 2022 21:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nsxCs-00052f-8Y for guix-patches@gnu.org; Sun, 22 May 2022 21:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55589] [PATCH] gnu: rspamd: Update to 3.2 Resent-From: ykonai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 May 2022 01:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55589 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55589@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165327054419301 (code B ref -1); Mon, 23 May 2022 01:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2022 01:49:04 +0000 Received: from localhost ([127.0.0.1]:46746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsxBt-00050F-0h for submit@debbugs.gnu.org; Sun, 22 May 2022 21:49:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:50484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsvE4-0001sM-6k for submit@debbugs.gnu.org; Sun, 22 May 2022 19:43:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsvE4-00051p-05 for guix-patches@gnu.org; Sun, 22 May 2022 19:43:08 -0400 Received: from www.ykonai.net ([2605:6400:10:1424:8f2:1eb3:b35b:fe2d]:48272) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsvE2-0001ZF-5z for guix-patches@gnu.org; Sun, 22 May 2022 19:43:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ykonai.net; s=20220513; t=1653263062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JiYYCcCc5L38lAXuhP+jhlO2437On5HiF8gWmqkjG6A=; b=W45zIs7m+oqTleHxovi5UDbDDnK1y8uNkR/h+VySI2iHacNTnReIvdmfrag2he8Q++T2Un 67k9lE2ut9QNOv5YH1+EOa1YkIZbWj90BgIj/zVH4odsa8BtR88Pa8WbceUgU91uU5NQ1R KuGMT00vADl5bnugGRn7ivDNg5/rPHDG2RhFRKVVZRUTySvmbGqrUV23uQqDNBjyo2g2zH rydJgCi4Ldyynygz48gs7/Xq+DZBcUiwHIdRk2V5lvyt19FyBC3C0BLVf2oJvXwd6BVOJu 7W7RWkrp+uRWtKGE82TDKUijUyfLk0ic8LgJNTJoSEIMznT4Fjz3h/v6k4IUUQ== Received: by www.ykonai.net (OpenSMTPD) with ESMTPSA id 957a41f4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sun, 22 May 2022 23:44:21 +0000 (UTC) Date: Mon, 23 May 2022 01:43:01 +0200 Message-Id: <20220522234301.14697-1-mail@ykonai.net> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2605:6400:10:1424:8f2:1eb3:b35b:fe2d; envelope-from=mail@ykonai.net; helo=www.ykonai.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 22 May 2022 21:48:59 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: ykonai X-ACL-Warn: , ykonai via Guix-patches X-Patchwork-Original-From: ykonai via Guix-patches via From: ykonai X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mail.scm (rspamd): Update to 3.2 I also added a new build option, that changes the LOCAL_CONFDIR variable to /etc/rspamd. This allows for rspamd configuration via the /etc/rspamd/local.d and override.d directories, which by default were located in the PREFIX which is in /gnu/store. --- gnu/packages/mail.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) base-commit: 4ba4cb1d49d70a00f7236f60bd92e5eccef573dd diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c4ccc53e84..1343042034 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4363,7 +4363,7 @@ (define-public python-imaplib2 (define-public rspamd (package (name "rspamd") - (version "2.7") + (version "3.2") (source (origin (method git-fetch) @@ -4371,11 +4371,12 @@ (define-public rspamd (url "https://github.com/rspamd/rspamd") (commit version))) (sha256 - (base32 "0fw6nbfc3xqapzq5nydakwgpw6cz6vb3qby2aqlr06lzf87d3hic")) + (base32 "122d5m1nfxxz93bhsk8lm4dazvdknzphb0a1188m7bsa4iynbfv2")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:configure-flags '("-DENABLE_LUAJIT=ON"))) + '(#:configure-flags '("-DENABLE_LUAJIT=ON" + "-DLOCAL_CONFDIR=/etc/rspamd"))) (inputs (list openssl glib @@ -4384,7 +4385,7 @@ (define-public rspamd sqlite file icu4c - pcre + pcre2 zlib perl libsodium))