ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: opensmtpd: Update to 7.3.0p0.

Browse source 
* gnu/packages/mail.scm (opensmtpd): Update to 7.3.0p0.
[arguments]: Remove obsolete 'fix-smtpctl-encrypt-bug phase.
Don't explicitly return #t from remaining phases.
This commit is contained in:
Tobias Geerinckx-Rice 2023-06-18 02:00:02 +02:00
parent 65ed7a61f1
commit dcca13ed73
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/mail.scm
View file

@ -3175,14 +3175,14 @@ (define-public sieve-connect
(define-public opensmtpd (define-public opensmtpd
(package (package
(name "opensmtpd") (name "opensmtpd")
(version "6.8.0p2") (version "7.3.0p0")
(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 "05sd7bmq29ibnqbl2z53hiyprfxzf0qydfdaixs68rz55wqhbgsi")))) (base32 "1rnaa022pkdc15vkvlisv42dvcxchib40h0m97myfyqjralabmrd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list bdb (list bdb
@ -3205,13 +3205,6 @@ (define-public opensmtpd
"--with-table-db") "--with-table-db")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; See: https://github.com/OpenSMTPD/OpenSMTPD/issues/1069.
(add-after 'unpack 'fix-smtpctl-encrypt-bug
(lambda _
(substitute* "usr.sbin/smtpd/smtpctl.c"
(("\"encrypt\", \"--\",")
"\"encrypt\","))
#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 _
@ -3219,8 +3212,7 @@ (define-public opensmtpd
;; ‘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* "usr.sbin/smtpd/mda_unpriv.c" (substitute* "usr.sbin/smtpd/mda_unpriv.c"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))))
#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
@ -3233,8 +3225,7 @@ (define-public opensmtpd
(for-each (lambda (command) (for-each (lambda (command)
(symlink "smtpctl" (string-append sbin command))) (symlink "smtpctl" (string-append sbin command)))
(list "mailq" "makemap" "newaliases" (list "mailq" "makemap" "newaliases"
"send-mail" "sendmail"))) "send-mail" "sendmail"))))))))
#t)))))
(synopsis "Lightweight SMTP daemon") (synopsis "Lightweight SMTP daemon")
(description (description
"OpenSMTPD is an implementation of server-side @acronym{SMTP, Simple Mail "OpenSMTPD is an implementation of server-side @acronym{SMTP, Simple Mail