guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/09: gnu: rottlog: Add gawk as an input.


From: guix-commits
Subject: 06/09: gnu: rottlog: Add gawk as an input.
Date: Thu, 14 Sep 2023 11:21:25 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 9aeb9e7cc83d5d0e1aed7b34fb5a357645fd86a9
Author: Skyler <skyvine@protonmail.com>
AuthorDate: Thu Sep 7 02:01:51 2023 +0000

    gnu: rottlog: Add gawk as an input.
    
    This avoids an issue where rottlog will delete the entire /tmp directory
    if gawk is not installed.  See <https://issues.guix.gnu.org/65793>.
    
    * gnu/packages/admin.scm (rottlog): Add gawk input, also update the
    patch-paths build phase for awk invocations.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/admin.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 98ed3d4e61..1b2324bfc7 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1978,7 +1978,11 @@ at once based on a Perl regular expression.")
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "rc/rc"
                 (("/usr/sbin/sendmail")
-                 (search-input-file inputs "/bin/mail")))))
+                 (search-input-file inputs "/bin/mail")))
+              (with-fluids ((%default-port-encoding "ISO-8859-1"))
+                (substitute* "src/rottlog"
+                  (("awk")
+                   (search-input-file inputs "/bin/awk"))))))
           (add-after 'build 'set-packdir
             (lambda _
               ;; Set a default location for archived logs.
@@ -1997,7 +2001,7 @@ at once based on a Perl regular expression.")
             (lambda _
               (invoke "make" "install-info"))))))
     (native-inputs (list autoconf automake texinfo util-linux)) ; for 'cal'
-    (inputs (list coreutils mailutils))
+    (inputs (list coreutils gawk mailutils))
     (home-page "https://www.gnu.org/software/rottlog/";)
     (synopsis "Log rotation and management")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]