On Sun, Feb 28, 2021 at 10:04:33AM +0000, Caspar Schutijser wrote:
> Hi,
>
> The diff below updates Tor Browser to 10.0.12. Tested on amd64. More
> information can be found here:
> https://blog.torproject.org/new-release-tor-browser-10012
>
> Upstream ships with NoScript 11.2.2 but the distfile for that version
> does not seem to be available anymore. Therefore I upgraded to 11.2.3,
> I don't think that hurts.
>
> Thanks,
> Caspar Schutijser
The Cargo.toml patch fails and is no longer required I believe.
Build & Run tested on amd64.
regards,
Dimitri
Index: meta/tor-browser/Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- meta/tor-browser/Makefile 6 Feb 2021 20:56:40 -0000 1.36
+++ meta/tor-browser/Makefile 28 Feb 2021 09:55:35 -0000
@@ -4,11 +4,11 @@ COMMENT= Tor Browser meta package
MAINTAINER= Caspar Schutijser <cas...@schutijser.com>
-PKGNAME= tor-browser-10.0.10
+PKGNAME= tor-browser-10.0.12
ONLY_FOR_ARCHS = amd64 i386
-RUN_DEPENDS= www/tor-browser/browser>=10.0.10 \
- www/tor-browser/noscript>=11.2 \
+RUN_DEPENDS= www/tor-browser/browser>=10.0.12 \
+ www/tor-browser/noscript>=11.2.3 \
net/tor>=0.4.4.6
.include <bsd.port.mk>
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile.inc
--- www/tor-browser/Makefile.inc 6 Feb 2021 20:56:40 -0000 1.36
+++ www/tor-browser/Makefile.inc 28 Feb 2021 09:55:35 -0000
@@ -5,7 +5,7 @@ HOMEPAGE ?= https://www.torproject.org
PERMIT_PACKAGE ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 10.0.10
+TB_VERSION = 10.0.12
TB_PREFIX = tb
SUBST_VARS += BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- www/tor-browser/browser/Makefile 23 Feb 2021 19:39:48 -0000 1.59
+++ www/tor-browser/browser/Makefile 28 Feb 2021 09:55:35 -0000
@@ -16,7 +16,7 @@ EXTRACT_SUFX = .tar.xz
PATCHORIG = .pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-78.7.0esr-10.0-2-build1
+DISTNAME = src-firefox-tor-browser-78.8.0esr-10.0-1-build1
FIX_EXTRACT_PERMISSIONS = Yes
EXTRACT_ONLY += ${DISTNAME}.tar.xz \
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- www/tor-browser/browser/distinfo 6 Feb 2021 20:56:40 -0000 1.35
+++ www/tor-browser/browser/distinfo 28 Feb 2021 09:55:35 -0000
@@ -1,8 +1,8 @@
SHA256 (mozilla/https-everywhere-2021.1.27-eff.xpi) =
g1ge5VObY9VPIICknsncfUN8hH+5wGq41TjU+AOcHOc=
-SHA256 (mozilla/src-firefox-tor-browser-78.7.0esr-10.0-2-build1.tar.xz) =
ULIHhWWksmvRQxsSQGKLQBfB/d/m4lwZIxDbyqYzP2A=
+SHA256 (mozilla/src-firefox-tor-browser-78.8.0esr-10.0-1-build1.tar.xz) =
eCq/RE0LpsnMzdBREEn9+whcZYpeJDeHE4f/t9WcyX8=
SHA256 (mozilla/src-tor-launcher-0.2.26.tar.xz) =
JNovULiGxs68qC1A5c4zKaZHGGGlpj9ohKT8nQFKmNU=
-SHA256 (mozilla/tor-browser-linux64-10.0.10_en-US.tar.xz) =
vYWZ+NsGN8YH5O61+zrUjlFv3rieaBqjBQ+a18sQcZg=
+SHA256 (mozilla/tor-browser-linux64-10.0.12_en-US.tar.xz) =
220fxv8BwnIdQIaqHbSIDtsx+tx+9XuiNPbYN09Kr0Q=
SIZE (mozilla/https-everywhere-2021.1.27-eff.xpi) = 1742613
-SIZE (mozilla/src-firefox-tor-browser-78.7.0esr-10.0-2-build1.tar.xz) =
364550288
+SIZE (mozilla/src-firefox-tor-browser-78.8.0esr-10.0-1-build1.tar.xz) =
364015416
SIZE (mozilla/src-tor-launcher-0.2.26.tar.xz) = 217792
-SIZE (mozilla/tor-browser-linux64-10.0.10_en-US.tar.xz) = 85351772
+SIZE (mozilla/tor-browser-linux64-10.0.12_en-US.tar.xz) = 85400268
Index: www/tor-browser/browser/patches/patch-Cargo_toml
===================================================================
RCS file: www/tor-browser/browser/patches/patch-Cargo_toml
diff -N www/tor-browser/browser/patches/patch-Cargo_toml
--- www/tor-browser/browser/patches/patch-Cargo_toml 12 Feb 2021 08:02:36
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-Cargo_toml,v 1.1 2021/02/12 08:02:36 landry Exp $
-
-fix for rust 1.50
-https://bugzilla.mozilla.org/show_bug.cgi?id=1684261
-https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
-
-Index: Cargo.toml
---- Cargo.toml.orig
-+++ Cargo.toml
-@@ -68,8 +68,8 @@ panic = "abort"
- libudev-sys = { path = "dom/webauthn/libudev-sys" }
- packed_simd = { git = "https://github.com/hsivonen/packed_simd";,
rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
- rlbox_lucet_sandbox = { git =
"https://github.com/PLSysSec/rlbox_lucet_sandbox/";,
rev="d510da5999a744c563b0acd18056069d1698273f" }
--nix = { git = "https://github.com/shravanrn/nix/";, branch = "r0.13.1",
rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
--spirv_cross = { git = "https://github.com/kvark/spirv_cross";, branch =
"wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-+nix = { git = "https://github.com/shravanrn/nix/";, branch = "r0.13.1" }
-+spirv_cross = { git = "https://github.com/kvark/spirv_cross";, branch =
"wgpu3" }
- # failure's backtrace feature might break our builds, see bug 1608157.
- failure = { git = "https://github.com/badboy/failure";, rev =
"64af847bc5fdcb6d2438bec8a6030812a80519a5" }
- failure_derive = { git = "https://github.com/badboy/failure";, rev =
"64af847bc5fdcb6d2438bec8a6030812a80519a5" }
Index: www/tor-browser/noscript/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- www/tor-browser/noscript/Makefile 14 Feb 2021 13:58:57 -0000 1.32
+++ www/tor-browser/noscript/Makefile 28 Feb 2021 09:55:35 -0000
@@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.32 2021/02/14 13:58:57 kn Exp $
ADDON_NAME = noscript
-V = 11.2
+V = 11.2.3
COMMENT = Tor Browser add-on: flexible JS blocker
HOMEPAGE = https://noscript.net
MASTER_SITES = https://secure.informaction.com/download/releases/
GUID = {73a6fe31-595d-460b-a920-fcc0f8843232}
DISTFILE_IS_XPI = Yes
-REVISION = 0
.include <bsd.port.mk>
Index: www/tor-browser/noscript/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/noscript/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- www/tor-browser/noscript/distinfo 6 Feb 2021 20:56:40 -0000 1.28
+++ www/tor-browser/noscript/distinfo 28 Feb 2021 09:55:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (noscript-11.2.xpi) = Qli80LzfyOyyMdJQ463xxHehpnLt50pc0QugWlOBurs=
-SIZE (noscript-11.2.xpi) = 601909
+SHA256 (noscript-11.2.3.xpi) = 6vxfW+QNM6NNdXlAtTkUVdrRZpIciA7mfaqwVgeNUa4=
+SIZE (noscript-11.2.3.xpi) = 603728
