branch master updated: gnu: opensmtpd: Patch bug in 'smtpctl encrypt'.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 838c4b1  gnu: opensmtpd: Patch bug in 'smtpctl encrypt'.
838c4b1 is described below

commit 838c4b10e9905e1957a57a281152599c1cdd17ce
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Jun 8 15:37:21 2020 -0400

    gnu: opensmtpd: Patch bug in 'smtpctl encrypt'.
    
    * gnu/packages/mail.scm (opensmtpd)[phases]{fix-smtpctl-encrypt-bug}: New
    phase.
---
 gnu/packages/mail.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 8337bc7..0c683f0 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2322,6 +2322,13 @@ transfer protocols.")
              "--with-table-db")
        #:phases
        (modify-phases %standard-phases
+         ;; See: https://github.com/OpenSMTPD/OpenSMTPD/issues/1069.
+         (add-after 'unpack 'fix-smtpctl-encrypt-bug
+           (lambda _
+             (substitute* "smtpd/smtpctl.c"
+               (("\"encrypt\", \"--\",")
+                "\"encrypt\","))
+             #t))
          ;; Fix some incorrectly hard-coded external tool file names.
          (add-after 'unpack 'patch-FHS-file-names
            (lambda _