gnu: sudo: Update to 1.9.0.

* gnu/packages/admin.scm (sudo): Update to 1.9.0.
[arguments]: Install example configuration to the right place
Move comments to where they don't confuse me.
This commit is contained in:
Tobias Geerinckx-Rice 2020-05-12 15:51:10 +02:00
parent a1891cbffb
commit 6f6dbf2ac1
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -1277,7 +1277,7 @@ (define-public rottlog
(define-public sudo
(package
(name "sudo")
(version "1.8.31p1")
(version "1.9.0")
(source (origin
(method url-fetch)
(uri
@ -1287,7 +1287,7 @@ (define-public sudo
version ".tar.gz")))
(sha256
(base32
"1n0mdmgcs92af34xxsnsh1arrngymhdmwd9srjgjbk65q7xzsg67"))
"0p7r3cl16pjwbc48ff1gbhjw51lngrghvwblxz5lxpyzqlwi88xb"))
(modules '((guix build utils)))
(snippet
'(begin
@ -1321,17 +1321,20 @@ (define-public sudo
;; prematurely.
(("@CONFIGURE_ARGS@") "\"\""))
(substitute* (find-files "." "Makefile\\.in")
;; Allow installation as non-root.
(("-o [[:graph:]]+ -g [[:graph:]]+")
;; Allow installation as non-root.
"")
;; Don't try to create /etc/sudoers.
(("^install: (.*)install-sudoers(.*)" _ before after)
;; Don't try to create /etc/sudoers.
(string-append "install: " before after "\n"))
;; Don't try to create /run/sudo.
(("\\$\\(DESTDIR\\)\\$\\(rundir\\)")
;; Don't try to create /run/sudo.
"$(TMPDIR)/dummy")
;; Install example sudo{,_logsrvd}.conf to the right place.
(("\\$\\(DESTDIR\\)\\$\\(sysconfdir\\)")
"$(DESTDIR)/$(docdir)/examples")
;; Don't try to create /var/db/sudo.
(("\\$\\(DESTDIR\\)\\$\\(vardir\\)")
;; Don't try to create /var/db/sudo.
"$(TMPDIR)/dummy"))
;; Checking existing [/etc/]sudoers file for syntax errors is