From patchwork Fri Sep 1 07:31:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ford X-Patchwork-Id: 53359 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8DB0027BBE9; Fri, 1 Sep 2023 08:33:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B73CB27BBE2 for ; Fri, 1 Sep 2023 08:33:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbyeL-0006Bp-Tg; Fri, 01 Sep 2023 03:33:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbyeD-0006B4-Lr for guix-patches@gnu.org; Fri, 01 Sep 2023 03:32:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbyeD-00085b-CH for guix-patches@gnu.org; Fri, 01 Sep 2023 03:32:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbyeM-0005MA-32 for guix-patches@gnu.org; Fri, 01 Sep 2023 03:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65489] [PATCH] gnu: tor: Update to 0.4.8.4. Resent-From: Michael Ford Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Sep 2023 07:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65489 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: =?utf-8?b?QW5kcsOp?= Batista Cc: 65489@debbugs.gnu.org Received: via spool by 65489-submit@debbugs.gnu.org id=B65489.169355353320533 (code B ref 65489); Fri, 01 Sep 2023 07:33:02 +0000 Received: (at 65489) by debbugs.gnu.org; 1 Sep 2023 07:32:13 +0000 Received: from localhost ([127.0.0.1]:59782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbydY-0005L7-Em for submit@debbugs.gnu.org; Fri, 01 Sep 2023 03:32:13 -0400 Received: from mail-yb1-xb33.google.com ([2607:f8b0:4864:20::b33]:52226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbydV-0005Kr-Jx for 65489@debbugs.gnu.org; Fri, 01 Sep 2023 03:32:10 -0400 Received: by mail-yb1-xb33.google.com with SMTP id 3f1490d57ef6-d7ba4c5f581so1324135276.0 for <65489@debbugs.gnu.org>; Fri, 01 Sep 2023 00:32:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693553515; x=1694158315; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=YC6gMQcFxmQr6eyPQC3KVtWAguTC15SLNc+NYEVQBoc=; b=HnjA+MlcUMpfu9WIEB/XDdGLFLwvkYSFRyql/7i2nu8kU55v8aoAwCU9XvN+joH+4r WCcn7+rdxjOu2cgHJqOTMD9U42tq43Z/NCxEP8xWaqbu5qJAJD/qwxSS9QrFd5Riw5PJ y0twdKnQ4JiH+AWtyA5uQlsrZvCT0xHBTF9T4ig7G30282Z5Ox9eFQw0pohxdrozDkrp mghDD3fB2VtiZTSf19xWEbGzlCQ9siL5ac1eG1KpabOZQ1/rgIVAZn98h02xLDGO7zLP a9c98MIVNvG/6lwUElK5qZ4NdZBnhO9hJrgKdMU+01yyaqPPii0TVPAdwZop6qeWw1vy LAlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693553515; x=1694158315; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YC6gMQcFxmQr6eyPQC3KVtWAguTC15SLNc+NYEVQBoc=; b=DcdjVLSQnxoE63RyvwEWCK7myqWuklN1+a1B+eY22PMADqguXZXFnrvoCmOD2Zv/eL c179m6j+yVrrXhm2dYL6HcFwuHzvErX3yyX3lPwLE0qYaWj/SadR/7sL2Lood99tU/O7 DjJd0hYmI2g/B0+e722sS2L2PAkDN4HA1N5o8VK3AoinajZCSLruBwVBwyY9YR5r0baY hP/rkWcl76qsPC03Lc8dXY81clX+qZRhoLoqqRhTP1z6B2BqfKFvDG/DJQwgi40Q0TKF MJjtNLjS/mWjaj5sxDo8IeHBV/0u8ZdbUP8ZrTFyoopPCevAIFftD6u+P6rR6GiYRx6U nigw== X-Gm-Message-State: AOJu0YzjNMI2FOxzqIzvA9GSSFlsllVfxKTZorPaTZmBlanmUm2bYxHF WLewB/GHqRTNRog0jOkdMBnO671VKsYLxwOKrnE= X-Google-Smtp-Source: AGHT+IF44cIQYY10tz3sUUXghqIpU1lz6/f8+kj1vyOpp7vqjmy6qr7eb61qvj8mfilL7AJN1Q3fhuXDqxwOU9pjXWs= X-Received: by 2002:a25:3751:0:b0:d7e:8175:4fa9 with SMTP id e78-20020a253751000000b00d7e81754fa9mr736550yba.4.1693553514668; Fri, 01 Sep 2023 00:31:54 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Michael Ford Date: Fri, 1 Sep 2023 10:31:43 +0300 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi Andre, I've taken your suggestions. Here is the updated patch. Thanks From a7c754da51888f23755ba46904191bf16523fc17 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 24 Aug 2023 09:47:33 +0100 Subject: [PATCH] gnu: tor: Update to 0.4.8.5. * gnu/packages/tor.scm (tor): Update to 0.4.8.5. * gnu/packages/tor.scm (tor)[arguments]<#:configure-flags>: Add "--enable-gpl". * gnu/packages/patches/tor-remove-defensive-assert.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/tor.scm (tor)[source]: Add patch to remove defensive assert. --- gnu/local.mk | 1 + .../patches/tor-remove-defensive-assert.patch | 28 +++++++++++++++++++ gnu/packages/tor.scm | 8 ++++-- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/tor-remove-defensive-assert.patch #~(modify-phases %standard-phases diff --git a/gnu/local.mk b/gnu/local.mk index 9b493df8d5..6a4f9dabb2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2012,6 +2012,7 @@ dist_patch_DATA = \ %D%/packages/patches/tofi-32bit-compat.patch \ %D%/packages/patches/tootle-glib-object-naming.patch \ %D%/packages/patches/tootle-reason-phrase.patch \ + %D%/packages/patches/tor-remove-defensive-assert.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transfig-gcc10-fno-common.patch \ %D%/packages/patches/trytond-add-egg-modules-to-path.patch \ diff --git a/gnu/packages/patches/tor-remove-defensive-assert.patch b/gnu/packages/patches/tor-remove-defensive-assert.patch new file mode 100644 index 0000000000..7207ec867a --- /dev/null +++ b/gnu/packages/patches/tor-remove-defensive-assert.patch @@ -0,0 +1,28 @@ +This patch removes a call to `tor_assert_nonfatal_unreached()` in +`relay_key_is_unavailable_()` that is only called when Tor is compiled +without relay support. + +Unfortunately, the non-fatal assertion causes a BUG log +message to appear for clients when they start up without relay support +for each CPU worker we spawn. This makes it spotting issues during +bootstrap harder particularly for our iOS developers. + +Since the call sites to `get_master_identity_key()` handles `NULL` +values already, we do not think this will be an issue later on. + +Reported by Benjamin Erhart (@tla) from Guardian Project. + +Fixes tpo/core/tor#40848. + +diff --git a/src/feature/relay/routerkeys.h b/src/feature/relay/routerkeys.h +index 7b6d80773c..b97615a9c9 100644 +--- a/src/feature/relay/routerkeys.h ++++ b/src/feature/relay/routerkeys.h +@@ -53,7 +53,6 @@ void routerkeys_free_all(void); + static inline void * + relay_key_is_unavailable_(void) + { +- tor_assert_nonfatal_unreached(); + return NULL; + } + #define relay_key_is_unavailable(type) \ diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 7fec88656f..44e62b63cc 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -63,18 +63,20 @@ (define-module (gnu packages tor) (define-public tor (package (name "tor") - (version "0.4.7.14") + (version "0.4.8.5") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "1y2xwrji1rvk6h0k15705yra5s74h72h2g84x02zr0338vv6gb55")))) + "06g1awb4piqvgxa97pyswxgjzkpj8rx3iy2jbiaygvi99b8wymv9")) + (patches (search-patches "tor-remove-defensive-assert.patch")))) (build-system gnu-build-system) (arguments (list #:configure-flags - #~(list "--enable-lzma" + #~(list "--enable-gpl" + "--enable-lzma" "--enable-zstd") #:phases