From patchwork Thu Jul 1 17:47:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1499674 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GG5L22flgz9sRK for ; Fri, 2 Jul 2021 03:48:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 36CA260703; Thu, 1 Jul 2021 17:48:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RUX_7QrzcTNj; Thu, 1 Jul 2021 17:48:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 66AE16066E; Thu, 1 Jul 2021 17:48:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 321C91BF83C for ; Thu, 1 Jul 2021 17:48:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2DF3E402CE for ; Thu, 1 Jul 2021 17:48:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kvQ6yRI4D2vu for ; Thu, 1 Jul 2021 17:48:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by smtp4.osuosl.org (Postfix) with ESMTPS id C4888402A4 for ; Thu, 1 Jul 2021 17:48:34 +0000 (UTC) Received: from fwd17.aul.t-online.de (fwd17.aul.t-online.de [172.20.27.64]) by mailout10.t-online.de (Postfix) with SMTP id AE09174BED for ; Thu, 1 Jul 2021 19:47:33 +0200 (CEST) Received: from fli4l.lan.fli4l (rSnppkZDYhxB5W2-w5BXSi9IBgbmHODDSoaM9Ww2eT3SWnim9OzPdZUPchsKK-rgPk@[79.214.193.178]) by fwd17.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1lz0mg-17jp1E0; Thu, 1 Jul 2021 19:47:30 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:52152) by fli4l.lan.fli4l with esmtp (Exim 4.94.2) (envelope-from ) id 1lz0mf-0007HQ-Ep for buildroot@buildroot.org; Thu, 01 Jul 2021 19:47:29 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Thu, 1 Jul 2021 19:47:29 +0200 Message-Id: <20210701174729.82981-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-ID: rSnppkZDYhxB5W2-w5BXSi9IBgbmHODDSoaM9Ww2eT3SWnim9OzPdZUPchsKK-rgPk X-TOI-EXPURGATEID: 150726::1625161650-0000EBC3-6DF14CA5/0/0 CLEAN NORMAL X-TOI-MSGID: 1ae1ed20-536d-425c-a428-3f79e20dd757 Subject: [Buildroot] [PATCH 1/1] package/tor: bump version to 0.4.6.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Release notes: https://blog.torproject.org/node/2046 Removed patch which was applied upstream. Signed-off-by: Bernd Kuhls --- ...0002-Fix-compilation-on-systems-with.patch | 47 ------------------- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/tor/0002-Fix-compilation-on-systems-with.patch diff --git a/package/tor/0002-Fix-compilation-on-systems-with.patch b/package/tor/0002-Fix-compilation-on-systems-with.patch deleted file mode 100644 index 3598a16588..0000000000 --- a/package/tor/0002-Fix-compilation-on-systems-with.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2c00ad36cd6808423821fc32a072a7f16e8509e5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= -Date: Thu, 10 Jun 2021 20:04:13 +0000 -Subject: [PATCH] Fix compilation on systems with older compilers. - -This patch fixes a build error with GCC 7.x which doesn't seem to accept -const int's as constants in macro initialization. - -See: tpo/core/tor#40410 - -Downloaded from upstream commit -https://gitlab.torproject.org/tpo/core/tor/-/commit/2c00ad36cd6808423821fc32a072a7f16e8509e5 - -Signed-off-by: Bernd Kuhls ---- - changes/ticket40410 | 4 ++++ - src/feature/dirclient/dirclient.c | 3 +-- - 2 files changed, 5 insertions(+), 2 deletions(-) - create mode 100644 changes/ticket40410 - -diff --git a/changes/ticket40410 b/changes/ticket40410 -new file mode 100644 -index 0000000000..90d6f4be63 ---- /dev/null -+++ b/changes/ticket40410 -@@ -0,0 +1,4 @@ -+ o Minor bugfixes (compilation): -+ - Fix a compilation error when trying to build Tor with a compiler that -+ does not support expanding statitically initialized const values in -+ macro's. Fixes bug 40410; bugfix on 0.4.6.5. -diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c -index 79ec518c25..fd677d33fe 100644 ---- a/src/feature/dirclient/dirclient.c -+++ b/src/feature/dirclient/dirclient.c -@@ -1873,8 +1873,7 @@ dir_client_decompress_response_body(char **bodyp, size_t *bodylenp, - /* If we're pretty sure that we have a compressed directory, and - * we didn't manage to uncompress it, then warn and bail. */ - if (!plausible && !new_body) { -- const int LOG_INTERVAL = 3600; -- static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL); -+ static ratelim_t warning_limit = RATELIM_INIT(60 * 60); - log_fn_ratelim(&warning_limit, LOG_WARN, LD_HTTP, - "Unable to decompress HTTP body (tried %s%s%s, on %s).", - description1, --- -GitLab - diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 800acee2f5..564e0e7ecb 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b6d354e0d9791eace4b51e92211909308297b7aa257993937163d7ee0694cf9 tor-0.4.6.5.tar.gz +sha256 3423189ba455372021ed44e0be576d181f2908cbd9bdef202d9c11c950882e12 tor-0.4.6.6.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index fca272f836..0f24ddd9e9 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.6.5 +TOR_VERSION = 0.4.6.6 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE