Subject: [PATCH] gnu: Add opendoas.
From: [email-masked]
To: [email-masked]
Cc: Morgan Smith <[email-masked]>
Date: Thu, 28 May 2020 11:35:07 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

From: Morgan Smith <[email-masked]>

* gnu/packages/admin.scm (opendoas): New variable.
---
 gnu/packages/admin.scm | 51 ++++++++++++++++++++++++++++++++++++++++++
 gnu/system.scm         |  1 +
 2 files changed, 52 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index b0a43d9644..594ec62c1d 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1389,6 +1389,57 @@ commands and their arguments.")
     ;; See <http://www.sudo.ws/sudo/license.html>.
     (license license:x11)))
 
+(define-public opendoas
+  (package
+    (name "opendoas")
+    (version "6.6.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Duncaen/OpenDoas.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn"))))
+    (build-system gnu-build-system)
+    (arguments (let* ((target (%current-target-system))
+                      (compiler (if target
+                                    (string-append target "-gcc")
+                                    "gcc")))
+                 `(#:phases
+                   (modify-phases %standard-phases
+                     ;; We replace the configure phase in order to remove all the
+                     ;; default flags. The configure script doesn't accept most
+                     ;; of the default flags
+                     (replace 'configure
+                       (lambda* (#:key configure-flags #:allow-other-keys)
+                         ;; The configure script can only be told which
+                         ;; compiler to use through environment variables
+                         (setenv "CC" ,compiler)
+                         (apply invoke "./configure" configure-flags)))
+                     (add-before 'install 'fix-makefile
+                       (lambda* (#:key outputs #:allow-other-keys)
+                         ;; We can't chown to root as the chroot doesn't have
+                         ;; this user. Also the store is owned by root so this
+                         ;; isn't necessary.
+                         (substitute* "bsd.prog.mk"
+                           (("^\tchown.*$") "")))))
+                   #:configure-flags (list (string-append "--prefix=" %output)
+                                           (string-append "--target=" (or ,target ""))
+                                           "--with-timestamp")
+                   ;; Compiler choice is not carried over from the configure script
+                   #:make-flags (list (string-append "CC=" ,compiler))
+                   ;; There are no tests provided
+                   #:tests? #f)))
+    (native-inputs `(("bison" ,bison)))
+    (home-page "https://github.com/Duncaen/OpenDoas")
+    (synopsis "Portable version of OpenBSD's doas command")
+    (description "Doas is a minimal replacement for the venerable sudo.  It was
+initially written by Ted Unangst of the OpenBSD project to provide 95% of the
+features of sudo with a fraction of the codebase.")
+    (license license:isc)))
+
 (define-public wpa-supplicant-minimal
   (package
     (name "wpa-supplicant-minimal")
diff --git a/gnu/system.scm b/gnu/system.scm
index d929187695..d5fd0979a1 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -896,6 +896,7 @@ use 'plain-file' instead~%")
           (file-append inetutils "/bin/ping6")
           (file-append sudo "/bin/sudo")
           (file-append sudo "/bin/sudoedit")
+          (file-append opendoas "/bin/doas")
           (file-append fuse "/bin/fusermount")
 
           ;; To allow mounts with the "user" option, "mount" and "umount" must
-- 
2.26.2