From e7f1c55eb121f626dcd51a7e128a92060d9fabd5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 10 Jun 2021 19:23:35 +0200 Subject: gnu: opensmtpd-filter-dkimsign: Support ed25519 signatures. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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(-) (limited to 'gnu/packages/mail.scm') 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 -- cgit v1.2.3