GNU bug report logs - #26392
[PATCH 1/1] gnu: torsocks: Patch references to 'getcap' and 'which'.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 26392 in the body.
You can then email your comments to 26392 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Eric Bavier <bavier <at> member.fsf.org>
To: guix-patches <at> gnu.org
Cc: Eric Bavier <bavier <at> member.fsf.org>
Subject: [PATCH 1/1] gnu: torsocks: Patch references to 'getcap' and 'which'.
Date: Fri,  7 Apr 2017 09:05:11 -0500

* 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 © 2016 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2016, 2017 ng0 <contact.ng0 <at> cryptolab.net>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2017 Eric Bavier <bavier <at> member.fsf.org>
 ;;;
 ;;; 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=`.*`")
+                         (string-append "getcap=" (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

Message #8 received at 26392 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Eric Bavier <bavier <at> member.fsf.org>
Cc: 26392 <at> debbugs.gnu.org
Subject: Re: bug#26392: [PATCH 1/1] gnu: torsocks: Patch references to
 'getcap' and 'which'.
Date: Mon, 10 Apr 2017 11:48:11 +0200

Eric Bavier <bavier <at> member.fsf.org> skribis:

> * gnu/packages/tor.scm (torsocks)[inputs,arguments]: New fields.

LGTM, thanks!

Ludo'.

Message #13 received at 26392-done <at> debbugs.gnu.org (full text, mbox):

From: Eric Bavier <ericbavier <at> openmailbox.org>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 26392-done <at> debbugs.gnu.org
Subject: Re: bug#26392: [PATCH 1/1] gnu: torsocks: Patch references to
 'getcap' and 'which'.
Date: Mon, 10 Apr 2017 08:50:55 -0500

On Mon, 10 Apr 2017 11:48:11 +0200
ludo <at> gnu.org (Ludovic Courtès) wrote:

> Eric Bavier <bavier <at> member.fsf.org> skribis:
> 
> > * gnu/packages/tor.scm (torsocks)[inputs,arguments]: New fields.  
> 
> LGTM, thanks!
> 
> Ludo'.

Didn't realize the cover-letter was sent to a separate bug.  Closing
this one too.

Pushed in f3cf25c3c2aef91a47b790fe69b5008cdb6a6316

`~Eric

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.