From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 24 04:59:16 2023 Received: (at submit) by debbugs.gnu.org; 24 Aug 2023 08:59:16 +0000 Received: from localhost ([127.0.0.1]:36094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ6BQ-00044Z-9e for submit@debbugs.gnu.org; Thu, 24 Aug 2023 04:59:16 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ6BO-00044J-9Q for submit@debbugs.gnu.org; Thu, 24 Aug 2023 04:59:15 -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 1qZ6B4-0000rk-Di for guix-patches@gnu.org; Thu, 24 Aug 2023 04:58:56 -0400 Received: from mail-yw1-x1133.google.com ([2607:f8b0:4864:20::1133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZ6Ay-0003yL-NL for guix-patches@gnu.org; Thu, 24 Aug 2023 04:58:53 -0400 Received: by mail-yw1-x1133.google.com with SMTP id 00721157ae682-5922b96c5fcso37899907b3.0 for ; Thu, 24 Aug 2023 01:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692867526; x=1693472326; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=TQJc5jNwD8XTuSoPmznUYyueCPc3A10C5ncET+t93Xg=; b=R4IoD7WPveMWPjxJs5yBG3KRIbw5oIZZB7fptcNO5xXs3wss0RMwrnzZpOhC+JRjRn bWlWOakxAd78y6wLLZS4mIy3EZn17X5pBxPwPfR4SNIa6kpywU+JKcWoBpEQOWVk7gpX QXxDpmBvikJGmpBHRaKOaMf3Xs0BboVN4K7dlozv3gfpzlauk4TZF0YOXbZClzlTjToC l33TkXxDIHLGMcgkpROP2VY2SytRX0ZhdwioiXoOTwXlbeNQLmQA5dLibXChWEB0qgRj hLXRj5+qpRCnR1E8JMRjZktxM3u+23veZg3mfEv9sMmN7z9raO/APaB4jWmWfentxGKW 0CSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692867526; x=1693472326; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=TQJc5jNwD8XTuSoPmznUYyueCPc3A10C5ncET+t93Xg=; b=MjBRxx2UzWqGqtDlr+EG1kwgoWnams5niGGurrKIo5TkZ5HY3b+clMCFmHAhDyYiVS PUK+h77w4rxYnd0EQIlDPD+o2lQEgtzoIW50Ekt23C54jQE3W4zl9j9Eeag3qH2zz7oN gV2O5CF47IE93loioQsVayt/uocvZOHgBrz8J54zoD1yaOsmLarDVJRQikplZuIVwWRn jfPhHAR1FoAcTubeID9mPzv23yaHKG2bv2OsJiP1gAgubVJWwSVBkERHDMAnCha1+fuP 96YOC3ziQERNPYGMPSEv27X+oF9fp188wunQM2ylsWr9ZStDP5nZ30lHblUGET+LlBNR 1nSQ== X-Gm-Message-State: AOJu0YzucnxzHbceqU0+pD8dAtVn9wXGN0Gc8k6MosyO7pu0IgUXN2zt 7fOahq1BraBYoBat6GLY2S+7D1ZCX6IDPVRoouTcdK5IvnI= X-Google-Smtp-Source: AGHT+IFQ0mNlpdp9dXBc0TbHXTN68ZEClbz5yMkDFIQPyt0VbxTfD7G/7Z3MxhIelnSaXku7873IyQUzAwZ6e8Dpu+Q= X-Received: by 2002:a81:a513:0:b0:589:fbfe:fff1 with SMTP id u19-20020a81a513000000b00589fbfefff1mr3393957ywg.10.1692867526448; Thu, 24 Aug 2023 01:58:46 -0700 (PDT) MIME-Version: 1.0 From: Michael Ford Date: Thu, 24 Aug 2023 09:58:35 +0100 Message-ID: Subject: [PATCH] gnu: tor: Update to 0.4.8.4. To: guix-patches@gnu.org Content-Type: multipart/alternative; boundary="00000000000090d9b30603a76fe9" Received-SPF: pass client-ip=2607:f8b0:4864:20::1133; envelope-from=fanquake@gmail.com; helo=mail-yw1-x1133.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --00000000000090d9b30603a76fe9 Content-Type: text/plain; charset="UTF-8" >From 1ca67dd8ba30c34d60c4ae49889c30d912edd4ee 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.4. * gnu/packages/tor.scm (tor): Update to 0.4.8.4. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 7fec88656f..ba8c98cf83 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -63,14 +63,14 @@ (define-module (gnu packages tor) (define-public tor (package (name "tor") - (version "0.4.7.14") + (version "0.4.8.4") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "1y2xwrji1rvk6h0k15705yra5s74h72h2g84x02zr0338vv6gb55")))) + "0aqxd8pijazvq97rdqp4iyxwnf6m1nynq57zh66b9hszl9scxh89")))) (build-system gnu-build-system) (arguments (list #:configure-flags -- 2.42.0 --00000000000090d9b30603a76fe9 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
From 1ca67dd8ba30c34d60c4ae49889c30d912edd4ee Mon Sep 17 0= 0:00:00 2001
From: fanquake <fa= nquake@gmail.com>
Date: Thu, 24 Aug 2023 09:47:33 +0100
Subjec= t: [PATCH] gnu: tor: Update to 0.4.8.4.

* gnu/packages/tor.scm (tor)= : Update to 0.4.8.4.
---
=C2=A0gnu/packages/tor.scm | 4 ++--
=C2= =A01 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/= packages/tor.scm b/gnu/packages/tor.scm
index 7fec88656f..ba8c98cf83 100= 644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -63,1= 4 +63,14 @@ (define-module (gnu packages tor)
=C2=A0(define-public tor=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name "tor")
- = =C2=A0 =C2=A0(version "0.4.7.14")
+ =C2=A0 =C2=A0(version &quo= t;0.4.8.4")
=C2=A0 =C2=A0 =C2=A0(source (origin
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (method url-fetch)
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (uri (string-append "https://dist.torproject.org/tor-"
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 version ".tar.gz"))=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (sha256
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(base32
- =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "1y2xwrji1rvk6h0k15705yra5s74h72h2g84x= 02zr0338vv6gb55"))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 "0aqxd8pijazvq97rdqp4iyxwnf6m1nynq57zh66b9hszl9scxh89"))))=
=C2=A0 =C2=A0 =C2=A0(build-system gnu-build-system)
=C2=A0 =C2=A0 = =C2=A0(arguments
=C2=A0 =C2=A0 =C2=A0 (list #:configure-flags
--
= 2.42.0
--00000000000090d9b30603a76fe9-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 30 20:10:37 2023 Received: (at 65489) by debbugs.gnu.org; 31 Aug 2023 00:10:37 +0000 Received: from localhost ([127.0.0.1]:54298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbVGf-0002C9-DS for submit@debbugs.gnu.org; Wed, 30 Aug 2023 20:10:37 -0400 Received: from mx0.riseup.net ([198.252.153.6]:57618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbVGb-0002Bu-V3 for 65489@debbugs.gnu.org; Wed, 30 Aug 2023 20:10:36 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4RbhPm1Tyfz9t7w; Thu, 31 Aug 2023 00:10:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693440620; bh=k5Jzlcq54pVp1VzfcfjeRpb3csxLTfgKKnHa9+Orw/w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=nPAH07kyVojb8DOaCkMpg4u+U5lVJBsOfrO5mGWNF2qTBG1k36zMt/QkahMgMwl92 IzK+Ug9F/E3iY5xAdhDf3jizHTF9IlFZ8jyt92tizNlBy0WvE7xtTKBQtUl7PSkcoy oLYjYJT+5+Uyravavn3gokfet0H32Pg57tV7pyu4= X-Riseup-User-ID: 1769DA63F28DFE28894B0C4F612805FB8FD3D06FA06C841CD477EE9D26284DA8 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RbhPl0rkgzFpn6; Thu, 31 Aug 2023 00:10:18 +0000 (UTC) Date: Wed, 30 Aug 2023 21:10:14 -0300 From: =?iso-8859-1?Q?Andr=E9?= Batista To: Michael Ford Subject: Re: [bug#65489] [PATCH] gnu: tor: Update to 0.4.8.4. Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 65489 Cc: 65489@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Michael! The Tor Project has released v0.4.8.5, so I guess we can skip v0.4.8.4. Would you care to send a new version of your patch? Also, Tor v0.4.8.x has introduced a new PoW feature which is useful for Onion Service operators and users during those all too common DDoS attempts on the network. However, the feature is disabled by default because the code was GPL'd. So, in order to enable it for Guix users - whom I think won't have an issue with GPL code ;) -, you need to change the current package definition configure flags and add "--enable-gpl", otherwise we will be missing on this. Moreover, I'm running the tor-client package and have hit on core/tor issue #40848[1], since upgrading to v0.4.8.5. Apparently it's a pretty harmless bug assertion which Alexander Færøy solved [2] by just removing the bug assertion. Nonetheless, I think it's best if we also include that patch on Guix, otherwise there may be future repeated questions from guix users once they start seeing it show up on system logs. WDYT? Cheers! 1 - https://gitlab.torproject.org/tpo/core/tor/-/issues/40848 2 - https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/752 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 01 03:32:13 2023 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: Subject: Re: [bug#65489] [PATCH] gnu: tor: Update to 0.4.8.4. To: =?UTF-8?Q?Andr=C3=A9_Batista?= Content-Type: multipart/alternative; boundary="000000000000a666bd0604472780" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65489 Cc: 65489@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000a666bd0604472780 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 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 =3D \ %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 #~(modify-phases %standard-phases --=20 2.42.0 On Thu, 31 Aug 2023 at 03:10, Andr=C3=A9 Batista wrote: > Hi Michael! > > The Tor Project has released v0.4.8.5, so I guess we can skip > v0.4.8.4. Would you care to send a new version of your patch? > > Also, Tor v0.4.8.x has introduced a new PoW feature which is useful > for Onion Service operators and users during those all too common > DDoS attempts on the network. However, the feature is disabled by > default because the code was GPL'd. So, in order to enable it for > Guix users - whom I think won't have an issue with GPL code ;) -, you > need to change the current package definition configure flags and add > "--enable-gpl", otherwise we will be missing on this. > > Moreover, I'm running the tor-client package and have hit on core/tor > issue #40848[1], since upgrading to v0.4.8.5. Apparently it's a > pretty harmless bug assertion which Alexander F=C3=A6r=C3=B8y solved [2] = by > just removing the bug assertion. Nonetheless, I think it's best if we > also include that patch on Guix, otherwise there may be future > repeated questions from guix users once they start seeing it show up > on system logs. > > WDYT? > > Cheers! > > 1 - https://gitlab.torproject.org/tpo/core/tor/-/issues/40848 > 2 - https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/752 > --000000000000a666bd0604472780 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Andre,

I've taken you= r suggestions.
Here is the updated patch.
Thanks
<= div>
From a7c754da51888f23755ba46904191bf16523fc17 Mon Sep 17= 00:00:00 2001
From: fanquake <= fanquake@gmail.com>
Date: Thu, 24 Aug 2023 09:47:33 +0100
Subj= ect: [PATCH] gnu: tor: Update to 0.4.8.5.

* gnu/packages/tor.scm (to= r): Update to 0.4.8.5.
* gnu/packages/tor.scm (tor)[arguments]<#:conf= igure-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
=C2=A0 assert.
---=C2=A0gnu/local.mk =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0| =C2=A01 +
=C2=A0.../patches/tor-remove-defensi= ve-assert.patch | 28 +++++++++++++++++++
=C2=A0gnu/packages/tor.scm =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| =C2=A08 ++++--
=C2=A03 files changed, 34 insertions(+), 3= deletions(-)
=C2=A0create mode 100644 gnu/packages/patches/tor-remove-d= efensive-assert.patch

diff --git a/gnu/l= ocal.mk b/gnu/local.mk
index 9b493df= 8d5..6a4f9dabb2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2012,6 +2012= ,7 @@ dist_patch_DATA =3D \
=C2=A0 =C2=A0%D%/packages/patches/tofi-= 32bit-compat.patch \
=C2=A0 =C2=A0%D%/packages/patches/tootle-glib-obj= ect-naming.patch \
=C2=A0 =C2=A0%D%/packages/patches/tootle-reason-phra= se.patch \
+ =C2=A0%D%/packages/patches/tor-remove-defensive-assert.pat= ch =C2=A0 \
=C2=A0 =C2=A0%D%/packages/patches/transcode-ffmpeg.patch \=C2=A0 =C2=A0%D%/packages/patches/transfig-gcc10-fno-common.patch \
= =C2=A0 =C2=A0%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/pat= ches/tor-remove-defensive-assert.patch
@@ -0,0 +1,28 @@
+This patch r= emoves a call to `tor_assert_nonfatal_unreached()` in
+`relay_key_is_una= vailable_()` that is only called when Tor is compiled
+without relay sup= port.
+
+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
+boot= strap harder particularly for our iOS developers.
+
+Since the call s= ites to `get_master_identity_key()` handles `NULL`
+values already, we d= o not think this will be an issue later on.
+
+Reported by Benjamin E= rhart (@tla) from Guardian Project.
+
+Fixes tpo/core/tor#40848.
+=
+diff --git a/src/feature/relay/routerkeys.h b/src/feature/relay/router= keys.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_i= s_unavailable_(void)
+ {
+- =C2=A0tor_assert_nonfatal_unreached();+ =C2=A0 return NULL;
+ }
+ #define relay_key_is_unavailable(type) \=
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 7fec8= 8656f..44e62b63cc 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/package= s/tor.scm
@@ -63,18 +63,20 @@ (define-module (gnu packages tor)
=C2= =A0(define-public tor
=C2=A0 =C2=A0(package
=C2=A0 =C2=A0 =C2=A0(name= "tor")
- =C2=A0 =C2=A0(version "0.4.7.14")
+ =C2= =A0 =C2=A0(version "0.4.8.5")
=C2=A0 =C2=A0 =C2=A0(source (ori= gin
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (method url-fetch)<= br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (uri (string-append &qu= ot;https://dist.torproject.org= /tor-"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 version &quo= t;.tar.gz"))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (sha2= 56
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(base32
- = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "1y2xwrji1rvk6h0k1570= 5yra5s74h72h2g84x02zr0338vv6gb55"))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 "06g1awb4piqvgxa97pyswxgjzkpj8rx3iy2jbiaygvi99b8= wymv9"))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (patches (sear= ch-patches "tor-remove-defensive-assert.patch"))))
=C2=A0 =C2= =A0 =C2=A0(build-system gnu-build-system)
=C2=A0 =C2=A0 =C2=A0(arguments=
=C2=A0 =C2=A0 =C2=A0 (list #:configure-flags
- =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 #~(list "--enable-lzma"
+ =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 #~(list "--enable-gpl"
+ =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "--enable-lzma"
=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "--= enable-zstd")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #:phases=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #~(modify-phases %standard-phase= s
--
2.42.0

On Thu, 31 Aug 2023 at 03:10, Andr=C3=A9 Batista &l= t;nandre@riseup.net> wrote:
=
Hi Michael!

The Tor Project has released v0.4.8.5, so I guess we can skip
v0.4.8.4. Would you care to send a new version of your patch?

Also, Tor v0.4.8.x has introduced a new PoW feature which is useful
for Onion Service operators and users during those all too common
DDoS attempts on the network. However, the feature is disabled by
default because the code was GPL'd. So, in order to enable it for
Guix users - whom I think won't have an issue with GPL code ;) -, you need to change the current package definition configure flags and add
"--enable-gpl", otherwise we will be missing on this.

Moreover, I'm running the tor-client package and have hit on core/tor issue #40848[1], since upgrading to v0.4.8.5. Apparently it's a
pretty harmless bug assertion which Alexander F=C3=A6r=C3=B8y solved [2] by=
just removing the bug assertion. Nonetheless, I think it's best if we also include that patch on Guix, otherwise there may be future
repeated questions from guix users once they start seeing it show up
on system logs.

WDYT?

Cheers!

1 - https://gitlab.torproject.org/tpo/core/= tor/-/issues/40848
2 - https://gitlab.torproject.org/tpo= /core/tor/-/merge_requests/752
--000000000000a666bd0604472780-- From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 01 10:46:47 2023 Received: (at 65489) by debbugs.gnu.org; 1 Sep 2023 14:46:47 +0000 Received: from localhost ([127.0.0.1]:33614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc5Q6-0002I0-SA for submit@debbugs.gnu.org; Fri, 01 Sep 2023 10:46:47 -0400 Received: from mx0.riseup.net ([198.252.153.6]:53054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc5Q3-0002Hm-W6 for 65489@debbugs.gnu.org; Fri, 01 Sep 2023 10:46:45 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4RcgpD6dGwz9t74; Fri, 1 Sep 2023 14:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693579588; bh=pRVkaDL55C/dlIHzKykMHwDqtd1aw1nMX6ceMNUUMmo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CQ41MA7bu7jmZjL9mqgKhV8jqgZ3QOEQAXr0T7dk2cYIan6vg6pFC2/smmREHnzbW cUKtcLcNiVoJegQHVL8qG3om+j1BMj+15REv5oquRSNb+XuRI9ID2idPdnWyBTmbg6 EUSd57uYzATpLab4tdRdoOazBPYtS/s166PdWZhk= X-Riseup-User-ID: D5301DC84D204B5CDAE3AA4A09BE2594BB79CCA82C0E81709E2808BD619059F4 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RcgpC5HT7zFs1Q; Fri, 1 Sep 2023 14:46:27 +0000 (UTC) Date: Fri, 1 Sep 2023 11:46:12 -0300 From: =?iso-8859-1?Q?Andr=E9?= Batista To: Michael Ford Subject: Re: [bug#65489] [PATCH] gnu: tor: Update to 0.4.8.4. Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 65489 Cc: 65489@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Michael, sex 01 set 2023 às 10:31:43 (1693575103), fanquake@gmail.com enviou: [...] > 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 > #~(modify-phases %standard-phases I'm sorry but I forgot to mention you should probably also update the license field in order to refer to the license option. It seems to me that the configure flag is a bit misleading, since the license is LGPLv3[1][2], not GPL. Other than that, it looks good to me, thank you! I do not have commit rights, so let's wait for a Guix Maintainer to pick it up. Cheers! 1 - https://gitlab.torproject.org/tpo/core/tor/-/blob/release-0.4.8/Makefile.am?ref_type=heads#L117 2 - https://gitlab.torproject.org/tpo/core/tor/-/blob/release-0.4.8/src/ext/equix/LICENSE?ref_type=heads From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 14 10:43:29 2023 Received: (at 65489) by debbugs.gnu.org; 14 Sep 2023 14:43:29 +0000 Received: from localhost ([127.0.0.1]:40775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgnZ2-0002Up-SC for submit@debbugs.gnu.org; Thu, 14 Sep 2023 10:43:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgnZ1-0002Ud-KI for 65489@debbugs.gnu.org; Thu, 14 Sep 2023 10:43:28 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgnYo-00016m-DA; Thu, 14 Sep 2023 10:43:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=C2zcx8TMMFpwW4ZF08f0CtcQcOlHm6uOKi1BxXHfFA4=; b=GT+B2y0xGgbBPuGbvDgC sWajjzumgZhA57ZwkMbgdudv6xpLFrR7S9N7MxiJyijOf0aLTCFpuLEoUTP+LqKdBkzEAqgycRm4u Vie9uAMSE5xiPdBe2bvgiSrP3V+CMEGM+39lDcLcew3liSkoEmrFm9+Dt7ZorekS6+krHyL+1AO4P h6Vo87b4E4hCgmWE8W0cPfxU7VW+PNMEAkiu8Elk/G/8H9i+SM1NcL/BIEFMJ6Ag9pe6D/IQDE5WB 7dFEpujTxWNXZIKvuProgFxAlj7sbqNkl9bzlwwt3VfOoA6EP8sLfmurcxV9rDw4JyGaw+V1TWD1s MV1zNkDUsqI+cA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: =?utf-8?Q?Andr=C3=A9?= Batista Subject: Re: bug#65489: [PATCH] gnu: tor: Update to 0.4.8.4. References: Date: Thu, 14 Sep 2023 16:43:08 +0200 In-Reply-To: (=?utf-8?Q?=22Andr=C3=A9?= Batista"'s message of "Fri, 1 Sep 2023 11:46:12 -0300") Message-ID: <87wmwsak8z.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65489 Cc: Michael Ford , 65489@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Andr=C3=A9, Andr=C3=A9 Batista skribis: > I'm sorry but I forgot to mention you should probably also update the > license field in order to refer to the license option. It seems to me > that the configure flag is a bit misleading, since the license is > LGPLv3[1][2], not GPL. However the flag is documented like this in =E2=80=98configure.ac=E2=80=99: --8<---------------cut here---------------start------------->8--- AC_ARG_ENABLE(gpl, AS_HELP_STRING(--enable-gpl, [allow the inclusion of GPL-licensed code, b= uilding a version of tor and libtor covered by the GPL rather than its usua= l 3-clause BSD license])) license_option=3DBSD AS_IF([test "x$enable_gpl" =3D xyes], [ AC_DEFINE(ENABLE_GPL, 1, [Defined if tor is building in GPL-licensed mo= de.]) license_option=3DGPL ]) --8<---------------cut here---------------end--------------->8--- That said, although that=E2=80=99s unwritten, the =E2=80=98license=E2=80=99= field describes the license of the package itself, not that of the combination with its dependencies, so I=E2=80=99d leave it at =E2=80=98bsd-3=E2=80=99. Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 14 10:45:24 2023 Received: (at 65489-done) by debbugs.gnu.org; 14 Sep 2023 14:45:24 +0000 Received: from localhost ([127.0.0.1]:40784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgnat-0002YJ-QO for submit@debbugs.gnu.org; Thu, 14 Sep 2023 10:45:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgnap-0002Xq-MD for 65489-done@debbugs.gnu.org; Thu, 14 Sep 2023 10:45:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgnad-0001Jy-Ey; Thu, 14 Sep 2023 10:45:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=1EEiAFP/dzRNYO6f/uX/hFJw0zh2SUZ7RVBmpOlh9Bw=; b=qZWg9UQxbXdz1Ci1PFLy 9sHis0oog/Cw5jCnssqoDjez93K6TFWtvcub34B7WjWpmShjkJjksihjNb1h+cC7ydEcJxH2C8qxh 60AWyZNPGjOQZGBEzWpR1RhfY1abCjGuCFnshoNqJ06p7q2Q1+725fYdi9+HlVI8nsN1hJSGhvMNi nfYgVsFnz1U4XndLs/fZMESZkv8oiKCEMA53NRiq6pa+shf0Hy9tOtb9t6shrd99B6mP1IxOCZsXp QyqXP2XAG7+HZrACBkOBLQdszPRPa8sKKseDG5aklUv4kilhG1mBT4OYqk6UYgvmAb7jtxUXfFdRB SCeERN1v2RtvuA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Michael Ford Subject: Re: bug#65489: [PATCH] gnu: tor: Update to 0.4.8.4. References: Date: Thu, 14 Sep 2023 16:45:03 +0200 In-Reply-To: (Michael Ford's message of "Fri, 1 Sep 2023 10:31:43 +0300") Message-ID: <87sf7gak5s.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65489-done Cc: =?utf-8?Q?Andr=C3=A9?= Batista , 65489-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Michael Ford skribis: >>>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. Applied, thanks! Note that the patch got mangled on the way. Please use =E2=80=98git send-e= mail=E2=80=99 or make it an attachment next time. Ludo=E2=80=99. From unknown Fri Jun 20 07:18:28 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 13 Oct 2023 11:24:17 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator