Attachment 245337 Details for Bug 273416 – update tor-brower to 12.5.6

[patch] update tor-brower to 12.5.6

tor-browser-12.5.6.diff (text/plain), 5.78 KB, created by Rene Ladan on 2023-09-30 20:03:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rene Ladan

Created: 2023-09-30 20:03:04 UTC

Size: 5.78 KB

patch

obsolete

>diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile
>index 571c3e66d3..af3a996dbe 100644
>--- a/www/tor-browser/Makefile
>+++ b/www/tor-browser/Makefile
>@@ -1,10 +1,9 @@
> PORTNAME=	tor-browser
>-DISTVERSION=	12.0.6
>-PORTREVISION=	4
>+DISTVERSION=	12.5.6
> CATEGORIES=	www net security wayland
> MASTER_SITES=	TOR
> MASTER_SITE_SUBDIR=torbrowser/${DISTVERSION}
>-DISTNAME=	src-firefox-tor-browser-102.11.0esr-${DISTVERSION:R}-1-build1
>+DISTNAME=	src-firefox-tor-browser-102.15.1esr-${DISTVERSION:R}-1-build3
> 
> MAINTAINER=	freebsd@sysctl.cz
> COMMENT=	Tor Browser for FreeBSD
>@@ -48,7 +47,7 @@ MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
> 		MOZ_APP_DISPLAYNAME="Tor Browser" \
> 		MOZ_APP_NAME="tor-browser"
> 
>-MOZ_OPTIONS=	--with-tor-browser-version=${DISTVERSION}-1 \
>+MOZ_OPTIONS=	--with-base-browser-version=${DISTVERSION} \
> 	--enable-official-branding \
> 	--enable-optimize \
> 	--enable-bundled-fonts \
>@@ -60,7 +59,6 @@ MOZ_OPTIONS=	--with-tor-browser-version=${DISTVERSION}-1 \
> 	--enable-proxy-bypass-protection \
> 	--disable-system-policies \
> 	--disable-backgroundtasks \
>-	--enable-base-browser \
> 	--enable-verify-mar \
> 	--with-distribution-id=org.torproject
> 
>diff --git a/www/tor-browser/distinfo b/www/tor-browser/distinfo
>index c8c74a3398..b93d9297a4 100644
>--- a/www/tor-browser/distinfo
>+++ b/www/tor-browser/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1684065683
>-SHA256 (src-firefox-tor-browser-102.11.0esr-12.0-1-build1.tar.xz) = 9b64d00e9bb5ad63f005e8f950800ab3a12f75f214c55f900d88df26bce1ba5d
>-SIZE (src-firefox-tor-browser-102.11.0esr-12.0-1-build1.tar.xz) = 511957244
>+TIMESTAMP = 1696070199
>+SHA256 (src-firefox-tor-browser-102.15.1esr-12.5-1-build3.tar.xz) = 2a7932c2b2f80a3ec6037e3fa475e1867c74a3528816b870b5a812dd15a74296
>+SIZE (src-firefox-tor-browser-102.15.1esr-12.5-1-build3.tar.xz) = 514543008
>diff --git a/www/tor-browser/files/patch-rust-1.70.0 b/www/tor-browser/files/patch-rust-1.70.0
>deleted file mode 100644
>index 233e51bee1..0000000000
>--- a/www/tor-browser/files/patch-rust-1.70.0
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100
>-
>-From 8b5b652d38e007e736bb442ccd5aa5ed699db100 Mon Sep 17 00:00:00 2001
>-From: Matthew Gregan <kinetik@flim.org>
>-Date: Thu, 16 Jun 2022 13:54:02 +1200
>-Subject: [PATCH] Fix `unstable-name-collisions` warning by using fully
>- qualified path.
>-
>----
>- mp4parse/src/lib.rs | 9 +++++++--
>- 1 file changed, 7 insertions(+), 2 deletions(-)
>-
>-diff --git a/mp4parse/src/lib.rs b/mp4parse/src/lib.rs
>-index 567ee21d..4f3d7153 100644
>---- third_party/rust/mp4parse/src/lib.rs
>-+++ third_party/rust/mp4parse/src/lib.rs
>-@@ -3506,8 +3506,13 @@ macro_rules! impl_mul {
>-             type Output = $output;
>- 
>-             fn mul(self, rhs: $rhs) -> Self::Output {
>--                static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64);
>--                static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX);
>-+                static_assertions::const_assert!(
>-+                    <$output as UpperBounded>::MAX <= <$inner>::MAX as u64
>-+                );
>-+                static_assertions::const_assert!(
>-+                    <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX
>-+                        <= <$output as UpperBounded>::MAX
>-+                );
>- 
>-                 let lhs: $inner = self.get().into();
>-                 let rhs: $inner = rhs.get().into();
>-
>diff --git a/www/tor-browser/files/patch-toolkit_compononents_tor-launcher_TorLauncherUtil.jsm b/www/tor-browser/files/patch-toolkit_compononents_tor-launcher_TorLauncherUtil.jsm
>deleted file mode 100644
>index 776e8f48c1..0000000000
>--- a/www/tor-browser/files/patch-toolkit_compononents_tor-launcher_TorLauncherUtil.jsm
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- ./toolkit/components/tor-launcher/TorLauncherUtil.jsm.orig	2022-12-12 08:48:18.438560000 +0000
>-+++ ./toolkit/components/tor-launcher/TorLauncherUtil.jsm	2022-12-12 08:49:39.039184000 +0000
>-@@ -31,7 +31,7 @@
>-   checkIPCPathLen = true;
>- 
>-   static _isFirstIPCPathRequest = true;
>--  static _isUserDataOutsideOfAppDir = undefined;
>-+  static _isUserDataOutsideOfAppDir = true;
>-   static _dataDir = null;
>-   static _appDir = null;
>- 
>-@@ -340,7 +340,7 @@
>-   static get dataDir() {
>-     if (!this._dataDir) {
>-       const profDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
>--      this._dataDir = profDir.parent.parent;
>-+      this._dataDir = profDir;
>-     }
>-     return this._dataDir;
>-   }
>diff --git a/www/tor-browser/files/patch-toolkit_xre_nsXREDirPRovider.cpp b/www/tor-browser/files/patch-toolkit_xre_nsXREDirPRovider.cpp
>deleted file mode 100644
>index b57ba700fb..0000000000
>--- a/www/tor-browser/files/patch-toolkit_xre_nsXREDirPRovider.cpp
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- toolkit/xre/nsXREDirProvider.cpp.orig	2023-01-15 10:55:50.058634000 +0100
>-+++ toolkit/xre/nsXREDirProvider.cpp	2023-01-15 10:56:48.735300000 +0100
>-@@ -1653,7 +1653,11 @@
>-     ToLowerCase(folder);
>- 
>-     rv = AppendProfileString(aFile, folder.BeginReading());
>-+  } else {
>-+    nsAutoCString folder(".tor-browser-profiles");
>-+    rv = aFile->AppendNative(folder);
>-   }
>-+
>-   NS_ENSURE_SUCCESS(rv, rv);
>- 
>- #else
>diff --git a/www/tor-browser/files/patch-toolkit_xre_nsXREDirProvider.cpp b/www/tor-browser/files/patch-toolkit_xre_nsXREDirProvider.cpp
>new file mode 100644
>index 0000000000..20d6c3721d
>--- /dev/null
>+++ b/www/tor-browser/files/patch-toolkit_xre_nsXREDirProvider.cpp
>@@ -0,0 +1,13 @@
>+--- toolkit/xre/nsXREDirProvider.cpp.orig	2023-09-26 21:44:17 UTC
>++++ toolkit/xre/nsXREDirProvider.cpp
>+@@ -1788,6 +1788,10 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* 
>+ 
>+       rv = aFile->AppendNative(folder);
>+     }
>++
>++    // FreeBSD PR 268684
>++    nsAutoCString folder(".tor-browser-profiles");
>++    rv = aFile->AppendNative(folder);
>+   }
>+   NS_ENSURE_SUCCESS(rv, rv);
>+

Actions: View | Diff

Attachments on bug 273416: 245337 | 245338 | 245777 | 246158