From d6894b95ec541d55447126436340faa1d86d0c5e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 18 Mar 2020 20:17:01 +0100
Subject: gnu: dovecot: Use SQLite.

* gnu/packages/mail.scm (dovecot)[arguments]: Add "--with-sqlite"
to #:configure-flags.
---
 gnu/packages/mail.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/mail.scm')

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index f3499b28d2..e7931cc670 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1401,7 +1401,8 @@ facilities for checking incoming mail.")
        ("zlib" ,zlib)))
     (arguments
      `(#:configure-flags '("--sysconfdir=/etc"
-                           "--localstatedir=/var")
+                           "--localstatedir=/var"
+                           "--with-sqlite") ; not auto-detected
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-file-names
-- 
cgit v1.2.3


From 8826b792d81c76571a562cb3d62ed5550e4ae04d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 18 Mar 2020 21:23:48 +0100
Subject: gnu: dovecot: Use libsodium.

This adds support for ARGON2I and ARGON2ID password hashing in exchange
for a <1% increase in closure size.

* gnu/packages/mail.scm (dovecot)[inputs]: Add libsodium.
(dovecot-libsodium-plugin)[description]: Note its use.
---
 gnu/packages/mail.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/mail.scm')

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index e7931cc670..d5eaf67ccb 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1394,6 +1394,7 @@ facilities for checking incoming mail.")
      `(("pkg-config" ,pkg-config)))
     (inputs
      `(("bzip2" ,bzip2)
+       ("libsodium" ,libsodium)         ; extra password algorithms
        ("linux-pam" ,linux-pam)
        ("lz4" ,lz4)
        ("openssl" ,openssl)
@@ -1516,8 +1517,8 @@ using libsodium sealed boxes.
       (home-page "https://github.com/LuckyFellow/dovecot-libsodium-plugin")
       (synopsis "Libsodium password hashing schemes plugin for Dovecot")
       (description
-       "@code{dovecot-libsodium-plugin} provides libsodium password
-hashing schemes plugin for @code{Dovecot}.")
+       "@code{dovecot-libsodium-plugin} provides a libsodium password
+hashing scheme (such as scrypt) plug-in for @code{Dovecot}.")
       (license gpl3+))))
 
 (define-public isync
-- 
cgit v1.2.3


From f44c555b7d5e631a1200c6ef0e43775e1b82dcc2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 19 Mar 2020 01:38:44 +0100
Subject: gnu: neomutt: Update to 20200313.

* gnu/packages/mail.scm (neomutt): Update to 20200313.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/mail.scm')

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index d5eaf67ccb..03383180b0 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -427,7 +427,7 @@ operating systems.")
 (define-public neomutt
   (package
     (name "neomutt")
-    (version "20191207")
+    (version "20200313")
     (source
      (origin
        (method git-fetch)
@@ -436,7 +436,7 @@ operating systems.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "147yjpqnsbfy01fhsflxlixk0985r91a6bjmqq3cwmf7gka3sihm"))))
+        (base32 "1k4k07l6h5krc3fx928qvdq3ssw9fxn95aj7k885xlckd2i1lnb5"))))
     (build-system gnu-build-system)
     (inputs
      `(("cyrus-sasl" ,cyrus-sasl)
-- 
cgit v1.2.3