04/10: gnu: opensmtpd-filter-dkimsign: Support ed25519 signatures.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit e7f1c55eb121f626dcd51a7e128a92060d9fabd5
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Thu Jun 10 19:23:35 2021 +0200

    gnu: opensmtpd-filter-dkimsign: Support ed25519 signatures.
    
    * gnu/packages/mail.scm (opensmtpd-filter-dkimsign)[arguments]:
    Define HAVE_ED25519 in #:make-flags.
    [arguments]: Rename 'inherit-ownership phase to 'patch-Makefile.gnu and
    patch a hard-coded ‘pkg-config’ command.
    [inputs]: Replace libressl with openssl.
---
 gnu/packages/mail.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 13f3415..18a0959 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3146,21 +3146,25 @@ writing OpenSMTPd filters.")
      `(#:make-flags
        (list "-f" "Makefile.gnu"
              (string-append "CC=" ,(cc-for-target))
+             "HAVE_ED25519=yep-but-is-openssl-only"
              (string-append "LOCALBASE=" (assoc-ref %outputs "out")))
        #:tests? #f                      ; no test suite
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'inherit-ownership
+         (add-after 'unpack 'patch-Makefile.gnu
            (lambda _
              (substitute* "Makefile.gnu"
+               (("pkg-config") ,(pkg-config-for-target))
                (("-o \\$\\{...OWN\\} -g \\$\\{...GRP\\}") ""))))
          (delete 'configure))))         ; no configure script
     (native-inputs
      `(("mandoc" ,mandoc)))           ; silently installs empty man page 
without
     (inputs
      `(("libevent" ,libevent)
-       ("libressl" ,libressl)           ; openssl works too but follow 
opensmtpd
-       ("libopensmtpd" ,libopensmtpd)))
+       ("libopensmtpd" ,libopensmtpd)
+       ;; XXX Our OpenSMTPd package uses libressl, but this package currently
+       ;; supports HAVE_ED25519 only with openssl.  Switch back when possible.
+       ("openssl" ,openssl)))
     (home-page "http://imperialat.at/dev/filter-dkimsign/";)
     (synopsis "OpenSMTPd filter for signing mail with DKIM")
     (description