gnu: opensmtpd-filter-dkimsign: Update to 0.5.

* gnu/packages/mail.scm (opensmtpd-filter-dkimsign): Update to 0.5.
[source]: Use the upstream release tarball now.
[arguments]: Adjust #:make-flags to new upstream Makefile.gnu.
Remove obsolete custom 'unpack and 'install phases.
Add a new 'inherit-ownership phase.
[native-inputs]: Remove Arch Linux Makefile.  Add mandoc.  Remove the
libopensmtpd sources in favour of…
[inputs]: …the real thing.
This commit is contained in:
Tobias Geerinckx-Rice 2021-06-10 19:13:57 +02:00
parent 5b0f0c80ef
commit 809e5f7602
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -3133,58 +3133,34 @@ (define-public libopensmtpd
(define-public opensmtpd-filter-dkimsign (define-public opensmtpd-filter-dkimsign
(package (package
(name "opensmtpd-filter-dkimsign") (name "opensmtpd-filter-dkimsign")
;; The .arch repackaging provides not only a usable Makefile, but patches (version "0.5")
;; the source to actually build on GNU, e.g., by making pledge() optional.
;; It's effectively the portable branch that upstream lacks at this time.
(version "0.2.arch2") ; also update both native-inputs
(source (source
(origin (origin
(method git-fetch) (method url-fetch)
(uri (git-reference (uri (string-append "https://distfiles.sigtrap.nl/"
(url "https://github.com/de-vri-es/filter-dkimsign") "filter-dkimsign-" version ".tar.gz"))
(commit (string-append "v" version))))
(sha256 (sha256
(base32 "1dv6184h0gq2safnc7ln4za3arbafzc1xwkgwmiihqcjvdyxig0c")) (base32 "0jwp47ixibnz8rghn193bk2hxh1j1zfrnidml18j7d7cylxfrd55"))))
(file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
(list (string-append "CC=" ,(cc-for-target))) (list "-f" "Makefile.gnu"
(string-append "CC=" ,(cc-for-target))
(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
(replace 'unpack (add-after 'unpack 'inherit-ownership
(lambda* (#:key source inputs #:allow-other-keys) (lambda _
(copy-recursively source "filter-dkimsign") (substitute* "Makefile.gnu"
(copy-recursively (assoc-ref inputs "libopensmtpd-source") (("-o \\$\\{...OWN\\} -g \\$\\{...GRP\\}") ""))))
"libopensmtpd") (delete 'configure)))) ; no configure script
(copy-file (assoc-ref inputs "Makefile") "Makefile")
#t))
(delete 'configure) ; no configure script
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(libexec (string-append out "/libexec/opensmtpd"))
(man8 (string-append out "/share/man/man8")))
(chdir "filter-dkimsign")
(install-file "filter-dkimsign" libexec)
(install-file "filter-dkimsign.8" man8)
#t))))))
(native-inputs (native-inputs
`(("Makefile" `(("mandoc" ,mandoc))) ; silently installs empty man page without
,(origin
(method url-fetch)
(uri (string-append
"https://aur.archlinux.org/cgit/aur.git/plain/Makefile"
"?h=opensmtpd-filter-dkimsign"
"&id=58393470477a2ff2a58f9d72f5d851698067539f"))
(sha256
(base32 "0da5qr9hfjkf07ybvfva967njmf2x0b82z020r6v5f93jzsbqx92"))
(file-name (string-append name "-" version "-Makefile"))))
("libopensmtpd-source" ,(package-source libopensmtpd))))
(inputs (inputs
`(("libevent" ,libevent) `(("libevent" ,libevent)
("libressl" ,libressl))) ; openssl works too but follow opensmtpd ("libressl" ,libressl) ; openssl works too but follow opensmtpd
("libopensmtpd" ,libopensmtpd)))
(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