Attachment #245337 for bug #273416

View | Details | Raw Unified | Return to bug 273416
Collapse All | Expand All




PORTNAME=	tor-browser
DISTVERSION=	12.5.6
PORTREVISION=	4
CATEGORIES=	www net security wayland
MASTER_SITES=	TOR
MASTER_SITE_SUBDIR=torbrowser/${DISTVERSION}
DISTNAME=	src-firefox-tor-browser-102.15.1esr-${DISTVERSION:R}-1-build3

MAINTAINER=	freebsd@sysctl.cz
COMMENT=	Tor Browser for FreeBSD

		MOZ_APP_DISPLAYNAME="Tor Browser" \
		MOZ_APP_NAME="tor-browser"

MOZ_OPTIONS=	--with-base-browser-version=${DISTVERSION} \
	--enable-official-branding \
	--enable-optimize \
	--enable-bundled-fonts \

	--enable-proxy-bypass-protection \
	--disable-system-policies \
	--disable-backgroundtasks \
	--enable-base-browser \
	--enable-verify-mar \
	--with-distribution-id=org.torproject


Lines 1-3 Link Here

(-)b/www/tor-browser/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1684065683	1	TIMESTAMP = 1696070199
2	SHA256 (src-firefox-tor-browser-102.11.0esr-12.0-1-build1.tar.xz) = 9b64d00e9bb5ad63f005e8f950800ab3a12f75f214c55f900d88df26bce1ba5d	2	SHA256 (src-firefox-tor-browser-102.15.1esr-12.5-1-build3.tar.xz) = 2a7932c2b2f80a3ec6037e3fa475e1867c74a3528816b870b5a812dd15a74296
3	SIZE (src-firefox-tor-browser-102.11.0esr-12.0-1-build1.tar.xz) = 511957244	3	SIZE (src-firefox-tor-browser-102.15.1esr-12.5-1-build3.tar.xz) = 514543008




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();





--- ./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;
   }




--- 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




--- 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);
 

Return to bug 273416

Lines 1-10 Link Here

(-)b/www/tor-browser/Makefile (-5 / +3 lines)
1	PORTNAME= tor-browser	1	PORTNAME= tor-browser
2	DISTVERSION= 12.0.6	2	DISTVERSION= 12.5.6
3	PORTREVISION= 4
4	CATEGORIES= www net security wayland	3	CATEGORIES= www net security wayland
5	MASTER_SITES= TOR	4	MASTER_SITES= TOR
6	MASTER_SITE_SUBDIR=torbrowser/${DISTVERSION}	5	MASTER_SITE_SUBDIR=torbrowser/${DISTVERSION}
7	DISTNAME= src-firefox-tor-browser-102.11.0esr-${DISTVERSION:R}-1-build1	6	DISTNAME= src-firefox-tor-browser-102.15.1esr-${DISTVERSION:R}-1-build3
8		7
9	MAINTAINER= freebsd@sysctl.cz	8	MAINTAINER= freebsd@sysctl.cz
10	COMMENT= Tor Browser for FreeBSD	9	COMMENT= Tor Browser for FreeBSD
Lines 48-54 MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \ Link Here
48	MOZ_APP_DISPLAYNAME="Tor Browser" \	47	MOZ_APP_DISPLAYNAME="Tor Browser" \
49	MOZ_APP_NAME="tor-browser"	48	MOZ_APP_NAME="tor-browser"
50		49
51	MOZ_OPTIONS= --with-tor-browser-version=${DISTVERSION}-1 \	50	MOZ_OPTIONS= --with-base-browser-version=${DISTVERSION} \
52	--enable-official-branding \	51	--enable-official-branding \
53	--enable-optimize \	52	--enable-optimize \
54	--enable-bundled-fonts \	53	--enable-bundled-fonts \
Lines 60-66 MOZ_OPTIONS= --with-tor-browser-version=${DISTVERSION}-1 \ Link Here
60	--enable-proxy-bypass-protection \	59	--enable-proxy-bypass-protection \
61	--disable-system-policies \	60	--disable-system-policies \
62	--disable-backgroundtasks \	61	--disable-backgroundtasks \
63	--enable-base-browser \
64	--enable-verify-mar \	62	--enable-verify-mar \
65	--with-distribution-id=org.torproject	63	--with-distribution-id=org.torproject
66		64

