me/guix
Archived
1
0
Fork 0
Code Activity

gnu: opensmtpd-filter-dkimsign: Support ed25519 signatures.

Browse source 
* 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.
This commit is contained in:
Tobias Geerinckx-Rice 2021-06-10 19:23:35 +02:00
parent 809e5f7602
commit e7f1c55eb1
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/mail.scm
View file

@ -3146,21 +3146,25 @@ writing OpenSMTPd filters.")
`(#:make-flags `(#:make-flags
(list "-f" "Makefile.gnu" (list "-f" "Makefile.gnu"
(string-append "CC=" ,(cc-for-target)) (string-append "CC=" ,(cc-for-target))
"HAVE_ED25519=yep-but-is-openssl-only"
(string-append "LOCALBASE=" (assoc-ref %outputs "out"))) (string-append "LOCALBASE=" (assoc-ref %outputs "out")))
#:tests? #f ; no test suite #:tests? #f ; no test suite
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'inherit-ownership (add-after 'unpack 'patch-Makefile.gnu
(lambda _ (lambda _
(substitute* "Makefile.gnu" (substitute* "Makefile.gnu"
(("pkg-config") ,(pkg-config-for-target))
(("-o \\$\\{...OWN\\} -g \\$\\{...GRP\\}") "")))) (("-o \\$\\{...OWN\\} -g \\$\\{...GRP\\}") ""))))
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
(native-inputs (native-inputs
`(("mandoc" ,mandoc))) ; silently installs empty man page without `(("mandoc" ,mandoc))) ; silently installs empty man page without
(inputs (inputs
`(("libevent" ,libevent) `(("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/") (home-page "http://imperialat.at/dev/filter-dkimsign/")
(synopsis "OpenSMTPd filter for signing mail with DKIM") (synopsis "OpenSMTPd filter for signing mail with DKIM")
(description (description