From patchwork Thu Sep 7 02:01:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Skyler Ferris X-Patchwork-Id: 53627 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 99A6527BBE9; Thu, 7 Sep 2023 13:55:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8880D27BBE2 for ; Thu, 7 Sep 2023 13:55:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeEX9-0000jx-SG; Thu, 07 Sep 2023 08:54:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qe4MH-0006WF-1Q for guix-patches@gnu.org; Wed, 06 Sep 2023 22:03:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qe4MG-0005O1-PO for guix-patches@gnu.org; Wed, 06 Sep 2023 22:03:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qe4MH-0006hI-QN for guix-patches@gnu.org; Wed, 06 Sep 2023 22:03:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65792] [PATCH] gnu: rottlog: Add gawk as an input. Resent-From: Skyler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 02:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65792 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65792@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.169405214925692 (code B ref -1); Thu, 07 Sep 2023 02:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Sep 2023 02:02:29 +0000 Received: from localhost ([127.0.0.1]:38201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qe4Ll-0006gK-2c for submit@debbugs.gnu.org; Wed, 06 Sep 2023 22:02:29 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qe4Lf-0006g1-Hm for submit@debbugs.gnu.org; Wed, 06 Sep 2023 22:02:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qe4LW-00069p-D9 for guix-patches@gnu.org; Wed, 06 Sep 2023 22:02:15 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qe4LT-0005CJ-2A for guix-patches@gnu.org; Wed, 06 Sep 2023 22:02:14 -0400 Date: Thu, 07 Sep 2023 02:01:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1694052126; x=1694311326; bh=EixnuXHXGsDJpw4JUQ0SnQYtp7wcdJH+sp6DBXwAja0=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=IZyYUXYeHAWp7hfmX0/bPKwISfZYSDC1x+HA5Q1uS8aX7gSpnWNb1E3xoRwQjRwa2 n81UXHb0kwnwkFoh7k4OUqmZq13ZnL5TUw8s3sm+PahaIvVN28oXjzx5FsHR+LD7rm kVpzOwrq2f0HKzcwBhLCB+M+/386G+JaKi8iKvT4PyJuRv5eDeuXRr+vmwM2CajFCF X1ERtFyym5JzZxxIQbXFNeCCn+QNybGZ5R0Ek5sn9Fm0I8QREDeV+Wtg/PVJq4NsZl bIzPQmtIPEVPwWBO/1g92WKOpK5QwIpYzI8MngoWd9AJOkyFGtqhMDYKUYSGS+/TDg QbXHWnDHdjuIA== Message-ID: <3IilDZKPeNEORKD6Akuetp_2bSYOEVBciL75gWUJdaGyfMJd440tbB6yd0DeZBF6yPGQgQnORVb0OPdqJChgRYXJ4oUSdXAO3u7hOOXhyP4=@protonmail.com> Feedback-ID: 40635331:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.22; envelope-from=skyvine@protonmail.com; helo=mail-4322.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 07 Sep 2023 08:54:53 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Skyler X-ACL-Warn: , Skyler via Guix-patches X-Patchwork-Original-From: Skyler via Guix-patches via From: Skyler Ferris Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This avoids an issue where rottlog will delete the entire /tmp directory if gawk is not installed. * gnu/packages/admin.scm (rottlog): Add gawk input, also update the patch-paths build phase for awk invocations. --- gnu/packages/admin.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) base-commit: e365c26a34fa485f9af46538fcea128db681c33d -- 2.41.0 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 604cd70c02..ea437e9f26 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1931,7 +1931,11 @@ (define-public rottlog (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. @@ -1950,7 +1954,7 @@ (define-public rottlog (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