From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id sLW4BGocfGb3AQEAe85BDQ:P1 (envelope-from ) for ; Wed, 26 Jun 2024 13:49:30 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sLW4BGocfGb3AQEAe85BDQ (envelope-from ) for ; Wed, 26 Jun 2024 15:49:30 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=Arsazclh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1719409769; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=2HFbZiRcmbWdllz1IiBUvAYrXRkjcAQsUSehxSrSUNI=; b=OMELCmmklpLYJz5GzKZ0a2xPj9o1vkzo8L7k4c6olJ8TRTF7VUAmPS8jVf9UAl72xiJldg 8SUN0Lbc1VgTEzVsRHtMjBmyi8FYPY2DjghhOVM0uhxElTDOzgpRSS0PRetEpRxhCeOrLU ntakjdDMKOxaqlXJNbRQHqxJNA2wb/22h0kAdKCtzSysEo5Xz7jxdcGBxklMM4tFQRdAta polm4X7q7WNuV8H+52xQygp+qf5Baj8RfQ69bpJnpDzo3N9lZ9srnaz6bH9cDTWMl964nb KyKXoAfTM4ItQd8w3t22a9kCfKd4XlkOnJPWavnnD4D8zDaohWh/77yv7ZZpzQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719409769; a=rsa-sha256; cv=none; b=YqDlLn857KAoi3Lk+CUUqIj+8Kv74GgcvyGxUuaLVnB1ciVRmIxDlCDn1FkW2FyoQfQbSF HfKXh1VxMDrnDbmjGSwnQnZ6FnAXNWsy4ogAcTeiZjWKhaw6xmB2lwf+su1ZTh4kV3jV/O 4ROD7CJA+GndJrrAqwq9src57B68Kev57rDBpXRwNlgDNfOQCTf4onjO4VW3k8FrJRsGke sos766YY/fVOQxop10O01/yYF63dywC3eeIj7fC9UOlG0MZwE0mql4Kcbshz0+4RyItTx6 Z7uW02jwWcYVBLAg9r6mfsu6gB05hsc8miMP6J6D4tE7yHOtWLN5rOdo8ITvig== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=Arsazclh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AADED6B199 for ; Wed, 26 Jun 2024 15:49:29 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMT1K-0005Cg-Gq; Wed, 26 Jun 2024 09:49:10 -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 1sMT1A-00058K-QR for guix-patches@gnu.org; Wed, 26 Jun 2024 09:49:02 -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 1sMT1A-0008Cq-Hx for guix-patches@gnu.org; Wed, 26 Jun 2024 09:49:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sMT1C-0000o0-R3 for guix-patches@gnu.org; Wed, 26 Jun 2024 09:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH 3/3] gnu: torbrowser: Update to 13.5. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2024 13:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.17194096993024 (code B ref 71782); Wed, 26 Jun 2024 13:49:02 +0000 Received: (at 71782) by debbugs.gnu.org; 26 Jun 2024 13:48:19 +0000 Received: from localhost ([127.0.0.1]:38854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMT0U-0000mh-Tw for submit@debbugs.gnu.org; Wed, 26 Jun 2024 09:48:19 -0400 Received: from mx0.riseup.net ([198.252.153.6]:54058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMT0T-0000mS-3Z for 71782@debbugs.gnu.org; Wed, 26 Jun 2024 09:48:18 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (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 4W8NLx2dngz9w8c for <71782@debbugs.gnu.org>; Wed, 26 Jun 2024 13:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1719409689; bh=L/xT8F6o1ziWcMtyUGmJIylBzjJNnuTDmGRo86Rxu9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Arsazclh+L3JBUV5d9sV+/u5jtLrDA9lbtvh4pwxUlDIjBg9KjCZ1oeHsfHWUwh1D g7tAu3tkKJqf+ters0EtJrWhV2w7ixY0EzdbxgeKFOSnDbgbDKXp0vlyIvrvO5g9tR IisEZbcfgG6ZfNxAo6oeTEAFhdpwz3IIGfcKJLZQ= X-Riseup-User-ID: 9197688E74CCF6B2BE0364ED0DEB3A4658D82198C6D5AF5A54A76E234E97C1D8 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4W8NLj3kdfzJt6T; Wed, 26 Jun 2024 13:47:57 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Wed, 26 Jun 2024 10:47:48 -0300 Message-ID: <20240626134748.21727-1-nandre@riseup.net> In-Reply-To: <20240626133817.21595-1-nandre@riseup.net> References: <20240626133817.21595-1-nandre@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: AADED6B199 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -3.87 X-Spam-Score: -3.87 X-TUID: uJsNNFAZYt2B * gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to 20240611120000. (%torbrowser-version): Update to 13.5. (%torbrowser-firefox-version): Update to 115.12.0esr-13.5-1-build3. (torbrowser-translation-base): Update to dc59db634f066298e903142227834da483ec197d. (torbrowser-translation-specific): Update to de4f91a5020d637ab5d66459718525a5f9207be2. (lld-as-ld-wrapper-16): New variable. (make-torbrowser)[native-inputs]: Add lld-as-ld-wrapper-16. Use llvm-16 and clang-16. [arguments] <#:phases>: Remove add-bridges. Change-Id: Ic08578fa1b0f33a8f426c60ca65db3c9102ad554 --- gnu/packages/tor-browsers.scm | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 3d01346c8c..0407cc39dc 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -151,16 +151,16 @@ (define %torbrowser-locales ;; We copy the official build id, which is defined at ;; tor-browser-build/rbm.conf (browser_release_date). -(define %torbrowser-build-date "20240510190000") +(define %torbrowser-build-date "20240611120000") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.0.16") +(define %torbrowser-version "13.5") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-tor-browser-". -(define %torbrowser-firefox-version "115.12.0esr-13.0-1-build1") +(define %torbrowser-firefox-version "115.12.0esr-13.5-1-build3") ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base @@ -168,11 +168,11 @@ (define torbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) + (commit "dc59db634f066298e903142227834da483ec197d"))) (file-name "translation-base-browser") (sha256 (base32 - "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) + "11lbw2lpsjm0r2lwmy8i2db40r5ypf8fhn4jh59l927g40ch6dxw")))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-specific @@ -180,11 +180,11 @@ (define torbrowser-translation-specific (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "b5d79336411e5a59c4861341ef9aa7353e0bcad9"))) + (commit "de4f91a5020d637ab5d66459718525a5f9207be2"))) (file-name "translation-tor-browser") (sha256 (base32 - "0ahz69pxhgik7ynmdkbnx7v5l2v392i6dswjz057g4hwnd7d34fb")))) + "0q8nnqf4zhqivv3rjlvcsbac5254ingw98qwrbnhz3m5gl78vpcf")))) (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. @@ -200,7 +200,7 @@ (define torbrowser-assets version "/tor-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1kffam66bsaahzx212hw9lb03jwfr24hivzg067iyzilsldpc9c1")))) + "0fqqzrwpqzadgi24qarpnj8aac5w57qlfb4vy2cwga5h40dsp6ly")))) (arguments (list #:install-plan @@ -215,6 +215,10 @@ (define torbrowser-assets Browser.") (license license:silofl1.1))) +;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld. +(define lld-as-ld-wrapper-16 + (make-lld-wrapper lld-16 #:lld-as-ld? #t)) + (define* (make-torbrowser #:key moz-app-name moz-app-remotingname @@ -238,7 +242,7 @@ (define* (make-torbrowser #:key ".tar.xz")) (sha256 (base32 - "1b70zyjyai6kk4y1kkl8jvrs56gg7z31kkad6bmdpd8jw4n71grx")))) + "0i5fmippmzhd1nlhzk46rnhv2rgb2ari071m8yww7gk8lfnn5x5f")))) (build-system mozilla-build-system) (inputs (list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird @@ -293,8 +297,9 @@ (define* (make-torbrowser #:key rust `(,rust "cargo") rust-cbindgen - llvm-15 - clang-15 + lld-as-ld-wrapper-16 ; for cargo rustc + llvm-16 + clang-16 perl node-lts python-wrapper @@ -632,14 +637,6 @@ (define (runpaths-of-input label) (substitute* "toolkit/locales/en-US/toolkit/about/aboutAddons.ftl" (("addons.mozilla.org") "gnuzilla.gnu.org")))) - (add-before 'build 'add-bridges ;see deploy.sh - (lambda _ - (let ((port (open-file - "browser/app/profile/000-tor-browser.js" "a"))) - (display - "#include ../../../tools/torbrowser/bridges.js" port) - (newline port) - (close port)))) (replace 'build (lambda* (#:key (make-flags '()) (parallel-build? #t) #:allow-other-keys) -- 2.45.1