unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: ng0 <ng0@we.make.ritual.n0.is>
To: guix-devel@gnu.org
Subject: [PATCH] gnu: torsocks: Update to 2.2.0.
Date: Tue, 18 Oct 2016 18:15:55 +0000	[thread overview]
Message-ID: <20161018181555.6878-2-ng0@we.make.ritual.n0.is> (raw)
In-Reply-To: <20161018181555.6878-1-ng0@we.make.ritual.n0.is>

* 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

  reply	other threads:[~2016-10-18 18:16 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-18 18:15 [PATCH] Update torsocks to 2.2.0 ng0
2016-10-18 18:15 ` ng0 [this message]
2016-10-18 22:52 ` Marius Bakke

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=20161018181555.6878-2-ng0@we.make.ritual.n0.is \
    --to=ng0@we.make.ritual.n0.is \
    --cc=guix-devel@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).