Patchwork (pre-release) [PATCH] torsocks update to 2.2.0-rc1

login
register
mail settings
Submitter non such
Date June 28, 2016, 2:09 p.m.
Message ID <87d1n1flqk.fsf@we.make.ritual.n0.is>
Download mbox | patch
Permalink /patch/13421/
State New
Headers show

Comments

non such - June 28, 2016, 2:09 p.m.
From fe94e760b8705f2972f04b565f02528a953277ae Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Tue, 28 Jun 2016 13:08:43 +0000
Subject: [PATCH] gnu: torsocks: Update to 2.2.0-rc1.

* gnu/packages/tor.scm (torsocks): Update to 2.2.0-rc1.
---
 gnu/packages/tor.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--
2.9.0
non such - July 28, 2016, 9:44 a.m.
Hi,

I have this in use on Gentoo and GuixSD systems now for some time.
I know that we do not (?) package release candidate versions, but this
would fix our much older current torsocks. 2.1.x fails for some reasons,
this fixes it. There should be a release hopefully soon, otherwise I'll
ask tor-dev for it.

Could we make an exception for torsocks here, or should we stick with
2.0.0 until 2.2.0 has a version release?

> From fe94e760b8705f2972f04b565f02528a953277ae Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Tue, 28 Jun 2016 13:08:43 +0000
> Subject: [PATCH] gnu: torsocks: Update to 2.2.0-rc1.
>
> * gnu/packages/tor.scm (torsocks): Update to 2.2.0-rc1.
> ---
>  gnu/packages/tor.scm | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
> index 5155fc0..006334a 100644
> --- a/gnu/packages/tor.scm
> +++ b/gnu/packages/tor.scm
> @@ -2,6 +2,7 @@
>  ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
>  ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
>  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
> +;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -70,16 +71,15 @@ applications based on the TCP protocol.")
>  (define-public torsocks
>    (package
>      (name "torsocks")
> -    (version "2.0.0")
> +    (version "2.2.0-rc1")
>      (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.bz2"))
>                (sha256
>                 (base32
> -                "0an2q5ail9z414riyjbkjkm29504hy778j914baz2gn5hlv2cfak"))
> -              (file-name (string-append name "-" version "-checkout"))
> +                "184khqjzpg79vyc50q1k5i7rh8m48pjxa495clxbyyq8ihgqk4l6"))
>                (patches (search-patches "torsocks-dns-test.patch"))))
>      (build-system gnu-build-system)
>      (arguments
> --
> 2.9.0
>
Ludovic Courtès - July 28, 2016, 1:03 p.m.
ng0 <ng0@we.make.ritual.n0.is> skribis:

> Could we make an exception for torsocks here, or should we stick with
> 2.0.0 until 2.2.0 has a version release?

I don’t think so.  :-)  I use torsocks 2.0.0 just fine, FWIW.

A release candidate is normally promptly followed by a release, so we
should use that as soon as it’s available.

Ludo’.

Patch

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 5155fc0..006334a 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -2,6 +2,7 @@ 
 ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -70,16 +71,15 @@  applications based on the TCP protocol.")
 (define-public torsocks
   (package
     (name "torsocks")
-    (version "2.0.0")
+    (version "2.2.0-rc1")
     (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.bz2"))
               (sha256
                (base32
-                "0an2q5ail9z414riyjbkjkm29504hy778j914baz2gn5hlv2cfak"))
-              (file-name (string-append name "-" version "-checkout"))
+                "184khqjzpg79vyc50q1k5i7rh8m48pjxa495clxbyyq8ihgqk4l6"))
               (patches (search-patches "torsocks-dns-test.patch"))))
     (build-system gnu-build-system)
     (arguments