ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-28 15:22:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: opensmtpd: Update to 6.8.0p1.

Browse source 
* gnu/packages/mail.scm (opensmtpd): Update to 6.8.0p1.
This commit is contained in:
Tobias Geerinckx-Rice 2020-12-24 12:41:17 +01:00
parent 20a687bbfb
commit f6e06e8b15
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/mail.scm
View file

@ -2877,14 +2877,14 @@ (define-public sieve-connect
(define-public opensmtpd (define-public opensmtpd
(package (package
(name "opensmtpd") (name "opensmtpd")
(version "6.7.1p1") (version "6.8.0p1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.opensmtpd.org/archives/" (uri (string-append "https://www.opensmtpd.org/archives/"
"opensmtpd-" version ".tar.gz")) "opensmtpd-" version ".tar.gz"))
(sha256 (sha256
(base32 "1jh8vxfajm1mvp1v5yh6llrhjzv0n9fgab88mlwllwqynhcfjy3l")))) (base32 "10095dskwmrnsjkqvm2d08pws9jig7b88prbfr0qc5am49ggl8gm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("bdb" ,bdb) `(("bdb" ,bdb)
@ -2911,19 +2911,27 @@ (define-public opensmtpd
;; See: https://github.com/OpenSMTPD/OpenSMTPD/issues/1069. ;; See: https://github.com/OpenSMTPD/OpenSMTPD/issues/1069.
(add-after 'unpack 'fix-smtpctl-encrypt-bug (add-after 'unpack 'fix-smtpctl-encrypt-bug
(lambda _ (lambda _
(substitute* "smtpd/smtpctl.c" (substitute* "usr.sbin/smtpd/smtpctl.c"
(("\"encrypt\", \"--\",") (("\"encrypt\", \"--\",")
"\"encrypt\",")) "\"encrypt\","))
#t)) #t))
;; Fix some incorrectly hard-coded external tool file names. ;; Fix some incorrectly hard-coded external tool file names.
(add-after 'unpack 'patch-FHS-file-names (add-after 'unpack 'patch-FHS-file-names
(lambda _ (lambda _
(substitute* "smtpd/smtpctl.c" (substitute* "usr.sbin/smtpd/smtpctl.c"
;; ‘gzcat’ is auto-detected at compile time, but ‘cat’ isn't. ;; ‘gzcat’ is auto-detected at compile time, but ‘cat’ isn't.
(("/bin/cat") (which "cat"))) (("/bin/cat") (which "cat")))
(substitute* "smtpd/mda_unpriv.c" (substitute* "usr.sbin/smtpd/mda_unpriv.c"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
#t)) #t))
(add-after 'unpack 'fix-man-page-detection
;; XXX Remove when https://github.com/OpenSMTPD/OpenSMTPD/pull/1113
;; or similar fix is released.
(lambda _
(substitute* "configure"
(("smtpd/smtpd.8" match)
(string-append "usr.sbin/" match)))
#t))
;; OpenSMTPD provides a single smtpctl utility to control both the ;; OpenSMTPD provides a single smtpctl utility to control both the
;; daemon and the local submission subsystem. To accomodate systems ;; daemon and the local submission subsystem. To accomodate systems
;; that require historical interfaces such as sendmail, newaliases or ;; that require historical interfaces such as sendmail, newaliases or