From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwUWb-0003zK-Rw for guix-patches@gnu.org; Fri, 07 Apr 2017 10:06:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwUWZ-0000pm-D6 for guix-patches@gnu.org; Fri, 07 Apr 2017 10:06:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:38444) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cwUWZ-0000pc-9V for guix-patches@gnu.org; Fri, 07 Apr 2017 10:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cwUWZ-00089q-2W for guix-patches@gnu.org; Fri, 07 Apr 2017 10:06:03 -0400 Subject: bug#26392: [PATCH 1/1] gnu: torsocks: Patch references to 'getcap' and 'which'. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwUW9-0003b2-12 for guix-patches@gnu.org; Fri, 07 Apr 2017 10:05:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwUW7-0000ZF-Ed for guix-patches@gnu.org; Fri, 07 Apr 2017 10:05:37 -0400 Received: from mail.centurylink.net ([205.219.233.9]:28104 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cwUW7-0000Xs-9l for guix-patches@gnu.org; Fri, 07 Apr 2017 10:05:35 -0400 From: Eric Bavier Date: Fri, 7 Apr 2017 09:05:11 -0500 Message-Id: <20170407140511.25564-2-bavier@member.fsf.org> In-Reply-To: <20170407140511.25564-1-bavier@member.fsf.org> References: <20170407140511.25564-1-bavier@member.fsf.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: 26392@debbugs.gnu.org Cc: Eric Bavier * gnu/packages/tor.scm (torsocks)[inputs,arguments]: New fields. --- gnu/packages/tor.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index e48017e64..06b6c4feb 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2016 Efraim Flashner ;;; Copyright =C2=A9 2016, 2017 ng0 ;;; Copyright =C2=A9 2017 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2017 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,7 +29,9 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages libevent) + #:use-module (gnu packages linux) #:use-module (gnu packages compression) #:use-module (gnu packages pcre) #:use-module (gnu packages python) @@ -88,6 +91,19 @@ the application layer) you need to install @code{torsocks}.") (base32 "0byr9ga9w79qz4vp0m11sbmspad7fsal9wm67r4znzb7zb7cis19")))) (build-system gnu-build-system) + (inputs + `(("which" ,which) + ("libcap" ,libcap))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'build 'absolutize + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/bin/torsocks" + (("getcap=3D`.*`") + (string-append "getcap=3D" (which "getcap"))) + (("`which") + (string-append "`" (which "which")))) + #t))))) (home-page "https://www.torproject.org/") (synopsis "Use socks-friendly applications with Tor") (description -- 2.12.2