Re: torsocks 2.0 bug

[swedebugia@riseup.net]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

On 2016-02-03 10:40, ludo@gnu.org wrote:
> swedebugia@riseup.net skribis:
> 
>> I propose: we update to 2.1 first and see if this fixes the problem
>> with only icecat.
> 
> Sounds good.  Would you like to send a patch?

I tried my best and... failed. Ha!

Attached an almost working patch with details of what fails.

Cheers
sdb

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-torsocks-Update-to-2.1.0.patch --]
[-- Type: text/x-diff; name=0001-gnu-torsocks-Update-to-2.1.0.patch, Size: 1849 bytes --]

From de72a36bbe3559c345e41359c91d80820d858127 Mon Sep 17 00:00:00 2001
From: swedebugia <swedebugia@riseup.net>
Date: Wed, 3 Feb 2016 18:58:47 +0100
Subject: [PATCH] gnu: torsocks: Update to 2.1.0.

---
 gnu/packages/tor.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 5fb8f95..329e282 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -70,7 +70,7 @@ applications based on the TCP protocol.")
 (define-public torsocks
   (package
     (name "torsocks")
-    (version "2.0.0")
+    (version "2.1.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -78,15 +78,20 @@ applications based on the TCP protocol.")
                     (commit (string-append "v" version))))
               (sha256
                (base32
-                "0an2q5ail9z414riyjbkjkm29504hy778j914baz2gn5hlv2cfak"))
+                "1l890pg0h2hqpkabsnwc6pq2qi8mfv58qzaaicc9y62rq5nmrrws"))
               (file-name (string-append name "-" version "-checkout"))
               (patches (list (search-patch "torsocks-dns-test.patch")))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
+                  ; FIXME. this phase is still needed but fails. I dont
+                  ; understand why. It works fine when done manually in an
+                  ; environment.
                   (add-before 'configure 'bootstrap
                     (lambda _
-                      (system* "autoreconf" "-vfi"))))))
+                      (system* "autoreconf" "-i")
+       ; FIXME. test_fd_passing fail.
+       #:tests? #f)))))
     (native-inputs `(("autoconf" ,(autoconf-wrapper))
                      ("automake" ,automake)
                      ("libtool" ,libtool)
-- 
2.6.3