aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-06-10 19:23:35 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2021-06-10 23:21:23 +0200
commite7f1c55eb121f626dcd51a7e128a92060d9fabd5 (patch)
treef8ddcf14ca1199075b034aecf173a5ed09fe1804
parent809e5f76025a55f07a70f93021ecf860eaf096d8 (diff)
downloadguix-e7f1c55eb121f626dcd51a7e128a92060d9fabd5.tar.gz
guix-e7f1c55eb121f626dcd51a7e128a92060d9fabd5.zip
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.
-rw-r--r--gnu/packages/mail.scm10
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 13f34155b3..18a0959eea 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