* bug#26392: [PATCH 1/1] gnu: torsocks: Patch references to 'getcap' and 'which'.
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
2017-04-10 9:48 ` Ludovic Courtès
2017-04-07 15:08 ` bug#26391: [PATCH 0/1] Patching getcap and which in torsocks ng0
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Eric Bavier @ 2017-04-07 14:05 UTC (permalink / raw)
To: 26392; +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 © 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
^ permalink raw reply related [flat|nested] 7+ messages in thread* bug#26391: [PATCH 0/1] Patching getcap and which in torsocks
2017-04-07 14:05 bug#26391: [PATCH 0/1] Patching getcap and which in torsocks Eric Bavier
2017-04-07 14:05 ` bug#26392: [PATCH 1/1] gnu: torsocks: Patch references to 'getcap' and 'which' Eric Bavier
@ 2017-04-07 15:08 ` ng0
2017-04-08 12:28 ` Ludovic Courtès
2017-04-09 3:36 ` Eric Bavier
3 siblings, 0 replies; 7+ messages in thread
From: ng0 @ 2017-04-07 15:08 UTC (permalink / raw)
To: Eric Bavier; +Cc: 26391
Eric Bavier transcribed 0.8K bytes:
> This patches references to the 'getcap' and 'which' programs in 'torsocks'
> so that users that don't have either of those packages installed in their
> profiles do not see confusing output about them missing. Usually torsocks
> will still function in that case, but it's probably better to have them
> available.
>
> I've so far done this sort of thing for several packages with shell scripts,
> and each time I'm convinced that this method is better than declaring the
> inputs in propagated-inputs. But I think I'd feel more sure of myself if we
> had a short "Packaging shell scripts" section in the manual that outlined
> best-practices-of-the-moment. Would that be useful?
>
> Eric Bavier (1):
> gnu: torsocks: Patch references to 'getcap' and 'which'.
>
> gnu/packages/tor.scm | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> --
> 2.12.2
>
>
I have not run the patch, but the code looks good to me.
The "dependencies" are not obvious, so your proposed change is okay.
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#26391: [PATCH 0/1] Patching getcap and which in torsocks
2017-04-07 14:05 bug#26391: [PATCH 0/1] Patching getcap and which in torsocks Eric Bavier
2017-04-07 14:05 ` bug#26392: [PATCH 1/1] gnu: torsocks: Patch references to 'getcap' and 'which' 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
3 siblings, 0 replies; 7+ messages in thread
From: Ludovic Courtès @ 2017-04-08 12:28 UTC (permalink / raw)
To: Eric Bavier; +Cc: 26391
Hi Eric,
Eric Bavier <bavier@member.fsf.org> skribis:
> This patches references to the 'getcap' and 'which' programs in 'torsocks'
> so that users that don't have either of those packages installed in their
> profiles do not see confusing output about them missing. Usually torsocks
> will still function in that case, but it's probably better to have them
> available.
>
> I've so far done this sort of thing for several packages with shell scripts,
> and each time I'm convinced that this method is better than declaring the
> inputs in propagated-inputs. But I think I'd feel more sure of myself if we
> had a short "Packaging shell scripts" section in the manual that outlined
> best-practices-of-the-moment. Would that be useful?
Yes, sure.
> * gnu/packages/tor.scm (torsocks)[inputs,arguments]: New fields.
LGTM, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#26391: [PATCH 0/1] Patching getcap and which in torsocks
2017-04-07 14:05 bug#26391: [PATCH 0/1] Patching getcap and which in torsocks Eric Bavier
` (2 preceding siblings ...)
2017-04-08 12:28 ` Ludovic Courtès
@ 2017-04-09 3:36 ` Eric Bavier
3 siblings, 0 replies; 7+ messages in thread
From: Eric Bavier @ 2017-04-09 3:36 UTC (permalink / raw)
To: 26391-done
ludo@gnu.org (Ludovic Courtès) writes:
> Hi Eric,
>
> Eric Bavier <bavier@member.fsf.org> skribis:
>
>> This patches references to the 'getcap' and 'which' programs in 'torsocks'
>> so that users that don't have either of those packages installed in their
>> profiles do not see confusing output about them missing. Usually torsocks
>> will still function in that case, but it's probably better to have them
>> available.
>
>> * gnu/packages/tor.scm (torsocks)[inputs,arguments]: New fields.
>
> LGTM, thanks!
Pushed in f3cf25c3c2aef91a47b790fe69b5008cdb6a6316
^ permalink raw reply [flat|nested] 7+ messages in thread