From patchwork Mon Apr 27 13:37:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21680 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 C701B27BBE1; Mon, 27 Apr 2020 14:38:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 831CE27BBE4 for ; Mon, 27 Apr 2020 14:38:20 +0100 (BST) Received: from localhost ([::1]:45880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT3xk-0007hI-0r for patchwork@mira.cbaines.net; Mon, 27 Apr 2020 09:38:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46802) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT3xe-0007h3-IS for guix-patches@gnu.org; Mon, 27 Apr 2020 09:38:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT3xS-0003Za-JY for guix-patches@gnu.org; Mon, 27 Apr 2020 09:38:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jT3xS-0003Z3-7J for guix-patches@gnu.org; Mon, 27 Apr 2020 09:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jT3xS-00067t-5C for guix-patches@gnu.org; Mon, 27 Apr 2020 09:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40901] gnu: ktsuss: Fix paths. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Apr 2020 13:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40901 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40901@debbugs.gnu.org Cc: Jan Nieuwenhuizen X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158799465023501 (code B ref -1); Mon, 27 Apr 2020 13:38:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Apr 2020 13:37:30 +0000 Received: from localhost ([127.0.0.1]:35930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT3ww-00066y-0W for submit@debbugs.gnu.org; Mon, 27 Apr 2020 09:37:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:60728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT3wu-00066s-V3 for submit@debbugs.gnu.org; Mon, 27 Apr 2020 09:37:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46658) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT3wu-0006oQ-5Y for guix-patches@gnu.org; Mon, 27 Apr 2020 09:37:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT3wq-0002TG-7h for guix-patches@gnu.org; Mon, 27 Apr 2020 09:37:27 -0400 Received: from knopi.disroot.org ([178.21.23.139]:59506) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jT3wp-0002RT-55; Mon, 27 Apr 2020 09:37:23 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5611B27F0C; Mon, 27 Apr 2020 15:37:19 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eLx_PbY8I6rN; Mon, 27 Apr 2020 15:37:17 +0200 (CEST) Date: Mon, 27 Apr 2020 09:37:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1587994637; bh=kJTW+wUiDL7d6iqAI9tP/yH5Woc6EjWlH8lT+utYCuI=; h=Date:From:To:Cc:Subject; b=biwL9sc5Y8CtgW/BgKq3pc9F4PLs39eKg3H9ixlIVMwAbBfhRUCu/ubyNuPlcdizy INriAEK5i/0rXwWbJr77356p4oAhHsTbxbZIwitQBgvDr8PL16hCYLQVQluzCDvDgr du/rb4dalEwQQiZYxSDt5Y0QnZVOce6AW0ln9uPojw2caMKwxRLLlE6lPikY64SLqJ ssJtEIdPUVs+81gCHr9eseg9JqpWmi1/U84zEnUf9tKKliiSpX/BCZbGTGfxf4xTXk 1OamFhJFASjNxQYZLb2pUb9U/YFyyrNt/Zn+4yDvC4ro0yC3dOAh/GPwFa6xucMJXT 0578PQkOhgHLw== From: Raghav Gururajan Message-ID: <20200427093702.16f9d953.raghavgururajan@disroot.org> Mime-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/27 09:37:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From ecdb9f73f2aa9854f03ace199fcc4c4547a2be49 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 27 Apr 2020 09:32:43 -0400 Subject: [PATCH] gnu: ktsuss: Fix paths. * gnu/packages/admin.scm (ktsuss): Fix paths. --- gnu/packages/admin.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 236eebe53c..9316e974bc 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -150,24 +150,25 @@ (list "--enable-sudo=yes") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-sudo-path - (lambda* (#:key inputs #:allow-other-keys) + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "src/ktsuss.c" + (("/usr/sbin:/usr/local/sbin:/sbin") + "~/.guix-profile/sbin")) (substitute* "configure.ac" + (("supath=`which su 2>/dev/null`") + "supath=/run/setuid-programs/su") (("sudopath=`which sudo 2>/dev/null`") - (string-append "sudopath=" - (string-append (assoc-ref inputs "sudo") - "/bin/sudo")))) + "sudopath=/run/setuid-programs/sudo")) #t))))) (native-inputs `(("autoconf" ,autoconf) - ("autogen" ,autogen) ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) - ("gtk+" ,gtk+-2) - ("sudo" ,sudo))) + ("gtk+" ,gtk+-2))) (synopsis "Graphical front end for @command{su}") (description "Ktsuss stands for ``Keep the @command{su} simple, stupid''. -- 2.26.2