And here is the diff for -stable. Still building and I will do some
testing afterwards; OK provided that works out?
Caspar
Index: meta/tor-browser//Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.53.2.3
diff -u -p -r1.53.2.3 Makefile
--- meta/tor-browser//Makefile 9 Jun 2022 19:23:19 -0000 1.53.2.3
+++ meta/tor-browser//Makefile 30 Jul 2022 07:39:57 -0000
@@ -2,11 +2,11 @@ COMMENT= Tor Browser meta package
MAINTAINER= Caspar Schutijser <caspar@schutijser.com>
-PKGNAME= tor-browser-11.0.14
+PKGNAME= tor-browser-11.5.1
ONLY_FOR_ARCHS = amd64
-RUN_DEPENDS= www/tor-browser/browser>=11.0.14 \
+RUN_DEPENDS= www/tor-browser/browser>=11.5.1 \
www/tor-browser/noscript>=11.4.6 \
- net/tor>=0.4.7.7
+ net/tor>=0.4.7.8
.include <bsd.port.mk>
Index: meta/tor-browser//pkg/DESCR
===================================================================
RCS file: /cvs/ports/meta/tor-browser/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- meta/tor-browser//pkg/DESCR 13 Jan 2022 20:02:29 -0000 1.2
+++ meta/tor-browser//pkg/DESCR 30 Jul 2022 07:39:57 -0000
@@ -4,14 +4,8 @@ network. In addition to obscuring the cl
mitigates browser fingerprinting attacks and patches the Mozilla code
in other ways to prevent privacy leaks.
-Tor Browser includes the patched version of Firefox ESR and these
-Firefox add-ons:
-
-* noscript: a well-known add-on for Firefox that allows flexible blocking
- of JS. The version in the Tor Browser ports is specifically configured
- for use in Tor Browser by the Tor project and is not for use with other
- Mozilla-based browsers;
-* https-everywhere: an add-on for Firefox from EFF that attempts to turn
- http:// requests into https:// requests wherever possible. Like noscript,
- the verison in the Tor Browser ports is specifically configured for use
- in Tor Browser.
+Tor Browser includes the patched version of Firefox ESR and the NoScript
+Firefox add-on, a well-known add-on that allows flexible blocking
+of JS. The version in the Tor Browser ports is specifically configured
+for use in Tor Browser by the Tor project and is not for use with other
+Mozilla-based browsers.
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.51.2.3
diff -u -p -r1.51.2.3 Makefile.inc
--- www/tor-browser/Makefile.inc 9 Jun 2022 19:23:19 -0000 1.51.2.3
+++ www/tor-browser/Makefile.inc 30 Jul 2022 07:39:57 -0000
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
PERMIT_PACKAGE ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 11.0.14
+TB_VERSION = 11.5.1
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.78.2.3
diff -u -p -r1.78.2.3 Makefile
--- www/tor-browser/browser/Makefile 9 Jun 2022 19:23:19 -0000 1.78.2.3
+++ www/tor-browser/browser/Makefile 30 Jul 2022 07:39:57 -0000
@@ -8,21 +8,18 @@ ONLY_FOR_ARCHS = amd64
MOZILLA_VERSION = ${TB_VERSION}
MOZILLA_PROJECT = ${BROWSER_NAME}
MOZILLA_CODENAME = browser
-TL_VERSION = 0.2.33
-HE_VERSION = 2021.4.15
+TL_VERSION = 0.2.37
EXTRACT_SUFX = .tar.xz
PATCHORIG = .pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-91.10.0esr-11.0-1-build1
+DISTNAME = src-firefox-tor-browser-91.12.0esr-11.5-1-build1
FIX_EXTRACT_PERMISSIONS = Yes
-EXTRACT_ONLY += ${DISTNAME}.tar.xz \
+DISTFILES += ${DISTNAME}.tar.xz \
src-tor-launcher-${TL_VERSION}.tar.xz \
tor-browser-linux64-${TB_VERSION}_en-US.tar.xz
-DISTFILES = ${EXTRACT_ONLY} \
- https-everywhere-${HE_VERSION}-eff.xpi:0
SO_VERSION = 7.0
MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
@@ -30,12 +27,11 @@ MOZILLA_LIBS += freebl3 nss3 nssckbi
MOZILLA_LIBS += nssutil3 smime3 softokn3 ssl3
MOZILLA_LIBS += nspr4 mozsqlite3 plc4 plds4
-# mozilla public license for the browser; GPLv2+ for HTTPS Everywhere
+# mozilla public license for the browser
PERMIT_PACKAGE= Yes
MASTER_SITES = https://dist.torproject.org/torbrowser/${TB_VERSION}/ \
https://archive.torproject.org/tor-package-archive/torbrowser/${TB_VERSION}/
-MASTER_SITES0 = https://www.eff.org/files/
MODULES = www/mozilla lang/python
@@ -73,7 +69,7 @@ CONFIGURE_ENV += M4=/usr/local/bin/gm4
# app-name etc. for tor-browser
CONFIGURE_ARGS += --with-app-name=${BROWSER_NAME} \
--with-tor-browser-version=${TB_VERSION} \
- --disable-tor-browser-update
+ --enable-tor-browser-data-outside-app-dir
# for nss build system
MAKE_ENV += BUILD_OPT=1 \
@@ -82,9 +78,7 @@ MAKE_ENV += BUILD_OPT=1 \
XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
BUILD_DEPENDS += devel/py-virtualenv
-BUILD_DEPENDS += archivers/unzip archivers/zip
-
-RUN_DEPENDS += net/tor>=0.4.7.7
+RUN_DEPENDS += net/tor>=0.4.7.8
CONFIGURE_ARGS += --enable-release #1386371
CONFIGURE_ARGS += --enable-sandbox
@@ -115,6 +109,7 @@ post-patch:
# Not using a patch for this; patch context would contain UTF-8
sed -i 's/#ifdef XP_LINUX/#if defined(XP_LINUX) || defined(XP_OPENBSD)/' \
${WRKSRC}/browser/app/profile/000-tor-browser.js
+ ln -s ${WRKSRC}/mozconfig-linux-x86_64 ${WRKSRC}/.mozconfig
BROWSER_DIR = ${PREFIX}/lib/${BROWSER_NAME}
TRUEBROWSER_DIR = ${TRUEPREFIX}/lib/${BROWSER_NAME}
@@ -164,12 +159,6 @@ post-install:
${INSTALL_DATA_DIR} ${BROWSER_DIR}/browser/fonts
cp ${WRKSRC}/tor-browser_en-US/Browser/fonts/* \
${BROWSER_DIR}/browser/fonts
-
- # Include HTTPS Everywhere in omni.ja
- mkdir -p ${WRKSRC}/https-everywhere/chrome/torbutton/content/extensions/https-everywhere/
- unzip -o ${FULLDISTDIR}/https-everywhere-${HE_VERSION}-eff.xpi \
- -d ${WRKSRC}/https-everywhere/chrome/torbutton/content/extensions/https-everywhere/
- cd ${WRKSRC}/https-everywhere && find chrome/ | zip -X -@ ${BROWSER_DIR}/omni.ja
# install wrapper script (remove symlink first)
rm ${PREFIX}/bin/${BROWSER_NAME}
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.49.2.3
diff -u -p -r1.49.2.3 distinfo
--- www/tor-browser/browser/distinfo 9 Jun 2022 19:23:19 -0000 1.49.2.3
+++ www/tor-browser/browser/distinfo 30 Jul 2022 07:39:57 -0000
@@ -1,8 +1,6 @@
-SHA256 (mozilla/https-everywhere-2021.4.15-eff.xpi) = fl9ygI6hSL7M1BbsvfM+oevEOkMuTnhbXl4TObeitwg=
-SHA256 (mozilla/src-firefox-tor-browser-91.10.0esr-11.0-1-build1.tar.xz) = 04NnD5ZDiIpA/6MaDQ40df1Y/1Qf+oLe8+U4q6mXiKI=
-SHA256 (mozilla/src-tor-launcher-0.2.33.tar.xz) = ZG7lH5mBhkCRA26AEdCo52HP0iNlHKbRKl/BKyP0C9U=
-SHA256 (mozilla/tor-browser-linux64-11.0.14_en-US.tar.xz) = tgaST9+CN+aXz5XCKRidpYdcGQh11yl2llXHtnrrmqY=
-SIZE (mozilla/https-everywhere-2021.4.15-eff.xpi) = 1746434
-SIZE (mozilla/src-firefox-tor-browser-91.10.0esr-11.0-1-build1.tar.xz) = 413196916
-SIZE (mozilla/src-tor-launcher-0.2.33.tar.xz) = 229992
-SIZE (mozilla/tor-browser-linux64-11.0.14_en-US.tar.xz) = 87620816
+SHA256 (mozilla/src-firefox-tor-browser-91.12.0esr-11.5-1-build1.tar.xz) = hDoJBdfxp1HKO73oVia1ODK1TUeUCSUC9F4E8zAXX0k=
+SHA256 (mozilla/src-tor-launcher-0.2.37.tar.xz) = 91AWkxTFbRS5HFXz2pon3l0hHAYusYX559AIr1i2MTw=
+SHA256 (mozilla/tor-browser-linux64-11.5.1_en-US.tar.xz) = LgzvptQoTHGngW4xDZNfm5teSjpAjcUzMKDbBHRInoo=
+SIZE (mozilla/src-firefox-tor-browser-91.12.0esr-11.5-1-build1.tar.xz) = 412734180
+SIZE (mozilla/src-tor-launcher-0.2.37.tar.xz) = 261128
+SIZE (mozilla/tor-browser-linux64-11.5.1_en-US.tar.xz) = 112193560
Index: www/tor-browser/browser/patches/patch-_mozconfig
===================================================================
RCS file: www/tor-browser/browser/patches/patch-_mozconfig
diff -N www/tor-browser/browser/patches/patch-_mozconfig
--- www/tor-browser/browser/patches/patch-_mozconfig 9 Mar 2022 20:48:33 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-Disable the updater and related stuff. Does nothing under OpenBSD
-
-Encrypted Media Extensions is not supported on OpenBSD. Apparently this also
-means we can not pass --disable-eme to configure so comment that out.
-
-Don't use --enable-rust-simd, fails to build.
-
-Index: .mozconfig
---- .mozconfig.orig
-+++ .mozconfig
-@@ -14,7 +14,6 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
- export MOZILLA_OFFICIAL=1
-
- ac_add_options --enable-optimize
--ac_add_options --enable-rust-simd
- ac_add_options --enable-official-branding
-
- # Let's support GTK3 for ESR60
-@@ -28,13 +27,15 @@ ac_add_options --disable-crashreporter
- ac_add_options --disable-webrtc
- ac_add_options --disable-parental-controls
- # Let's make sure no preference is enabling either Adobe's or Google's CDM.
--ac_add_options --disable-eme
-+#ac_add_options --disable-eme
- ac_add_options --enable-proxy-bypass-protection
-
- # Disable telemetry
- ac_add_options MOZ_TELEMETRY_REPORTING=
-
--ac_add_options --disable-tor-launcher
--ac_add_options --with-tor-browser-version=dev-build
-+# avoid 1.1GB libxul
-+ac_add_options --disable-debug-symbols
-+
-+#ac_add_options --with-tor-browser-version=dev-build
- ac_add_options --disable-tor-browser-update
--ac_add_options --enable-verify-mar
-+#ac_add_options --enable-verify-mar
Index: www/tor-browser/browser/patches/patch-browser_config_mozconfigs_base-browser
===================================================================
RCS file: www/tor-browser/browser/patches/patch-browser_config_mozconfigs_base-browser
diff -N www/tor-browser/browser/patches/patch-browser_config_mozconfigs_base-browser
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/patches/patch-browser_config_mozconfigs_base-browser 30 Jul 2022 07:39:57 -0000
@@ -0,0 +1,30 @@
+Encrypted Media Extensions is not supported on OpenBSD. Apparently this also
+means we can not pass --disable-eme to configure so comment that out.
+
+Don't use --enable-rust-simd, fails to build.
+
+Index: browser/config/mozconfigs/base-browser
+--- browser/config/mozconfigs/base-browser.orig
++++ browser/config/mozconfigs/base-browser
+@@ -12,19 +12,19 @@ ac_add_options --enable-official-branding
+ export MOZILLA_OFFICIAL=1
+
+ ac_add_options --enable-optimize
+-ac_add_options --enable-rust-simd
+
+ ac_add_options --enable-bundled-fonts
+
+ ac_add_options --disable-tests
+ ac_add_options --disable-debug
++# avoid 1.1GB libxul
++ac_add_options --disable-debug-symbols
+
+ ac_add_options --disable-crashreporter
+ # Before removing, please notice that WebRTC does not work on mingw (Bug 1393901)
+ ac_add_options --disable-webrtc
+ ac_add_options --disable-parental-controls
+ # Let's make sure no preference is enabling either Adobe's or Google's CDM.
+-ac_add_options --disable-eme
+ ac_add_options --enable-proxy-bypass-protection
+ # See bugs #30575 and #32418: system policies are harmful either because they
+ # could allow proxy bypass, and override a number of other preferences we set
Index: www/tor-browser/browser/patches/patch-browser_config_mozconfigs_tor-browser
===================================================================
RCS file: www/tor-browser/browser/patches/patch-browser_config_mozconfigs_tor-browser
diff -N www/tor-browser/browser/patches/patch-browser_config_mozconfigs_tor-browser
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/patches/patch-browser_config_mozconfigs_tor-browser 30 Jul 2022 07:39:57 -0000
@@ -0,0 +1,13 @@
+Disable the updater and related stuff. Does nothing under OpenBSD.
+
+Index: browser/config/mozconfigs/tor-browser
+--- browser/config/mozconfigs/tor-browser.orig
++++ browser/config/mozconfigs/tor-browser
+@@ -4,7 +4,4 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
+
+ ac_add_options --with-relative-profile=TorBrowser/Data/Browser
+
+-ac_add_options --enable-tor-browser-update
+-ac_add_options --enable-verify-mar
+-
+ ac_add_options --with-distribution-id=org.torproject
Index: www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js,v
retrieving revision 1.7
diff -u -p -r1.7 patch-browser_extensions_tor-launcher_src_components_tl-process_js
--- www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js 9 Mar 2022 20:48:33 -0000 1.7
+++ www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js 30 Jul 2022 07:39:57 -0000
@@ -4,7 +4,7 @@ the new getTorFile() deal with it.
Index: browser/extensions/tor-launcher/src/components/tl-process.js
--- browser/extensions/tor-launcher/src/components/tl-process.js.orig
+++ browser/extensions/tor-launcher/src/components/tl-process.js
-@@ -381,6 +381,8 @@ TorProcessService.prototype =
+@@ -386,6 +386,8 @@ TorProcessService.prototype =
var torrcFile = TorLauncherUtil.getTorFile("torrc", true);
var torrcDefaultsFile =
TorLauncherUtil.getTorFile("torrc-defaults", false);
@@ -13,7 +13,7 @@ Index: browser/extensions/tor-launcher/s
var hashedPassword = this.mProtocolSvc.TorGetPassword(true);
var controlIPCFile = this.mProtocolSvc.TorGetControlIPCFile();
var controlPort = this.mProtocolSvc.TorGetControlPort();
-@@ -408,19 +410,14 @@ TorProcessService.prototype =
+@@ -413,19 +415,14 @@ TorProcessService.prototype =
return;
}
Index: www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp,v
retrieving revision 1.7
diff -u -p -r1.7 patch-xpcom_io_TorFileUtils_cpp
--- www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp 9 Mar 2022 20:48:33 -0000 1.7
+++ www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp 30 Jul 2022 07:39:58 -0000
@@ -15,15 +15,15 @@ Index: xpcom/io/TorFileUtils.cpp
+# define TOR_BROWSER_DATA_IN_HOME_DIR 1
+
No comments:
Post a Comment