Removed Link Here

(-)a/www/tor-browser/files/patch-rust-1.70.0 (-33 lines)
1	https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100
2
3	From 8b5b652d38e007e736bb442ccd5aa5ed699db100 Mon Sep 17 00:00:00 2001
4	From: Matthew Gregan <kinetik@flim.org>
5	Date: Thu, 16 Jun 2022 13:54:02 +1200
6	Subject: [PATCH] Fix `unstable-name-collisions` warning by using fully
7	qualified path.
8
9	---
10	mp4parse/src/lib.rs \| 9 +++++++--
11	1 file changed, 7 insertions(+), 2 deletions(-)
12
13	diff --git a/mp4parse/src/lib.rs b/mp4parse/src/lib.rs
14	index 567ee21d..4f3d7153 100644
15	--- third_party/rust/mp4parse/src/lib.rs
16	+++ third_party/rust/mp4parse/src/lib.rs
17	@@ -3506,8 +3506,13 @@ macro_rules! impl_mul {
18	type Output = $output;
19
20	fn mul(self, rhs: $rhs) -> Self::Output {
21	- static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64);
22	- static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX);
23	+ static_assertions::const_assert!(
24	+ <$output as UpperBounded>::MAX <= <$inner>::MAX as u64
25	+ );
26	+ static_assertions::const_assert!(
27	+ <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX
28	+ <= <$output as UpperBounded>::MAX
29	+ );
30
31	let lhs: $inner = self.get().into();
32	let rhs: $inner = rhs.get().into();
33

Removed Link Here

(-)a/www/tor-browser/files/patch-toolkit_compononents_tor-launcher_TorLauncherUtil.jsm (-20 lines)
1	--- ./toolkit/components/tor-launcher/TorLauncherUtil.jsm.orig 2022-12-12 08:48:18.438560000 +0000
2	+++ ./toolkit/components/tor-launcher/TorLauncherUtil.jsm 2022-12-12 08:49:39.039184000 +0000
3	@@ -31,7 +31,7 @@
4	checkIPCPathLen = true;
5
6	static _isFirstIPCPathRequest = true;
7	- static _isUserDataOutsideOfAppDir = undefined;
8	+ static _isUserDataOutsideOfAppDir = true;
9	static _dataDir = null;
10	static _appDir = null;
11
12	@@ -340,7 +340,7 @@
13	static get dataDir() {
14	if (!this._dataDir) {
15	const profDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
16	- this._dataDir = profDir.parent.parent;
17	+ this._dataDir = profDir;
18	}
19	return this._dataDir;
20	}

Removed Link Here

(-)a/www/tor-browser/files/patch-toolkit_xre_nsXREDirPRovider.cpp (-14 lines)
1	--- toolkit/xre/nsXREDirProvider.cpp.orig 2023-01-15 10:55:50.058634000 +0100
2	+++ toolkit/xre/nsXREDirProvider.cpp 2023-01-15 10:56:48.735300000 +0100
3	@@ -1653,7 +1653,11 @@
4	ToLowerCase(folder);
5
6	rv = AppendProfileString(aFile, folder.BeginReading());
7	+ } else {
8	+ nsAutoCString folder(".tor-browser-profiles");
9	+ rv = aFile->AppendNative(folder);
10	}
11	+
12	NS_ENSURE_SUCCESS(rv, rv);
13
14	#else

Added Link Here

(-)b/www/tor-browser/files/patch-toolkit_xre_nsXREDirProvider.cpp (+13 lines)
1	--- toolkit/xre/nsXREDirProvider.cpp.orig 2023-09-26 21:44:17 UTC
2	+++ toolkit/xre/nsXREDirProvider.cpp
3	@@ -1788,6 +1788,10 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile*
4
5	rv = aFile->AppendNative(folder);
6	}
7	+
8	+ // FreeBSD PR 268684
9	+ nsAutoCString folder(".tor-browser-profiles");
10	+ rv = aFile->AppendNative(folder);
11	}
12	NS_ENSURE_SUCCESS(rv, rv);
13