From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: torsocks 2.0 bug Date: Fri, 29 Jan 2016 13:28:09 +0200 Message-ID: <20160129132809.1fe0c52e@debian-netbook> References: <92c4a901a98ba83b4d21aa69921a942e@riseup.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/1kX5=hx9WeckbYzap.0_1Ri"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aP7Dw-0007qt-CF for guix-devel@gnu.org; Fri, 29 Jan 2016 06:28:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aP7Dt-0006Fs-5Q for guix-devel@gnu.org; Fri, 29 Jan 2016 06:28:20 -0500 Received: from flashner.co.il ([178.62.234.194]:47350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aP7Ds-0006Fn-RP for guix-devel@gnu.org; Fri, 29 Jan 2016 06:28:17 -0500 In-Reply-To: <92c4a901a98ba83b4d21aa69921a942e@riseup.net> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: swedebugia@riseup.net Cc: guix-devel --Sig_/1kX5=hx9WeckbYzap.0_1Ri Content-Type: multipart/mixed; boundary="MP_/_By_TLoD5u3dX8QFlABGqEX" --MP_/_By_TLoD5u3dX8QFlABGqEX Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Fri, 29 Jan 2016 11:45:59 +0100 swedebugia@riseup.net wrote: > Hi >=20 > I found after reconfiguring my system lately that the update to torsocks= =20 > 2.0 broke this: >=20 > $ torsocks icecat >=20 > Which I use all the time. >=20 > I tested with the former 2-3 versions of Icecat in my store and they all= =20 > fail silently. Passing debug options does not give a clue to whats=20 > wrong. What type of things don't work? That update was about 2.5 months ago, did y= ou do all the normal things like rebooting after reconfiguring? > I tested torsocks 2.0 with youtube-dl and lynx and both work. >=20 > I would like to patch tor.scm to have the option of installing an=20 > earlier version of torsocks but dont know hot to check out the old=20 > version. >=20 > cheers swedebugia >=20 here's the patch that updated torsocks. (attached) to have your own, custom torsocks from the previous version, you could add a file torsocks.scm, and build it with `guix build -f torsocks.scm` #:use-module ... (define-public torsocks-custom <-- I'm not sure if this line is necessary = here (package (inherit torsocks) (name "torsocks-custom") (version "1.2") (source (origin (method url-fetch) (uri (string-append "http://torsocks.googlecode.com/files/t= orsocks-" version ".tar.gz")) (sha256 (base32 "1m0is5q24sf7jjlkl0icfkdc0m53nbkg0q72s57p48yp4hv7v9dy")))) (arguments '()) (native-inputs '(())))) --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --MP_/_By_TLoD5u3dX8QFlABGqEX Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-torsocks-Upgrade-to-2.0.0.patch =46rom ba583bd2ce887cdd8b99ea55c15b57c5209e4b58 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Ludovic=3D20Court=3DC3=3DA8s?=3D Date: Tue, 10 Nov 2015 18:38:04 +0100 Subject: [PATCH] gnu: torsocks: Upgrade to 2.0.0. * gnu/packages/tor.scm (torsocks): Update to 2.0.0. [source]: Fetch from git.torproject.org. Use 'torsocks-dns-test.patch'. [arguments, native-inputs]: New fields. [license]: Change to GPL2. * gnu/packages/patches/torsocks-dns-test.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/patches/torsocks-dns-test.patch | 18 ++++++++++++++ gnu/packages/tor.scm | 37 ++++++++++++++++++++----= ---- 3 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/torsocks-dns-test.patch diff --git a/gnu-system.am b/gnu-system.am index cf99a9a..c5b32b2 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -661,6 +661,7 @@ dist_patch_DATA =3D \ gnu/packages/patches/texi2html-document-encoding.patch \ gnu/packages/patches/texi2html-i18n.patch \ gnu/packages/patches/tidy-CVE-2015-5522+5523.patch \ + gnu/packages/patches/torsocks-dns-test.patch \ gnu/packages/patches/tvtime-gcc41.patch \ gnu/packages/patches/tvtime-pngoutput.patch \ gnu/packages/patches/tvtime-videodev2.patch \ diff --git a/gnu/packages/patches/torsocks-dns-test.patch b/gnu/packages/pa= tches/torsocks-dns-test.patch new file mode 100644 index 0000000..ba70ba5 --- /dev/null +++ b/gnu/packages/patches/torsocks-dns-test.patch @@ -0,0 +1,18 @@ +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); +=20 +- test_getaddrinfo(&tor_check); +- test_gethostbyname(&tor_dir_auth1); +- test_gethostbyaddr(&tor_dir_auth2); + test_getaddrinfo(&tor_localhost); +=20 + return 0; diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 3cf45a4..3b057d4 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -18,13 +18,16 @@ ;;; along with GNU Guix. If not, see . =20 (define-module (gnu packages tor) - #:use-module ((guix licenses) #:select (bsd-3 gpl2+)) + #:use-module ((guix licenses) #:select (bsd-3 gpl2+ gpl2)) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages libevent) #:use-module (gnu packages compression) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages autotools) #:use-module (gnu packages tls) @@ -66,22 +69,36 @@ applications based on the TCP protocol.") (define-public torsocks (package (name "torsocks") - (version "1.2") + (version "2.0.0") (source (origin - (method url-fetch) - (uri (string-append "http://torsocks.googlecode.com/files/tor= socks-" - version ".tar.gz")) - (sha256 - (base32 - "1m0is5q24sf7jjlkl0icfkdc0m53nbkg0q72s57p48yp4hv7v9dy")))) + (method git-fetch) + (uri (git-reference + (url "https://git.torproject.org/torsocks.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0an2q5ail9z414riyjbkjkm29504hy778j914baz2gn5hlv2cfak")) + (file-name (string-append name "-" version "-checkout")) + (patches (list (search-patch "torsocks-dns-test.patch"))))) (build-system gnu-build-system) - (home-page "http://code.google.com/p/torsocks/") + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda _ + (system* "autoreconf" "-vfi")))))) + (native-inputs `(("autoconf" ,(autoconf-wrapper)) + ("automake" ,automake) + ("libtool" ,libtool) + ("perl-test-harness" ,perl-test-harness))) + (home-page "http://www.torproject.org/") (synopsis "Use socks-friendly applications with Tor") (description "Torsocks allows you to use most socks-friendly applications in a safe way with Tor. It ensures that DNS requests are handled safely and explici= tly rejects UDP traffic from the application you're using.") - (license gpl2+))) + + ;; All the files explicitly say "version 2 only". + (license gpl2))) =20 (define-public privoxy (package --=20 2.7.0 --MP_/_By_TLoD5u3dX8QFlABGqEX-- --Sig_/1kX5=hx9WeckbYzap.0_1Ri Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJWq0zJAAoJEPTB05F+rO6ToqMP/1IYBvN8pTmSMDmIOVV2nM7j eQjedlhyJ/czjN0mm+0HjGaFFI4tsPl6/nIfoIB7FVLaQZwyfHdt0CYAfvrUvn4/ lvdtEhAZqbdHkR3n5J06gz9afX3BNRBrT98yOrLqZnRk6Zovs/89beGqHFLa7r65 Ibf4Y06vp9qVm9vayG0CH+T7rX0nFzkRNnaSEzIg6CXjqm4iAQAgPo3xukcSBpkq Gak1GHz4NXhaFaDpGTjyyCyiikieH2awP6kZcQrETDEZKng48B7+HHFY3pdyJ5Wr VMcr1cfj6zq2+QgyOjv9foUtsAE2VDLRD3DLExhBzRc0FGwAoZZBcsqbhrhqhiI8 veXnxZTEowGXzWFKMCQkp4gOnWfI/wSdngd2NzoFGwNBhPRQdNRSsr5Rh/xcVkOK gQE5B/HGC+QF8pcqSnjgT7HFLWzFkY2lxBB5Tb/vIif2ia7Fb59fi0/SDxcE70gD M2m9OMXB0IGfxY01HYkMaZWFU9iooU7BykYpZux/Z/VcuJAiSuYj5sA/Z7l1XC5y a+DEf5d4YYQ9fXFe3H937CRJYAyDgBXokw51adCx9k7i0oPnMa2+6TYE+Jz9dfw1 4ffdXwHqgJqPMW7rJSyCJ/cjGezOU4fDe9QWMuTas+MjaToXh+A7rOD7EbRfJgFl KbCNEvvF+T9lLPqn3Mh7 =7AHO -----END PGP SIGNATURE----- --Sig_/1kX5=hx9WeckbYzap.0_1Ri--