From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#40901] gnu: ktsuss: Fix paths. Resent-Message-ID: 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 Date: Mon, 27 Apr 2020 09:37:02 -0400 From: Raghav Gururajan Message-ID: <20200427093702.16f9d953.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/2Edl5fhf3GhUFbuXuhaxjUk" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40901@debbugs.gnu.org Cc: Jan Nieuwenhuizen --MP_/2Edl5fhf3GhUFbuXuhaxjUk Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/2Edl5fhf3GhUFbuXuhaxjUk Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-ktsuss-Fix-paths.patch >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 --MP_/2Edl5fhf3GhUFbuXuhaxjUk--