From: Eric Bavier <bavier@member.fsf.org>
To: 26392@debbugs.gnu.org
Cc: Eric Bavier <bavier@member.fsf.org>
Subject: bug#26392: [PATCH 1/1] gnu: torsocks: Patch references to 'getcap' and 'which'.
Date: Fri, 7 Apr 2017 09:05:11 -0500 [thread overview]
Message-ID: <20170407140511.25564-2-bavier@member.fsf.org> (raw)
In-Reply-To: <20170407140511.25564-1-bavier@member.fsf.org>
* 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@flashner.co.il>
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017 Eric Bavier <bavier@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
next prev parent reply other threads:[~2017-04-07 14:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-07 14:05 bug#26391: [PATCH 0/1] Patching getcap and which in torsocks Eric Bavier
2017-04-07 14:05 ` Eric Bavier [this message]
2017-04-10 9:48 ` bug#26392: [PATCH 1/1] gnu: torsocks: Patch references to 'getcap' and 'which' Ludovic Courtès
2017-04-10 13:50 ` Eric Bavier
2017-04-07 15:08 ` bug#26391: [PATCH 0/1] Patching getcap and which in torsocks ng0
2017-04-08 12:28 ` Ludovic Courtès
2017-04-09 3:36 ` Eric Bavier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170407140511.25564-2-bavier@member.fsf.org \
--to=bavier@member.fsf.org \
--cc=26392@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).