From patchwork Thu Mar 31 07:24:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5420 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KTZYs3W7Cz3wcX for ; Thu, 31 Mar 2022 07:24:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KTZYq0mXqz2Nq; Thu, 31 Mar 2022 07:24:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KTZYp6xrnz2yWZ; Thu, 31 Mar 2022 07:24:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KTZYn6xPqz2xQw for ; Thu, 31 Mar 2022 07:24:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KTZYm68TLzQl for ; Thu, 31 Mar 2022 07:24:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1648711469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ayO/oCkOjFOIOoejJiYAZ3hnbqzWBQ1mE2F5GjoIM84=; b=pRu03oh7taYbolZ9hLpmZaQkHi4Y1oEEu8ZdB4P1kkpqwXZ83naiONLKqfI8avJgGSaSNV dhg65WG/K0pXoeDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1648711469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ayO/oCkOjFOIOoejJiYAZ3hnbqzWBQ1mE2F5GjoIM84=; b=XWsZhN/GjI9hs6kBmzpj9zUKmty/gzyV7VUsc65Xu7IpV/AJLjJmwzwus6TCaogeSitBpE Wb7u0FuLbU08rPiwlVgwnKVbxDXT6cnXn4NPJwCxGKUr9Rm7+p8aiknvDdY+RdyqI5LVd2 3S3GR9YyRO3IHexTb3PMx+hoz+MrhpGHzXNIQmxzR9rTwzXg3WhOtfqOvaRvBY/uGMVou5 Uj9F2SVyIXesS0eLAqxu9D60vjyH/HahwGZusP6q5+8hbyGfx/VYMxklNDFdft/McyUatD mC3C1eRvKDvIx0Jxp4/xcch5hV/jeswJQtoTJYsKLln4+sbZoppaGB43hBEkJA== Message-ID: <4b60a176-a325-3d64-2c58-7755185ecc00@ipfire.org> Date: Thu, 31 Mar 2022 07:24:25 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] Tor: Pick up upstream patch for fixing sandbox with glibc >= 2.34 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Fixes: #12807 Signed-off-by: Peter Müller --- lfs/tor | 5 ++++- .../Tor-Sandbox-permit-the-clone3-system-call.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/patches/Tor-Sandbox-permit-the-clone3-system-call.patch diff --git a/lfs/tor b/lfs/tor index 2eb2adcb1..d732bc66e 100644 --- a/lfs/tor +++ b/lfs/tor @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 67 +PAK_VER = 68 DEPS = libseccomp @@ -89,6 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-tor-user=tor \ --with-tor-group=tor + # https://bugzilla.ipfire.org/show_bug.cgi?id=12807 + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/Tor-Sandbox-permit-the-clone3-system-call.patch + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/Tor-Sandbox-permit-the-clone3-system-call.patch b/src/patches/Tor-Sandbox-permit-the-clone3-system-call.patch new file mode 100644 index 000000000..e8c6957f2 --- /dev/null +++ b/src/patches/Tor-Sandbox-permit-the-clone3-system-call.patch @@ -0,0 +1,13 @@ +diff -Naur tor-0.4.6.10.orig/src/lib/sandbox/sandbox.c tor-0.4.6.10/src/lib/sandbox/sandbox.c +--- tor-0.4.6.10.orig/src/lib/sandbox/sandbox.c 2022-03-31 07:17:55.966217291 +0000 ++++ tor-0.4.6.10/src/lib/sandbox/sandbox.c 2022-03-31 07:19:23.730134367 +0000 +@@ -151,6 +151,9 @@ + SCMP_SYS(clock_gettime), + SCMP_SYS(close), + SCMP_SYS(clone), ++#ifdef __NR_clone3 ++ SCMP_SYS(clone3), ++#endif + SCMP_SYS(dup), + SCMP_SYS(epoll_create), + SCMP_SYS(epoll_wait),