branch core-updates-frozen updated: gnu: tor: Fix build issue on some architectures.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch core-updates-frozen
in repository guix.

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new 68d0900  gnu: tor: Fix build issue on some architectures.
68d0900 is described below

commit 68d090002a1a5623494006fca3e2c2c97d3ff676
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Dec 1 10:49:29 2021 +0200

    gnu: tor: Fix build issue on some architectures.
    
    * gnu/packages/tor.scm (tor)[arguments]: Add phase to remove sandbox
    during one of the tests.
---
 gnu/packages/tor.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 11b81a1..cb8fa7e 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -76,8 +76,16 @@
          (add-before 'check 'skip-practracker
            ;; This is a style linter.  It doesn't get to throw fatal errors.
            (lambda _
-             (setenv "TOR_DISABLE_PRACTRACKER" "set")
-             #t)))))
+             (setenv "TOR_DISABLE_PRACTRACKER" "set")))
+         (add-before 'check 'adjust-test-suite
+           (lambda _
+             ;; 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
+             (substitute* "src/test/test_include.sh"
+               ((".*Sandbox 1.*") "")))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("python" ,python)))             ; for tests