From be6d5783ba542d8f0a0e9125839e8ac2dfb2326d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 May 2022 02:00:00 +0200 Subject: gnu: tor: Update to 0.4.7.7. * gnu/packages/tor.scm (tor): Update to 0.4.7.7. [source]: Remove patch. * gnu/packages/patches/tor-sandbox-i686.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/tor.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index cc11255a24..ca694cc90c 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -57,15 +57,14 @@ (define-public tor (package (name "tor") - (version "0.4.6.10") + (version "0.4.7.7") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "077374vqk9mxi63viksq5zwn05i4xa2bqcihwwxz6n750h7ddk4l")) - (patches (search-patches "tor-sandbox-i686.patch")))) + "0i2v3a2h7d0bjn64pi1c6h2x15lb53plf71xwkbkb51bnmc124ry")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From cc796dc3207cfc31a6e605cc7a974a9e67feb120 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 May 2022 02:00:00 +0200 Subject: gnu: tor: Use G-expressions. * gnu/packages/tor.scm (tor)[arguments]: Rewrite using (guix gexp). (tor-client)[arguments]: SUBSTITUTE-KEYWORD-ARGUMENTS accordingly. --- gnu/packages/tor.scm | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index ca694cc90c..abc33fb68b 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -28,6 +28,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages tor) + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -67,27 +68,27 @@ "0i2v3a2h7d0bjn64pi1c6h2x15lb53plf71xwkbkb51bnmc124ry")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list "--enable-lzma" - "--enable-zstd") - #:phases - (modify-phases %standard-phases - (add-before 'check 'skip-practracker - ;; This is a style linter. It doesn't get to throw fatal errors. - (lambda _ - (setenv "TOR_DISABLE_PRACTRACKER" "set"))) - ,@(if (or (target-aarch64?) - (target-ppc32?)) - ;; Work around upstream issue relating to sandboxing and glibc-2.33. - ;; This is similar to the issue the tor-sandbox-i686 patch fixes - ;; but for other architectures. - ;; https://gitlab.torproject.org/tpo/core/tor/-/issues/40381 - ;; https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/446 - `((add-before 'check 'adjust-test-suite + (list #:configure-flags + #~(list "--enable-lzma" + "--enable-zstd") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'skip-practracker + ;; This is a style linter. It doesn't get to throw fatal errors. (lambda _ - (substitute* "src/test/test_include.sh" - ((".*Sandbox 1.*") ""))))) - '())))) + (setenv "TOR_DISABLE_PRACTRACKER" "set"))) + #$@(if (or (target-aarch64?) + (target-ppc32?)) + ;; Work around upstream issue relating to sandboxing and glibc-2.33. + ;; This is similar to the issue the tor-sandbox-i686 patch fixes + ;; but for other architectures. + ;; https://gitlab.torproject.org/tpo/core/tor/-/issues/40381 + ;; https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/446 + `((add-before 'check 'adjust-test-suite + (lambda _ + (substitute* "src/test/test_include.sh" + ((".*Sandbox 1.*") ""))))) + '())))) (native-inputs (list pkg-config python)) ; for tests (inputs @@ -120,9 +121,9 @@ instead.") (name "tor-client") (arguments (substitute-keyword-arguments (package-arguments tor) - ((#:configure-flags flags) - (append flags - '("--disable-module-relay"))))) + ((#:configure-flags flags #~'()) + #~(append #$flags + (list "--disable-module-relay"))))) (synopsis "Client to the anonymous Tor network") (description "Tor protects you by bouncing your communications around a distributed -- cgit v1.2.3 From fc7fc13716c9be03e2123b09d629c2e5e1328330 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 May 2022 12:53:52 +0300 Subject: gnu: tor: Only run sandbox tests on some architectures. * gnu/packages/tor.scm (tor)[arguments]: Adjust custom 'adjust-test-suite phase to upstream code changes. Use phase on more architectures. --- gnu/packages/tor.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index abc33fb68b..277acf4754 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2021 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2016, 2017, 2018, 2020, 2021 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020, 2021, 2022 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019, 2021 Eric Bavier @@ -77,18 +77,21 @@ ;; This is a style linter. It doesn't get to throw fatal errors. (lambda _ (setenv "TOR_DISABLE_PRACTRACKER" "set"))) - #$@(if (or (target-aarch64?) - (target-ppc32?)) - ;; Work around upstream issue relating to sandboxing and glibc-2.33. - ;; This is similar to the issue the tor-sandbox-i686 patch fixes - ;; but for other architectures. + #$@(if (or (target-x86-64?) + (target-x86-32?)) + '() + ;; Work around upstream issues relating to libseccomp, + ;; sandboxing and glibc-2.33. This is similar to the issue + ;; the tor-sandbox-i686 patch fixes but for other architectures. ;; https://gitlab.torproject.org/tpo/core/tor/-/issues/40381 + ;; https://gitlab.torproject.org/tpo/core/tor/-/issues/40599 ;; https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/446 `((add-before 'check 'adjust-test-suite (lambda _ (substitute* "src/test/test_include.sh" - ((".*Sandbox 1.*") ""))))) - '())))) + ((".*Sandbox 1.*") "")) + (substitute* "src/test/test.c" + ((".*sandbox_tests.*") ""))))))))) (native-inputs (list pkg-config python)) ; for tests (inputs -- cgit v1.2.3 From 7750f220bedb5f7a24e7429a4ccd794f9d07e4aa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 30 May 2022 12:23:00 +0200 Subject: gnu: tor: Record the file name of 'torsocks' in 'torify'. * gnu/packages/tor.scm (tor)[arguments]: Add 'adjust-torify' phase. [inputs]: Add TORSOCKS. --- gnu/packages/tor.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 277acf4754..4c4ccbb003 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -73,6 +73,16 @@ "--enable-zstd") #:phases #~(modify-phases %standard-phases + (add-before 'build 'adjust-torify + (lambda* (#:key inputs #:allow-other-keys) + ;; Record in 'torify' the absolute file name of 'torsocks'. + (let ((torsocks (search-input-file + inputs "/bin/torsocks"))) + (substitute* "contrib/client-tools/torify" + (("pathfind torsocks") + "true") + (("exec torsocks") + (string-append "exec " torsocks)))))) (add-before 'check 'skip-practracker ;; This is a style linter. It doesn't get to throw fatal errors. (lambda _ @@ -98,6 +108,7 @@ (list libevent libseccomp openssl + torsocks xz zlib `(,zstd "lib"))) -- cgit v1.2.3 From 91861046f2bddb37ece693810bcccb80ec2ed4ce Mon Sep 17 00:00:00 2001 From: Danial Behzadi Date: Wed, 1 Jun 2022 15:40:16 +0430 Subject: gnu: tractor: Update to 3.13. * gnu/packages/tor.scm (tractor): Update to 3.13. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 4c4ccbb003..40f941fcea 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -455,14 +455,14 @@ Potential client and exit connections are scrubbed of sensitive information.") (define-public tractor (package (name "tractor") - (version "3.12") + (version "3.13") (source (origin (method url-fetch) (uri (pypi-uri "traxtor" version)) (sha256 (base32 - "0bwj4l6szvx7hpjr8va3hlv0g79sxz02hsb60l61hb314c6d4r3q")))) + "0r8zzaia1s678d39cpqjfpb72fwc46lfwnz1rb043hi6grd39jl7")))) (build-system python-build-system) (native-inputs `(("glib:bin" ,glib "bin"))) ; for glib-compile-schemas. -- cgit v1.2.3