From patchwork Thu Aug 27 15:17:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23798 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 BFAD827BBE5; Thu, 27 Aug 2020 16:19:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E0A5B27BBE7 for ; Thu, 27 Aug 2020 16:19:10 +0100 (BST) Received: from localhost ([::1]:35228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgE-0002L2-Bh for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg7-0002KA-9k for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg7-0004cj-0J for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg6-0007gs-SG for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 1/9] gnu: dovecot: Set moduledir to global directory. References: <20200817092748.30057-1-levenson@mmer.org> In-Reply-To: <20200817092748.30057-1-levenson@mmer.org> Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 15:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159854148829442 (code B ref 42899); Thu, 27 Aug 2020 15:19:02 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:08 +0000 Received: from localhost ([127.0.0.1]:43654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfE-0007ej-57 for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:08 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:53039) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf6-0007dF-Uh for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:03 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 285369CD66; Thu, 27 Aug 2020 14:47:13 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:35 +0200 Message-Id: <20200827151743.27712-1-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches From: Efraim Flashner * gnu/packages/mail.scm (dovecot)[arguments]: Add configure-flag to set moduledir. Adjust custom 'install phase to override moduledir so it successfully installs. --- gnu/packages/mail.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 81dc5b8eec..c22dd27547 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1444,7 +1444,8 @@ facilities for checking incoming mail.") `(#:configure-flags '("--sysconfdir=/etc" "--localstatedir=/var" "--with-sqlite" ; not auto-detected - "--with-lucene") ; not auto-detected + "--with-lucene" ; not auto-detected + "--with-moduledir=/etc/dovecot/modules") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-file-names @@ -1461,9 +1462,13 @@ facilities for checking incoming mail.") (("cat") (which "cat"))) #t)) (replace 'install - (lambda* (#:key make-flags #:allow-other-keys) + (lambda* (#:key outputs make-flags #:allow-other-keys) + ;; The .la files don't like having the moduledir moved. + (for-each delete-file (find-files "." "\\.la")) ;; Simple hack to avoid installing a trivial README in /etc. (apply invoke "make" "install" "sysconfdir=/tmp/bogus" + (string-append "moduledir=" (assoc-ref outputs "out") + "/lib/dovecot") make-flags)))))) (home-page "https://www.dovecot.org") (synopsis "Secure POP3/IMAP server") From patchwork Thu Aug 27 15:17:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23800 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 8269527BBE6; Thu, 27 Aug 2020 16:19:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2822227BBE5 for ; Thu, 27 Aug 2020 16:19:12 +0100 (BST) Received: from localhost ([::1]:35276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgF-0002N1-MQ for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg6-0002Jx-GD for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60353) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg6-0004cX-7E for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg6-0007gd-1H for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 2/9] services: dovecot: Use modules via symlink to system profile. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 15:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159854148729429 (code B ref 42899); Thu, 27 Aug 2020 15:19:01 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:07 +0000 Received: from localhost ([127.0.0.1]:43644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf9-0007dx-EO for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:07 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:50004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf6-0007dG-Ui for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:02 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 794A89CE5D for <42899@debbugs.gnu.org>; Thu, 27 Aug 2020 14:47:13 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:36 +0200 Message-Id: <20200827151743.27712-2-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200827151743.27712-1-levenson@mmer.org> References: <20200827151743.27712-1-levenson@mmer.org> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services/mail.scm (%dovecot-activation): Link the location with multiple plugins (dovecot-pigeonhole, etc), to a place where dovecot can find them. * gnu/services/mail.scm (dovecot-configuration): Use the symlink. --- doc/guix.texi | 9 +++++++-- gnu/services/mail.scm | 13 ++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 0b79a49814..dfa83c409c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18360,8 +18360,13 @@ Defaults to @samp{"/var/run/dovecot/auth-userdb"}. @end deftypevr @deftypevr {@code{dovecot-configuration} parameter} file-name mail-plugin-dir -Directory where to look up mail plugins. -Defaults to @samp{"/usr/lib/dovecot"}. +Directory where to look up mail plugins. In Guix, dovecot plugins have +all its modules under /gnu/store/xxx-plugin/(lib|libexec)/dovecot. To be +able to load all those modules by doveconf or services like sieve, +@samp{mail-plugin-dir} is a symlink "/run/current-system/profile/lib/dovecot", +which creates during the activation step. + +Defaults to @samp{"/etc/dovecot/modules"}. @end deftypevr @deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index cfcaf4601b..2832303d88 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1044,8 +1044,12 @@ directories are prefixed with the chroot directory, append \"/.\" to This is used by imap (for shared users) and lda.") (mail-plugin-dir - (file-name "/usr/lib/dovecot") - "Directory where to look up mail plugins.") + (file-name "/etc/dovecot/modules") + "Directory where to look up mail plugins. In Guix, dovecot plugins have +all its modules under /gnu/store/xxx-plugin/(lib|libexec)/dovecot. To be able +to load all those modules by doveconf or services like imap, +@samp{mail-plugin-dir} is a symlink `/run/current-system/profile/lib/dovecot`, +which creates during the activation step.") (mail-plugins (space-separated-string-list '()) @@ -1519,13 +1523,16 @@ greyed out, instead of only later giving \"not selectable\" popup error. (else (format (current-error-port) "Failed to create public key at ~a.\n" public-key))))) - (let ((user (getpwnam "dovecot"))) + (let ((user (getpwnam "dovecot")) + (moduledir "/etc/dovecot/modules")) (mkdir-p/perms "/var/run/dovecot" user #o755) (mkdir-p/perms "/var/lib/dovecot" user #o755) (mkdir-p/perms "/etc/dovecot" user #o755) (copy-file #$(plain-file "dovecot.conf" config-str) "/etc/dovecot/dovecot.conf") (mkdir-p/perms "/etc/dovecot/private" user #o700) + (unless (file-exists? moduledir) + (symlink "/run/current-system/profile/lib/dovecot" moduledir)) (create-self-signed-certificate-if-absent #:private-key "/etc/dovecot/private/default.pem" #:public-key "/etc/dovecot/default.pem" From patchwork Thu Aug 27 15:17:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23797 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 E881C27BBE8; Thu, 27 Aug 2020 16:19:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8576327BBE5 for ; Thu, 27 Aug 2020 16:19:10 +0100 (BST) Received: from localhost ([::1]:35214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgD-0002KN-S2 for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg6-0002K4-SX for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60354) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg6-0004cd-Jf for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg6-0007gl-Fh for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 3/9] gnu: dovecot-pigeonhole: Add new variable. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 15:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159854148829436 (code B ref 42899); Thu, 27 Aug 2020 15:19:02 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:08 +0000 Received: from localhost ([127.0.0.1]:43652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfD-0007ec-QU for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:08 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:51967) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf6-0007dH-Ux for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:03 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id B3CAF9CF0D for <42899@debbugs.gnu.org>; Thu, 27 Aug 2020 14:47:13 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:37 +0200 Message-Id: <20200827151743.27712-3-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200827151743.27712-1-levenson@mmer.org> References: <20200827151743.27712-1-levenson@mmer.org> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/mail.scm | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c22dd27547..5470144d53 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1481,6 +1481,56 @@ It supports mbox/Maildir and its own dbox/mdbox formats.") (license (list license:lgpl2.1 license:expat (license:non-copyleft "file://COPYING"))))) +(define-public dovecot-pigeonhole + (let ((dovecot-version (version-major+minor (package-version dovecot)))) + (package + (name "dovecot-pigeonhole") + (version "0.5.11") + (source + (origin + (method url-fetch) + (uri (string-append "https://pigeonhole.dovecot.org/releases/" + dovecot-version "/" + "dovecot-" dovecot-version "-pigeonhole-" version ".tar.gz")) + (sha256 + (base32 + "1w5mryv6izh1gv7davnl94rb0pvh5bxl2bydzbfla1b83x22m5qb")))) + (build-system gnu-build-system) + (inputs + `(("dovecot" ,dovecot))) + (arguments + `(#:configure-flags + (list "--with-dovecot-install-dirs=no" + (string-append "--with-dovecot=" + (assoc-ref %build-inputs "dovecot") + "/lib/dovecot") + (string-append "--with-moduledir=" + (assoc-ref %outputs "out") + "/lib/dovecot")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-file-names + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "src/managesieve/managesieve-settings.c" + ((".executable = \"managesieve\"") + (string-append ".executable = \"" out + "/libexec/dovecot/managesieve\""))) + (substitute* "src/managesieve-login/managesieve-login-settings.c" + ((".executable = \"managesieve-login\"") + (string-append ".executable = \"" out + "/libexec/dovecot/managesieve-login\"")))) + #t))))) + (home-page "https://pigeonhole.dovecot.org") + (synopsis "Mail filtering in Dovecot using the Sieve language") + (description + "@code{dovecot-pigonhole} adds support for the Sieve +language (RFC 5228) and the ManageSieve protocol (RFC 5804) to the +@code{Dovecot} Secure IMAP Server.") + (license (list license:lgpl2.1 + (license:non-copyleft "file://COPYING") + (license:non-copyleft "file://COPYING.LGPL")))))) + (define-public dovecot-trees (package (name "dovecot-trees") From patchwork Thu Aug 27 15:17:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23804 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 DE3D827BBE6; Thu, 27 Aug 2020 16:19:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6B56727BBE5 for ; Thu, 27 Aug 2020 16:19:24 +0100 (BST) Received: from localhost ([::1]:36506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgR-0002ub-W4 for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg9-0002NI-Ov for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60361) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg9-0004dT-Cx for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg9-0007ha-91 for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 4/9] services: dovecot: Serialize global settings first. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 15:19:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159854149629491 (code B ref 42899); Thu, 27 Aug 2020 15:19:05 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:16 +0000 Received: from localhost ([127.0.0.1]:43666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfL-0007fW-Gb for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:15 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:51971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf7-0007dJ-IE for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:05 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 69C7D9CF81 for <42899@debbugs.gnu.org>; Thu, 27 Aug 2020 14:47:14 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:38 +0200 Message-Id: <20200827151743.27712-4-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200827151743.27712-1-levenson@mmer.org> References: <20200827151743.27712-1-levenson@mmer.org> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services/mail.scm (dovecot-configuration): To avoid dovecot warning messages, move serialization of protocol settings below the global one. --- gnu/services/mail.scm | 118 +++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 2832303d88..a3c48bdb99 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -479,64 +479,6 @@ interfaces. If you want to specify non-default ports or anything more complex, customize the address and port fields of the @samp{inet-listener} of the specific services you are interested in.") - (protocols - (protocol-configuration-list - (list (protocol-configuration - (name "imap")))) - "List of protocols we want to serve. Available protocols include -@samp{imap}, @samp{pop3}, and @samp{lmtp}.") - - (services - (service-configuration-list - (list - (service-configuration - (kind "imap-login") - (client-limit 0) - (process-limit 0) - (listeners - (list - (inet-listener-configuration (protocol "imap") (port 143) (ssl? #f)) - (inet-listener-configuration (protocol "imaps") (port 993) (ssl? #t))))) - (service-configuration - (kind "pop3-login") - (listeners - (list - (inet-listener-configuration (protocol "pop3") (port 110) (ssl? #f)) - (inet-listener-configuration (protocol "pop3s") (port 995) (ssl? #t))))) - (service-configuration - (kind "lmtp") - (client-limit 1) - (process-limit 0) - (listeners - (list (unix-listener-configuration (path "lmtp") (mode "0666"))))) - (service-configuration - (kind "imap") - (client-limit 1) - (process-limit 1024)) - (service-configuration - (kind "pop3") - (client-limit 1) - (process-limit 1024)) - (service-configuration - (kind "auth") - (service-count 0) - (client-limit 0) - (process-limit 1) - (listeners - (list (unix-listener-configuration (path "auth-userdb"))))) - (service-configuration - (kind "auth-worker") - (client-limit 1) - (process-limit 0)) - (service-configuration - (kind "dict") - (client-limit 1) - (process-limit 0) - (listeners (list (unix-listener-configuration (path "dict"))))))) - "List of services to enable. Available services include @samp{imap}, -@samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and -@samp{lmtp}.") - (dict (dict-configuration (dict-configuration)) "Dict configuration, as created by the @code{dict-configuration} @@ -1434,7 +1376,65 @@ greyed out, instead of only later giving \"not selectable\" popup error. (imap-urlauth-host (string "") - "Host allowed in URLAUTH URLs sent by client. \"*\" allows all.") ) + "Host allowed in URLAUTH URLs sent by client. \"*\" allows all.") + + (protocols + (protocol-configuration-list + (list (protocol-configuration + (name "imap")))) + "List of protocols we want to serve. Available protocols include +@samp{imap}, @samp{pop3}, and @samp{lmtp}.") + + (services + (service-configuration-list + (list + (service-configuration + (kind "imap-login") + (client-limit 0) + (process-limit 0) + (listeners + (list + (inet-listener-configuration (protocol "imap") (port 143) (ssl? #f)) + (inet-listener-configuration (protocol "imaps") (port 993) (ssl? #t))))) + (service-configuration + (kind "pop3-login") + (listeners + (list + (inet-listener-configuration (protocol "pop3") (port 110) (ssl? #f)) + (inet-listener-configuration (protocol "pop3s") (port 995) (ssl? #t))))) + (service-configuration + (kind "lmtp") + (client-limit 1) + (process-limit 0) + (listeners + (list (unix-listener-configuration (path "lmtp") (mode "0666"))))) + (service-configuration + (kind "imap") + (client-limit 1) + (process-limit 1024)) + (service-configuration + (kind "pop3") + (client-limit 1) + (process-limit 1024)) + (service-configuration + (kind "auth") + (service-count 0) + (client-limit 0) + (process-limit 1) + (listeners + (list (unix-listener-configuration (path "auth-userdb"))))) + (service-configuration + (kind "auth-worker") + (client-limit 1) + (process-limit 0)) + (service-configuration + (kind "dict") + (client-limit 1) + (process-limit 0) + (listeners (list (unix-listener-configuration (path "dict"))))))) + "List of services to enable. Available services include @samp{imap}, +@samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and +@samp{lmtp}.")) (define-configuration opaque-dovecot-configuration (dovecot From patchwork Thu Aug 27 15:17:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23805 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 E8BDC27BBE6; Thu, 27 Aug 2020 16:19:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AB42327BBE5 for ; Thu, 27 Aug 2020 16:19:28 +0100 (BST) Received: from localhost ([::1]:36846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgW-00033G-9P for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg9-0002MP-Aw for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60360) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg9-0004dK-04 for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg8-0007hT-RJ for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 5/9] services: dovecot: Only serialize settings with non-empty values. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 15:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159854149529485 (code B ref 42899); Thu, 27 Aug 2020 15:19:04 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:15 +0000 Received: from localhost ([127.0.0.1]:43664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfL-0007fO-93 for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:15 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:51975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf8-0007dQ-4f for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:05 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 0814D9CF8E for <42899@debbugs.gnu.org>; Thu, 27 Aug 2020 14:47:14 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:39 +0200 Message-Id: <20200827151743.27712-5-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200827151743.27712-1-levenson@mmer.org> References: <20200827151743.27712-1-levenson@mmer.org> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services/mail.scm (serialize-space-separated-string-list): Protocols might have custom settings, which are not supported by other protocols. To prevent dovecot/services from crashing, serialize settings that hold non-empty values only. --- gnu/services/mail.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index a3c48bdb99..6e166af2be 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -99,7 +99,9 @@ (and (string? x) (not (string-index x #\space)))) val))) (define (serialize-space-separated-string-list field-name val) - (serialize-field field-name (string-join val " "))) + (match val + (() #f) + (_ (serialize-field field-name (string-join val " "))))) (define (comma-separated-string-list? val) (and (list? val) From patchwork Thu Aug 27 15:17:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23802 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 C0EF127BBE6; Thu, 27 Aug 2020 16:19:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7241827BBE5 for ; Thu, 27 Aug 2020 16:19:18 +0100 (BST) Received: from localhost ([::1]:36080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgM-0002je-0G for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg8-0002KM-1x for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60357) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg7-0004cv-PY for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg7-0007h7-Lr for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 6/9] services: dovecot: Add 'mail-attribute-dict' configuration option. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 15:19:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159854149429463 (code B ref 42899); Thu, 27 Aug 2020 15:19:03 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:14 +0000 Received: from localhost ([127.0.0.1]:43658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfK-0007f2-1V for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:14 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:51979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf9-0007dj-CP for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:04 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id B30B09CFCF for <42899@debbugs.gnu.org>; Thu, 27 Aug 2020 14:47:15 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:40 +0200 Message-Id: <20200827151743.27712-6-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200827151743.27712-1-levenson@mmer.org> References: <20200827151743.27712-1-levenson@mmer.org> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services/mail.scm (dovecot-configuration): Define 'mail-attribute-dict' directive to support IMAP METADATA extension.: * doc/guix.texi (Mail Services): Document it. --- doc/guix.texi | 15 +++++++++++++++ gnu/services/mail.scm | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index dfa83c409c..f2124560ae 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18238,6 +18238,21 @@ could allow a user to delete others' mailboxes, or @code{ln -s @samp{""}. @end deftypevr +@deftypevr {@code{dovecot-configuration} parameter} string mail-attribute-dict +Activate the metadata storage of @code{IMAP METADATA} extension +@uref{https://tools.ietf.org/html/rfc5464,RFC@tie{}5464}. The goal of +the METADATA extension is to provide a means for clients to set and +retrieve 'annotations' or 'metadata' on an IMAP server. The annotations +can be associated with specific mailboxes or the server as a whole. The +server can choose to support only server annotations or both server and +mailbox annotations. For example, a general comment being added to a +mailbox may have an entry name of '/comment' and a value of 'Really +useful mailbox' + +Defaults to @samp{""}. + +@end deftypevr + @deftypevr {@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access? Allow full file system access to clients. There's no access checks other than what the operating system does for the active UID/GID. It diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 6e166af2be..d8df5c82e4 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1130,6 +1130,17 @@ disabled.") @samp{mdbox-rotate-size}. This setting currently works only in Linux with some file systems (ext4, xfs).") + (mail-attribute-dict + (string "") + "Activate the metadata storage of @code{IMAP METADATA} extension +@uref{https://tools.ietf.org/html/rfc5464, RFC@tie{}5464}. The goal of the +METADATA extension is to provide a means for clients to set and retrieve +'annotations' or 'metadata' on an IMAP server. The annotations can be +associated with specific mailboxes or the server as a whole. The server can +choose to support only server annotations or both server and mailbox +annotations. For example, a general comment being added to a mailbox may have +an entry name of '/comment' and a value of 'Really useful mailbox'") + (mail-attachment-dir (string "") "sdbox and mdbox support saving mail attachments to external files, From patchwork Thu Aug 27 15:17:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23799 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 2FFEA27BBE7; Thu, 27 Aug 2020 16:19:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CB1E527BBE6 for ; Thu, 27 Aug 2020 16:19:11 +0100 (BST) Received: from localhost ([::1]:35268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgF-0002Mc-AV for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg7-0002KG-KY for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg7-0004cr-Bb for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg7-0007gz-8G for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 7/9] services: dovecot: Add 'imap-metadata?' protocol configuration option. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 15:19:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159854149429455 (code B ref 42899); Thu, 27 Aug 2020 15:19:03 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:14 +0000 Received: from localhost ([127.0.0.1]:43656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfJ-0007f0-Kb for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:14 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:51983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf9-0007dt-J1 for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:04 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 822929CFE3 for <42899@debbugs.gnu.org>; Thu, 27 Aug 2020 14:47:16 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:41 +0200 Message-Id: <20200827151743.27712-7-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200827151743.27712-1-levenson@mmer.org> References: <20200827151743.27712-1-levenson@mmer.org> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services/mail.scm (protocol-configuration): Define the option to be able to activate the IMAP METADATA commands over the imap protocol. * doc/guix.texi (Mail Services): Document it. --- doc/guix.texi | 11 +++++++++++ gnu/services/mail.scm | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index f2124560ae..f46854480b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17540,6 +17540,17 @@ This is used by imap (for shared users) and lda. It defaults to @samp{"/var/run/dovecot/auth-userdb"}. @end deftypevr +@deftypevr {@code{protocol-configuration} parameter} boolean imap-metadata? +Activate the commands of @code{IMAP METADATA} extension +@uref{https://tools.ietf.org/html/rfc5464,RFC@tie{}5464}. + +If activated, a dictionary needs to be configured, via the +@code{mail-attribute-dict} setting. + +Defaults to @samp{#f}. + +@end deftypevr + @deftypevr {@code{protocol-configuration} parameter} space-separated-string-list mail-plugins Space separated list of plugins to load. @end deftypevr diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index d8df5c82e4..ee710303e7 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -348,7 +348,13 @@ This is used by imap (for shared users) and lda.") (mail-max-userip-connections (non-negative-integer 10) "Maximum number of IMAP connections allowed for a user from each IP -address. NOTE: The username is compared case-sensitively.")) +address. NOTE: The username is compared case-sensitively.") + (imap-metadata? + (boolean #f) + "Activate the commands of @code{IMAP METADATA} extension +@uref{https://tools.ietf.org/html/rfc5464, RFC@tie{}5464}. If activated, a +dictionary needs to be configured, via the @code{mail-attribute-dict} +setting.")) (define (serialize-protocol-configuration field-name val) (format #t "protocol ~a {\n" (protocol-configuration-name val)) From patchwork Thu Aug 27 15:17:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23803 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 C837627BBE6; Thu, 27 Aug 2020 16:19:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7D7C427BBE5 for ; Thu, 27 Aug 2020 16:19:23 +0100 (BST) Received: from localhost ([::1]:36448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgR-0002t7-2u for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg8-0002Lb-Th for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60359) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg8-0004dB-IG for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg8-0007hM-EO for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 8/9] services: dovecot: Add 'managesieve-notify-capability' option. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 15:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159854149529477 (code B ref 42899); Thu, 27 Aug 2020 15:19:04 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:15 +0000 Received: from localhost ([127.0.0.1]:43662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfK-0007fH-TV for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:15 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:51987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfA-0007dw-P7 for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:05 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id EDC379D028 for <42899@debbugs.gnu.org>; Thu, 27 Aug 2020 14:47:16 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:42 +0200 Message-Id: <20200827151743.27712-8-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200827151743.27712-1-levenson@mmer.org> References: <20200827151743.27712-1-levenson@mmer.org> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * doc/guix.texi (Mail Services): Document it. * gnu/services/mail.scm (protocol-configuration): Define it. --- doc/guix.texi | 9 +++++++++ gnu/services/mail.scm | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index f46854480b..acccef181f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17551,6 +17551,15 @@ Defaults to @samp{#f}. @end deftypevr +@deftypevr {@code{protocol-configuration} parameter} space-separated-string-list managesieve-notify-capabilities +Report notify capabilities by the managesieve service upon a client +connection. If left unassigned, these will be assigned dynamically +according to what the Sieve interpreter supports by default (after login +this may differ depending on the authenticated user). + +Defaults to @samp{()}. +@end deftypevr + @deftypevr {@code{protocol-configuration} parameter} space-separated-string-list mail-plugins Space separated list of plugins to load. @end deftypevr diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index ee710303e7..8b57b42dfe 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -354,7 +354,13 @@ address. NOTE: The username is compared case-sensitively.") "Activate the commands of @code{IMAP METADATA} extension @uref{https://tools.ietf.org/html/rfc5464, RFC@tie{}5464}. If activated, a dictionary needs to be configured, via the @code{mail-attribute-dict} -setting.")) +setting.") + (managesieve-notify-capability + (space-separated-string-list '()) + "Report NOTIFY capabilities by the ManageSieve service upon a client +connection. If left unassigned, these will be assigned dynamically +according to what the Sieve interpreter supports by default.")) + (define (serialize-protocol-configuration field-name val) (format #t "protocol ~a {\n" (protocol-configuration-name val)) From patchwork Thu Aug 27 15:17:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23801 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 DD89D27BBE6; Thu, 27 Aug 2020 16:19:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A672D27BBE5 for ; Thu, 27 Aug 2020 16:19:17 +0100 (BST) Received: from localhost ([::1]:36008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgL-0002i4-7i for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg8-0002Kq-FX for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60358) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg8-0004d4-4p for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg8-0007hE-1R for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 9/9] services: dovecot: Add 'managesieve-sieve-capability' option. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 15:19:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159854149529470 (code B ref 42899); Thu, 27 Aug 2020 15:19:03 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:15 +0000 Received: from localhost ([127.0.0.1]:43660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfK-0007fA-I9 for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:14 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:51991) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf9-0007dy-Vi for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:04 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 3008A9D07E for <42899@debbugs.gnu.org>; Thu, 27 Aug 2020 14:47:17 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:43 +0200 Message-Id: <20200827151743.27712-9-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200827151743.27712-1-levenson@mmer.org> References: <20200827151743.27712-1-levenson@mmer.org> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services/mail.scm (protocol-configuration): Define it. * doc/guix.texi (Mail Services): Document it. --- doc/guix.texi | 9 +++++++++ gnu/services/mail.scm | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index acccef181f..59377bb678 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17560,6 +17560,15 @@ this may differ depending on the authenticated user). Defaults to @samp{()}. @end deftypevr +@deftypevr {@code{protocol-configuration} parameter} space-separated-string-list managesieve-sieve-capability +Report SIEVE capabilities by the ManageSieve service upon a client +connection. If left unassigned, these will be assigned dynamically +according to what the Sieve interpreter supports by default. + +Defaults to @samp{()}. + +@end deftypevr + @deftypevr {@code{protocol-configuration} parameter} space-separated-string-list mail-plugins Space separated list of plugins to load. @end deftypevr diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 8b57b42dfe..91d7041636 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -359,7 +359,12 @@ setting.") (space-separated-string-list '()) "Report NOTIFY capabilities by the ManageSieve service upon a client connection. If left unassigned, these will be assigned dynamically -according to what the Sieve interpreter supports by default.")) +according to what the Sieve interpreter supports by default.") + (managesieve-sieve-capability + (space-separated-string-list '()) + "Report SIEVE capabilities by the ManageSieve service upon a client ++connection. If left unassigned, these will be assigned dynamically ++according to what the Sieve interpreter supports by default.")) (define (serialize-protocol-configuration field-name val)