[PATCH] Update torsocks to 2.2.0

[PATCH] Update torsocks to 2.2.0

[ng0]

torsocks 2.2.0 has been released.
I changed the method from git to url fetch and removed the patch we included as it seems to be no longer necessary.

[PATCH] gnu: torsocks: Update to 2.2.0.

[ng0]

* gnu/packages/tor.scm (torsocks): Update to 2.2.0.
* [source]: Remove patch.  Change method from 'git-fetch' to 'url-fetch'.
Remove 'file-name'.
---
 gnu/packages/patches/torsocks-dns-test.patch | 18 ------------------
 gnu/packages/tor.scm                         | 13 +++++--------
 2 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 gnu/packages/patches/torsocks-dns-test.patch

diff --git a/gnu/packages/patches/torsocks-dns-test.patch b/gnu/packages/patches/torsocks-dns-test.patch
deleted file mode 100644
index ba70ba5..0000000
--- a/gnu/packages/patches/torsocks-dns-test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Skip DNS tests that rely on the ability to look up arbitary
-host names.
-
---- torsocks/tests/test_dns.c	2015-11-10 18:30:53.955941984 +0100
-+++ torsocks/tests/test_dns.c	2015-11-10 18:31:02.199941892 +0100
-@@ -134,11 +134,8 @@ static void test_getaddrinfo(const struc
- int main(int argc, char **argv)
- {
- 	/* Libtap call for the number of tests planned. */
--	plan_tests(NUM_TESTS);
-+	plan_tests(1);
- 
--	test_getaddrinfo(&tor_check);
--    test_gethostbyname(&tor_dir_auth1);
--	test_gethostbyaddr(&tor_dir_auth2);
- 	test_getaddrinfo(&tor_localhost);
- 
-     return 0;
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 0812b57..3a44631 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -73,17 +73,14 @@ applications based on the TCP protocol.")
 (define-public torsocks
   (package
     (name "torsocks")
-    (version "2.0.0")
+    (version "2.2.0")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://git.torproject.org/torsocks.git")
-                    (commit (string-append "v" version))))
+              (method url-fetch)
+              (uri (string-append "https://people.torproject.org/~dgoulet/"
+                                  name "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0an2q5ail9z414riyjbkjkm29504hy778j914baz2gn5hlv2cfak"))
-              (file-name (string-append name "-" version "-checkout"))
-              (patches (search-patches "torsocks-dns-test.patch"))))
+                "0byr9ga9w79qz4vp0m11sbmspad7fsal9wm67r4znzb7zb7cis19"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
-- 
2.10.1

Re: [PATCH] Update torsocks to 2.2.0

[Marius Bakke]

ng0 <ng0@we.make.ritual.n0.is> writes:

> torsocks 2.2.0 has been released.
> I changed the method from git to url fetch and removed the patch we
> included as it seems to be no longer necessary.

Thanks for paying attention to this.

I couldn't find a link to the download page at first glance, but the
GPG signature is good, and the sources are identical to git apart from
the generated autotools stuff.

I updated local.mk to reflect the removed patch, removed the 'bootstrap'
phase and autotools inputs and adjusted commit message accordingly. I
also updated home-page to HTTPS and removed the 'perl-test-harness'
input as they seem to have switched to a different test framework:

https://gitweb.torproject.org/torsocks.git/commit/?id=e124961ba739861351e3e674f29798a43e4cd734

Pushed as 91988aee126376ea9e111882afb511e3a555936d !